Ver Fonte

外部市场准入流程添加

huahaiyan há 6 anos atrás
pai
commit
237dc7dac3

+ 9 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -647,6 +647,8 @@ func (this *OilSupplierCertController) AuditEntity() {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
 			} else if supplierCertEntity.InStyle == "3" {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
+			} else if supplierCertEntity.InStyle == "6" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
 			} else {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id)
 			}
@@ -655,6 +657,8 @@ func (this *OilSupplierCertController) AuditEntity() {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
 			} else if supplierCertEntity.InStyle == "3" {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_SUPPLIER_APPLY, businessKey, this.User.Id)
+			} else if supplierCertEntity.InStyle == "6" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_SUPPLIER_APPLY, businessKey, this.User.Id)
 			} else {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SUPPLIER_APPLY, businessKey, this.User.Id)
 			}
@@ -675,6 +679,8 @@ func (this *OilSupplierCertController) AuditEntity() {
 			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY
 		} else if supplierCertEntity.InStyle == "3" {
 			ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_SUPPLIER_APPLY
+		} else if supplierCertEntity.InStyle == "6" {
+			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_SUPPLIER_APPLY
 		} else {
 			ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
 		}
@@ -683,6 +689,8 @@ func (this *OilSupplierCertController) AuditEntity() {
 			ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
 		} else if supplierCertEntity.InStyle == "3" {
 			ActiComplete.ProcessKey = workflow.OIL_SECOND_SUPPLIER_APPLY
+		} else if supplierCertEntity.InStyle == "6" {
+			ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
 		} else {
 			ActiComplete.ProcessKey = workflow.OIL_SUPPLIER_APPLY
 		}
@@ -880,7 +888,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		var setting auditsetting.Base_OilAuditSetting
 		usvc := userRole.GetUserService(utils.DBE)
 
-		if supplierCertEntity.InStyle == "2" {
+		if supplierCertEntity.InStyle == "2" || supplierCertEntity.InStyle == "6"{
 			status = suppliercert.CENT_AUDIT_STATUS
 			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
 			usvc.GetEntity(&setting, where)

+ 9 - 1
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercertappend.go

@@ -534,6 +534,8 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
 			} else if supplierCertAppendEntity.InStyle == "3" {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
+			} else if supplierCertAppendEntity.InStyle == "6" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
 			} else {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id)
 			}
@@ -542,6 +544,8 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
 			}else if  supplierCertAppendEntity.InStyle == "3" {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_APPEND_APPLY, businessKey, this.User.Id)
+			}else if  supplierCertAppendEntity.InStyle == "6" {
+				processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
 			}else {
 				processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
 			}
@@ -555,6 +559,8 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
 		} else if supplierCertAppendEntity.InStyle == "3" {
 			ActiComplete.ProcessKey = workflow.OIL_SECOND_ENUSER_APPEND_APPLY
+		} else if supplierCertAppendEntity.InStyle == "6" {
+			ActiComplete.ProcessKey = workflow.OIL_FIRST_ENUSER_APPEND_APPLY
 		} else {
 			ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
 		}
@@ -563,6 +569,8 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 			ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
 		}else if  supplierCertAppendEntity.InStyle == "3" {
 			ActiComplete.ProcessKey = workflow.OIL_SECOND_APPEND_APPLY
+		}else if  supplierCertAppendEntity.InStyle == "6" {
+			ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
 		}else{
 			ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
 		}
@@ -699,7 +707,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 		var userlist []userRole.Base_User
 		var setting auditsetting.Base_OilAuditSetting
 		usvc := userRole.GetUserService(utils.DBE)
-		if supplierCertAppendEntity.InStyle == "2" {
+		if supplierCertAppendEntity.InStyle == "2"  || supplierCertAppendEntity.InStyle == "6" {
 			status = suppliercert.CENT_AUDIT_STATUS
 			where := "AuditStepCode='" + workflow.PROF_REGULATION + "'"
 			usvc.GetEntity(&setting, where)

+ 152 - 148
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -267,7 +267,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="allowpre">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
                 <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">-->
               <!--</el-cascader>-->
@@ -354,9 +354,9 @@
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import FloatImgBtn from '@/components/floatButton/index'
-  import ElButton from "../../../../../node_modules/element-ui/packages/button/src/button";
+  import ElButton from '../../../../../node_modules/element-ui/packages/button/src/button'
 
-  export default {
+export default {
 
     components: {
       ElButton,
@@ -384,36 +384,37 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       var checkWorkerTotal = (rule, value, callback) => {
         if (value <= 0) {
           return callback(new Error('企业员工总数必须大于0'))
         } else {
           callback()
         }
-      };
+      }
       var checkTechnicalNum = (rule, value, callback) => {
         if (value <= 0) {
           return callback(new Error('技术、管理人员数量必须大于0'))
         } else {
           callback()
         }
-      };
+      }
       var checkSkillerTotal = (rule, value, callback) => {
         if (value <= 0) {
           return callback(new Error('技术工人总数必须大于0'))
         } else {
           callback()
         }
-      };
+      }
       return {
+        allowpre: true,
         totalTab: 3,
         activeName: '0',
         chooseAuditorVisible: false,
         chooseAuditorVisibleFen: false,
         showReturn: 1,
         IsCompanyUser: 0,
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         majorDept: [100000000, 100000128, 100000151],
         orgauditOptions: [],
         UnitOrgOptions: [],
@@ -443,11 +444,11 @@
         certId: '',
         classId: '02',
         auditform: {
-          FirstAuditName: "",
-          SecondAudit: "",
-          ThirdAudit: "",
-          CertId: "",
-          AuditRemark: ""
+          FirstAuditName: '',
+          SecondAudit: '',
+          ThirdAudit: '',
+          CertId: '',
+          AuditRemark: ''
         },
         orgtreeprops: {
           value: 'id',
@@ -486,7 +487,7 @@
           QualitySystemCert: '',
           ProductQualityCert: '',
           MaunLicense: '',
-          PACNumber:'',
+          PACNumber: '',
           QualifCert: '',
           QualifCertLevel: '',
           SafetyLicense: '',
@@ -572,17 +573,17 @@
         flag: '02',
         rules: {
           WorkerTotal: [{
-            required:true,
+            required: true,
             validator: checkWorkerTotal,
             trigger: 'blur'
           }],
           TechnicalNum: [{
-            required:true,
+            required: true,
             validator: checkTechnicalNum,
             trigger: 'blur'
           }],
           SkillerTotal: [{
-            required:true,
+            required: true,
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
@@ -594,11 +595,11 @@
           SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
-          RecUnitFlag: '', //推荐单位的级联Id标记
-          RecUnitId: '', //推荐单位编码
-          RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(01 物资类,02 基建类,03 技术服务类)
-          Remark: '', //备注
+          RecUnitFlag: '', // 推荐单位的级联Id标记
+          RecUnitId: '', // 推荐单位编码
+          RecUnitName: '', // 推荐单位名称
+          AppendType: '', // 增项类别(01 物资类,02 基建类,03 技术服务类)
+          Remark: '' // 备注
         },
         annentityForm: {
           Id: '',
@@ -609,11 +610,11 @@
           auditer: '',
           Step: 0,
           Remark: ''
-        },
+        }
       }
     },
 
-    mounted() {
+    mounted () {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.rtn) {
         this.showReturn = 0
@@ -627,9 +628,9 @@
         this.formData.Id = 0
       }
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      console.log("----this.IsCompanyUser----", this.IsCompanyUser)
+      console.log('----this.IsCompanyUser----', this.IsCompanyUser)
       this.getDictOptions()
-      //this.getorgtreelist()
+      // this.getorgtreelist()
       if (this.IsCompanyUser && this.serviceId === 'add') {
         // apiCert.getEntityByCreatorAndType('02', this.$axios).then(res => {
         //   this.certId = res.data.Id
@@ -647,43 +648,41 @@
       this.changeOrgUnit(this.selectDept)
     },
     methods: {
-       nextStep(){
-         this.$refs["subfileList"].nextStep();
+      nextStep () {
+        this.$refs['subfileList'].nextStep()
       },
-      annaudit() {
+      annaudit () {
         this.annentityForm.supplierId = parseInt(this.serviceId)
         this.annentityForm.SupplierName = this.formData.SupplierName
         annapi.addEntity(this.annentityForm, this.annentityForm.auditer, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后,初始化数据,变成修改
-            let annId= res.data.item;
+            // 保存成功后,初始化数据,变成修改
+            let annId = res.data.item
             this.$router.push({
               path: '/oilsupplier/annualaudit/' + this.serviceId + '/bassicoperation',
               query: {
                 certid: this.certId,
-                //WorkflowId: ,
+                // WorkflowId: ,
                 Status: 0,
                 Step: 1,
-                annualId: annId,
+                annualId: annId
               }
             })
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-
+            })
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
+            })
           }
         }).catch(err => {
           console.error(err)
-        });
-
+        })
       },
-      //导出到Word文件
+      // 导出到Word文件
       toWord () {
         let id = this.formData.Id
         dataapi.docexport(id, this.$axios)
@@ -707,7 +706,7 @@
             console.error(err)
           })
       },
-      //导出准入范围到pdf
+      // 导出准入范围到pdf
       toPdf () {
         let id = this.formData.Id
         dataapi.pdfexport(id, this.$axios)
@@ -747,10 +746,10 @@
               }
             }
           }).catch(err => {
-          console.error(err)
-        })
+            console.error(err)
+          })
       },
-      qppend() {
+      qppend () {
         let _this = this
         _this.appendformData.SupplierName = this.formData.SupplierName
         _this.appendformData.SupplierId = parseInt(this.serviceId)
@@ -759,18 +758,18 @@
         _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
           .then(res => {
             if (res.data.code === 0) {
-              //this.entityList = res.data.item
+              // this.entityList = res.data.item
               let AppendId = res.data.info
               this.$router.push({
                 path: `/oilsupplier/supplierappend/2/basisdataopera`,
                 query: {
                   Id: AppendId,
-                  editFlag: 1 //编辑标记: 1 修改,0 不修改
+                  editFlag: 1 // 编辑标记: 1 修改,0 不修改
                 }
               })
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
             } else {
               _this.$message({
@@ -782,7 +781,6 @@
           .catch(err => {
             console.error(err)
           })
-
       },
       orgunitChange (val) {
         let deptid = val
@@ -801,7 +799,7 @@
           console.error(err)
         })
       },
-      orgtreeChange(val) {
+      orgtreeChange (val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
         let auditstepcode = 'PROF_RECE'
@@ -811,9 +809,9 @@
           console.error(err)
         })
       },
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) { // 已经关联到子表了,就不能再切换主表ID了
-          api.getEntityByName(val,'02', this.$axios).then(res => {
+          api.getEntityByName(val, '02', this.$axios).then(res => {
             if (res.data) {
               this.SetFormData(res.data)
             }
@@ -822,33 +820,33 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) { // 已经关联到子表了,就不能再切换主表ID了
           this.SetFormData(fdata)
         }
       },
-      SetFormData(fdata) {
+      SetFormData (fdata) {
         this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
         this.formData.Grade = fdata.Grade
         this.formData.MgrUnit = fdata.MgrUnit
-        if(fdata.InStyle!=null && fdata.InStyle!=""){
-        this.formData.InStyle = fdata.InStyle
+        if (fdata.InStyle != null && fdata.InStyle != '') {
+          this.formData.InStyle = fdata.InStyle
         }
         this.formData.OperType = fdata.OperType
-        if(fdata.Country!=""){
-            this.formData.Country = fdata.Country;
+        if (fdata.Country != '') {
+          this.formData.Country = fdata.Country
         }
         this.formData.MaunAgent = fdata.MaunAgent
         this.formData.ConstructTeam = fdata.ConstructTeam
-        if(fdata.CredentialFlag!=null&&fdata.CredentialFlag!=""){
+        if (fdata.CredentialFlag != null && fdata.CredentialFlag != '') {
           this.formData.CredentialFlag = fdata.CredentialFlag
         }
         this.formData.CommercialNo = fdata.CommercialNo
-        if (fdata.CredentialFlag!=null&&fdata.CredentialFlag!="") {
-            this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
+        if (fdata.CredentialFlag != null && fdata.CredentialFlag != '') {
+          this.$refs['BasisInfo'].showorhid(this.formData.CredentialFlag)
         }
         this.formData.OrganCode = fdata.OrganCode
         this.formData.CountryTaxNo = fdata.CountryTaxNo
@@ -869,12 +867,12 @@
         this.formData.CategoryCode = fdata.CategoryCode
         this.formData.CategoryName = fdata.CategoryName
         this.formData.RegCapital = fdata.RegCapital
-        if(fdata.Currency!=null && fdata.Currency!=""){
-        this.formData.Currency = fdata.Currency
+        if (fdata.Currency != null && fdata.Currency != '') {
+          this.formData.Currency = fdata.Currency
         }
         this.formData.ContactName = fdata.ContactName
 
-        if(fdata.CompanyType!=null && fdata.CompanyType!=""){
+        if (fdata.CompanyType != null && fdata.CompanyType != '') {
           this.formData.CompanyType = fdata.CompanyType
         }
         this.formData.SetupTime = fdata.SetupTime
@@ -882,21 +880,21 @@
         this.formData.BankAccount = fdata.BankAccount
         this.formData.EMail = fdata.EMail
         this.formData.BankCreditRating = fdata.BankCreditRating
-          if(fdata.Mobile!=null && fdata.Mobile!=""){
-           this.formData.Mobile = fdata.Mobile;
-        }else{
-           this.formData.Mobile = fdata.UserTelephone;
+        if (fdata.Mobile != null && fdata.Mobile != '') {
+          this.formData.Mobile = fdata.Mobile
+        } else {
+          this.formData.Mobile = fdata.UserTelephone
         }
         this.formData.Telphone = fdata.Telphone
         this.formData.Fax = fdata.Fax
         this.formData.CompanyTel = fdata.CompanyTel
         this.formData.QQ = fdata.QQ
         this.formData.CompanyUrl = fdata.CompanyUrl
-        if(fdata.HseTraining!=null && fdata.HseTraining!=""){
-        this.formData.HseTraining = fdata.HseTraining
+        if (fdata.HseTraining != null && fdata.HseTraining != '') {
+          this.formData.HseTraining = fdata.HseTraining
         }
-        if(fdata.SpecTypeCode!=null && fdata.SpecTypeCode!=""){
-         this.formData.SpecTypeCode = fdata.SpecTypeCode
+        if (fdata.SpecTypeCode != null && fdata.SpecTypeCode != '') {
+          this.formData.SpecTypeCode = fdata.SpecTypeCode
         }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
         this.formData.QualifCert = fdata.QualifCert
@@ -924,27 +922,27 @@
         } */
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
+      equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
+      performancedialog () {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
+      patentdialog () {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
+      winningdialog () {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         if (this.formData.Id) {
           this.isCanUpdateSupplier(this.formData.Id)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -962,17 +960,17 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.formDataCert.InStyle = this.formData.InStyle
-            if (this.formData.Status > 0 || this.formData.Status == -5 ) {
+            if (this.formData.Status > 0 || this.formData.Status == -5) {
               this.add_flat = false
             }
             if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
               this.delete_flat = false
             }
-            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+            if ((this.formData.Status > 0) && (this.authUser.Profile.IsCompanyUser == 1)) {
               this.delete_flat = false
             }
-            if (this.formData.CredentialFlag != "") {
-              this.$refs["BasisInfo"].showorhid(this.formData.CredentialFlag)
+            if (this.formData.CredentialFlag != '') {
+              this.$refs['BasisInfo'].showorhid(this.formData.CredentialFlag)
             }
             this.$refs['BasisInfo'].CityAry = []
             this.$refs['BasisInfo'].CityAry.push(this.formData.Province)
@@ -993,25 +991,29 @@
             this.backhistroy.certId = this.certId
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             if (this.certId && this.formDataCert.WorkflowId) {
-              //this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
+              // this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
             }
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
-            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
-              .formDataCert.InStyle)
+            this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
+            console.log('this.formData.InStyle1', this.formData.InStyle)
+            if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+              console.log('this.formData.InStyle2', this.formData.InStyle)
+              this.allowpre = false
+            }
           }).catch(err => {
             console.error(err)
           })
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
           .formDataCert.InStyle)
       },
-      nextTab() {
+      nextTab () {
         if (this.formData.AuditIndex > 0) {
           this.totalTab = 4
         }
@@ -1026,12 +1028,12 @@
         }
 
         let valid = true
-        this
+        // this
         if (this.formDataCert.Status <= 0 && this.activeName === '0') {
           valid = this.saveEntity()
         } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
           valid = this.updateNumberEntity()
-          valid = true//没办法中的办法
+          valid = true// 没办法中的办法
         }
         if (!valid) {
           return false
@@ -1042,10 +1044,10 @@
         } else {
           this.activeName = '0'
         }
-          document.querySelector(".content").scrollTop=0
+        document.querySelector('.content').scrollTop = 0
       },
 
-      backTab() {
+      backTab () {
         if (this.formData.AuditIndex > 0) {
           this.totalTab = 4
         }
@@ -1065,9 +1067,9 @@
         } else {
           this.activeName = this.totalTab + ''
         }
-          document.querySelector(".content").scrollTop=0
+        document.querySelector('.content').scrollTop = 0
       },
-      getDictOptions() {
+      getDictOptions () {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
@@ -1086,14 +1088,14 @@
         })
       },
 
-      getorgtreelist() {
+      getorgtreelist () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
             if (_this.authUser.Profile.IsCompanyUser === 0) {
@@ -1107,16 +1109,16 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        let auditstepcode = 'SECOND_TRIAL'
         api
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
+            console.error(err)
+          })
       },
       /* getCityList(val) {
        let resultData = JSON.parse(val)
@@ -1126,7 +1128,7 @@
        }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         let valid1 = false
         let valid2 = false
         this.$refs['BasisInfo'].$refs['EntityForm'].validate((valid) => {
@@ -1157,11 +1159,11 @@
       },
 
       // 保存信息
-      saveCertEntity() {
+      saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity() {
+      addEntity () {
         this.formData.SupplierTypeCode = '02'
         this.formData.SupplierTypeName = '基建类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -1174,7 +1176,6 @@
               type: 'success',
               message: res.data.message
             })
-
           } else {
             this.$message({
               type: 'warning',
@@ -1186,16 +1187,16 @@
         })
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //更新子表
+            // 更新子表
             // this.updateNumberEntity()
-              this.initDatas();
-              this.$message({
-                type: "success",
-                message: res.data.message
-              });
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
           } else {
             this.$message({
               type: 'warning',
@@ -1207,7 +1208,7 @@
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -1225,7 +1226,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         this.$refs['EntityFormNumber'].validate((valid) => {
           if (valid) {
             if (!this.CheckCompanyBase()) {
@@ -1255,63 +1256,67 @@
           }
         })
       },
-      selectAuditOrg() {
-        console.log("----this.IsCompanyUser", this.IsCompanyUser)
+      selectAuditOrg () {
+        console.log('----this.IsCompanyUser', this.IsCompanyUser)
         if (this.IsCompanyUser === 0) {
           this.dialogVisible = true
         } else if (this.IsCompanyUser === 1) {
           this.dialogVisibleCom = true
         }
       },
-      chooseAuditorShow() {
-        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+      chooseAuditorShow () {
+        console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
-      chooseAuditorShowFen() {
-        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+      chooseAuditorShowFen () {
+        console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
         this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisibleFen = true
       },
-      setAuditerFen(val, name) {
+      setAuditerFen (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisibleFen = false
       },
-      AuditEntity(val) {
-        if (this.auditer === "") {
+      AuditEntity (val) {
+        if (this.auditer === '') {
           this.$message({
-            type: "warning",
-            message: "请选择初审人!"
+            type: 'warning',
+            message: '请选择初审人!'
           })
           return
         }
-        if (this.fushenauditer === "") {
+        if (this.fushenauditer === '') {
           this.$message({
-            type: "warning",
-            message: "请选择复审人!"
+            type: 'warning',
+            message: '请选择复审人!'
           })
           return
         }
-        if (this.selectDept === 0 || this.selectDept == '') {
-          this.$message({
-            type: "warning",
-            message: "请选择专业处室!"
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.selectDept === 0 || this.selectDept == '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择专业处室!'
+            })
+            return
+          }
         }
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人!'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.userOptions == null || this.userOptions.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该专业科室未配置接收人!'
+            })
+            return
+          }
         }
         this.applyLoading = true
         this.auditform.FirstAuditName = this.auditer
@@ -1338,7 +1343,7 @@
           console.error(err)
         })
       },
-      SubpEntity() {
+      SubpEntity () {
         if (this.orgauditOptions == null || this.orgauditOptions.length === 0) {
           this.$message({
             type: 'warning',
@@ -1356,7 +1361,7 @@
         this.applyLoading = true
         this.auditform.FirstAuditName = this.UnitOrg
         this.auditform.CertId = this.certId
-        console.log("--this.audiform--", this.auditform)
+        console.log('--this.audiform--', this.auditform)
         apiCert
           .auditEntity(this.certId, this.auditform, this.$axios)
           .then(res => {
@@ -1365,14 +1370,14 @@
               this.initDatas()
               this.dialogVisibleCom = false
               this.$message({
-                type: "success",
+                type: 'success',
                 message: res.data.message
-              });
+              })
             } else {
               this.$message({
-                type: "warning",
+                type: 'warning',
                 message: res.data.message
-              });
+              })
             }
             this.applyLoading = false
           })
@@ -1381,11 +1386,11 @@
           })
       },
 
-      nexStepCB() {
+      nexStepCB () {
         this.formData.Step += 1
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1398,7 +1403,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -1411,7 +1416,6 @@
       }
     }
   }
-
 </script>
 
 <style>

Diff do ficheiro suprimidas por serem muito extensas
+ 401 - 392
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue


+ 181 - 176
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -265,7 +265,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室">
+            <el-form-item label="专业处室" v-if="allowpre">
               <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
                 <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">-->
               <!--</el-cascader>-->
@@ -379,29 +379,30 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       var checkWorkerTotal = (rule, value, callback) => {
         if (value <= 0) {
           return callback(new Error('企业员工总数必须大于0'))
         } else {
           callback()
         }
-      };
-      var checkTechnicalNum = (rule, value, callback) => {
+      }
+    var checkTechnicalNum = (rule, value, callback) => {
         if (value <= 0) {
           return callback(new Error('技术、管理人员数量必须大于0'))
         } else {
           callback()
         }
-      };
-      var checkSkillerTotal = (rule, value, callback) => {
+      }
+    var checkSkillerTotal = (rule, value, callback) => {
         if (value <= 0) {
           return callback(new Error('技术工人总数必须大于0'))
         } else {
           callback()
         }
-      };
-      return {
+      }
+    return {
+        allowpre: true,
         totalTab: 3,
         activeName: '0',
         chooseAuditorVisible: false,
@@ -410,7 +411,7 @@
         IsCompanyUser: 0,
         dialogVisible: false,
         canUpdateSupplier: true,
-        fushenauditer: '', //复审人员
+        fushenauditer: '', // 复审人员
         majorDept: [],
         userOptions: [],
         secauditerOptions: [],
@@ -438,11 +439,11 @@
         certId: '',
         classId: '03',
         auditform: {
-          FirstAuditName: "",
-          SecondAudit: "",
-          ThirdAudit: "",
-          CertId: "",
-          AuditRemark: ""
+          FirstAuditName: '',
+          SecondAudit: '',
+          ThirdAudit: '',
+          CertId: '',
+          AuditRemark: ''
         },
         orgtreeprops: {
           value: 'id',
@@ -481,7 +482,7 @@
           QualitySystemCert: '',
           ProductQualityCert: '',
           MaunLicense: '',
-          PACNumber: "",
+          PACNumber: '',
           QualifCert: '',
           QualifCertLevel: '',
           SafetyLicense: '',
@@ -567,17 +568,17 @@
         flag: '03',
         rules: {
           WorkerTotal: [{
-            required:true,
+            required: true,
             validator: checkWorkerTotal,
             trigger: 'blur'
           }],
           TechnicalNum: [{
-            required:true,
+            required: true,
             validator: checkTechnicalNum,
             trigger: 'blur'
           }],
           SkillerTotal: [{
-            required:true,
+            required: true,
             validator: checkSkillerTotal,
             trigger: 'blur'
           }]
@@ -589,11 +590,11 @@
           SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
-          RecUnitFlag: '', //推荐单位的级联Id标记
-          RecUnitId: '', //推荐单位编码
-          RecUnitName: '', //推荐单位名称
-          AppendType: '', //增项类别(01 物资类,02 基建类,03 技术服务类)
-          Remark: '', //备注
+          RecUnitFlag: '', // 推荐单位的级联Id标记
+          RecUnitId: '', // 推荐单位编码
+          RecUnitName: '', // 推荐单位名称
+          AppendType: '', // 增项类别(01 物资类,02 基建类,03 技术服务类)
+          Remark: '' // 备注
         },
         annentityForm: {
           Id: '',
@@ -604,10 +605,10 @@
           auditer: '',
           Step: 0,
           Remark: ''
-        },
+        }
       }
     },
-    mounted() {
+    mounted () {
       this.serviceId = this.$route.params.opera + ''
       if (this.$route.query.rtn) {
         this.showReturn = 0
@@ -622,7 +623,7 @@
       }
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
       this.getDictOptions()
-      //this.getorgtreelist()
+      // this.getorgtreelist()
       if (this.IsCompanyUser && this.serviceId === 'add') {
         // apiCert.getEntityByCreatorAndType('03', this.$axios).then(res => {
         //   this.certId = res.data.Id
@@ -640,43 +641,43 @@
       // this.changeOrgUnit(this.selectDept)
     },
     methods: {
-      nextStep(){
-         this.$refs["subfileList"].nextStep();
-      },
-      annaudit() {
+      nextStep () {
+        this.$refs['subfileList'].nextStep()
+    },
+      annaudit () {
         this.annentityForm.supplierId = parseInt(this.serviceId)
         this.annentityForm.SupplierName = this.formData.SupplierName
-        console.log("----this.ann",this.annentityForm)
+        console.log('----this.ann', this.annentityForm)
         annapi.addEntity(this.annentityForm, this.annentityForm.auditer, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //保存成功后,初始化数据,变成修改
-            let annId= res.data.item;
-            this.$router.push({
+            // 保存成功后,初始化数据,变成修改
+            let annId = res.data.item
+          this.$router.push({
               path: '/oilsupplier/annualaudit/' + this.serviceId + '/operation',
               query: {
                 certid: this.certId,
-                //WorkflowId: ,
+                // WorkflowId: ,
                 Status: 0,
                 Step: 1,
-                annualId: annId,
+                annualId: annId
               }
             })
             this.$message({
               type: 'success',
               message: res.data.message
-            });
+            })
 
-          } else {
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
-          }
+            })
+        }
         }).catch(err => {
           console.error(err)
-        });
-      },
-      qppend() {
+        })
+    },
+      qppend () {
         let _this = this
         _this.appendformData.SupplierName = this.formData.SupplierName
         _this.appendformData.SupplierId = parseInt(this.serviceId)
@@ -685,18 +686,18 @@
         _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
           .then(res => {
             if (res.data.code === 0) {
-              //this.entityList = res.data.item
+              // this.entityList = res.data.item
               let AppendId = res.data.info
               this.$router.push({
                 path: `/oilsupplier/supplierappend/3/techdataopera`,
                 query: {
                   Id: AppendId,
-                  editFlag: 1 //编辑标记: 1 修改,0 不修改
+                  editFlag: 1 // 编辑标记: 1 修改,0 不修改
                 }
               })
               _this.$message({
                 type: 'success',
-                message: res.data.message,
+                message: res.data.message
               })
             } else {
               _this.$message({
@@ -708,9 +709,8 @@
           .catch(err => {
             console.error(err)
           })
-
       },
-      //导出到Word文件
+      // 导出到Word文件
       toWord () {
         let id = this.formData.Id
         dataapi.docexport(id, this.$axios)
@@ -734,7 +734,7 @@
             console.error(err)
           })
       },
-      //导出准入范围到pdf
+      // 导出准入范围到pdf
       toPdf () {
         let id = this.formData.Id
         dataapi.pdfexport(id, this.$axios)
@@ -774,8 +774,8 @@
               }
             }
           }).catch(err => {
-          console.error(err)
-        })
+            console.error(err)
+          })
       },
       orgunitChange (val) {
         let deptid = val
@@ -794,7 +794,7 @@
           console.error(err)
         })
       },
-      orgtreeChange(val) {
+      orgtreeChange (val) {
         this.userOptions = []
         let deptid = val[val.length - 1]
         let auditstepcode = 'PROF_RECE'
@@ -804,9 +804,9 @@
           console.error(err)
         })
       },
-      inputCompany(val) {
+      inputCompany (val) {
         if (!this.certId) {
-          api.getEntityByName(val,'03', this.$axios).then(res => {
+          api.getEntityByName(val, '03', this.$axios).then(res => {
             if (res.data) {
               this.SetFormData(res.data)
             }
@@ -815,33 +815,33 @@
           })
         }
       },
-      changeFormData(fdata) {
+      changeFormData (fdata) {
         if (!this.certId) {
           this.SetFormData(fdata)
         }
       },
-      SetFormData(fdata) {
-         this.isCanUpdateSupplier(fdata.Id)
+      SetFormData (fdata) {
+        this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
         this.formData.Grade = fdata.Grade
         this.formData.MgrUnit = fdata.MgrUnit
-        if(fdata.InStyle!=null && fdata.InStyle!=""){
-        this.formData.InStyle = fdata.InStyle
+        if (fdata.InStyle != null && fdata.InStyle != '') {
+          this.formData.InStyle = fdata.InStyle
         }
         this.formData.OperType = fdata.OperType
-        if(fdata.Country!=""){
-            this.formData.Country = fdata.Country;
-        }
+        if (fdata.Country != '') {
+          this.formData.Country = fdata.Country
+      }
         this.formData.MaunAgent = fdata.MaunAgent
         this.formData.ConstructTeam = fdata.ConstructTeam
-        if(fdata.CredentialFlag!=null&&fdata.CredentialFlag!=""){
+        if (fdata.CredentialFlag != null && fdata.CredentialFlag != '') {
           this.formData.CredentialFlag = fdata.CredentialFlag
         }
         this.formData.CommercialNo = fdata.CommercialNo
-        if (fdata.CredentialFlag!=null&&fdata.CredentialFlag!="") {
-            this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
+        if (fdata.CredentialFlag != null && fdata.CredentialFlag != '') {
+          this.$refs['TechInfo'].showorhid(this.formData.CredentialFlag)
         }
         this.formData.OrganCode = fdata.OrganCode
         this.formData.CountryTaxNo = fdata.CountryTaxNo
@@ -862,12 +862,12 @@
         this.formData.CategoryCode = fdata.CategoryCode
         this.formData.CategoryName = fdata.CategoryName
         this.formData.RegCapital = fdata.RegCapital
-        if(fdata.Currency!=null && fdata.Currency!=""){
-        this.formData.Currency = fdata.Currency
+        if (fdata.Currency != null && fdata.Currency != '') {
+          this.formData.Currency = fdata.Currency
         }
         this.formData.ContactName = fdata.ContactName
 
-        if(fdata.CompanyType!=null && fdata.CompanyType!=""){
+        if (fdata.CompanyType != null && fdata.CompanyType != '') {
           this.formData.CompanyType = fdata.CompanyType
         }
         this.formData.SetupTime = fdata.SetupTime
@@ -875,21 +875,21 @@
         this.formData.BankAccount = fdata.BankAccount
         this.formData.EMail = fdata.EMail
         this.formData.BankCreditRating = fdata.BankCreditRating
-          if(fdata.Mobile!=null && fdata.Mobile!=""){
-           this.formData.Mobile = fdata.Mobile;
-        }else{
-           this.formData.Mobile = fdata.UserTelephone;
-        }
+        if (fdata.Mobile != null && fdata.Mobile != '') {
+          this.formData.Mobile = fdata.Mobile
+      }else {
+          this.formData.Mobile = fdata.UserTelephone
+      }
         this.formData.Telphone = fdata.Telphone
         this.formData.Fax = fdata.Fax
         this.formData.CompanyTel = fdata.CompanyTel
         this.formData.QQ = fdata.QQ
         this.formData.CompanyUrl = fdata.CompanyUrl
-        if(fdata.HseTraining!=null && fdata.HseTraining!=""){
-        this.formData.HseTraining = fdata.HseTraining
+        if (fdata.HseTraining != null && fdata.HseTraining != '') {
+          this.formData.HseTraining = fdata.HseTraining
         }
-        if(fdata.SpecTypeCode!=null && fdata.SpecTypeCode!=""){
-         this.formData.SpecTypeCode = fdata.SpecTypeCode
+        if (fdata.SpecTypeCode != null && fdata.SpecTypeCode != '') {
+          this.formData.SpecTypeCode = fdata.SpecTypeCode
         }
         this.formData.QualitySystemCert = fdata.QualitySystemCert
         this.formData.QualifCert = fdata.QualifCert
@@ -903,43 +903,41 @@
         this.formData.MaunLicense = fdata.MaunLicense
         this.formData.PACNumber = fdata.PACNumber
 
-
-        this.$refs["TechInfo"].CityAry = []
-        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-        this.$refs["TechInfo"].CityAry.push(this.formData.City)
-        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-        this.$refs["TechInfo"].LinkCityAry = []
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs['TechInfo'].CityAry = []
+        this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+        this.$refs['TechInfo'].CityAry.push(this.formData.City)
+        this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+        this.$refs['TechInfo'].LinkCityAry = []
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
         /*this.$refs["TechInfo"].UnitRelationAry = []
         if (this.formData.SpecTypeCode.length > 0) {
           this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-        }*/
+        } */
       },
 
-      isCanUpdateSupplier(supplierId) {
+      isCanUpdateSupplier (supplierId) {
         api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
           this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
-      equipmentdialog() {
+      equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
-      performancedialog() {
+      performancedialog () {
         this.$refs['performanceList'].showDialog()
       },
-      patentdialog() {
+      patentdialog () {
         this.$refs['patentList'].showDialog()
       },
-      winningdialog() {
+      winningdialog () {
         this.$refs['winningList'].showDialog()
       },
 
-      initDatas() {
-
+      initDatas () {
         if (this.formData.Id) {
           this.isCanUpdateSupplier(this.formData.Id)
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
@@ -957,32 +955,32 @@
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
             this.formDataCert.InStyle = this.formData.InStyle
-            if (this.formData.Status > 0 || this.formData.Status == -5 ) {
+            if (this.formData.Status > 0 || this.formData.Status == -5) {
               this.add_flat = false
             }
             if ((this.formData.Status > 0) && (this.formData.Status != 4)) {
               this.delete_flat = false
             }
-            if ((this.formData.Status > 0) &&(this.authUser.Profile.IsCompanyUser==1)) {
+            if ((this.formData.Status > 0) && (this.authUser.Profile.IsCompanyUser == 1)) {
               this.delete_flat = false
             }
-            if (this.formData.CredentialFlag != "") {
-              this.$refs["TechInfo"].showorhid(this.formData.CredentialFlag)
+            if (this.formData.CredentialFlag != '') {
+              this.$refs['TechInfo'].showorhid(this.formData.CredentialFlag)
             }
             this.formDataCert.WorkflowId = this.formData.WorkflowId
-            this.$refs["TechInfo"].CityAry = []
-            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
-            this.$refs["TechInfo"].CityAry.push(this.formData.City)
-            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
-            this.$refs["TechInfo"].LinkCityAry = []
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
-            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs['TechInfo'].CityAry = []
+            this.$refs['TechInfo'].CityAry.push(this.formData.Province)
+            this.$refs['TechInfo'].CityAry.push(this.formData.City)
+            this.$refs['TechInfo'].CityAry.push(this.formData.Street)
+            this.$refs['TechInfo'].LinkCityAry = []
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs['TechInfo'].LinkCityAry.push(this.formData.LinkStreet)
             /*this.$refs["TechInfo"].UnitRelationAry = []
 
             if (this.formData.SpecTypeCode.length > 0) {
               this.$refs['TechInfo'].UnitRelationAry = this.formData.SpecTypeCode.split(',')
-            }*/
+            } */
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
@@ -991,7 +989,7 @@
             this.backhistroy.workflowId = this.formDataCert.WorkflowId
             /*if (this.certId && this.formDataCert.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /!* 刷新工作流 *!/
-            }*/
+            } */
             this.$refs['equipmentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['performanceList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['patentList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
@@ -999,17 +997,22 @@
             this.$refs['techList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
               .formDataCert.InStyle)
+            console.log('this.formData.InStyle1', this.formData.InStyle)
+            if (this.formData.InStyle == '2' || this.formData.InStyle == '6') {
+              console.log('this.formData.InStyle2', this.formData.InStyle)
+              this.allowpre = false
+            }
           }).catch(err => {
             console.error(err)
           })
         }
       },
-      getbuslist() {
+      getbuslist () {
         this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
           .formDataCert.InStyle)
       },
 
-      getDictOptions() {
+      getDictOptions () {
         let params = {
           status: this.formData.Status,
           majorAduit: this.formData.ThirdAudit
@@ -1029,14 +1032,14 @@
           console.error(err)
         })
       },
-      getorgtreelist() {
+      getorgtreelist () {
         let _this = this
         let params = {
           IsInnerOrganize: 1
         }
         _this.$axios.get('organizes/orgalllist', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.orgtreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'Parentid', 'Id,Fullname')
             if (_this.authUser.Profile.IsCompanyUser === 0) {
@@ -1050,19 +1053,19 @@
             console.error(err)
           })
       },
-      auditOrgChang(val) {
-        console.log("------val", val)
-        let auditstepcode = "SECOND_TRIAL";
+      auditOrgChang (val) {
+        console.log('------val', val)
+        let auditstepcode = 'SECOND_TRIAL';
         api
           .getAuditerByFirst(val, auditstepcode, this.$axios)
           .then(res => {
             this.secauditerOptions = res.data.item
           })
           .catch(err => {
-            console.error(err);
-          });
-      },
-      nextTab() {
+            console.error(err)
+        })
+    },
+      nextTab () {
         if (this.formData.AuditIndex > 0) {
           this.totalTab = 4
         }
@@ -1081,7 +1084,7 @@
           valid = this.saveEntity()
         } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {
           valid = this.updateNumberEntity()
-          valid = true//没办法中的办法
+          valid = true// 没办法中的办法
         }
         if (!valid) {
           return false
@@ -1092,10 +1095,10 @@
         } else {
           this.activeName = '0'
         }
-          document.querySelector(".content").scrollTop=0
+        document.querySelector('.content').scrollTop = 0
       },
 
-      backTab() {
+      backTab () {
         if (this.formData.AuditIndex > 0) {
           this.totalTab = 4
         }
@@ -1115,7 +1118,7 @@
         } else {
           this.activeName = this.totalTab + ''
         }
-          document.querySelector(".content").scrollTop=0
+        document.querySelector('.content').scrollTop = 0
       },
       /* getCityList(val) {
         let resultData = JSON.parse(val)
@@ -1125,7 +1128,7 @@
       }, */
 
       // 保存信息
-      saveEntity() {
+      saveEntity () {
         let valid1 = false
         let valid2 = false
 
@@ -1133,7 +1136,7 @@
           valid1 = valid
         })
 
-        this.$refs["TechInfo"].$refs["EntityFormCert"].validate(vvalid => {
+        this.$refs['TechInfo'].$refs['EntityFormCert'].validate(vvalid => {
           valid2 = vvalid
         })
 
@@ -1154,15 +1157,14 @@
         } else {
           return false
         }
-
       },
 
       // 保存信息
-      saveCertEntity() {
+      saveCertEntity () {
         this.$refs['SupplierCertEditCompoment'].saveEntity()
       },
 
-      addEntity() {
+      addEntity () {
         this.formData.SupplierTypeCode = '03'
         this.formData.SupplierTypeName = '技术服务类'
         api.addEntity(this.formData, this.$axios).then(res => {
@@ -1186,17 +1188,17 @@
         })
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
-            //更新子表
+            // 更新子表
             // this.updateNumberEntity()
-             this.initDatas();
-              this.$message({
-                type: "success",
-                message: res.data.message
-              });
-          } else {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+        } else {
             this.$message({
               type: 'warning',
               message: res.data.message
@@ -1207,7 +1209,7 @@
         })
       },
 
-      CheckCompanyBase() {
+      CheckCompanyBase () {
         if (!this.formData.Id) {
           this.$message({
             type: 'error',
@@ -1225,7 +1227,7 @@
         return true
       },
       // 企业人员结构情况
-      updateNumberEntity() {
+      updateNumberEntity () {
         this.$refs['EntityFormNumber'].validate((valid) => {
           if (valid) {
             if (!this.CheckCompanyBase()) {
@@ -1251,40 +1253,40 @@
               console.error(err)
             })
           } else {
-            return false;
-          }
+            return false
+        }
         })
       },
-      selectAuditOrg() {
-        console.log("----this.IsCompanyUser", this.IsCompanyUser)
+      selectAuditOrg () {
+        console.log('----this.IsCompanyUser', this.IsCompanyUser)
         if (this.IsCompanyUser === 0) {
           this.dialogVisible = true
         } else if (this.IsCompanyUser === 1) {
           this.dialogVisibleCom = true
         }
       },
-      chooseAuditorShow() {
+      chooseAuditorShow () {
         this.$refs['chooseAuditor'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisible = true
       },
-      setAuditer(val, name) {
+      setAuditer (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisible = false
         this.auditOrgChang(this.auditer)
       },
-      chooseAuditorShowFen() {
-        console.log("--this.formData.SupplierTypeCode----", this.formData.SupplierTypeCode)
+      chooseAuditorShowFen () {
+        console.log('--this.formData.SupplierTypeCode----', this.formData.SupplierTypeCode)
         this.$refs['chooseAuditorFen'].getorgtreelist(this.formData.SupplierTypeCode)
         this.chooseAuditorVisibleFen = true
       },
-      setAuditerFen(val, name) {
+      setAuditerFen (val, name) {
         this.auditer = val
         this.auditerName = name
         this.chooseAuditorVisibleFen = false
       },
-      AuditEntity() {
-        //this.auditer = val
+      AuditEntity () {
+        // this.auditer = val
         if (this.auditer === '') {
           this.$message({
             type: 'warning',
@@ -1292,26 +1294,30 @@
           })
           return
         }
-        if (this.fushenauditer === "") {
+        if (this.fushenauditer === '') {
           this.$message({
-            type: "warning",
-            message: "请选择复审人!"
+            type: 'warning',
+            message: '请选择复审人!'
           })
           return
         }
-        if (this.selectDept === 0 || this.selectDept == '') {
-          this.$message({
-            type: "warning",
-            message: "请选择专业处室!"
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.selectDept === 0 || this.selectDept == '') {
+            this.$message({
+              type: 'warning',
+              message: '请选择专业处室!'
+            })
+            return
+          }
         }
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人!'
-          })
-          return
+        if (this.formData.InStyle != '2' && this.formData.InStyle != '6') {
+          if (this.userOptions == null || this.userOptions.length === 0) {
+            this.$message({
+              type: 'warning',
+              message: '该专业科室未配置接收人!'
+            })
+            return
+          }
         }
         this.applyLoading = true
         this.auditform.FirstAuditName = this.auditer
@@ -1339,7 +1345,7 @@
           console.error(err)
         })
       },
-      SubpEntity() {
+      SubpEntity () {
         if (this.orgauditOptions == null || this.orgauditOptions.length === 0) {
           this.$message({
             type: 'warning',
@@ -1357,7 +1363,7 @@
         this.applyLoading = true
         this.auditform.FirstAuditName = this.UnitOrg
         this.auditform.CertId = this.certId
-        console.log("--this.audiform--", this.auditform)
+        console.log('--this.audiform--', this.auditform)
         apiCert
           .auditEntity(this.certId, this.auditform, this.$axios)
           .then(res => {
@@ -1366,15 +1372,15 @@
               this.initDatas()
               this.dialogVisibleCom = false
               this.$message({
-                type: "success",
+                type: 'success',
                 message: res.data.message
-              });
-            } else {
+              })
+          } else {
               this.$message({
-                type: "warning",
+                type: 'warning',
                 message: res.data.message
-              });
-            }
+              })
+          }
             this.applyLoading = false
           })
           .catch(err => {
@@ -1382,7 +1388,7 @@
           })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T08:00:00+08:00') {
@@ -1395,7 +1401,7 @@
         }
       },
 
-      formatDateTime(date) {
+      formatDateTime (date) {
         var y = date.getFullYear()
         var m = date.getMonth() + 1
         m = m < 10 ? ('0' + m) : m
@@ -1408,7 +1414,6 @@
       }
     }
   }
-
 </script>
 
 <style>

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff