From 455c80050cdf45491077752404215bf35fc920c5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 2 Jul 2024 13:47:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0routepack?=
 =?UTF-8?q?=E7=A9=BA=E7=99=BD=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/route.js         | 10 ++++++++++
 src/views/mtm/route.vue     | 10 +++++-----
 src/views/mtm/routepack.vue |  5 +++++
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 src/views/mtm/routepack.vue

diff --git a/src/config/route.js b/src/config/route.js
index a2918920..5ead1323 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -1027,6 +1027,16 @@ const routes = [
 						},
 						component: "mtm/route",
 					},
+					{
+						name: "routepack",
+						path: "/mtm/routepack",
+						meta: {
+							title: "加工工艺",
+							icon: "el-icon-share",
+							perms: ["routepack"],
+						},
+						component: "mtm/routepack",
+					},
 					// {
 					//   "name": "process",
 					//   "path": "/mtm/process",
diff --git a/src/views/mtm/route.vue b/src/views/mtm/route.vue
index e1c15904..2fed0f3a 100644
--- a/src/views/mtm/route.vue
+++ b/src/views/mtm/route.vue
@@ -42,13 +42,13 @@
                                         <span>{{ scope.row.process_cate }} - {{ scope.row.process_name }}</span>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="自动排产" prop="is_autotask" min-width="80">
+                                <!-- <el-table-column label="自动排产" prop="is_autotask" min-width="80">
                                     <template #default="scope">
                                         <el-icon v-if="scope.row.is_autotask" color="green">
                                             <CircleCheckFilled />
                                         </el-icon>
                                     </template>
-                                </el-table-column>
+                                </el-table-column> -->
                                 <el-table-column label="输入/输出" min-width="120">
                                     <template #default="scope">
                                         <span>{{ scope.row.material_in_name }} -> {{ scope.row.material_out_name }}</span>
@@ -94,14 +94,14 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="出材率" prop="out_rate">
-                <el-input-number v-model="form.out_rate" :max="100" :precision="1" :step="0.1" />
+                <el-input-number v-model="form.out_rate" :max="100" :min="0" :precision="1" :step="0.1" style="width:80%"/>
             </el-form-item>
             <el-form-item label="统计工序">
                 <el-switch v-model="form.is_count_utask" />
             </el-form-item>
-            <el-form-item label="自动排产" prop="is_autotask">
+            <!-- <el-form-item label="自动排产" prop="is_autotask">
                 <el-switch v-model="form.is_autotask" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="主要输入" prop="material_in">
                 <el-select v-model="form.material_in" placeholder="物料" clearable filterable style="width: 100%;">
                     <el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name" :value="item.id">
diff --git a/src/views/mtm/routepack.vue b/src/views/mtm/routepack.vue
new file mode 100644
index 00000000..8b407a00
--- /dev/null
+++ b/src/views/mtm/routepack.vue
@@ -0,0 +1,5 @@
+<template>
+    <div>
+        
+    </div>
+</template>
\ No newline at end of file

From c20dc4dbdac7fc4a6d27e5cd7f5679b7b8c8c2b6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 2 Jul 2024 18:07:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20base=20=E4=BC=98=E5=8C=96wf?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wf/configuration.vue | 10 ++++-----
 src/views/wf/state.vue         | 40 +++++++++++++++++++++++-----------
 src/views/wf/transform.vue     | 15 ++++++++-----
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/views/wf/configuration.vue b/src/views/wf/configuration.vue
index 075ea2b9..3ae45b41 100644
--- a/src/views/wf/configuration.vue
+++ b/src/views/wf/configuration.vue
@@ -1,10 +1,6 @@
 <template>
 	<el-container>
 		<el-tabs style="width: 100%; height:100%" type="border-card" v-model="activeName" id="workflowElTabs" @tab-click="handleClick">
-			<el-tab-pane label="自定义字段" name="customField">
-				<field v-if="activeName==='customField'"></field>
-			</el-tab-pane>
-
 			<el-tab-pane label="状态" name="state">
 				<state  v-if="activeName==='state'"></state>
 			</el-tab-pane>
@@ -12,6 +8,10 @@
 			<el-tab-pane label="流转" name="transform">
 				<transform  v-if="activeName==='transform'"></transform>
 			</el-tab-pane>
+
+			<el-tab-pane label="自定义字段" name="customField">
+				<field v-if="activeName==='customField'"></field>
+			</el-tab-pane>
 		</el-tabs>
 	</el-container>
 </template>
@@ -31,7 +31,7 @@
 		data() {
 			return {
 				workflow:null,
-				activeName:'customField',
+				activeName:'state',
 			}
 		},
 		mounted() {
diff --git a/src/views/wf/state.vue b/src/views/wf/state.vue
index d23b6304..340e67d9 100644
--- a/src/views/wf/state.vue
+++ b/src/views/wf/state.vue
@@ -12,23 +12,25 @@
     <el-main class="nopadding" style="height: 100%">
       <scTable
         ref="table"
+        v-loading="listLoading"
         :data="list"
         row-key="id"
         stripe
         highlightCurrentRow
         hidePagination
+        hideDo
       >
         <el-table-column label="#" type="index"></el-table-column>
-        <el-table-column label="ID" prop="id"></el-table-column>
+        <el-table-column label="ID" prop="id" width="160"></el-table-column>
         <el-table-column label="名称" prop="name"></el-table-column>
-        <el-table-column label="是否隐藏">
+        <el-table-column label="是否隐藏" width="80">
           <template #default="scope">
             <span v-if="scope.row.is_hidden">是</span>
             <span v-else>否</span>
           </template>
         </el-table-column>
-        <el-table-column label="顺序ID" prop="sort"></el-table-column>
-        <el-table-column label="类型">
+        <el-table-column label="顺序ID" prop="sort" width="80"></el-table-column>
+        <el-table-column label="类型" width="100">
           <template #default="scope">
             <el-tag effect="plain" v-if="scope.row.type == 0">
               普通类型
@@ -41,23 +43,28 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="参与人类型">
+        <el-table-column label="参与人类型" width="100">
           <template #default="scope">
             {{ options_[scope.row.participant_type] }}</template
           >
         </el-table-column>
-        <el-table-column label="分配方式">
+        <el-table-column label="分配方式" width="100">
           <template #default="scope">
             {{ options2_[scope.row.distribute_type] }}</template
           >
         </el-table-column>
-        <el-table-column label="创建时间" prop="create_time"></el-table-column>
+        <el-table-column label="到达调用">
+          <template #default="scope">
+          {{ scope.row.on_reach_func }}
+        </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="create_time" width="160"></el-table-column>
         <el-table-column label="操作" fixed="right" align="right" width="120">
           <template #default="scope">
-            <el-button link size="small" @click="handleEdit(scope.row)"
+            <el-button link size="small" type="primary" @click="handleEdit(scope.row)"
               >编辑</el-button
             >
-            <el-button link size="small" @click="handleDelete(scope.row)"
+            <el-button link size="small" type="danger" @click="handleDelete(scope.row)"
               >删除</el-button
             >
           </template>
@@ -378,6 +385,7 @@ export default {
   data() {
     return {
       id: sessionStorage.getItem("jinYuWorkflowId"),
+      listLoading: false,
       list: null,
       type: "add",
       titleMap: {
@@ -510,15 +518,12 @@ export default {
       ],
       editId: null,
       dialogVisible: false,
+      dialogInitNum: 0
     };
   },
   mounted() {
     this.id = sessionStorage.getItem("jinYuWorkflowId");
     this.getList();
-    this.getUsers();
-    this.getRole();
-    this.getPost();
-    this.getField();
   },
   methods: {
     //添加字段选项
@@ -552,6 +557,13 @@ export default {
     handleAdd() {
       this.type = "add";
       this.dialogVisible = true;
+      if(this.dialogInitNum === 0){
+        this.getUsers();
+        this.getRole();
+        this.getPost();
+        this.getField();
+        this.dialogInitNum++;
+      }
     },
     async submitHandle() {
       let that = this;
@@ -610,7 +622,9 @@ export default {
       });
     },
     async getList() {
+      this.listLoading = true
       let res = await this.$API.wf.workflow.states.req(this.id);
+      this.listLoading = false
       console.log(res);
       this.list = res;
     },
diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue
index 0a533f53..a32a24f0 100644
--- a/src/views/wf/transform.vue
+++ b/src/views/wf/transform.vue
@@ -9,12 +9,12 @@
 		
 		<scTable
 			:data="list" ref="table"
-			row-key="id" stripe highlightCurrentRow hidePagination
+			row-key="id" stripe highlightCurrentRow hidePagination hideDo
 		>
 			<el-table-column label="#" type="index"></el-table-column>
-			<el-table-column label="ID" prop="id"></el-table-column>
+			<el-table-column label="ID" prop="id" width="160"></el-table-column>
 			<el-table-column label="名称" prop="name"></el-table-column>
-			<el-table-column label="定时器（单位秒）" prop="timer"></el-table-column>
+			<!-- <el-table-column label="定时器(s)" prop="timer" width="100"></el-table-column> -->
 			<el-table-column label="源状态">
 				<template #default="scope">
 					<span v-if="scope.row.source_state_">{{scope.row.source_state_.name}}</span>
@@ -25,7 +25,12 @@
 					<span v-if="scope.row.destination_state_">{{scope.row.destination_state_.name}}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="创建时间">
+			<el-table-column label="提交时调用">
+			<template #default="scope">
+			{{ scope.row.on_submit_func }}
+			</template>
+			</el-table-column>
+			<el-table-column label="创建时间" width="160">
 				<template #default="scope">{{ scope.row.create_time }}</template>
 			</el-table-column>
 			<el-table-column
@@ -34,7 +39,7 @@
 				width="220px"
 			>
 				<template #default="scope">
-					<el-button @click="handleEdit(scope.row)" link size="small">
+					<el-button @click="handleEdit(scope.row)" link size="small" type="primary">
 						编辑
 					</el-button>
 					<el-button