From 87acc51f22b7e1781d4c4984e95028d8d0aee437 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 19 六月 2023 15:01:26 +0800
Subject: [PATCH] 主数据bug

---
 Source/UBCS-WEB/src/components/Crud/Crud.vue         |   28 ++++++++++++++++++++--------
 Source/UBCS-WEB/vue.config.js                        |    4 ++--
 Source/UBCS-WEB/src/components/Master/MasterTree.vue |    8 +++++---
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue
index 53cd177..3f5698a 100644
--- a/Source/UBCS-WEB/src/components/Crud/Crud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -11,6 +11,7 @@
           :templateOid="templateOid"
           :type="add"
           :visible.sync="addvisible"
+          @submit="AddSumbit"
         >
         </FormTemplateDialog>
         <el-button plain size="small" type="primary" @click="editHandler">缂栬緫
@@ -24,6 +25,7 @@
           :type="edit"
           :title="'淇敼缂栫爜淇℃伅'"
           :visible.sync="editvisible"
+          @submit="EditSumbit"
         ></FormTemplateDialog>
         <el-button plain size="small" type="primary">鎵归噺瀵煎叆鐢宠</el-button>
         <el-button plain size="small" type="primary">鍘嗗彶鏁版嵁瀵煎叆</el-button>
@@ -61,7 +63,7 @@
       </div>
       <el-row style="height: 700px;width: 100%">
         <el-table v-loading="isLoading" :data="tableData" max-height="700" style="" @cell-click="handleCellClick"
-                  @selection-change="handleSelectionChange" @sort-change="sortChange">
+                  @selection-change="handleSelectionChange" @sort-change="sortChange" v-if="tableData.length != 0">
           <el-table-column
             fixed
             type="selection"
@@ -215,7 +217,7 @@
     codeClassifyOid: {
       handler(newval, oldval) {
         this.codeClassifyOid = newval;
-        this.CrudHeaderRend()
+
       },
       deep: true
     },
@@ -256,10 +258,7 @@
       this.visibleFlow = true
     },
     huishouHandler() {
-      console.log('tem', this.templateOid)
-      console.log('table', this.tableData)
-      console.log('tabheadle', this.tableHeadData)
-      console.log('tableFather', this.tableHeadDataFateher)
+
     },
     openD() {
       this.dialogPush = true;
@@ -402,12 +401,16 @@
     },
     //澶氶��
     handleSelectionChange(row) {
+      this.rowOid = row[0].oid;
+      this.selectRow = row;
       console.log(row)
-      this.rowOid = row.oid
-      this.selectRow = row
     },
     //缂栬緫
     editHandler() {
+      console.log('row',this.rowOid)
+      console.log('temp',this.templateOid)
+      console.log('code',this.codeClassifyOid)
+      console.log('rule',this.coderuleoid)
       if (this.selectRow.length <= 0) {
         this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
       } else if (this.selectRow.length > 1) {
@@ -443,6 +446,15 @@
       } else {
         this.DataVisible = true
       }
+    },
+    //澧炲姞淇濆瓨
+    AddSumbit(val){
+      console.log(val)
+      this.addvisible=false
+    },
+    EditSumbit(val){
+      console.log(val)
+      this.editvisible=false
     }
   }
 }
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 8506919..3163e4a 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -132,6 +132,7 @@
               width: item.minWidth
             };
          this.tableHeadFindData.push(columnItem)
+            // console.log(' this.tableHeadFindData', this.tableHeadFindData)
           })
           this.$emit('tableHeadDataFateher', this.tableHeadDataFateher);
           this.$emit('tableHeadFindData', this.tableHeadFindData);
@@ -149,9 +150,10 @@
         this.TableRend(); // TableHeadRend() 鏂规硶瀹屾垚鍚庡啀鎵ц TableRend()
         this.$emit('nodeClick',this.templateOids)
         this.$emit("codeClassifyOid", this.nodeClickList.oid )
-        console.log('鍏冩暟鎹�',this.templateOids)
-        console.log('鍏冩暟鎹甤od',this.codeClassifyOid)
-        console.log('鍏冩暟鎹畁odeclick', this.nodeClickList.oid)
+        // console.log('鍏冩暟鎹�',this.templateOids)
+        // console.log('鍏冩暟鎹甤od',this.codeClassifyOid)
+        // console.log('鍏冩暟鎹畁odeclick', this.nodeClickList.oid)
+        // console.log(this.tableHeadFindData)
       } catch (error) {
         // 澶勭悊閿欒
         this.$message.error(error)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 736fed3..b47d590 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -28,8 +28,8 @@
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
         // target: 'http://localhost:37000',
         // target: 'http://localhost:37000',
-        // target: 'http://192.168.1.51:37000',
-        target: 'http://192.168.1.46:37000',
+        target: 'http://192.168.1.51:37000',
+        // target: 'http://192.168.1.46:37000',
         // target: 'http://dev.vci-tech.com:37000',
         // target: 'http://192.168.1.51:37000/',
           // target: 'http://192.168.1.104:37000',

--
Gitblit v1.9.3