From a2109930695034bc9fe3e2d38f97649b0d2d2a12 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 31 七月 2023 20:46:04 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue |   85 ++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
index 1a3157b..3f35190 100644
--- a/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue
@@ -48,6 +48,16 @@
     <el-button-group>
       <el-button size="small" plain  icon="el-icon-view"  v-if="(!checkStatus|| crudLCStatus=='Editing') && !editOpenFlag && attrEditVisible == false && attrFlagChiledren==false" @click="editOpen" >寮�鍚紪杈�</el-button>
     </el-button-group>
+      <el-select v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag"  size="small" v-model="selectvalue" placeholder="璇烽�夋嫨">
+        <el-option
+          v-for="item in selectoptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+      <el-switch v-if="(!checkStatus || crudLCStatus=='Editing') && editOpenFlag"  v-model="switchvalue" @change="batchSetFlag" active-value="true" style="margin:6px 0 0 10px">
+      </el-switch>
     </div>
 <!--    寮圭獥-->
     <div>
@@ -256,6 +266,7 @@
               @cell-click="handleCellClicks"
               @select="selectHandle"
               @selection-change="selectionChange"
+              @row-click="rowClick"
               v-if="this.crudArrayFlag"
               ref="referAttrCrud"
               v-loading="loading"
@@ -331,6 +342,7 @@
       type: Boolean,
       default: false
     },
+    //鎺у埗鏄惁寮�鍚紪杈�
     editOpenFlag:{
       type: Boolean,
       default: false
@@ -360,9 +372,16 @@
     crudArrayFlag:{
       type: Boolean,
       default: false
-    }
+    },
   },
   watch:{
+    crudOid:{
+      handler(newval,oldval){
+        if(newval){
+          this.editOpenFlag=false
+        }
+      }
+    },
     crudArray:{
       handler(newval,oldval){
         if(newval != undefined){
@@ -405,7 +424,7 @@
     },
     editOpenFlag:{
       handler(newval,oldval){
-        console.log(newval)
+        console.log('editOpenFlag',newval)
       },
       deep:true,
       immediate:true
@@ -1394,7 +1413,50 @@
       codeDataFlag:false,
     //  缁勫悎瑙勫崟鍏冩牸缂栬緫鍥炲～
       componentRuleText:"",
-
+      //妯℃澘灞炴�т笅鎷夎缃畇witch
+      selectoptions: [{
+        value: 'keyAttrFlag',
+        label: '鍏抽敭灞炴��'
+      }, {
+        value: 'queryAttrFlag',
+        label: '鏌ヨ灞炴��'
+      }, {
+        value: 'seniorQueryAttrFlag',
+        label: '楂樼骇鏌ヨ灞炴��'
+      }, {
+        value: 'sameRepeatAttrFlag',
+        label: '鐩镐技鏌ラ噸灞炴��'
+      }, {
+        value: 'barcodeFlag',
+        label: '涓�缁寸爜'
+      }, {
+        value: 'qrcodeFlag',
+        label: '浜岀淮鐮�'
+      }, {
+        value: 'requireFlag',
+        label: '蹇呰緭'
+      }, {
+        value: 'formDisplayFlag',
+        label: '琛ㄥ崟鏄剧ず'
+      }, {
+        value: 'tableDisplayFlag',
+        label: '鍒楄〃鏄剧ず'
+      }, {
+        value: 'readonlyFlag',
+        label: '鍙'
+      }, {
+        value: 'sortAttrFlag',
+        label: '鍒楄〃鎺掑簭'
+      }, {
+        value: 'textareaFlag',
+        label: '澶氳鏂囨湰'
+      }, {
+        value: 'imageFlag',
+        label: '棰勮鍥�'
+      }],
+      //妯℃澘灞炴�т笅鎷夐�変腑鍊�
+      selectvalue: 'keyAttrFlag',
+      switchvalue:'false'
     }
   },
   computed:{
@@ -1613,7 +1675,15 @@
     //琛ㄦ牸閫夋嫨
     selectionChange(list) {
       this.attrSelectList = list;
-      console.log(list)
+    },
+    rowClick(row){
+      this.$refs.referAttrCrud.clearSelection();
+      this.attrSelectList = [row];
+      this.$refs.referAttrCrud.setCurrentRow(row);
+      this.$refs.referAttrCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+
+      this.attrOid = row.oid;
+      this.attrRow = row;
     },
     //淇濆瓨
     addsHandler() {
@@ -1633,7 +1703,6 @@
          this.rowOid = row.oid;
          this.CurrentCell=row;
          if(column.property == 'referConfig' ){
-           console.log( this.CurrentCell.referConfig)
            this.referConfigVisble= true;
            this.referConfigOption = {
              referConfig: this.CurrentCell.referConfig || '',
@@ -1944,6 +2013,12 @@
     //寮�鍚紪杈�
     editOpen(){
       this.editOpenFlag=true;
+    },
+    //鎵归噺璁剧疆switch
+    batchSetFlag(value){
+      this.attrSelectList.forEach(item=>{
+        item[this.selectvalue]=value;
+      })
     }
   }
 }

--
Gitblit v1.9.3