From e181cff71cf276574506abb3b8a0c42bfed7cc1d Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 08 十一月 2023 18:45:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/api/system/dict.js                       |    7 +++++++
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   19 ++++++++++++++++---
 Source/UBCS-WEB/src/components/Master/MasterTree.vue         |   16 +++++++++++-----
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/system/dict.js b/Source/UBCS-WEB/src/api/system/dict.js
index 0ed54ed..6ce1f13 100644
--- a/Source/UBCS-WEB/src/api/system/dict.js
+++ b/Source/UBCS-WEB/src/api/system/dict.js
@@ -87,3 +87,10 @@
     params,
   })
 }
+export const getEnumDictionary = (params) => {
+  return request({
+    url: '/api/ubcs-omd/enum/dictionary',
+    method: 'get',
+    params,
+  })
+}
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 3ff1350..5a0cdc9 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -43,7 +43,7 @@
 
 <script>
 import { getFormDetail } from "@/api/formTemplate";
-import { getDictionary } from "../../api/system/dict";
+import { getEnumDictionary } from "../../api/system/dict";
 import vciWebRefer from "../refer/vciWebRefer.vue";
 export default {
   name: "FormTemplate",
@@ -101,6 +101,7 @@
   },
   data() {
     return {
+      codeattrsecValue:'',
       ValidataValue:false,
       eventFlag:{},
       TreeValueForm:'',
@@ -227,7 +228,16 @@
           formItem.fieldMap[fieldMapKey]='id'
           formItem.fieldMap[formItem.field+'id']='id'
         }
+
+
         let columnItem = {
+          change:(val)=>{
+            // console.log(val)
+            if(val.column.field === "drawingno"){
+              this.codeattrsecValue=val.value;
+            }
+            console.log(this.codeattrsecValue)
+          },
           dataKey:formItem.dataKey || formItem.field,
           label: formItem.text,
           labelslot: true,
@@ -246,7 +256,8 @@
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
-            (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null) ,
+            (formItem.secType == "codedatesec" ? formItem.codeDateValue: null) || ( TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
+            (formItem.secType == "codeattrsec" ? this.codeattrsecValue : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
@@ -289,6 +300,8 @@
             value: "key",
           },
         };
+        // console.log('formItem',formItem)
+        // console.log('columnItem',columnItem)
         slotColumnList.push(columnItem);
         if (group.length === 0) {
           column.push(columnItem);
@@ -489,7 +502,7 @@
     // 寮傛鑾峰彇瀛楀吀鏁版嵁
     geDictData(dictKeys) {
       dictKeys.forEach((dictObj) => {
-        getDictionary({ code: dictObj.dictKey }).then((res) => {
+        getEnumDictionary({ code: dictObj.dictKey }).then((res) => {
           if (res.data && res.data.code === 200) {
             this.option.column = this.option.column.map((item) => {
               if (item.field === dictObj.field) {
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 4d4bfd5..c1e383e 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -6,7 +6,9 @@
         <span v-html="node.label"></span>
       </template>
     </avue-tree>
-    <div style="display: inline-block;"><el-link icon="el-icon-refresh" class="refresh-icon" @click="getTreeLists"></el-link></div>
+    <div style="display: inline-block;">
+      <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
+    </div>
   </div>
 </template>
 
@@ -34,7 +36,7 @@
     return {
       TreeValue: '',
       idData: '',
-      referTreeId:'',
+      referTreeId: '',
       masterVrBtnList: [],
       tableHeadFindData: [],
       tableHeadDataFateher: [],
@@ -57,11 +59,15 @@
         //   console.log(node)
         //   console.log(resolve)
         // }
-        treeLoad: (node, resolve) =>{
+        treeLoad: (node, resolve) => {
           if (node.data != false) {
             const parentId = (node.level === 0) ? 0 : node.data.oid;
             const parentBtmName = node.data.attributes.btmname;
-            getTreeList({parentOid: parentId, parentBtmName: parentBtmName,'conditionMap[btmTypeId]': this.referTreeId }).then(res => {
+            getTreeList({
+              parentOid: parentId,
+              parentBtmName: parentBtmName,
+              'conditionMap[btmTypeId]': this.referTreeId
+            }).then(res => {
               resolve(res.data.map(item => {
                 return {
                   ...item,
@@ -107,7 +113,7 @@
 
             const [firstProperty] = res.data;
             this.ModifyProperties(this.Treedata, 'text', 'label');
-            this.referTreeId=firstProperty.attributes.btmTypeId;
+            this.referTreeId = firstProperty.attributes.btmTypeId;
             // console.log(this.referTreeId)
             this.codeClassifyOid = firstProperty.oid;
             this.coderuleoid = firstProperty.attributes.coderuleoid;

--
Gitblit v1.9.3