From c0e4323f851c5216d1b020bc4177a8566e77bfd2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 30 十一月 2023 18:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/package.json                                 |   54 +++++++++---------
 Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue      |   13 ++++
 Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue     |   13 ++++
 Source/UBCS-WEB/src/views/code/code.vue                      |    2 
 Source/UBCS-WEB/src/views/docking/info.vue                   |   18 +++---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue        |    8 ++
 Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue      |   13 ++++
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   17 +++--
 Source/UBCS-WEB/src/views/MasterData/items.vue               |    4 
 Source/UBCS-WEB/vue.config.js                                |    6 +-
 Source/UBCS-WEB/src/components/Master/MasterTree.vue         |    4 
 11 files changed, 99 insertions(+), 53 deletions(-)

diff --git a/Source/UBCS-WEB/package.json b/Source/UBCS-WEB/package.json
index 0b035b2..4e9dfc2 100644
--- a/Source/UBCS-WEB/package.json
+++ b/Source/UBCS-WEB/package.json
@@ -11,44 +11,44 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
-    "avue-plugin-ueditor": "0.1.4",
-    "axios": "0.18.0",
-    "babel-polyfill": "6.26.0",
-    "classlist-polyfill": "1.2.0",
-    "crypto-js": "4.1.1",
+    "avue-plugin-ueditor": "^0.1.4",
+    "axios": "^0.18.0",
+    "babel-polyfill": "^6.26.0",
+    "classlist-polyfill": "^1.2.0",
+    "crypto-js": "^4.1.1",
     "echarts": "4.9.0",
-    "element-ui": "2.15.6",
-    "instead": "1.0.3",
-    "js-base64": "2.5.1",
-    "js-cookie": "2.2.0",
-    "js-md5": "0.7.3",
-    "js-pinyin": "0.2.4",
-    "mockjs": "1.0.1-beta3",
-    "moment": "2.29.4",
-    "node-gyp": "4.0.0",
+    "element-ui": "^2.15.6",
+    "instead": "^1.0.3",
+    "js-base64": "^2.5.1",
+    "js-cookie": "^2.2.0",
+    "js-md5": "^0.7.3",
+    "js-pinyin": "^0.2.4",
+    "mockjs": "^1.0.1-beta3",
+    "moment": "^2.29.4",
+    "node-gyp": "^4.0.0",
     "nprogress": "0.2.0",
     "portfinder": "1.0.23",
     "save": "2.9.0",
     "script-loader": "0.7.2",
     "vue": "2.6.10",
-    "vue-axios": "2.1.2",
-    "vue-clipboard2": "0.3.3",
+    "vue-axios": "^2.1.2",
+    "vue-clipboard2": "^0.3.3",
     "vue-echarts": "5.0.0-beta.0",
     "vue-flowchart-editor": "1.0.2",
-    "vue-i18n": "8.7.0",
-    "vue-router": "3.0.1",
-    "vuex": "3.1.1"
+    "vue-i18n": "^8.7.0",
+    "vue-router": "^3.0.1",
+    "vuex": "^3.1.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "3.1.1",
-    "@vue/cli-plugin-eslint": "3.1.5",
-    "@vue/cli-service": "3.1.4",
-    "@vue/composition-api": "1.7.2",
-    "chai": "4.1.2",
+    "@vue/cli-plugin-babel": "^3.5.0",
+    "@vue/cli-plugin-eslint": "^3.5.0",
+    "@vue/cli-service": "^3.5.0",
+    "@vue/composition-api": "^1.7.2",
+    "chai": "^4.1.2",
     "node-sass": "6.0.1",
-    "sass-loader": "10.0.5",
-    "vue-template-compiler": "2.5.17",
-    "webpack-bundle-analyzer": "3.0.3"
+    "sass-loader": "10.3.1",
+    "vue-template-compiler": "2.6.10",
+    "webpack-bundle-analyzer": "^3.0.3"
   },
   "lint-staged": {
     "*.js": [
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 5849e98..bfd0254 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -278,7 +278,6 @@
 
         let columnItem = {
           change: (val) => {
-            console.log(val)
             if (val.column.field === "drawingno") {
               this.codeattrsecValue = val.value;
               return;
@@ -600,12 +599,16 @@
     // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
     getFormDetail() {
       if (this.type === "add") return;
-      getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(
-        (res) => {
-          this.form = Object.assign(this.form, res.data.data[0]);
-          this.loading = false;
-        }
-      );
+      if(this.templateOid){
+        getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(
+          (res) => {
+            this.form = Object.assign(this.form, res.data.data[0]);
+            this.loading = false;
+          }
+        );
+        return;
+      }
+
     },
     setReferValue(data) {
       if (data.field) {
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 573c4b5..2567d87 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -250,9 +250,11 @@
   },
   methods: {
     openDialog() {
+      //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
       this.getFormTemplate();
-      if (this.type === "add") {
+      if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
         this.getCodeRule();
+        return;
       }
     },
     close() {
@@ -260,6 +262,7 @@
     },
     // 鎺ュ彛鑾峰彇琛ㄥ崟鏁版嵁
     getFormTemplate() {
+      //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
       getFormTemplate({
         templateOid: this.templateOid,
         codeClassifyOid: this.codeClassifyOid,
@@ -277,6 +280,7 @@
             } else {
               this.showResembleQuery = false;
             }
+            //浼犻�掕〃鍗曚笂鏂瑰尯鍩熸暟鎹� 锛堟柊澧炲拰淇敼锛�
             this.$nextTick(() => {
               this.$refs.FormTemplate.templateRender(
                 res.data.formDefineVO.items
@@ -319,7 +323,7 @@
           that.secVOList = (res.data.data.secVOList || []).filter((item) =>
             typeList.includes(item.secType)
           );
-          if (that.secVOList.length > 0 && that.type === "add") {
+          if (that.secVOList.length > 0 && that.type === "add" ||(that.type !== "add" &&  that.status === "amend")) {
             that.showCodeApply = true;
             that.activeName = "codeApply";
 
diff --git a/Source/UBCS-WEB/src/components/Master/MasterTree.vue b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
index 3948716..b34e705 100644
--- a/Source/UBCS-WEB/src/components/Master/MasterTree.vue
+++ b/Source/UBCS-WEB/src/components/Master/MasterTree.vue
@@ -1,12 +1,12 @@
 <template>
-  <div class="app" style="display: flex;">
+  <div class="app" style="position: relative;">
     <avue-tree ref="tree" v-model="CloneTreeAvueform" v-loading="loading" :data="Treedata" :defaultExpandAll="false"
                :option="Treeoption" style="width: fit-content;" @node-click="nodeClick">
       <template slot-scope="{ node }">
         <span v-html="node.label"></span>
       </template>
     </avue-tree>
-    <div style="display: inline-block;">
+    <div style="position: absolute; right: 0px; top: -1px;">
       <el-link class="refresh-icon" icon="el-icon-refresh" @click="getTreeLists"></el-link>
     </div>
   </div>
diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue
index f84b48b..c0a80c0 100644
--- a/Source/UBCS-WEB/src/views/MasterData/items.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/items.vue
@@ -1,7 +1,7 @@
 <template>
   <el-container>
-    <el-aside>
-      <basic-container style="overflow: hidden;">
+    <el-aside style="width:250px">
+      <basic-container>
         <!--          鏍戠粍浠�-->
         <master-tree
           :currentPage="this.currentPage"
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 9668e7d..4b0e705 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -1385,7 +1385,7 @@
             cols: [
               {title: '绠楁硶缂栧彿', field: 'id', width: 200},
               {title: '绠楁硶鍚嶇О', field: 'name', width: 150},
-              {title: '鑷畾涔夋祦姘碆ean', field: 'classFullName', width: 300},
+              {title: '绫诲叏璺緞', field: 'classFullName', width: 300},
               {title: '绫诲瀷', field: 'serialType', width: 300},
               {title: '鎻忚堪', field: 'description'}
             ],
diff --git a/Source/UBCS-WEB/src/views/docking/info.vue b/Source/UBCS-WEB/src/views/docking/info.vue
index 973fcd7..f7cbbc7 100644
--- a/Source/UBCS-WEB/src/views/docking/info.vue
+++ b/Source/UBCS-WEB/src/views/docking/info.vue
@@ -266,15 +266,15 @@
   },
   computed: {
     ...mapGetters(["permission"]),
-    permissionList(){
-      return{
-        sync:this.vaildData(this.permission.info.info_sync,false),
-        add:this.vaildData(this.permission.info.info_add,false),
-        query:this.vaildData(this.permission.info.info_query,false),
-        edit:this.vaildData(this.permission.info.info_edit,false),
-        delete:this.vaildData(this.permission.info.info_delete,false),
-        enable:this.vaildData(this.permission.info.info_enable,false),
-        stop:this.vaildData(this.permission.info.info_stop,false),
+    permissionList() {
+      return {
+        sync: this.vaildData(this.permission.info.info_sync, false),
+        add: this.vaildData(this.permission.info.info_add, false),
+        query: this.vaildData(this.permission.info.info_query, false),
+        edit: this.vaildData(this.permission.info.info_edit, false),
+        delete: this.vaildData(this.permission.info.info_delete, false),
+        enable: this.vaildData(this.permission.info.info_enable, false),
+        stop: this.vaildData(this.permission.info.info_stop, false),
       }
     },
     oids() {
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
new file mode 100644
index 0000000..867a34d
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/ruleBasic/delimiterConfig.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "delimiterConfig"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
new file mode 100644
index 0000000..9de161e
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/ruleBasic/paddingCharacter.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "paddingCharacter"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
new file mode 100644
index 0000000..f983576
--- /dev/null
+++ b/Source/UBCS-WEB/src/views/ruleBasic/usableCharacter.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+name: "usableCharacter"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 264ceae..80aaff2 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,11 +26,11 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-        target: 'http://127.0.0.1:37000',
+        // target: 'http://127.0.0.1:37000',
         // target: 'http://192.168.1.51:37000',
-        // target: 'http://dev.vci-tech.com:37000',
+        target: 'http://dev.vci-tech.com:37000',
         //yxc
-        // target: 'http:// 192.168.0.104:37000',
+        // target: 'http:// 192.168.0.100:37000',
         // target: 'http://192.168.0.105:37000',
         // target: 'http://192.168.0.103:37000',
         // target: 'http://192.168.1.63:37000',

--
Gitblit v1.9.3