From 8835c9e1dec836d6d8159e78b9df12ad6402ad98 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 十一月 2024 10:03:24 +0800
Subject: [PATCH] 修复bug 整合代码

---
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue                       |    2 
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue |   30 ++
 Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue                     |    3 
 Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue                        |   26 +-
 Source/plt-web/plt-web-ui/src/router/avue-router.js                                            |    1 
 Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue                                   |    2 
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue                           |    5 
 Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue                           |   53 ++---
 Source/plt-web/plt-web-ui/src/components/actions/base/AddEditDialog.vue                        |  201 +++++++++++-----------
 Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue                                      |   13 +
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue       |    4 
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue                  |    5 
 Source/plt-web/plt-web-ui/src/api/UI/uiDefine.js                                               |    9 +
 Source/plt-web/plt-web-ui/src/components/actions/base/DeleteAction.js                          |    2 
 Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue      |   14 +
 Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue           |  122 ++++++++-----
 16 files changed, 287 insertions(+), 205 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/api/UI/uiDefine.js b/Source/plt-web/plt-web-ui/src/api/UI/uiDefine.js
index 8a6bec0..3fd0dc4 100644
--- a/Source/plt-web/plt-web-ui/src/api/UI/uiDefine.js
+++ b/Source/plt-web/plt-web-ui/src/api/UI/uiDefine.js
@@ -257,6 +257,15 @@
   });
 }
 
+// 淇敼鎺ュ彛
+export function updatePageDefination(params) {
+  return request({
+    url: "/api/uiManagerController/updatePageDefination",
+    method: "put",
+    data: params
+  });
+}
+
 
 // 鍏嬮殕鏍戞煡璇㈡帴鍙�
 export function getAllLevelTreeByBtm(params) {
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
index f1650ee..5131082 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/basicForm.vue
@@ -1,6 +1,6 @@
 <template>
   <!--鍔ㄦ�佹ā鏉�-->
-  <avue-form ref="form" :option="option" v-model="form">
+  <avue-form ref="form" :option="option" v-model="form" v-loading="loading">
     <template v-for="item in allColumn" :slot="item.prop+ ''">
       <vciWebRefer
         v-if="item.type === 'refer'"
@@ -83,6 +83,7 @@
   },
   data() {
     return {
+      loading:false,
       form: this.formData,
       option: {
         menuBtn:false,
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/AddEditDialog.vue b/Source/plt-web/plt-web-ui/src/components/actions/base/AddEditDialog.vue
index 83a3836..7e62c19 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/AddEditDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/AddEditDialog.vue
@@ -1,44 +1,45 @@
 <template>
   <el-dialog v-dialogDrag
+             :append-to-body="true"
+             :close-on-click-modal="false"
+             :destroy-on-close="true"
+             :fullscreen="fullscreen"
              :title="title"
              :visible.sync="visible"
              :width="width"
-             :fullscreen="fullscreen"
-             :append-to-body="true"
-             top="0"
              class="avue-dialog"
-             :destroy-on-close="true"
-             :close-on-click-modal="false"
+             top="0"
              @close="dialogClose">
-    <basic-form ref="formRef" v-if="paramVOS.form"
-                :key="'dialog-'+paramVOS.form"
+    <basic-form v-if="paramVOS.form" :key="'dialog-'+paramVOS.form"
+                ref="formRef"
+                v-loading="loading"
+                :formData="form"
+                :formItems="formItems"
+                :initValue="paramVOS.initvalue"
+                :isEdit="true"
                 :span="span"
                 :style="fullscreen?'':'height:'+height"
-                :isEdit="true"
-                :formItems="formItems"
-                :formData="form"
-                :initValue="paramVOS.initvalue"
                 :uploadattachment="paramVOS.uploadattachment || false"
                 @getFormData="getFormData">
     </basic-form>
-    <ui-view ref="uiViewRef" v-else-if="paramVOS.context"
-             :key="'AddEditDialog-'+type"
-             :style="fullscreen?'':'height:'+height"
-             :btmType="paramVOS.type"
-             :context="paramVOS.context"
-             :inDialog="true"
-             :canEdit="true"
+    <ui-view v-else-if="paramVOS.context" :key="'AddEditDialog-'+type"
+             ref="uiViewRef"
              :actionType="type"
-             :sourceData="sourceData"
+             :btmType="paramVOS.type"
+             :canEdit="true"
+             :context="paramVOS.context"
              :dataStore="dataStore"
+             :inDialog="true"
              :paramVOS="paramVOS"
+             :sourceData="sourceData"
+             :style="fullscreen?'':'height:'+height"
              @getFormData="getFormData"
     ></ui-view>
     <div v-if="showSave" class="dialog-footer avue-dialog__footer">
-      <el-button type="primary" plain size="small" @click="formSave" v-if="paramVOS.form">淇� 瀛�</el-button>
-      <el-button type="primary" plain size="small" @click="contextSave" v-else>淇� 瀛�</el-button>
+      <el-button v-if="paramVOS.form" plain size="small" type="primary" @click="formSave">淇� 瀛�</el-button>
+      <el-button v-else plain size="small" type="primary" @click="contextSave">淇� 瀛�</el-button>
       <el-button size="small" @click="dialogClose">鍙� 娑�</el-button>
-      <el-button size="small" @click="resetValue" v-if="paramVOS.form">閲� 缃�</el-button>
+      <el-button v-if="paramVOS.form" size="small" @click="resetValue">閲� 缃�</el-button>
     </div>
   </el-dialog>
 </template>
@@ -46,13 +47,13 @@
 <script>
 import uiView from "@/views/base/UIContentViewerInDialog"
 import {parseEventByUrl} from "@/components/actions/BaseAction"
-import {getFormDefineById,dataForm} from "@/api/base/ui";
-import {addSave,editSave} from "@/api/base/actions"
+import {getFormDefineById, dataForm} from "@/api/base/ui";
+import {addSave, editSave} from "@/api/base/actions"
 import {validatenull} from "@/util/validate"
 
 export default {
   name: "AddEditDialog",
-  components:{uiView},
+  components: {uiView},
   props: {
     sourceData: {
       //鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
@@ -69,22 +70,23 @@
       default: {}
     }
   },
-  data(){
+  data() {
     return {
-      type:"add",
-      visible:false,
-      showSave:this.paramVOS.customBtn || true,
-      span:12,
-      formItems:[],
-      form:{},
-      btmDefaultKeys : ['oid', 'id', 'name', 'description', 'revisionoid', 'nameoid', 'btmname', 'lastr', 'firstr', 'lastv', 'firstv', 'creator', 'createtime', 'lastModifier', 'lastmodifytime', 'revisionrule', 'revisionseq', 'revisionvalue', 'versionrule', 'versionseq', 'versionvalue', 'lcstatus', 'ts', 'owner', 'checkinby', 'checkintime', 'checkoutby', 'checkouttime', 'copyfromversion', 'secretgrade'],
-      linkDefaultKeys :['oid','creator','createtime','lastmodifier','lastmodifytime','f_oid','foid','f_revisionoid','frevisionoid','f_nameoid','fnameoid','f_btmname','fbtmname','t_oid','toid','t_revisionoid','trevisionoid','t_nameoid','tnameoid','t_btmname','tbtmname','ts']
+      loading: false,
+      type: "add",
+      visible: false,
+      showSave: this.paramVOS.customBtn || true,
+      span: 12,
+      formItems: [],
+      form: {},
+      btmDefaultKeys: ['oid', 'id', 'name', 'description', 'revisionoid', 'nameoid', 'btmname', 'lastr', 'firstr', 'lastv', 'firstv', 'creator', 'createtime', 'lastModifier', 'lastmodifytime', 'revisionrule', 'revisionseq', 'revisionvalue', 'versionrule', 'versionseq', 'versionvalue', 'lcstatus', 'ts', 'owner', 'checkinby', 'checkintime', 'checkoutby', 'checkouttime', 'copyfromversion', 'secretgrade'],
+      linkDefaultKeys: ['oid', 'creator', 'createtime', 'lastmodifier', 'lastmodifytime', 'f_oid', 'foid', 'f_revisionoid', 'frevisionoid', 'f_nameoid', 'fnameoid', 'f_btmname', 'fbtmname', 't_oid', 'toid', 't_revisionoid', 'trevisionoid', 't_nameoid', 'tnameoid', 't_btmname', 'tbtmname', 'ts']
 
     }
   },
-  computed:{
-    title(){
-      return this.paramVOS.title || (this.type=='add'?'娣诲姞':'淇敼')
+  computed: {
+    title() {
+      return this.paramVOS.title || (this.type == 'add' ? '娣诲姞' : '淇敼')
     },
     width() {
       if (!validatenull(this.paramVOS.width)) {
@@ -97,7 +99,7 @@
         return "60%";
       }
     },
-    height(){
+    height() {
       if (!validatenull(this.paramVOS.height)) {
         if (this.paramVOS.height.includes("px") || this.paramVOS.height.includes("%")) {
           return this.paramVOS.height;
@@ -108,10 +110,10 @@
         return "auto"
       }
     },
-    fullscreen(){
-      if(this.paramVOS.width || this.paramVOS.height){
+    fullscreen() {
+      if (this.paramVOS.width || this.paramVOS.height) {
         return false;
-      }else if(this.paramVOS.form){
+      } else if (this.paramVOS.form) {
         return false;
       }
       return true;
@@ -137,13 +139,13 @@
     onLoad: function () {
       if (Object.keys(this.sourceData).length > 0) {
         this.loading = true;
-        getFormDefineById(this.paramVOS.type,this.paramVOS.form).then(result => {
-          this.formItems=result.data.obj.items;
-          this.span=result.data.obj.columnOneRow?(24/result.data.obj.columnOneRow) : 12;
+        getFormDefineById(this.paramVOS.type, this.paramVOS.form).then(result => {
+          this.formItems = result.data.obj.items;
+          this.span = result.data.obj.columnOneRow ? (24 / result.data.obj.columnOneRow) : 12;
           if (this.paramVOS.initvalue) {
-            this.form=this.paramVOS.initvalue;
+            this.form = this.paramVOS.initvalue;
           }
-          if(this.type=="edit") {
+          if (this.type == "edit") {
             //鍔犺浇琛ㄥ崟鏁版嵁
             let sourceDataMap = {};
             for (let i in this.sourceData) {
@@ -156,13 +158,14 @@
               formDefineId: this.paramVOS.form,
               oid: this.dataStore[0].oid
             }, sourceDataMap), this.paramVOS.getdataurl, this.paramVOS.getdatamethod).then(res => {
-              this.form=res.data.obj;
+              this.form = res.data.obj.data;
               this.loading = false;
             }).catch(error => {
               this.$message.error(error);
               this.loading = false;
             })
           }
+          this.loading = false;
         }).catch(error => {
           this.$message.error(error);
           this.loading = false;
@@ -170,27 +173,27 @@
 
       }
     },
-    contextSave(){
-      const useDataType=this.paramVOS["useDataType"] || "form";//浣跨敤ui涓婁笅鏂囦腑鐨勫摢涓被鍨嬫暟鎹紝榛樿form銆傚�硷細form銆乼ree銆乼able銆乀reeTable
-      for(let key in this.$refs.uiViewRef.data){
-        if(this.$refs.uiViewRef.data[key].type== useDataType){
-          this.form=this.$refs.uiViewRef.data[key].data;
-          this.formDefineId=this.$refs.uiViewRef.data[key].DefineVO.id;
+    contextSave() {
+      const useDataType = this.paramVOS["useDataType"] || "form";//浣跨敤ui涓婁笅鏂囦腑鐨勫摢涓被鍨嬫暟鎹紝榛樿form銆傚�硷細form銆乼ree銆乼able銆乀reeTable
+      for (let key in this.$refs.uiViewRef.data) {
+        if (this.$refs.uiViewRef.data[key].type == useDataType) {
+          this.form = this.$refs.uiViewRef.data[key].data;
+          this.formDefineId = this.$refs.uiViewRef.data[key].DefineVO.id;
           if (this.paramVOS.savebeforeevent) {
-            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent,null,null,'doAction');
-            if(urlobj.params){
-              Object.assign(this.paramVOS,urlobj.params);
+            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent, null, null, 'doAction');
+            if (urlobj.params) {
+              Object.assign(this.paramVOS, urlobj.params);
             }
-            if(validatenull(urlobj.jsPath)){
+            if (validatenull(urlobj.jsPath)) {
               this.saveBforeHandle(this.paramVOS);
-            }else{
+            } else {
               try {
                 import(`./${urlobj.jsPath}.js`).then(module => {
                   module[urlobj.methodName]({
                     paramVOS: this.paramVOS,
                     dataStore: this.dataStore,
-                    sourceData:this.sourceData
-                  },this.formSaveHandle);
+                    sourceData: this.sourceData
+                  }, this.formSaveHandle);
                 })
               } catch (error) {
                 this.$message.error('鏈壘鍒颁繚瀛樺墠缃簨浠舵墽琛宩s');
@@ -204,18 +207,18 @@
       }
     },
     formSave() {
-      let that=this;
+      let that = this;
       this.$refs.formRef.validate((valid, done) => {
         if (valid) {
-          this.formDefineId=this.paramVOS.form;
+          this.formDefineId = this.paramVOS.form;
           if (this.paramVOS.savebeforeevent) {
-            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent,null,null,'doAction');
-            if(urlobj.params){
-              Object.assign(this.paramVOS,urlobj.params);
+            var urlobj = parseEventByUrl(this.paramVOS.savebeforeevent, null, null, 'doAction');
+            if (urlobj.params) {
+              Object.assign(this.paramVOS, urlobj.params);
             }
-            if(validatenull(urlobj.jsPath)){
+            if (validatenull(urlobj.jsPath)) {
               this.saveBforeHandle(this.paramVOS);
-            }else{
+            } else {
               try {
                 import(`./${urlobj.jsPath}.js`).then(module => {
                   module[urlobj.methodName]({
@@ -236,11 +239,11 @@
         }
       });
     },
-    formSaveHandle(){
-      let that=this;
+    formSaveHandle() {
+      let that = this;
       let formValues = this.getValues();
-      if(formValues.otherValue.releaseFileOids){
-        formValues.otherValue.releaseFileOids=formValues.otherValue.releaseFileOids.split(',');
+      if (formValues.otherValue.releaseFileOids) {
+        formValues.otherValue.releaseFileOids = formValues.otherValue.releaseFileOids.split(',');
       }
       if (!formValues.defaultValues.btmname) {
         formValues.defaultValues.btmname = this.paramVOS.type;
@@ -251,33 +254,33 @@
         afterEvent: this.paramVOS.afterevent,
         beforeServerEvent: this.paramVOS.beforeserverevent,
         afterServerEvent: this.paramVOS.afterserverevent,
-        releaseFileOids: formValues.otherValue.releaseFileOids||[],
+        releaseFileOids: formValues.otherValue.releaseFileOids || [],
         data: formValues.otherValue
       }
       Object.assign(datas, formValues.defaultValues);
-      if(that.type=="add"){
-        addSave(datas,that.paramVOS.url,that.paramVOS.method).then(() => {
+      if (that.type == "add") {
+        addSave(datas, that.paramVOS.url, that.paramVOS.method).then(() => {
           that.$message({
             type: "success",
-            message: that.paramVOS.successmsg||"淇濆瓨鎴愬姛!"
+            message: that.paramVOS.successmsg || "淇濆瓨鎴愬姛!"
           });
-          if(that.saveCallback){
-            that.saveCallback(that.type,that.form);
+          if (that.saveCallback) {
+            that.saveCallback(that.type, that.form);
           }
           if (this.paramVOS.saveafterevent) {
-            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent,null,null,'doAction');
-            if(urlobj.params){
-              Object.assign(this.paramVOS,urlobj.params);
+            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent, null, null, 'doAction');
+            if (urlobj.params) {
+              Object.assign(this.paramVOS, urlobj.params);
             }
-            if(validatenull(urlobj.jsPath)){
+            if (validatenull(urlobj.jsPath)) {
               this.saveAfterHandle(this.paramVOS);
-            }else{
+            } else {
               try {
                 import(`./${urlobj.jsPath}.js`).then(module => {
                   module[urlobj.methodName]({
                     paramVOS: this.paramVOS,
                     dataStore: this.dataStore,
-                    sourceData:this.sourceData
+                    sourceData: this.sourceData
                   });
                 })
               } catch (error) {
@@ -287,29 +290,29 @@
           }
           that.dialogClose();
         });
-      }else{
-        editSave(datas,that.paramVOS.url,that.paramVOS.method).then(() => {
+      } else {
+        editSave(datas, that.paramVOS.url, that.paramVOS.method).then(() => {
           that.$message({
             type: "success",
-            message: that.paramVOS.successmsg||"淇敼鎴愬姛!"
+            message: that.paramVOS.successmsg || "淇敼鎴愬姛!"
           });
-          if(that.saveCallback){
-            that.saveCallback(that.type,that.form);
+          if (that.saveCallback) {
+            that.saveCallback(that.type, that.form);
           }
           if (this.paramVOS.saveafterevent) {
-            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent,null,null,'doAction');
-            if(urlobj.params){
-              Object.assign(this.paramVOS,urlobj.params);
+            let urlobj = parseEventByUrl(this.paramVOS.saveafterevent, null, null, 'doAction');
+            if (urlobj.params) {
+              Object.assign(this.paramVOS, urlobj.params);
             }
-            if(validatenull(urlobj.jsPath)){
+            if (validatenull(urlobj.jsPath)) {
               this.saveAfterHandle(this.paramVOS);
-            }else{
+            } else {
               try {
                 import(`./${urlobj.jsPath}.js`).then(module => {
                   module[urlobj.methodName]({
                     paramVOS: this.paramVOS,
                     dataStore: this.dataStore,
-                    sourceData:this.sourceData
+                    sourceData: this.sourceData
                   });
                 })
               } catch (error) {
@@ -321,7 +324,7 @@
         });
       }
     },
-    getValues(){
+    getValues() {
       let defaultValues = {}, otherValue = {};
       for (var key in this.form) {
         if (this.btmDefaultKeys.indexOf(key.toLowerCase()) > -1) {
@@ -331,8 +334,8 @@
         }
       }
       return {
-        defaultValues:defaultValues,
-        otherValue:otherValue
+        defaultValues: defaultValues,
+        otherValue: otherValue
       }
     },
     resetValue() {
@@ -344,11 +347,11 @@
       this.form = form;
     },
     //淇濆瓨鍓嶇疆浜嬩欢
-    saveBforeHandle(params){
+    saveBforeHandle(params) {
       this.$message.info('鎵ц淇濆瓨鍓嶇疆浜嬩欢');
     },
     //淇濆瓨鍚庣疆浜嬩欢
-    saveAfterHandle(params){
+    saveAfterHandle(params) {
       this.$message.info('淇濆瓨鍚庣疆浜嬩欢鎵ц');
     },
   }
diff --git a/Source/plt-web/plt-web-ui/src/components/actions/base/DeleteAction.js b/Source/plt-web/plt-web-ui/src/components/actions/base/DeleteAction.js
index 1c95391..0bf1268 100644
--- a/Source/plt-web/plt-web-ui/src/components/actions/base/DeleteAction.js
+++ b/Source/plt-web/plt-web-ui/src/components/actions/base/DeleteAction.js
@@ -9,7 +9,7 @@
 export const doAction = (options,callback) => {
   options.paramVOS = paramLow(options.paramVOS)
   const paramVOS = Object.assign({
-    url: 'uiDataController/deleteData',
+    url: 'api/uiDataController/deleteData',
     method: 'delete'
   }, options.paramVOS)
   options.paramVOS = paramVOS;
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
index 9d71bfd..3f07b29 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-table.vue
@@ -230,7 +230,7 @@
         if(newval) {
           this.sourceDataMapParams=this.sourceDataMap();
           this.getParams();
-          this.handleRefresh();
+          // this.handleRefresh();
         }
       },
       deep: true,
@@ -327,6 +327,7 @@
     },
     onLoad(page, params = {}) {
       if (Object.keys(this.sourceData).length>0 && this.isShow) {
+        this.tableList = [];
         this.loading = true;
         getList(page.currentPage, page.pageSize, Object.assign({},this.params,this.query,params)).then(res => {
           let data = [];
@@ -400,6 +401,7 @@
       this.onLoad(this.page,parms);
     },
     searchReset() {
+      console.log('searchReset')
       this.query = {};
       this.onLoad(this.page);
     },
@@ -412,6 +414,7 @@
       }
     },
     handleRefresh(type) {
+      console.log('handleRefresh')
       this.onLoad(this.page);
     },
     rowExcel() {
diff --git a/Source/plt-web/plt-web-ui/src/router/avue-router.js b/Source/plt-web/plt-web-ui/src/router/avue-router.js
index 52c14c9..a18ad96 100644
--- a/Source/plt-web/plt-web-ui/src/router/avue-router.js
+++ b/Source/plt-web/plt-web-ui/src/router/avue-router.js
@@ -57,6 +57,7 @@
     },
     //澶勭悊璺敱
     getPath: function (params) {
+      console.log('params',params)
       let {src} = params;
       let result = src || '/';
       if (isURL(src)) {
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue
index 308c333..97a3686 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/secure/machineClassification/index.vue
@@ -41,52 +41,82 @@
 
   </el-container>
 </template>
-
 <script>
 export default {
-  name: "index"
-}
+  data() {
+    return {
+      form: {},
+      data: [
+        {
+          name: "寮犱笁",
+          sex: "鐢�",
+          showType:'Ludc'
+        },
+      ],
+      option: {
+        column: [
+          {
+            label: "濮撳悕",
+            prop: "name",
+          },
+          {
+            label: "鎬у埆",
+            prop: "sex",
+            type: "select",
+            dicData: [
+              {
+                label: "鐢�",
+                value: 0,
+              },
+              {
+                label: "濂�",
+                value: 1,
+              },
+            ],
+          },
+          {
+            label: '婧愬璞�',
+            prop: 'showType',
+            type: 'select',
+            cascader: ['linkType', 'templateId', 'SubUILayout', 'searchObjType', 'queryTemplateName'],
+            placeholder: "璇疯緭鍏ュ唴瀹�",
+            dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1',
+            filterable: true,
+            props: {
+              label: 'name',
+              value: 'name',
+              desc: 'label'
+            },
+            rules: [
+              {
+                required: true,
+                message: '璇烽�夋嫨鍐呭',
+                trigger: 'change'
+              }
+            ],
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    beforeOpen(done, type) {
+      this.$alert(`鎴戞槸${type}`, {
+        confirmButtonText: "纭畾",
+        callback: (action) => {
+          if (["view", "edit"].includes(type)) {
+            // 鏌ョ湅鍜岀紪杈戦�昏緫
+            this.form.showType = 'Ludc';
+          } else {
+            //鏂板閫昏緫
+            this.form.name = "鍒濆鍖栬祴鍊�";
+            this.form.sex = 0;
+            this.form.showType = 'Ludc';
+          }
+          done();
+        },
+      });
+    },
+  },
+};
 </script>
-
-<style lang="scss" scoped>
-::v-deep {
-  .el-scrollbar__wrap {
-    overflow: auto !important;
-  }
-  .headerCon{
-    .el-button{
-      width: 82px;
-    }
-  }
-}
-
-.headerCon {
-  display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 5px;
-
-  .el-button + .el-button {
-    margin-left: 5px;
-  }
-
-  .el-button {
-    margin-top: 5px;
-  }
-}
-
-.headerCon > .el-button:nth-child(4) {
-  margin-left: 0;
-}
-
-.headerCon > .el-button:nth-child(7) {
-  margin-left: 0;
-}
-
-
-.smallBtn {
-  width: 82px;
-  text-align: center;
-  padding-left: 4.5px;
-}
-
-</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue b/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue
index bbdf5e3..822042e 100644
--- a/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue
+++ b/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue
@@ -117,7 +117,7 @@
     }
   },
   created() {
-    console.log(this.$route);
+    console.log('route',this.$route);
     if (verifyNull(this.$route.query.type) || (verifyNull(this.$route.query.context) && verifyNull(this.$route.query.content))) {
       this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰冣��?type=xxx&context=yyy&param=zzz鈥濊繖绉嶅舰寮忋�傚叾涓璽ype鏄笟鍔$被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
       return false;
diff --git a/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue b/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue
new file mode 100644
index 0000000..a8dc620
--- /dev/null
+++ b/Source/plt-web/plt-web-ui/src/views/custom-ui/product.vue
@@ -0,0 +1,13 @@
+<template>
+  <p>浜у搧鑷畾涔夐〉闈�</p>
+</template>
+
+<script>
+export default {
+  name: "product"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index aa97702..8536661 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -390,9 +390,10 @@
 
     // 鍙充晶琛ㄦ牸淇℃伅
     getRightTableList(row) {
+      console.log(row);
       this.tableLoading = true;
       const params = {
-        plactioncls: row.id
+        plactioncls: row.id ? row.id : ''
       }
       getActionTableData(params).then(res => {
         const data = res.data.data;
@@ -433,7 +434,7 @@
       }
       this.tableLoading = true;
       const apiParams = {
-        plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id,
+        plactioncls: this.treeNodeRow.id === 'root' ? '' : this.treeNodeRow.id ? this.treeNodeRow.id : '',
         ...params
       }
 
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index 142890e..0214151 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -140,6 +140,7 @@
           <basic-container>
             <div style="height: 660px; overflow-y: auto;padding-right: 10px">
               <h3>璁剧疆</h3>
+              <h4 style="color: red">灞炴�ц缃俊鎭悗闇�鍗曞嚮鍙充笅瑙掑簲鐢ㄦ寜閽繘琛屽簲鐢�</h4>
               <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="85px">
                 <el-row style="border-bottom: 1px solid #878585;padding-bottom: 10px">
                   <el-col :span="24">
@@ -1305,7 +1306,7 @@
         viType: 1, // 瑙嗗浘绫诲瀷
         viTypeText: "琛ㄥ崟", // 瑙嗗浘涓枃鍚嶇О
         prm: {
-          formQtName: '', // 鏌ヨ妯℃澘鍚嶇О
+          formQtName: this.form.qtName, // 鏌ヨ妯℃澘鍚嶇О
           showCols: this.topForm.showColumn,
           prmItemList: this.formList
         },
@@ -1315,6 +1316,7 @@
           this.$message.success(res.data.obj);
           this.visible = false;
           this.closeDialog();
+          this.$emit('updataTable');
         }
       })
       // this.visible = false;
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
index 96e3090..c0e9696 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/tableDialog.vue
@@ -304,11 +304,11 @@
           message: '璇烽�夋嫨缁戝畾琛ㄥ崟',
           trigger: 'change'
         }],
-        showLabel: [{
-          required: true,
-          message: '璇烽�夋嫨鏄剧ず瀛楁',
-          trigger: 'submit'
-        }],
+        // showLabel: [{
+        //   required: true,
+        //   message: '璇烽�夋嫨鏄剧ず瀛楁',
+        //   trigger: 'submit'
+        // }],
       },
       form: {
         viName: '', // 鍚嶇О
@@ -525,6 +525,10 @@
     dialogSaveClickHandler() {
       this.$refs.form.validate((valid) => {
         if (valid) {
+          if(this.form.itemOutFieldList.length <= 0){
+            this.$message.error('璇烽�夋嫨鏄剧ず瀛楁');
+            return;
+          }
           const paramsForm = {...this.form};
           paramsForm.itemSelectOutFieldList = this.form.itemSelectOutFieldList.map(item => item.id); // 鍙娇鐢ㄥ瓧娈�
           paramsForm.itemOutFieldList = this.form.itemOutFieldList; // 闇�瑕佷娇鐢ㄥ瓧娈�
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
index 9165813..e08b4b6 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/index.vue
@@ -66,7 +66,7 @@
         </avue-crud>
       </basic-container>
     </el-main>
-    <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"></form-dialog>
+    <form-dialog ref="formDialog" :TreeNodeRow="this.nodeRow" :editRow="editRow" :treeRadio="treeRadio"  @updataTable="getRightPortalVIDatas"></form-dialog>
     <table-dialog ref="tableDialog" :TreeNodeRow="this.nodeRow" :treeRadio="treeRadio"
                   @updataTable="getRightPortalVIDatas"></table-dialog>
     <!-- 瀵煎叆 -->
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index 627f21e..e3152b4 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -217,7 +217,8 @@
   deleteTabButton,
   delPageDefination,
   joinBtn,
-  exitBtn
+  exitBtn,
+  updatePageDefination
 } from "@/api/UI/uiDefine";
 import actionDialog from '@/views/modelingMenu/ui/Aciton/components/dialog';
 import cloneDialog from "@/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog";
@@ -587,9 +588,8 @@
                 filterable: true,
                 display: false,
                 props: {
-                  label: 'qtName',
-                  value: 'qtName',
-                  desc: 'btmName'
+                  label: 'plName',
+                  value: 'plCode',
                 },
                 dicUrl: '/api/uiManagerController/getUILayoutDatasByPage?page=1&limit=-1&conditionMap[selectBtmType]={{key}}',
               },
@@ -871,6 +871,28 @@
       })
     },
 
+    rowUpdateHandler(row,index,done,loading){
+      if (row.templateType === '6') {
+        row.SubUIObjType = row.showType;
+        row.showType = "";
+      }
+      console.log(this.sourceData);
+      const params = {
+        ...row,
+        tabPageOId: this.sourceData.plOId
+      }
+      updatePageDefination(params).then(res => {
+        console.log(res);
+        if (res.data.code === 200) {
+          this.$message.success(res.data.obj);
+          this.getTableList();
+          done();
+        }
+      }).catch(err => {
+        loading();
+      })
+    },
+
     // 瀵硅瘽妗嗚〃鏍艰鐐瑰嚮
     formDataRowClick(row) {
       this.formDataRow = row;
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index a4838f3..41a1cf5 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -17,8 +17,8 @@
 
     <el-main>
       <basic-container>
-        <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
-          <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
+        <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1" class="btnBox">
+          <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus" plain
                      size="small"
                      type="primary" @click="addClickHandler">澧炲姞
           </el-button>
@@ -32,11 +32,11 @@
                      size="small"
                      type="primary" @click="addMethodsClickHandler">澧炲姞鎿嶄綔绫诲瀷
           </el-button>
-          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+          <el-button v-if=" mangeShowBtn" icon="el-icon-circle-close" plain size="small"
                      type="danger"
                      @click="addClickHandler">鍒犻櫎闈炵郴缁熸ā鍧�
           </el-button>
-          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+          <el-button v-if="mangeShowBtn " icon="el-icon-circle-close" plain size="small"
                      type="danger"
                      @click="addClickHandler">鍒犻櫎涓氬姟妯″潡
           </el-button>
@@ -49,7 +49,7 @@
           <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
           </el-button>
         </div>
-        <div v-else-if="form.childType && form.childType !== 0 &&(addStatus || editStatus)" class="btnBox">
+        <div v-else-if="(form.childType || form.childType === 0) && (addStatus || editStatus)" class="btnBox">
           <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
                      type="success" @click="addSaveClickHandler">淇濆瓨
           </el-button>
@@ -60,14 +60,14 @@
                       type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
           </el-button>
         </div>
-        <div v-if="form.childType === 0" class="btnBox">
+        <div v-if="form.category === 1" class="btnBox">
           <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">淇敼鍒悕
           </el-button>
           <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
           </el-button>
         </div>
         <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
-          <span v-if="form.childType !== 0">
+          <span v-if="form.category !== 1">
             <el-form-item label="妯″潡鍚嶏細">
             <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
           </el-form-item>
@@ -106,21 +106,21 @@
             <el-link :underline="false" style="margin-left: 20px" type="danger">涓嶇敓鏁堬紙涓嶉�夋嫨锛夋椂锛岃妯″潡鍦ㄥ姛鑳芥ā鍧楁巿鏉冮噷涓嶆樉绀�</el-link>
           </el-form-item>
           </span>
-          <span v-if="form.childType === 0">
+          <span v-if="form.category === 1">
             <el-form-item label="鍚嶇О锛�">
-            <el-input v-model="form.name" :disabled="form.childType === 0" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+            <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
             </el-form-item>
             <el-form-item label="鏍囪瘑锛�">
-            <el-input v-model="form.code" :disabled="form.childType === 0" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+            <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
             </el-form-item>
             <el-form-item label="鍒悕锛�">
             <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
             </el-form-item>
             <el-form-item label="缂栧彿锛�">
-            <el-input v-model="form.sort" :disabled="form.childType === 0" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
+            <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
             </el-form-item>
             <el-form-item label="鎻忚堪锛�">
-            <el-input v-model="form.remark" :disabled="form.childType === 0" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+            <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
             </el-form-item>
             <el-form-item label="鏄惁鏈夋晥锛�">
             <el-switch
@@ -249,6 +249,7 @@
   computed: {
     /**
      * childType
+     * 涓�0 鍏ㄩ儴鎸夐挳灞曠ず
      * 涓�-1   鍏ㄩ儴鎸夐挳灞曠ず 绂佺敤淇敼 鍒犻櫎 澧炲姞鎿嶄綔绫诲瀷
      * 涓嶄负-1 闅愯棌 鍒犻櫎闈炵郴缁熸ā鍧� 鍒犻櫎涓氬姟妯″潡
      * 涓�1鏃� 绂佺敤鎿嶄綔绫诲瀷銆佸鍏ャ�佸鍑�
@@ -360,7 +361,6 @@
         this.$message.error('Mobile鏍囪瘑闀垮害涓嶈兘255锛�');
         return
       }
-
       updateModel(this.form).then(res => {
         if (res.data.code === 200) {
           this.$message.success(res.data.msg);
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index a116746..b097807 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -18,8 +18,8 @@
 
     <el-main>
       <basic-container>
-        <div v-if="form.childType && form.childType !== 0 && !addStatus && !editStatus" class="btnBox">
-          <el-button :disabled="mangeShowBtn ? false : !childTypeBtn" icon="el-icon-plus" plain
+        <div v-if="(form.childType || form.childType === 0) && !addStatus && !editStatus && form.category !== 1" class="btnBox">
+          <el-button :disabled="(mangeShowBtn || form.childType === 0) ? false : !childTypeBtn" icon="el-icon-plus" plain
                      size="small"
                      type="primary" @click="addClickHandler">澧炲姞
           </el-button>
@@ -33,11 +33,11 @@
                      size="small"
                      type="primary" @click="addMethodsClickHandler">澧炲姞鎿嶄綔绫诲瀷
           </el-button>
-          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+          <el-button v-if=" mangeShowBtn" icon="el-icon-circle-close" plain size="small"
                      type="danger"
                      @click="addClickHandler">鍒犻櫎闈炵郴缁熸ā鍧�
           </el-button>
-          <el-button v-if="this.form.childType ? mangeShowBtn :true" icon="el-icon-circle-close" plain size="small"
+          <el-button v-if="mangeShowBtn " icon="el-icon-circle-close" plain size="small"
                      type="danger"
                      @click="addClickHandler">鍒犻櫎涓氬姟妯″潡
           </el-button>
@@ -50,59 +50,52 @@
           <el-button icon="el-icon-upload2" plain size="small" type="primary" @click="sqlClickExportClick">瀵煎嚭sql
           </el-button>
         </div>
-        <div v-else-if="form.childType && form.childType !== 0 &&(addStatus || editStatus)" class="btnBox">
+        <div v-else-if="(form.childType || form.childType === 0) && (addStatus || editStatus)" class="btnBox">
           <el-button v-if="addStatus" icon="el-icon-check" plain size="small"
                      type="success" @click="addSaveClickHandler">淇濆瓨
           </el-button>
           <el-button v-if="editStatus" icon="el-icon-check" plain size="small"
                      type="success" @click="editSaveClickHandler">淇濆瓨
           </el-button>
-          <el-button icon="el-icon-close" plain size="small"
-                     type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
+          <el-button  icon="el-icon-close" plain size="small"
+                      type="danger" @click="addStatus=false;editStatus=false;">鍙栨秷
           </el-button>
         </div>
-        <div v-if="form.childType === 0" class="btnBox">
+        <div v-if="form.category === 1" class="btnBox">
           <el-button icon="el-icon-edit" plain size="small" type="primary" @click="updataAliasClickHandler">淇敼鍒悕
           </el-button>
           <el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
           </el-button>
         </div>
         <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
-          <span v-if="form.childType !== 0">
+          <span v-if="form.category !== 1">
             <el-form-item label="妯″潡鍚嶏細">
             <el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
           </el-form-item>
           <el-form-item label="妯″潡鍒悕锛�">
             <el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="妯″潡鍒悕鐢ㄦ潵璁板綍鏃ュ織浣跨敤"></el-input>
           </el-form-item>
-            <el-form-item label="C/S锛�">
-            <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞"
-                      type="textarea"></el-input>
+                <el-form-item label="C/S锛�">
+            <el-input v-model="form.pathC" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
           </el-form-item>
           <el-form-item label="B/S锛�">
-            <el-input v-model="form.path" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞"
-                      type="textarea"></el-input>
+            <el-input v-model="form.path" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏/S璺緞" type="textarea"></el-input>
           </el-form-item>
           <el-form-item label=".NET锛�">
-            <el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2"
-                      placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
+            <el-input v-model="form.resourceDotNet" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏�.NET" type="textarea"></el-input>
           </el-form-item>
           <el-form-item label="Mobile锛�">
-            <el-input v-model="form.resourceMobile" :disabled="!editStatus && !addStatus" :rows="2"
-                      placeholder="璇疯緭鍏obile" type="textarea"></el-input>
+            <el-input v-model="form.resourceMobile" :disabled="!editStatus && !addStatus" :rows="2" placeholder="璇疯緭鍏obile" type="textarea"></el-input>
           </el-form-item>
           <el-form-item label="搴忓彿锛�">
-            <el-input v-model="form.sort" :disabled="!editStatus && !addStatus"
-                      placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
+            <el-input v-model="form.sort" :disabled="!editStatus && !addStatus" placeholder="鏁板瓧锛屾弿杩拌妯″潡鍦ㄥ叾鐖舵ā鍧椾笅鐨勬樉绀洪『搴�"></el-input>
           </el-form-item>
           <el-form-item label="鍥炬爣锛�">
-<!--            <el-input v-model="form.source" :disabled="!editStatus && !addStatus"></el-input>-->
-             <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
-             </avue-input-icon>
+              <avue-input-icon v-model="form.source" :disabled="!editStatus && !addStatus" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+              </avue-input-icon>
           </el-form-item>
           <el-form-item label="鎻忚堪锛�">
-            <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="璇疯緭鍏ユ弿杩�"
-                      type="textarea"></el-input>
+            <el-input v-model="form.remark" :disabled="!editStatus && !addStatus" :rows="3" placeholder="璇疯緭鍏ユ弿杩�" type="textarea"></el-input>
           </el-form-item>
           <el-form-item label="鏄惁鏈夋晥锛�">
             <el-switch
@@ -114,21 +107,21 @@
             <el-link :underline="false" style="margin-left: 20px" type="danger">涓嶇敓鏁堬紙涓嶉�夋嫨锛夋椂锛岃妯″潡鍦ㄥ姛鑳芥ā鍧楁巿鏉冮噷涓嶆樉绀�</el-link>
           </el-form-item>
           </span>
-          <span v-if="form.childType === 0">
+          <span v-if="form.category === 1">
             <el-form-item label="鍚嶇О锛�">
-            <el-input v-model="form.name" :disabled="form.childType === 0" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+            <el-input v-model="form.name" :disabled="form.category === 1" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
             </el-form-item>
             <el-form-item label="鏍囪瘑锛�">
-            <el-input v-model="form.code" :disabled="form.childType === 0" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
+            <el-input v-model="form.code" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
             </el-form-item>
             <el-form-item label="鍒悕锛�">
             <el-input v-model="form.alias" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
             </el-form-item>
             <el-form-item label="缂栧彿锛�">
-            <el-input v-model="form.sort" :disabled="form.childType === 0" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
+            <el-input v-model="form.sort" :disabled="form.category === 1" placeholder="璇疯緭鍏ョ紪鍙�"></el-input>
             </el-form-item>
             <el-form-item label="鎻忚堪锛�">
-            <el-input v-model="form.remark" :disabled="form.childType === 0" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
+            <el-input v-model="form.remark" :disabled="form.category === 1" placeholder="璇疯緭鍏ユ弿杩�"></el-input>
             </el-form-item>
             <el-form-item label="鏄惁鏈夋晥锛�">
             <el-switch

--
Gitblit v1.9.3