diff --git a/src/config/route.js b/src/config/route.js
index 806133f2..b7f55fd1 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 @@
{{ scope.row.process_cate }} - {{ scope.row.process_name }}
-
+
{{ scope.row.material_in_name }} -> {{ scope.row.material_out_name }}
@@ -94,14 +94,14 @@
-
+
-
+
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 @@
+
+
+
+
+
\ No newline at end of file
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 @@
-
-
-
-
@@ -12,6 +8,10 @@
+
+
+
+
@@ -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 @@
-
+
-
+
是
否
-
-
+
+
普通类型
@@ -41,23 +43,28 @@
-
+
{{ options_[scope.row.participant_type] }}
-
+
{{ options2_[scope.row.distribute_type] }}
-
+
+
+ {{ scope.row.on_reach_func }}
+
+
+
- 编辑
- 删除
@@ -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 @@
-
+
-
+
{{scope.row.source_state_.name}}
@@ -25,7 +25,12 @@
{{scope.row.destination_state_.name}}
-
+
+
+ {{ scope.row.on_submit_func }}
+
+
+
{{ scope.row.create_time }}
-
+
编辑