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/sparePartReceive/SparePartReceiveForm.vue |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
index 9184f06..f64c147 100644
--- a/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
+++ b/src/views/spare/modules/sparePartReceive/SparePartReceiveForm.vue
@@ -190,7 +190,7 @@
             defaultValue: ''
           },
           {
-            title: '涓诲崟浣�',
+            title: '鍗曚綅',
             key: 'mainUnitIdName',
             type: JVXETypes.normal,
             align:'center',
@@ -199,7 +199,7 @@
             defaultValue: ''
           },
           {
-            title: '涓诲崟浣�',
+            title: '鍗曚綅',
             key: 'mainUnitId',
             type: JVXETypes.hidden,
             align:'center',
@@ -207,7 +207,7 @@
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
           },
-          {
+        /*   {
             title: '杈呭崟浣�',
             key: 'auxiliaryUnitIdName',
             type: JVXETypes.normal,
@@ -224,16 +224,16 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
-            title: '涓绘暟閲�',
+            title: '鏁伴噺',
             key: 'mainQuantity',
             type: JVXETypes.normal,
             align:'center',
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: 0,
-            formatter({ cellValue, row, column }) {
+/*             formatter({ cellValue, row, column }) {
 
               if (cellValue != null) {
                 let conversionRatio = row.conversionRatio
@@ -243,7 +243,7 @@
               }
               return cellValue
 
-            },
+            }, */
             validateRules: [
               {
                 required: true,
@@ -261,7 +261,7 @@
             ]
           },
 
-          {
+        /*   {
             title: '杈呮暟閲�',
             key: 'auxiliaryQuantity',
             align:'center',
@@ -269,17 +269,17 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: 0
-          },
+          }, */
 
           {
-            title: '棰嗙敤涓绘暟閲�',
+            title: '棰嗙敤鏁伴噺',
             key: 'receiveMainQuantity',
             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)
@@ -289,7 +289,7 @@
               }
               return cellValue
 
-            },
+            }, */
             validateRules: [
               {
                 required: true,
@@ -308,7 +308,7 @@
               }
             ]
           },
-          {
+        /*   {
             title: '棰嗙敤杈呮暟閲�',
             align:'center',
             key: 'receiveMainQuantity',
@@ -316,7 +316,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
 
 
 
@@ -423,18 +423,18 @@
             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, */
             manufactureDate: data[i].manufactureDate,
             constructorId: data[i].constructorId,
             constructorName: data[i].constructorName,
             batchNum: data[i].batchNum,
             ReceiveReason: data[i].ReceiveReason,
             validityPeriod:data[i].validityPeriod,
-            conversionRatio:data[i].conversionRatio
+           /*  conversionRatio:data[i].conversionRatio */
           }
         }
         addRows.push(sparesReceiveDetail)

--
Gitblit v1.9.3