From 2d0fdaca6f7637c68782ae53ed2c3feee4f48db7 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期三, 21 六月 2023 16:39:07 +0800
Subject: [PATCH] fjl

---
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index f8ab6cd..a73954c 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -28,13 +28,13 @@
           @submit="EditSumbit"
         ></FormTemplateDialog>
         <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="historyVisible = true">鍘嗗彶鏁版嵁瀵煎叆</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">鍒犻櫎</el-button>
         <el-button plain size="small" type="primary" @click="setHandler">鍙戝竷</el-button>
-        <set-personnel :visible.sync="visibleFlow"  :parameter="parameter"
+        <set-personnel :visible.sync="visibleFlow"  :parameter="this.parameter"
         ></set-personnel>
         <el-button plain size="small" type="primary" @click="DataChange">鏁版嵁鏇存敼</el-button>
         <FormTemplateDialog
@@ -111,6 +111,7 @@
         @current-change="handleCurrentChange">
       </el-pagination>
     </div>
+    <historyImport :visible.sync="historyVisible" :codeClassifyOid="codeClassifyOid" type="historyImport"></historyImport>
   </basic-container>
 </template>
 <script>
@@ -119,11 +120,13 @@
 import integrationTransfer from '@/views/integration/integrationTransfer'
 import SetPersonnel from '@/components/template/SetPersonnel'
 import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import historyImport from '../BatchImport/index.vue'
 export default {
   components: {
     integrationTransfer,
     SetPersonnel,
-    ResembleQueryDialog
+    ResembleQueryDialog,
+    historyImport
   },
   name: "Crud.vue",
   props: {
@@ -150,6 +153,7 @@
     },
     templateOid: {
       type: String,
+      default:''
     },
     tableHeadDataFateher: {
       type: Array,
@@ -168,8 +172,8 @@
       similarVisible:false,
       //鍙戝竷
       parameter:{
-        ids:['0000','22222222'],
-        code:this.templateOid,
+        ids:[],
+        code:'',
         type:'PUBLIC',
         template:'妯℃澘template'
       },
@@ -180,7 +184,6 @@
         label: 'name'
       },
       tableHeadFindDatas:[],
-      templateOid: "",
       addvisible: false,
       editvisible: false,
       findvisible: false,
@@ -208,16 +211,15 @@
       tableHeadData: [],
       items: {},
       seniorQueryColumns: [],
-      selectRow: []
+      selectRow: [],
+      historyVisible: false
     }
   },
   computed: {},
   created() {
-    // this.CrudHeaderRend();
-    // this.tableHeadHandle()
+
   },
   mounted() {
-
   },
   activated() {
     this.doLayout()
@@ -245,13 +247,21 @@
         this.page.total = newval;
       }
     },
+    templateOid:{
+      handler(newval,oldval) {
+        this.parameter.code=newval;
+      },
+      deep:true
+    }
   },
   methods: {
     setHandler() {
-      this.visibleFlow = true;
-    },
-    huishouHandler() {
 
+      if (this.selectRow.length <= 0) {
+        this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
+      }  else {
+        this.visibleFlow = true;
+      }
     },
     openD() {
       this.dialogPush = true;
@@ -386,6 +396,10 @@
       }
       this.selectRow = row;
       console.log(row)
+      row.forEach(item=>{
+        this.parameter.ids.push(item.oid)
+        console.log( this.parameter.ids)
+      })
     },
     //缂栬緫
     editHandler() {
@@ -405,7 +419,8 @@
     },
     //楂樼骇鏌ヨ鎸夐挳
     findHandler(){
-      this.findvisible=true
+      this.findvisible=true;
+      console.log(this.options)
     },
     // 楂樼骇鏌ヨ
     echoContion(val) {

--
Gitblit v1.9.3