From ee79f53fd9385b087ebd7a93af638d91a9825d10 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期三, 23 八月 2023 18:04:35 +0800
Subject: [PATCH] lnl，设备台账导入功能+页面字段调整

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

diff --git a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
index bf9e454..f101143 100644
--- a/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
+++ b/src/views/spare/modules/sparePartScrap/SparePartScrapForm.vue
@@ -18,10 +18,18 @@
                 v-model='model.departId'
                 dictCode="sys_depart,depart_name,id,del_flag!='1'"
               />-->
-              <a-select
+<!--              <a-select
                 :placeholder="'璇烽�夋嫨棰嗙敤閮ㄩ棬'"
                 :options="this.departs"
                 style="width: 100%"
+                v-model='model.departId'
+              />-->
+              <a-tree-select
+                style="width: 100%"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                :tree-data="treeData"
+                placeholder="璇烽�夋嫨棰嗙敤閮ㄩ棬"
+                tree-default-expand-all
                 v-model='model.departId'
               />
             </a-form-model-item>
@@ -97,6 +105,7 @@
   },
   data() {
     return {
+      treeData:[],
       departs:[],
       bordered:true,
       labelCol: {
@@ -226,7 +235,7 @@
             ]
           },
           {
-            title: '涓诲崟浣�',
+            title: '鍗曚綅',
             key: 'mainUnitIdName',
             type: JVXETypes.normal,
             width: '200px',
@@ -235,7 +244,7 @@
             defaultValue: ''
           },
           {
-            title: '涓诲崟浣�',
+            title: '鍗曚綅',
             key: 'mainUnitId',
             type: JVXETypes.hidden,
             align:'center',
@@ -243,7 +252,7 @@
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
           },
-          {
+         /*  {
             title: '杈呭崟浣�',
             key: 'auxiliaryUnitIdName',
             type: JVXETypes.normal,
@@ -260,9 +269,9 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
-            title: '涓绘暟閲�',
+            title: '鏁伴噺',
             key: 'mainQuantity',
             align:'center',
             type: JVXETypes.normal,
@@ -271,7 +280,7 @@
             defaultValue: ''
           },
 
-          {
+       /*    {
             title: '杈呮暟閲�',
             key: 'auxiliaryQuantity',
             type: JVXETypes.normal,
@@ -279,7 +288,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
             title: '澶囦欢id',
             key: 'sparePartId',
@@ -299,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)
@@ -316,7 +325,7 @@
               }
               return cellValue
 
-            },
+            }, */
             validateRules: [
               {
                 required: true,
@@ -335,7 +344,7 @@
               }
             ]
           },
-          {
+          /* {
             title: '鎶ュ簾杈呮暟閲�',
             align:'center',
             key: 'scrapAuxiliaryQuantity',
@@ -343,7 +352,7 @@
             width: '200px',
             placeholder: '璇疯緭鍏�${title}',
             defaultValue: ''
-          },
+          }, */
           {
             title: '搴撳尯',
             align:'center',
@@ -386,6 +395,7 @@
         add: '/spare/sparePartScrap/add',
         edit: '/spare/sparePartScrap/edit',
         getSysDeparts: "/eam/equipment/getSysDeparts",
+        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
         queryById: '/spare/sparePartScrap/queryById',
         sparesScrapDetail: {
           list: '/spare/sparePartScrap/querySparesScrapDetailByMainId'
@@ -414,9 +424,18 @@
     })
   },
   created() {
-    this.getSysDeparts()
+    this.initOptions()
   },
   methods: {
+    initOptions() {
+      getAction(this.url.loadOptions).then(res => {
+        if (res.success) {
+          this.treeData = res.result
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     getSysDeparts() {
       getAction(this.url.getSysDeparts).then((res) => {
         if (res.success) {
@@ -454,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,
@@ -532,7 +551,14 @@
       this.visible = false
       this.$emit('close')
       this.$refs.form.clearValidate()
-    }
+    },
+/*     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