sunyize 2 gadi atpakaļ
vecāks
revīzija
e024620de6

+ 15 - 1
src/views/lotCheck/TaskUploadData.vue

@@ -1608,7 +1608,7 @@ export default {
       this.$refs.form.validate(valid => {
         // 验证通过
         if (!valid) {
-          info = "no";
+          info = "infoNo";
           this.uploading = false;
         }}
       )
@@ -1643,6 +1643,20 @@ export default {
         })
         return
       }
+      if (info==="infoNo"){
+        this.$warning({
+          title: '提示',
+          dangerouslyUseHTMLString: true,
+          content:(h) => {
+            return h('div', {
+              domProps: {
+                innerHTML: '基本信息未填写完整!!!'
+              },
+            }, []);
+          }
+        })
+        return
+      }
       var that = this;
 
       var data=that.infoModel ;

+ 8 - 8
src/views/lotCheck/modules/TaskCheckAudit.vue

@@ -249,7 +249,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.testCardResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.testCardRemark"
                           @change="textareaChange('testCard','testCardRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -403,7 +403,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.contractResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.contractRemark"
                           @change="textareaChange('contract','contractRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -548,7 +548,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.handlingContractResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.handlingContractRemark"
                           @change="textareaChange('handlingContract','handlingContractRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -695,7 +695,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.handlingCardResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.handlingCardRemark"
                           @change="textareaChange('handlingCard','handlingCardRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -844,7 +844,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.customerCardScanningResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.customerCardScanningRemark"
                           @change="textareaChange('customerCardScanning','customerCardScanningRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -998,7 +998,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.riskTableResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.riskTableRemark"
                           @change="textareaChange('riskTable','riskTableRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -1147,7 +1147,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.priceTableResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.priceTableRemark"
                           @change="textareaChange('priceTable','priceTableRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"
@@ -1293,7 +1293,7 @@
               />
             </a-form-model-item>
             <a-form-model-item style="left: 10%;margin-top: 20px" label="上传资料备注:" v-bind="labelCol1Note">
-              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.applySignResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
+              <a-textarea style="height: 77px"  :disabled="(checkState===4 && infoModel.commitmentResult  ==='1' ) || (checkState===2|| checkState===5) ?true:false"
                           v-model="infoModel.commitmentRemark"
                           @change="textareaChange('commitment','commitmentRemark')"
                           placeholder="如没有上传资料备注,需要说明原因"