From c4161e6467c5c8ae172681d81734036aa493ec77 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 06 七月 2023 10:28:53 +0800
Subject: [PATCH] 整合冲突代码

---
 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue |   58 ----------------------------
 Source/UBCS-WEB/vue.config.js                         |    4 +-
 Source/UBCS-WEB/src/api/template/templateAttr.js      |   10 +++++
 Source/UBCS-WEB/src/components/Tree/attrCrud.vue      |   27 ++++++++-----
 4 files changed, 30 insertions(+), 69 deletions(-)

diff --git a/Source/UBCS-WEB/src/api/template/templateAttr.js b/Source/UBCS-WEB/src/api/template/templateAttr.js
index 238a09d..29dd2e5 100644
--- a/Source/UBCS-WEB/src/api/template/templateAttr.js
+++ b/Source/UBCS-WEB/src/api/template/templateAttr.js
@@ -182,3 +182,13 @@
     }
   })
 }
+//鏃堕棿鏍煎紡涓嬫媺鑿滃崟
+export const  listByFlag = (params) =>{
+  return request({
+    url:'/api/ubcs-code/bdSelectInputController/listByFlag',
+    method: 'get',
+    params:{
+      ...params
+    }
+  })
+}
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index b837cb6..68d16f7 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
-      <el-button-group>
       <!--鏂板-->
       <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary" icon="el-icon-plus" @click="busineHandle">娣诲姞 {{ msg }}</el-button>
       <!--        鍏ㄥ睆缂栬緫-->
@@ -10,9 +9,6 @@
       <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
       <!--        灞炴�у垎缁�-->
       <el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
-      </el-button-group>
-      <el-button-group>
-<<<<<<< HEAD
         <!--        鍒嗙被娉ㄥ叆-->
         <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
           <!--    缁勫悎瑙勫垯-->
@@ -23,7 +19,6 @@
         <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
         <!--    棰勮鎺掑簭-->
         <el-button size="small" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
-=======
       <!--        鍒嗙被娉ㄥ叆-->
       <el-button icon="el-icon-magic-stick" size="small" @click="injectBtn">鍒嗙被娉ㄥ叆</el-button>
         <!--    缁勫悎瑙勫垯-->
@@ -34,8 +29,6 @@
       <el-button size="small" @click="CascadeHandle">绾ц仈灞炴��</el-button>
       <!--    棰勮鎺掑簭-->
       <el-button size="small" @click="orderHandle" icon="el-icon-arrow-down">棰勮鎺掑簭</el-button>
->>>>>>> 92e7dde00a56aff46e01efe72e1f7ab9b76dcf69
-      </el-button-group>
       <!--    淇濆瓨-->
       <el-button size="small" @click="addsHandler" icon="el-icon-check">淇濆瓨</el-button>
       <!--    鍒犻櫎-->
@@ -268,6 +261,11 @@
                     @blur="saveRows"></el-input>
           <el-input-number controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
                            @blur="saveRows"></el-input-number>
+          <el-select v-model="row[item.prop]" slot="prepend" v-if="editingRows === row && editShows== item.prop && item.prop == 'codeDateFormat'  && row[item.prop] ==''" @focus="DataChangeHandler">
+            <el-option label="椁愬巺鍚�" value="1"></el-option>
+            <el-option label="璁㈠崟鍙�" value="2"></el-option>
+            <el-option label="鐢ㄦ埛鐢佃瘽" value="3"></el-option>
+          </el-select>
           <el-switch
             v-if="item.edit === 'switch'" v-model="row[item.sortableprop]" active-value="true"
             inactive-value="false">
@@ -290,11 +288,10 @@
       </el-table-column>
     </el-table>
   </div>
-  <!--  </avue-crud>-->
 </template>
 
 <script>
-import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto} from '@/api/template/templateAttr'
+import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
 
 export default {
   name: "attrCrud .vue",
@@ -1298,6 +1295,16 @@
     formAttr(row, column) {
       console.log(row,column)
     },
+    //鏃堕棿涓嬫媺鏍煎紡
+    DataChangeHandler(){
+      debugger
+      listByFlag({comboxKey: 'codedateformat',
+        id: 'codedateformat',
+        namespace: 'codeclstempattr',
+        flag: 'dateFormates'}).then(res=>{
+        console.log(res)
+      })
+    },
     //灞炴�у垎缁勬寜閽�
     attrVisibleHandle() {
       if (this.attrSelectList.length > 1) {
@@ -1527,7 +1534,7 @@
         "灞傜骇璁剧疆": this.injectOption.injectNum,
         "鏄惁鍙慨鏀�": this.injectOption.change
       }
-      console.log(this.injectOption)      
+      console.log(this.injectOption)
       this.$set(this.attrRow, 'classifyInvokeLevel', data);
       this.injectVisible = false
     },
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index 428a3a8..4afd457 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -81,20 +81,6 @@
             <el-button plain size="small" type="primary" @click="Enable">鍚敤</el-button>
             <el-button plain size="small" type="primary" @click="Deactivate">鍋滅敤</el-button>
               <el-button plain size="small" type="primary" @click="CloneBtn">浠庡叾瀹冩ā鏉垮厠闅�</el-button>
-              <!-- <div style="display: inline-block">
-                <el-select v-model="searchTemplate.searchCondition" placeholder="璇烽�夋嫨" class="search-condition">
-                  <el-option
-                    v-for="item in searchTemplateOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-                <el-input v-model="searchTemplate.findText" placeholder="璇疯緭鍏ュ叧閿瓧鎸夊洖杞︽煡璇�"
-                  size="small"
-                  @keyup.enter.native="EnterFind">
-                </el-input>
-              </div> -->
               <!--              鏌ヨ瀵硅瘽妗�-->
            <el-dialog :visible.sync="FindFormVisible" append-to-body title="楂樼骇鏌ヨ">
               <div>
@@ -210,48 +196,6 @@
   inject: [, "crudTreeData"],
   data() {
     return {
-<<<<<<< HEAD
-=======
-      // //琛ㄦ牸option閰嶇疆椤�
-      // crudTreeOption: {
-      //   index: true,
-      //   border: true,
-      //   height:180,
-      //   selection:true,
-      //   addBtn:this.addFlag,
-      //   column: [
-      //     {
-      //       label: "妯℃澘缂栧彿",
-      //       prop: "id"
-      //     },
-      //     {
-      //       label:"妯℃澘鍚嶇О",
-      //       prop:"name"
-      //     },
-      //     {
-      //       label: "妯℃澘鎻忚堪",
-      //       prop:"description"
-      //     },
-      //     {
-      //       label:"鐗堟湰鍙�",
-      //       prop:"revisionSeq"
-      //     },
-      //     {
-      //       label:"鐘舵��",
-      //       prop:"lcStatusText"
-      //     }
-      //   ]
-      // },
-      // searchTemplateOptions: [
-      //   {
-      //     value: 'id',
-      //     label: '妯℃澘缂栧彿'
-      //   }, {
-      //     value: 'name',
-      //     label: '妯℃澘鍚嶇О'
-      //   }
-      // ],
->>>>>>> 7ff3f607595a30fc66924eb4b60ff00407afbbc2
       addFlag:false,
       // 琛ㄦ牸褰撳墠琛宨d
       crudOid:"",
@@ -264,7 +208,7 @@
         searchCondition: 'id',
         findText: "",
       },
-      
+
       //楂樼骇鏌ヨ瀵硅瘽妗�
       FindFormVisible: false,
       //鍏嬮殕妯℃澘瀵硅瘽妗�
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 0991057..4124c7c 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -27,9 +27,9 @@
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
         // target: 'http://localhost:37000',
-        // target: 'http://192.168.1.51:37000',
+        target: 'http://192.168.1.51:37000',
         // target: 'http://192.168.1.46:37000',
-        target: 'http://dev.vci-tech.com:37000',
+        // target: 'http://dev.vci-tech.com:37000',
         // target: 'http://192.168.1.51:37000/',
         // target: 'http://192.168.1.104:37000',
         // target: 'http://192.168.1.63:37000',

--
Gitblit v1.9.3