From 7033fa158e4f62fbb756344f6c359c93750e7a34 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 07 七月 2023 10:51:36 +0800
Subject: [PATCH] 批量带入

---
 Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue |   95 +++++++++++++++++++++++++++++------------------
 1 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
index 684801e..b4ebd93 100644
--- a/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
+++ b/Source/UBCS-WEB/src/components/BatchImport/ShowImportData.vue
@@ -6,7 +6,7 @@
     append-to-body
     top="5vh"
   >
-    <div>
+    <!-- <div>
       <FormTemplate
         v-if="type === 'batchApplyCode'"
         type="add"
@@ -16,9 +16,9 @@
         @getFormData="getCodeApplyFormData"
         @referConfigDataUpdate="referConfigDataUpdate"
       ></FormTemplate>
-    </div>
+    </div> -->
     <div class="flex_box">
-      <div class="left" :style="{ width: leftWidth + 'px' }">
+      <div class="left" :style="{ width: leftWidth + 'px' }" v-show="false">
         <div class="isExpand_box">
           <el-link type="primary" @click="hideTree">
             <i
@@ -91,23 +91,7 @@
                 </el-table-column>
               </el-table>
               <div v-else style="height: 400px"></div>
-            </el-tab-pane>
-            <el-tab-pane :label="tab2Name" name="tab2">
-              <el-table border :data="tab2Table" height="400px">
-                <el-table-column
-                  v-for="item in cloNamesList"
-                  :key="item.field"
-                  :prop="item.field"
-                  :label="item.title"
-                  :width="item.width"
-                  align="center"
-                >
-                </el-table-column>
-              </el-table>
-            </el-tab-pane>
-          </el-tabs>
-        </div>
-        <div>
+              <div>
           <el-table
             border
             :data="currentSelectedResemble"
@@ -141,6 +125,23 @@
             ></el-table-column>
           </el-table>
         </div>
+            </el-tab-pane>
+            <el-tab-pane :label="tab2Name" name="tab2">
+              <el-table border :data="tab2Table" height="600px">
+                <el-table-column
+                  v-for="item in cloNamesList"
+                  :key="item.field"
+                  :prop="item.field"
+                  :label="item.title"
+                  :width="item.width"
+                  align="center"
+                >
+                </el-table-column>
+              </el-table>
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+        
       </div>
     </div>
     <template #footer>
@@ -163,8 +164,8 @@
 
 <script>
 import {
-  getHistorySuccessTable,
-  getHistoryResembleTable,
+  getSuccessTable,
+  getResembleTable,
   getFormTemplate,
   getCurretnSelectedRowResemble,
   submitHistoryimport,
@@ -176,7 +177,7 @@
 export default {
   name: "ShowImportData",
   components: { ResembleQuery, FormTemplate },
-  mixins: [codeApply],
+  // mixins: [codeApply],
   props: {
     title: {
       type: String,
@@ -199,6 +200,11 @@
       type: String,
       default: "",
     },
+    type: String,
+    secDTOList: {
+      type: Array,
+      default: () => ({})
+    }
   },
   computed: {
     dialogVisible: {
@@ -214,7 +220,7 @@
     return {
       isExpand: true,
       filterText: "",
-      leftWidth: "200",
+      leftWidth: 200,
       templateOid: null,
       tab1Name: "鐩镐技椤�",
       tab2Name: "姝ｇ‘鏁版嵁",
@@ -243,9 +249,9 @@
     },
     hideTree() {
       if (this.isExpand) {
-        this.leftWidth = "50";
+        this.leftWidth = 50;
       } else {
-        this.leftWidth = "200";
+        this.leftWidth = 200;
       }
       this.isExpand = !this.isExpand;
     },
@@ -254,17 +260,18 @@
       this.localCodeClassifyOid = data.codeclassifyoid;
       this.cloNamesList = data.cloNamesList;
       this.templateOid = data.oid;
-      getHistorySuccessTable({
-        codeClassifyOid: this.templateOid,
-        redisOid: this.redisOid + "-ok",
-      }).then((res) => {
-        this.tab2Table = res.data.data;
-      });
-      getHistoryResembleTable({
+      getResembleTable({
         codeClassifyOid: this.templateOid,
         redisOid: this.redisOid + "-resemble",
       }).then((res) => {
         this.tab1Table = res.data.data;
+      });
+      // 鑾峰彇姝ｇ‘鏁版嵁
+      getSuccessTable({
+        codeClassifyOid: this.templateOid,
+        redisOid: this.redisOid + "-ok",
+      }).then((res) => {
+        this.tab2Table = res.data.data;
       });
       getFormTemplate({
         templateOid: data.oid,
@@ -294,8 +301,8 @@
     },
     submit() {
       const params = {
-        classifyAttr: this.classifyAttr,
-        improt: true,
+        classifyAttr: this.type === 'historyImport' ? this.classifyAttr : undefined,
+        improt: this.type === 'historyImport' ? true : false,
         codeImprotSaveDatVOList: [
           {
             Clos: this.cloNamesList.map((item) => item.title),
@@ -303,7 +310,7 @@
             orderDTO: {
               codeClassifyOid: this.codeClassifyOid,
               templateOid: this.templateOid,
-              secDTOList: [],
+              secDTOList: this.secDTOList,
             },
           },
         ],
@@ -322,6 +329,22 @@
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    leftTree: {
+      immediate: true,
+      deep: true,
+      handler(arr) {
+        if (arr.length > 0 ) {
+          this.treeNodeClick(arr[0])
+          if (this.type === 'batchImportApply') {
+            this.tab1Name = '鏈夌浉浼奸」鎴栭敊璇暟鎹�'
+            this.tab2Name = '姝ｇ‘鏁版嵁'
+            this.leftWidth = 0
+          } else {
+            this.leftWidth = 200
+          }
+        }
+      }
+    }
   },
 };
 </script>

--
Gitblit v1.9.3