From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/Tree/TemplatePro.vue |  209 +++++-----------------------------------------------
 1 files changed, 20 insertions(+), 189 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
index b82a392..63588d6 100644
--- a/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
+++ b/Source/UBCS-WEB/src/components/Tree/TemplatePro.vue
@@ -2,11 +2,15 @@
   <basic-container>
     <avue-tabs :option="Taboption" @change="handleChange"></avue-tabs>
     <span v-if="type.prop==='tab1'">
-    <avue-crud :data="data" :option="option"></avue-crud>
+      <attrCrud :ProData="ProData" :crudOid="crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus" :crudArray="crudArray" :Formlist="Formlist" :codeClassifyOid="codeClassifyOid"></attrCrud>
     </span>
-    <span v-else-if="type.prop==='tab2'">妯℃澘娴佺▼</span>
-    <span v-else-if="type.prop==='tab3'">妯℃澘闃舵</span>
-    <span v-else-if="type.prop==='tab4'">妯℃澘鎸夐挳娴佺▼</span>
+    <span v-else-if="type.prop==='tab2'">
+       <FlowPath :code="this.crudOid" :checkStatus="checkStatus" :crudLCStatus="crudLCStatus"></FlowPath>
+
+    </span>
+    <span v-else-if="type.prop==='tab3'">
+          <stage  :code="this.crudOid"></stage>
+    </span>
   </basic-container>
 
 </template>
@@ -14,215 +18,42 @@
 <script>
 export default {
   name: "TemplatePro.vue",
+  props: ['ProData','crudOid','crudLCStatus','crudArray','Formlist','codeClassifyOid'],
   data: function () {
     return {
       type: {},
       Taboption: {
         column: [{
-          icon: 'el-icon-info',
           label: '妯℃澘灞炴��',
           prop: 'tab1',
         }, {
-          icon: 'el-icon-warning',
           label: '妯℃澘娴佺▼',
           prop: 'tab2',
         }, {
-          icon: 'el-icon-question',
           label: '妯℃澘闃舵',
           prop: 'tab3',
-        }, {
-          icon: 'el-icon-question',
-          label: '妯℃澘鎸夐挳娴佺▼',
-          prop: 'tab4',
         }]
       },
-      data:[
-        {
-          EnglishNum:"娴嬭瘯涓�",
-          ChinaName:"娴嬭瘯涓�",
-          PropGruop:"娴嬭瘯涓�",
-          Type:"娴嬭瘯涓�"
-        },
-        {
-          EnglishNum:"娴嬭瘯浜�",
-          ChinaName:"娴嬭瘯浜�",
-          PropGruop:"娴嬭瘯浜�",
-          Type:"娴嬭瘯浜�"
-        },
-        {
-          EnglishNum:"娴嬭瘯涓�",
-          ChinaName:"娴嬭瘯涓�",
-          PropGruop:"娴嬭瘯涓�",
-          Type:"娴嬭瘯涓�"
-        }
-      ],
-      option: {
-        index: true,
-        border: true,
-        editBtn:false,
-        labelWidth:110,
-        column: [
-          {
-            label: "灞炴�ц嫳鏂囩紪鍙�",
-            prop: "EnglishNum",
-            fixed:true,
-            labelWidth:110,
-            width:95
-          },
-          {
-            label: "灞炴�т腑鏂囧悕绉�",
-            prop: "ChinaName",
-            fixed:true,
-            width:95
-          },
-          {
-            label: "灞炴�у垎缁�",
-            prop: "PropGruop"
-          },
-          {
-            label: "绫诲瀷",
-            prop: "Type"
-          },
-          {
-            label: "鍒楄〃瀹藉害",
-            prop: "ListWidth"
-          },
-          {
-            label: "鍏抽敭灞炴��",
-            prop: "KeyAttr"
-          },
-          {
-            label: "鏌ヨ灞炴��",
-            prop: "QueryPro"
-          },
-          {
-            label: "楂樼骇鏌ヨ灞炴��",
-            prop: "SeniorQueryPro",
-            width:95
-          },
-          {
-            label: "鐩镐技鏌ヨ灞炴��",
-            prop: "SimilarPro",
-            width:95
-          },
-          {
-            label: "蹇呰緭",
-            prop: "MustLose"
-          },
-          {
-            label: "琛ㄥ崟鏄剧ず",
-            prop: "FormDIs"
-          },
-          {
-            label: "鍒楄〃鏄剧ず",
-            prop: "TableDis"
-          },
-          {
-            label: "鍙",
-            prop: "readOnly"
-          },
-          {
-            label: "鍒楄〃鎺掑簭",
-            prop: "ListSort"
-          },
-
-          {
-            label: "澶氳鏂囨湰",
-            prop:"LineText",
-          },
-          {
-            label: "榛樿鍊�",
-            prop:"DefaultValue",
-          },
-          {
-            label: "鍓嶇紑",
-            prop:"prefix",
-          },
-          {
-            label: "鍚庣紑",
-            prop:"suffix"
-          },
-          {
-            label: "缁勫悎瑙勫垯",
-            prop:"ComRules"
-          },
-          {
-            label: "楠岃瘉瑙勫垯",
-            prop:"rules"
-          },
-          {
-            label: "鏃堕棿鏍煎紡",
-            prop:"TimeForm"
-          },
-          {
-            label: "鍒嗙被娉ㄥ叆",
-            prop:"claInjection"
-          },
-          {
-            label: "鍒嗙被娉ㄥ叆",
-            prop:"EnuInjection"
-          },
-          {
-            label: "绾ц仈灞炴��",
-            prop:"CasProp"
-          },
-          {
-            label: "鍙傜収閰嶇疆",
-            prop:"RefConfig"
-          },
-          {
-            label: "绾ц仈鏌ヨ灞炴��",
-            prop:"CasQueryProp"
-          },
-          {
-            label: "閫夋嫨搴撴爣璇�",
-            prop:"SelectLib"
-          },
-          {
-            label: "濉啓鎻愮ず",
-            prop:"FillPrompt"
-          },
-          {
-            label: "琛ㄥ崟鏄剧ず鏍峰紡",
-            prop:"FormShow"
-          },
-          {
-            label: "琛ㄥ崟瓒呴摼鎺�",
-            prop:"FormHer"
-          },
-          {
-            label: "琛ㄦ牸鏄剧ずjs",
-            prop:"CrudJs"
-          },
-          {
-            label: "闀垮害",
-            prop:"length"
-          },
-          {
-            label: "灏忔暟绮惧害",
-            prop:"DecimalPrecis"
-          },
-          {
-            label: "鍙栧�艰寖鍥�",
-            prop:"ValueRange"
-          },
-        ]
-      }
+      checkStatus:false //鏄惁闇�瑕侀獙璇佹ā鏉跨姸鎬�
     }
   },
   created() {
+    // 杩涘叆椤甸潰榛樿鏄ā鏉垮睘鎬�
     this.type = this.Taboption.column[0];
-    this.type.prop="tab1"
+    this.type.prop = "tab1";
   },
   methods: {
+    // Tab鏍忓垏鎹�
     handleChange(column) {
-      this.type = column
-      this.$message.success(JSON.stringify(column))
-    }
+      this.type = column;
+    },
   }
 }
 </script>
-
-<style scoped>
+<style lang="scss">
+//淇敼鍒嗙被娉ㄥ叆瀵硅瘽妗嗗叕鍏辨牱寮�
+.mydialog .el-dialog__body {
+  padding: 10px 20px 30px;
+}
 
 </style>

--
Gitblit v1.9.3