Merge remote-tracking branch 'origin/master'

src/views/requiremanager/HwRequirementList.vue

@@ -354,7 +354,7 @@
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`+record.id;
       },
       //审核
-      authRequire1(record) {
+      authRequire(record) {
         this.$refs.modelAuthForm.edit(record);
         this.$refs.modelAuthForm.title = '审核'
         this.$refs.modelAuthForm.disableSubmit = false

src/views/requiremanager/modules/HwRequirementModal.vue

@@ -628,7 +628,7 @@
 
       //搜索服务商
       onSearch(){
-        if(!this.selectedDepartKeys1[0]){
+        if(!this.form.getFieldValue('companyName')){
           this.$message.warning('请先选择企业')
           return
         }
@@ -681,7 +681,7 @@
       //搜索甲方掐指农行
       onSearch2(){
         var cpType=1
-        if(this.selectedDepartKeys[0]){
+        if(this.form.getFieldValue('subcontractorName')){
           //1:服务商 2：开心
           cpType= this.selectedDepartKeys[0].substring(2,3);
         }else{