From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue |   46 ++++++++++++++++++++++++++--------------------
 1 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index f422f8c..90927e1 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -6,7 +6,7 @@
         <a-row>
           <a-col :span='12'>
             <a-form-model-item label='鍗曟嵁鍙�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='num'>
-              <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿'></a-input>
+              <a-input v-model='model.num' placeholder='璇疯緭鍏ュ崟鎹彿' :disabled="true"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span='12'>
@@ -70,7 +70,6 @@
           :columns='sparesScrapDetailTable.columns'
           :dataSource='sparesScrapDetailTable.dataSource'
           :maxHeight='300'
-          @valueChange="changeAuxiliaryQuantity"
           :disabled='formDisabled'
           :rowNumber='true'
           :rowSelection='true'
@@ -236,7 +235,7 @@
             ]
           },
           {
-            title: '涓诲崟浣�',
+            title: '鍗曚綅',
             key: 'mainUnitIdName',
             type: JVXETypes.normal,
             width: '200px',
@@ -245,7 +244,7 @@
             defaultValue: ''
           },
           {
-            title: '涓诲崟浣�',
+            title: '鍗曚綅',
             key: 'mainUnitId',
             type: JVXETypes.hidden,
             align:'center',
@@ -253,7 +252,7 @@
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
           },
-          {
+         /*  {
             title: '杈呭崟浣�',
             key: 'auxiliaryUnitIdName',
             type: JVXETypes.normal,
@@ -270,9 +269,9 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
-            title: '涓绘暟閲�',
+            title: '鏁伴噺',
             key: 'mainQuantity',
             align:'center',
             type: JVXETypes.normal,
@@ -281,7 +280,7 @@
             defaultValue: ''
           },
 
-          {
+       /*    {
             title: '杈呮暟閲�',
             key: 'auxiliaryQuantity',
             type: JVXETypes.normal,
@@ -289,7 +288,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
             title: '澶囦欢id',
             key: 'sparePartId',
@@ -309,14 +308,14 @@
             defaultValue: ''
           },
           {
-            title: '鎶ュ簾涓绘暟閲�',
+            title: '鎶ュ簾鏁伴噺',
             key: 'scrapMainQuantity',
             align:'center',
             type: JVXETypes.inputNumber,
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: 0,
-            formatter({ cellValue, row, column }) {
+   /*          formatter({ cellValue, row, column }) {
               if (cellValue != null) {
                 let conversionRatio = row.conversionRatio
                 console.log(conversionRatio)
@@ -326,7 +325,7 @@
               }
               return cellValue
 
-            },
+            }, */
             validateRules: [
               {
                 required: true,
@@ -345,7 +344,7 @@
               }
             ]
           },
-          {
+          /* {
             title: '鎶ュ簾杈呮暟閲�',
             align:'center',
             key: 'scrapAuxiliaryQuantity',
@@ -353,7 +352,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
             title: '搴撳尯',
             align:'center',
@@ -398,6 +397,7 @@
         getSysDeparts: "/eam/equipment/getSysDeparts",
         loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
         queryById: '/spare/sparePartScrap/queryById',
+        getNum: '/eam/sysIdentity/getNumNew',
         sparesScrapDetail: {
           list: '/spare/sparePartScrap/querySparesScrapDetailByMainId'
         }
@@ -474,13 +474,13 @@
             model: data[i].model,
             specification: data[i].specification,
             mainUnitId: data[i].mainUnitId,
-            auxiliaryUnitId: data[i].auxiliaryUnitId,
+         /*    auxiliaryUnitId: data[i].auxiliaryUnitId, */
             mainUnitIdName: data[i].mainUnitId_dictText,
-            auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText,
+         /*    auxiliaryUnitIdName: data[i].auxiliaryUnitId_dictText, */
             mainQuantity: data[i].mainQuantity,
-            auxiliaryQuantity: data[i].auxiliaryQuantity,
+          /*   auxiliaryQuantity: data[i].auxiliaryQuantity, */
             scrapMainQuantity: data[i].scrapMainQuantity,
-            scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity,
+          /*   scrapAuxiliaryQuantity: data[i].scrapAuxiliaryQuantity, */
             manufactureDate: data[i].manufactureDate,
             constructorId: data[i].constructorId,
             constructorName: data[i].constructorName,
@@ -515,6 +515,12 @@
       if (this.model.id) {
         let params = { id: this.model.id }
         this.requestSubTableData(this.url.sparesScrapDetail.list, params, this.sparesScrapDetailTable)
+      }else{
+        getAction(this.url.getNum, { type: 'SparePartScrap', length: '4' }).then((res) => {
+        if (res.success) {
+          this.model.num = res.message
+        }
+      })
       }
     },
     //鏍￠獙鎵�鏈変竴瀵逛竴瀛愯〃琛ㄥ崟
@@ -553,13 +559,13 @@
       this.$emit('close')
       this.$refs.form.clearValidate()
     },
-    changeAuxiliaryQuantity(target){
+/*     changeAuxiliaryQuantity(target){
       console.log(target.columnIndex)
       let num=target.columnIndex
       if (target.columnIndex ===num){
         target.row.scrapAuxiliaryQuantity=Math.abs(target.row.conversionRatio*target.row.scrapMainQuantity)
       }
-    }
+    } */
   }
 }
 </script>

--
Gitblit v1.9.3