From c8cdec5a84e86c35fbe7d18ca8eefbe5cbf11ba7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 08 八月 2023 18:11:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
index 347fef0..7324680 100644
--- a/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue
@@ -16,7 +16,7 @@
                 }}
               </el-button>
               <span v-if="tableHeadFindData.length > 0">
-              <el-select v-model="keyWordFind" slot="prepend" placeholder="璇烽�夋嫨" size="small">
+              <el-select slot="prepend" v-model="keyWordFind" placeholder="璇烽�夋嫨" size="small">
                 <el-option v-for="item in tableHeadFindData" :label="item.label" :value="item.prop"></el-option>
               </el-select>
               <el-input v-model="WupinFindValue" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
@@ -66,8 +66,8 @@
           <FormTemplateDialog :codeClassifyOid="this.codeClassifyOid" :codeRuleOid="this.codeRuleOid"
                               :disabledProp="disabledProp" :rowOid="rowOid" :templateOid="templateOid"
                               :title="'宸插彂甯冩暟鎹洿鏀�'"
-                              type="edit"
-                              :visible.sync="DataVisible" @submit="updataSumbit"></FormTemplateDialog>
+                              :visible.sync="DataVisible"
+                              type="edit" @submit="updataSumbit"></FormTemplateDialog>
           <!--          鍙戝竷-->
           <set-personnel :parameter="this.parameter" :title="title" :visible.sync="visibleFlow"
                          @onLoad="onLoad"></set-personnel>
@@ -175,8 +175,8 @@
     tableHeadBtnData: {
       type: Array,
     },
-    Treedata:{
-      type:Array
+    Treedata: {
+      type: Array
     }
   },
   data() {
@@ -184,7 +184,7 @@
       // 鐘舵�佹悳绱�
       statusSelect: "all",
       // 鍏抽敭瀛楁煡璇�
-      keyWordFind:"",
+      keyWordFind: "",
       searchResults: [],
       //棣栭〉鍙充晶鎼滅储
       WupinFindValue: "",
@@ -193,7 +193,7 @@
       //鍚姩娴佺▼
       parameter: {
         ids: [],
-        btmtype:'',
+        btmtype: '',
         code: "",
         type: '',
         // this.visibleDeactivate ?'ENABLE':this.visibleEnable ? 'DISABLE' :this.visibleRecovery ? 'ROLLBACK' :'PUBLIC'
@@ -280,8 +280,8 @@
   created() {
     // const index = this.$route.query.id.indexOf('@name=') + '@name='.length;
     // this.result = this.$route.query.id.substring(index);
-    getUserInfo().then(res=>{
-      this.result=res.data.data.realName
+    getUserInfo().then(res => {
+      this.result = res.data.data.realName
     })
   },
   mounted() {
@@ -328,12 +328,12 @@
             }
           }
 
-          if(_index==0){
-            this.keyWordFind=record.field
+          if (_index == 0) {
+            this.keyWordFind = record.field
           }
         })
         this.tableHeadFindDatas = newval;
-        this.WupinFindValue=''
+        this.WupinFindValue = ''
       },
     },
     total: {
@@ -780,12 +780,12 @@
       })
     },
     //鏁版嵁鏇存敼鍥炶皟
-    updataSumbit(val){
+    updataSumbit(val) {
       this.DataVisible = false;
       val.copyFromVersion = this.rowOid;
-      val.oid=''
+      val.oid = '';
       console.log(val)
-      upSaveCode(val).then(res=>{
+      upSaveCode(val).then(res => {
         console.log(res)
         this.$nextTick(() => {
           this.onLoad()
@@ -808,7 +808,7 @@
         codeClassifyOid: this.codeClassifyOid,
         page: this.page.currentPage,
         limit: this.page.pageSize,
-        [ 'conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
+        ['conditionMap[' + this.keyWordFind + ']']: '*' + this.WupinFindValue + '*'
       }).then(res => {
         this.tableData = res.data.data
       })

--
Gitblit v1.9.3