From 1ec4da063b3195f4f46af969a9d170bda2df7c2a Mon Sep 17 00:00:00 2001
From: houjie <714924425@qq.com>
Date: 星期三, 23 八月 2023 17:36:08 +0800
Subject: [PATCH] 计量单位：重构， 备件相关功能页面调整

---
 src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue |   37 ++++++++++++++++++-------------------
 1 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index f422f8c..f101143 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -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',
@@ -474,13 +473,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,
@@ -553,13 +552,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