Browse Source

Merge branch 'hotfix/SubcontractingMainten-tip' of Epans/modernDairy into master

duanxiaoduan 1 year ago
parent
commit
50c07c46a0
2 changed files with 26 additions and 22 deletions
  1. 0 0
      dist/index.html
  2. 26 22
      src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 26 - 22
src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -2269,29 +2269,33 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        var send_data1 = {
-            "name": "checkOutsourcingAmount",
-            "parammaps": { "outsourcingCode":row.outsourcingCode }
-        }
-        var send_data2 = {
-        "common": { "returnmap": "0" },
-        "data": [
-          {
-            "name": "editBigacceptanceIsAcceptance", "type": "e",
-            "parammaps": { "id":row.id }
-           }
-          ]
-        }
-        GetDataByName(send_data1).then(response => {
-          if(parseFloat(response.data.list[0].amount) !== 0){
-            this.save_submit(send_data2)
-          }else{
-            this.$message({
-              type: 'error',
-              message: '数据未填写,请完善相关信息'
-            })
+        if(row.isPartapply == 1){
+          var send_data1 = {
+              "name": "checkOutsourcingAmount",
+              "parammaps": { "outsourcingCode":row.outsourcingCode }
           }
-        })
+          var send_data2 = {
+          "common": { "returnmap": "0" },
+          "data": [
+            {
+              "name": "editBigacceptanceIsAcceptance", "type": "e",
+              "parammaps": { "id":row.id }
+             }
+            ]
+          }
+          GetDataByName(send_data1).then(response => {
+            if(parseFloat(response.data.list[0].amount) !== 0){
+              this.save_submit(send_data2)
+            }else{
+              this.$message({
+                type: 'error',
+                message: '数据未填写,请完善相关信息'
+              })
+            }
+          })
+        }else{
+          this.$message({ type: 'warning', message: '备件未领用,暂时不能提交。', duration: 2000 })
+        }
       }).catch(() => {
         this.$message({
           type: 'info',

Some files were not shown because too many files changed in this diff