From 10c2ee4be4508c62b5980cc7059b1e8e95f7a3cc Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 04 七月 2023 17:22:11 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue |   42 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 0992b9c..21a5b5f 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -8,9 +8,9 @@
         <el-button plain size="small" type="primary" @click="editHandler"
           >缂栬緫
         </el-button>
-        <el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button>
-        <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button>
-        <el-button plain size="small" type="primary">鎵归噺鐢宠缂栫爜</el-button>
+        <el-button plain size="small" type="primary" @click="openBatchImport('batchImportApply')">鎵归噺瀵煎叆鐢宠</el-button>
+        <el-button plain size="small" type="primary" @click="openBatchImport('historyImport')">鍘嗗彶鏁版嵁瀵煎叆</el-button>
+        <el-button plain size="small" type="primary" @click="openBatchImport('batchApplyCode')">鎵归噺鐢宠缂栫爜</el-button>
         <el-button plain size="small" type="primary">鎵归噺鍙戝竷</el-button>
         <el-button plain size="small" type="primary">鏌ョ湅娴佺▼鍘嗗彶</el-button>
         <el-button plain size="small" type="primary">鍒犻櫎</el-button>
@@ -60,6 +60,9 @@
             :prop="item.prop"
             :sortable="item.sortable"
             :formatter="formatBoolean"
+            :width="item.label.length >=4 ?'150':item.label.length==3 ?'120':'90'"
+            :show-overflow-tooltip="true"
+            align="center"
           >
             <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
             <!--              <template slot-scope="{ row }">-->
@@ -141,6 +144,7 @@
       >
       </el-pagination>
     </div>
+    <BatchImport v-if="batchImportData.visible" :visible.sync="batchImportData.visible" v-bind="batchImportData"></BatchImport>
   </basic-container>
 </template>
 <script>
@@ -149,11 +153,13 @@
 import integrationTransfer from "@/views/integration/integrationTransfer";
 import SetPersonnel from "@/components/template/SetPersonnel";
 import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import BatchImport from '@/components/BatchImport'
 export default {
   components: {
     integrationTransfer,
     SetPersonnel,
     ResembleQueryDialog,
+    BatchImport
   },
   name: "Crud.vue",
   props: {
@@ -240,6 +246,11 @@
       seniorQueryColumns: [],
       selectRow: [],
       userName: "",
+      batchImportData: {
+        visible: false,
+        type: '',
+        codeClassifyOid: ''
+      }
     };
   },
   computed: {},
@@ -249,6 +260,11 @@
     this.doLayout();
   },
   watch: {
+     tableHeadDataFateher:{
+      handler(newval,oldval){
+        this.options=newval.tableDefineVO.seniorQueryColumns
+      }
+    },
     codeClassifyOid: {
       handler(newval, oldval) {
         this.codeClassifyOid = newval;
@@ -281,9 +297,9 @@
     // 杞崲鏁版嵁true鍜宖alse
     formatBoolean(row, column) {
       if (column.property === "xiaoshouwl"
-        ||column.property === "shifoupihaoguanli" 
-        ||column.property === "caigouwl" 
-        ||column.property === "kucunwl" 
+        ||column.property === "shifoupihaoguanli"
+        ||column.property === "caigouwl"
+        ||column.property === "kucunwl"
         ||column.property === "passing") {
         return row[column.property] =='true'? "鏄�" : "鍚�";
       }
@@ -433,6 +449,7 @@
         this.rowOid = "";
       }
       this.selectRow = row;
+      this.parameter.ids = [];
       row.forEach((item) => {
         this.parameter.ids.push(item.oid);
       });
@@ -461,6 +478,8 @@
         ...val,
       }).then((res) => {
         console.log(res);
+        this.tableData=res.data.data;
+        this.page.total=res.data.total
       });
     },
     //鐩镐技椤规煡璇�
@@ -492,6 +511,11 @@
     EditSumbit(val) {
       this.editvisible = false;
     },
+    openBatchImport(type) {
+      this.batchImportData.visible = true
+      this.batchImportData.type = type
+      this.batchImportData.codeClassifyOid = this.codeClassifyOid
+    }
   },
 };
 </script>
@@ -506,4 +530,10 @@
     background-color: #f5f7fa !important;
   }
 }
+
+/deep/ .el-button {
+  margin: 0 10px 10px 0;
+}
+
+
 </style>

--
Gitblit v1.9.3