Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/api/model/wf.js

@@ -85,6 +85,14 @@ export default {
 			}
 		}
 	},
+	state: {
+		item: {
+			name: "节点详情",
+			req: async function(id){
+				return await http.get(`${config.API_URL}/wf/state/${id}/`);
+			}
+		},
+	},
 	ticket: {
 		list: {
 			url: `${config.API_URL}/wf/ticket/`,

src/views/wf/state.vue

@@ -9,7 +9,7 @@
         ></el-button>
       </div>
     </el-header>
-    <el-main class="nopadding" style="height: 100%">
+    <el-main class="nopadding">
       <scTable
         ref="table"
         v-loading="listLoading"
@@ -18,7 +18,6 @@
         stripe
         highlightCurrentRow
         hidePagination
-        hideDo
       >
         <el-table-column label="#" type="index"></el-table-column>
         <el-table-column label="ID" prop="id" width="160"></el-table-column>
@@ -32,14 +31,14 @@
         <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">
-              普通类型
+            <el-tag type="info" v-if="scope.row.type == 0">
+              普通
             </el-tag>
-            <el-tag effect="plain" v-if="scope.row.type == 1">
-              初始状态
+            <el-tag type="primary" v-if="scope.row.type == 1">
+              初始
             </el-tag>
-            <el-tag effect="plain" v-if="scope.row.type == 2">
-              结束状态
+            <el-tag type="success" v-if="scope.row.type == 2">
+              结束
             </el-tag>
           </template>
         </el-table-column>
@@ -53,7 +52,7 @@
             {{ options2_[scope.row.distribute_type] }}</template
           >
         </el-table-column>
-        <el-table-column label="到达调用">
+        <el-table-column label="到达调用" :show-overflow-tooltip="true">
           <template #default="scope">
           {{ scope.row.on_reach_func }}
         </template>
@@ -136,7 +135,17 @@
             prop="participant"
             v-if="addForm.participant_type == 1"
           >
-            <el-select
+          <xtSelect
+            v-model="addForm.participant"
+            v-model:obj = "addForm.participant_"
+            style="width:100%"
+            :apiObj="$API.system.user.list"
+            >
+            <el-table-column prop="name" label="姓名" />
+            <el-table-column prop="phone" label="手机号" />
+            <el-table-column prop="belong_dept_name" label="部门" />
+          </xtSelect>
+            <!-- <el-select
               style="width: 100%"
               v-model="addForm.participant"
               placeholder="请选择参与者"
@@ -158,14 +167,25 @@
                   >{{ item.phone }}</span
                 >
               </el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
           <el-form-item
             label="参与者"
             prop="participant"
             v-if="addForm.participant_type == 2"
           >
-            <el-select
+          <xtSelect
+            v-model="addForm.participant"
+            v-model:obj = "addForm.participant_"
+            style="width:100%"
+            :apiObj="$API.system.user.list"
+            :multiple="true"
+            >
+            <el-table-column prop="name" label="姓名" />
+            <el-table-column prop="phone" label="手机号" />
+            <el-table-column prop="belong_dept_name" label="部门" />
+          </xtSelect>
+            <!-- <el-select
               style="width: 100%"
               v-model="addForm.participant"
               multiple
@@ -188,7 +208,7 @@
                   >{{ item.phone }}</span
                 >
               </el-option>
-            </el-select>
+            </el-select> -->
           </el-form-item>
           <el-form-item
             label="参与者"
@@ -236,40 +256,31 @@
             prop="participant"
             v-if="addForm.participant_type == 4"
           >
-            <el-select
-              style="width: 100%"
-              v-model="addForm.participant"
-              multiple
-              placeholder="请选择角色"
+            <xtSelect
+            v-model="addForm.participant"
+            v-model:obj = "addForm.participant_"
+            style="width:100%"
+            :apiObj="$API.system.role.list"
+            :multiple="true"
             >
-              <el-option
-                v-for="item in roles"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
+            <el-table-column prop="name" label="名称" />
+          </xtSelect>
           </el-form-item>
           <el-form-item
             label="岗位"
             prop="participant"
             v-if="addForm.participant_type == 10"
           >
-            <el-select
-              style="width: 100%"
-              v-model="addForm.participant"
-              multiple
-              placeholder="请选择岗位"
+            <xtSelect
+            v-model="addForm.participant"
+            v-model:obj = "addForm.participant_"
+            style="width:100%"
+            :apiObj="$API.system.post.list"
+            :multiple="true"
             >
-              <el-option
-                v-for="item in posts"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
+            <el-table-column prop="name" label="名称" />
+            <el-table-column prop="code" label="标识" />
+          </xtSelect>
           </el-form-item>
           <el-form-item
             label="部门过滤"
@@ -524,10 +535,6 @@ export default {
   mounted() {
     this.id = sessionStorage.getItem("jinYuWorkflowId");
     this.getList();
-    this.getUsers();
-    this.getRole();
-    this.getPost();
-    this.getField();
   },
   methods: {
     //添加字段选项
@@ -559,6 +566,7 @@ export default {
       this.fieldList = fieldList;
     },
     handleAdd() {
+      this.getField();
       this.type = "add";
       this.dialogVisible = true;
       // if(this.dialogInitNum === 0){
@@ -616,10 +624,13 @@ export default {
       // })
     },
     handleEdit(row) {
-      this.type = "edit";
-      this.editId = row.id;
-      this.dialogVisible = true;
-      this.addForm = Object.assign({}, row);
+      this.getField();
+      this.$API.wf.state.item.req(row.id).then(res=>{
+        this.type = "edit";
+        this.editId = row.id;
+        this.dialogVisible = true;
+        this.addForm = Object.assign({}, res);
+      })
     },
     handleDelete(row) {
       this.$API.wf.state.delete.req(row.id).then((res) => {

src/views/wf/transform.vue

@@ -9,12 +9,24 @@
 		
 		<scTable
 			:data="list" ref="table"
-			row-key="id" stripe highlightCurrentRow hidePagination hideDo
+			row-key="id" stripe highlightCurrentRow hidePagination
 		>
 			<el-table-column label="#" type="index"></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="定时器(s)" prop="timer" width="100"></el-table-column> -->
+			<el-table-column label="属性" width="100">
+				<template #default="scope">
+					<el-tag type="primary" v-if="scope.row.attribute_type == 1">
+					同意
+					</el-tag>
+					<el-tag type="danger" v-if="scope.row.attribute_type == 2">
+					拒绝
+					</el-tag>
+					<el-tag type="info" v-if="scope.row.attribute_type == 3">
+					其他
+					</el-tag>
+				</template>
+			</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 +37,7 @@
 					<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="提交时调用" :show-overflow-tooltip="true">
 			<template #default="scope">
 			{{ scope.row.on_submit_func }}
 			</template>
@@ -167,7 +179,6 @@
 		},
 		mounted() {
 			this.getList();
-			this.getStateList();
 		},
 		methods: {
 			onJsonChange (value) {
@@ -187,10 +198,12 @@
 				}
 			},
 			handleAdd() {
+				this.getStateList();
 				this.type = 'add';
 				this.dialogVisible = true;
 			},
 			handleEdit(row) {
+				this.getStateList();
 				this.type = 'edit';
 				this.editId = row.id;
 				this.dialogVisible = true;
@@ -208,7 +221,6 @@
 			},
 			async getStateList() {
 				let res = await this.$API.wf.workflow.states.req(this.id);
-				console.log(res);
 				this.stateList = res;
 			},
 			async submitHandle(){