流程相关代码同步

zkqy-ui/src/views/bussiness/OAMange.vue

@@ -0,0 +1,328 @@
+<template>
+  <div class="process-mange-wrap">
+    <el-card shadow="always" :body-style="{ padding: '20px' }">
+      <div slot="header" class="clearfix">
+        <span>待办任务</span>
+      </div>
+      <div class="search-area">
+        <el-form
+          :model="queryParams"
+          ref="queryParamsRef"
+          label-width="80px"
+          :inline="true"
+          size="medium"
+        >
+          <el-form-item label="名称" size="normal">
+            <el-input v-model="queryParams.taskName"></el-input>
+          </el-form-item>
+          <el-form-item label="开始时间" size="normal">
+            <el-date-picker
+              v-model="queryParams.startDate"
+              type="date"
+              size="normal"
+              placeholder="选择日期时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="medium"
+              @click="() => {}"
+              icon="el-icon-search"
+              >搜索</el-button
+            >
+            <el-button size="medium" icon="el-icon-refresh">重置</el-button>
+            <el-button type="info" size="medium" @click="toDetail"
+              >详情</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="show-body">
+        <!--    流程任务列表    -->
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          border
+          @selection-change="() => {}"
+        >
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column
+            label="流程编号"
+            align="center"
+            prop="procInsId"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="流程名称"
+            align="center"
+            prop="procDefName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="流程类别"
+            align="center"
+            prop="category"
+            width="100px"
+          />
+          <el-table-column label="流程版本" align="center" width="80px">
+            <template slot-scope="scope">
+              <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="提交时间"
+            align="center"
+            prop="createTime"
+            width="180"
+          />
+          <el-table-column label="流程状态" align="center" width="100">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.finishTime == null" size="mini"
+                >进行中</el-tag
+              >
+              <el-tag
+                type="success"
+                v-if="scope.row.finishTime != null"
+                size="mini"
+                >已完成</el-tag
+              >
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="耗时"
+            align="center"
+            prop="duration"
+            width="180"
+          />
+          <el-table-column label="当前节点" align="center" prop="taskName" />
+          <el-table-column label="办理人" align="center">
+            <template slot-scope="scope">
+              <label v-if="scope.row.assigneeName"
+                >{{ scope.row.assigneeName }}
+                <el-tag type="info" size="mini">{{
+                  scope.row.assigneeDeptName
+                }}</el-tag></label
+              >
+              <!--          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>-->
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="150"
+            fixed="right"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button @click="(scope) => {}" type="text" size="small"
+                >详情</el-button
+              >
+              <el-button @click="() => {}" type="text" size="small"
+                >取消申请</el-button
+              >
+              <el-button
+                @click="() => {}"
+                type="text"
+                size="small"
+                v-hasPermi="['system:deployment:remove']"
+                >删除</el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <!--    分页    -->
+        <!-- <pagination
+          v-show="total > 0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        /> -->
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  processList,
+  runProcessNodeExecution,
+  getProcessNodeFormTemplate,
+  getProcessNodeFormInfoData,
+} from "@/api/bpmprocess/run/executeProcess";
+import { triggerExceptionNode } from "@/api/bpmprocess/process";
+import getNodeSequence from "@/utils/bpmn/getNodeSequence";
+import { getForm } from "@/api/dragform/form";
+
+export default {
+  name: "processMange",
+  props: [],
+  components: {},
+  dicts: ["bpm_type", "task_process_state"],
+  data() {
+    return {
+      loading: false,
+      row: {}, //当前操作行数据
+      myForm: "", //自定义表单组件名
+      // 节点弹窗title
+      nodeTitle: "节点弹窗",
+      open: false,
+      // 节点弹窗对应的formData
+      commonData: {},
+      taskType: 1,
+      queryString: "",
+      taskStatus: "",
+      tableData: [], //表格数据
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        taskProcessState: "0",
+      },
+      total: 0,
+      columns: [
+        {
+          prop: "bepTaskKey",
+          label: "任务编号",
+        },
+        {
+          prop: "bepTaskName",
+          label: "任务名称",
+        },
+        {
+          prop: "bepTaskProcessType",
+          label: "任务流程类型",
+        },
+        {
+          prop: "bepTaskProcessState",
+          label: "任务流程状态",
+        },
+        {
+          prop: "benTaskNodeName",
+          label: "节点名称",
+        },
+        {
+          prop: "benTaskNodeType",
+          label: "节点类型",
+        },
+        {
+          prop: "benTaskNodeState",
+          label: "节点状态",
+        },
+        {
+          prop: "benCreateBy",
+          label: "创建人",
+        },
+        {
+          prop: "benCreateTime",
+          label: "创建时间",
+        },
+      ],
+      formType: "", //表单类型 dragForm:拖拽表单 composeForm:工艺组合表单   designForm:定制表单
+      // k-form-build 数据
+      dynamicData: {},
+      tableName: "",
+      defaultValue: {},
+      jsonData: {},
+      // 拖拽数据
+      taskInfo: {},
+      groupKey: "",
+      subCount: {},
+      tableCount: {},
+      subTableName: "",
+
+      // 弹窗表单渲染数据
+      formData: {},
+      backExceptionTaskList: ["GY06"], //特殊回退表单组件列表
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {
+    toDetail() {
+      this.$router.push({
+        path: "/processMange/detail",
+      });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.process-mange-wrap {
+  background-color: #f2f3f8;
+  padding: 20px;
+
+  .col {
+    background-color: #fff;
+    border-right: 1px solid #ebedf2;
+    /* margin-right: 3px; */
+    .statistic-wrap {
+      /* // height: 70px; */
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      padding: 10px 17px;
+      justify-content: space-between;
+
+      .discription {
+        display: flex;
+        flex-direction: column;
+
+        .title {
+          line-height: 20px;
+          font-size: 18px;
+          font-weight: 700;
+          margin-bottom: 5px;
+        }
+
+        .sub-title {
+          font-size: 14px;
+        }
+      }
+
+      .data {
+        font-size: 20px;
+        font-weight: 700;
+      }
+    }
+  }
+
+  .main-area {
+    margin-top: 30px;
+    box-shadow: 0 1px 15px 1px rgb(69 65 78 / 8%);
+    background-color: #fff;
+
+    .show-header {
+      border-bottom: 1px solid #ebedf2;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 0px 20px 0px 20px;
+      height: 70px;
+
+      /* .header {
+      } */
+
+      .search-list {
+        display: flex;
+
+        .search-tab {
+          margin-right: 20px;
+
+          .btn-list-two {
+            margin-left: 10px;
+          }
+        }
+      }
+    }
+
+    .show-body {
+      padding: 25px;
+    }
+  }
+}
+</style>

zkqy-ui/src/views/bussiness/components/TaskItem.vue

@@ -8,7 +8,11 @@
   >
     <div class="task-title">
       <span class="mr5">{{ cardData.num }}.</span>
-      <span>{{ cardData.nodeInfo.name }}</span>
+      <span class="mr5">{{ cardData.nodeInfo.name }}</span>
+      <i
+        v-if="cardData.nodeInfo.localName == 'exceptionTask'"
+        class="el-icon-warning icon"
+      ></i>
     </div>
     <div class="msg-list">
       <div class="msg-item">
@@ -20,10 +24,10 @@
         <span>{{ cardData.nodeInfo.localName || "未知类型" }}</span>
       </div>
       <div class="msg-item">
-        <i v-if="cardData.isNow" class="el-icon-loading icon"></i>
-        <i v-else-if="cardData.isDone" class="el-icon-success icon"></i>
+        <i v-if="cardData.isDone" class="el-icon-success icon"></i>
+        <i v-else-if="cardData.isNow" class="el-icon-loading icon"></i>
         <i v-else class="el-icon-more icon"></i>
-        <!-- <span>admin</span> -->
+        <span>{{ cardData.nodeInfo.localName }}</span>
       </div>
     </div>
   </div>

zkqy-ui/src/views/bussiness/components/taskList.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="task-list-wrap">
     <div class="title-list">
+      <div class="title-item">
+        <!-- <span class="title-label">完成时间:</span> -->
+        <span class="title-label">序号:</span>
+        <span class="title-content" style="font-size: 50px; color: red">{{
+          num
+        }}</span>
+      </div>
       <div class="title-item">
         <span class="title-label">任务号:</span>
         <span class="title-content">{{ baseInfo.benTaskProcessKey }}</span>
@@ -21,7 +28,7 @@
         <!-- <span class="title-label">完成时间:</span> -->
         <span class="title-label">开始时间:</span>
         <span class="title-content">{{
-          baseInfo.benCreateTime.replace("T", " ")
+          baseInfo.benCreateTime ? baseInfo.benCreateTime.replace("T", " ") : ""
         }}</span>
       </div>
     </div>
@@ -33,7 +40,7 @@
         <TaskItem
           class="card-item"
           v-for="(item, index) of tempList"
-          :key="item.nodeId"
+          :key="item.nodeId + index"
           :itemData="item"
           :index="index + 1"
         ></TaskItem>
@@ -50,7 +57,7 @@ import uuid from "@/utils/bpmn/uuid";
 import TaskItem from "./TaskItem.vue";
 export default {
   name: "TaskList",
-  props: ["cardData"],
+  props: ["cardData", "num"],
   components: { TaskItem },
   data() {
     return {

zkqy-ui/src/views/bussiness/detail/formList.js

@@ -0,0 +1,239 @@
+const List = [
+	{
+		jsonData: {
+			list: [
+				{
+					"type": "input",
+					"label": "计划名称",
+					"options": {
+						"type": "text",
+						"width": "100%",
+						"defaultValue": "",
+						"placeholder": "请输入计划名称",
+						"clearable": false,
+						"maxLength": null,
+						"addonBefore": "",
+						"addonAfter": "",
+						"showLabel": true,
+						"hidden": false,
+						"disabled": false
+					},
+					"model": "name",
+					"key": "input_1703556025735",
+					"help": "",
+					"rules": [
+						{
+							"required": false,
+							"message": "必填项"
+						}
+					],
+					"tableName": "plan"
+				},
+				{
+					"type": "select",
+					"label": "货品",
+					"options": {
+						"width": "100%",
+						"multiple": false,
+						"disabled": false,
+						"clearable": false,
+						"showLabel": true,
+						"hidden": false,
+						"placeholder": "请选择货品",
+						"dynamicKey": "SP",
+						"dynamic": true,
+						"options": [
+							{
+								"value": "1",
+								"label": "下拉框1"
+							},
+							{
+								"value": "2",
+								"label": "下拉框2"
+							}
+						],
+						"showSearch": false,
+						"sqlData": {
+							"dynamicName": "SP",
+							"sqls": [
+								"SELECT goods.goodsname AS `label`,goods.id AS `value`,goods.* FROM goods AS goods "
+							],
+							"echoDatas": [
+								"{\"formData\":{\"dynamicName\":\"SP\",\"tableName\":\"goods\",\"optLabelData\":\"goodsname\",\"optValueData\":\"id\"},\"filterTableData\":[]}"
+							]
+						}
+					},
+					"model": "good_id",
+					"key": "select_1703556044150",
+					"help": "",
+					"rules": [
+						{
+							"required": false,
+							"message": "必填项"
+						}
+					],
+					"tableName": "plan"
+				},
+				{
+					"type": "number",
+					"label": "计划产量",
+					"options": {
+						"width": "100%",
+						"defaultValue": null,
+						"min": null,
+						"max": null,
+						"precision": null,
+						"step": 1,
+						"showLabel": true,
+						"hidden": false,
+						"disabled": false,
+						"placeholder": "请输入计划产量"
+					},
+					"model": "plan_weight",
+					"key": "number_1703556096465",
+					"help": "",
+					"rules": [
+						{
+							"required": false,
+							"message": "必填项"
+						}
+					],
+					"tableName": "plan"
+				},
+				{
+					"type": "select",
+					"label": "发起流程",
+					"options": {
+						"width": "100%",
+						"multiple": false,
+						"disabled": false,
+						"clearable": false,
+						"showLabel": true,
+						"hidden": false,
+						"placeholder": "请选择",
+						"dynamicKey": "FQLC",
+						"dynamic": true,
+						"options": [
+							{
+								"value": "1",
+								"label": "下拉框1"
+							},
+							{
+								"value": "2",
+								"label": "下拉框2"
+							}
+						],
+						"showSearch": false,
+						"sqlData": {
+							"dynamicName": "FQLC",
+							"sqls": [
+								"SELECT bpm_process.process_name AS `label`,bpm_process.process_key AS `value`,bpm_process.* FROM bpm_process AS bpm_process WHERE bpm_process.del_flag = 0"
+							],
+							"echoDatas": [
+								"{\"formData\":{\"dynamicName\":\"FQLC\",\"tableName\":\"bpm_process\",\"optLabelData\":\"process_name\",\"optValueData\":\"process_key\"},\"filterTableData\":[{\"fieldName\":\"del_flag\",\"flagValue\":\"\",\"fieldOptions\":[],\"flagFormData\":{\"flagType\":0,\"tableField\":{\"tableName\":\"\",\"fieldName\":\"\"},\"flagValue\":\"0\"}}]}"
+							]
+						}
+					},
+					"model": "process_key",
+					"key": "select_1703556257092",
+					"help": "",
+					"rules": [
+						{
+							"required": false,
+							"message": "必填项"
+						}
+					],
+					"tableName": "plan"
+				}
+			],
+			config: {
+				"layout": "horizontal",
+				"labelCol": {
+					"xs": 4,
+					"sm": 4,
+					"md": 4,
+					"lg": 4,
+					"xl": 4,
+					"xxl": 4
+				},
+				"labelWidth": 100,
+				"labelLayout": "flex",
+				"wrapperCol": {
+					"xs": 18,
+					"sm": 18,
+					"md": 18,
+					"lg": 18,
+					"xl": 18,
+					"xxl": 18
+				},
+				"hideRequiredMark": false,
+				"customStyle": "",
+				"formName": "计划表单",
+				"nickFormName": "JHBD",
+				"mainTableName": "plan",
+				"tdId": 3
+			}
+		},
+		dynamicData: {},
+		defaultValue: {},
+	}
+	, {
+		list: [
+			{
+				type: "input",
+				label: "货品名称",
+				options: {
+					type: "text",
+					width: "100%",
+					defaultValue: "",
+					placeholder: "请输入",
+					clearable: false,
+					maxLength: null,
+					addonBefore: "",
+					addonAfter: "",
+					showLabel: true,
+					hidden: false,
+					disabled: false,
+				},
+				model: "goodsname",
+				key: "input_1703555460307",
+				help: "",
+				rules: [
+					{
+						required: false,
+						message: "必填项",
+					},
+				],
+				tableName: "goods",
+			},
+		],
+		config: {
+			layout: "horizontal",
+			labelCol: {
+				xs: 4,
+				sm: 4,
+				md: 4,
+				lg: 4,
+				xl: 4,
+				xxl: 4,
+			},
+			labelWidth: 100,
+			labelLayout: "flex",
+			wrapperCol: {
+				xs: 18,
+				sm: 18,
+				md: 18,
+				lg: 18,
+				xl: 18,
+				xxl: 18,
+			},
+			hideRequiredMark: false,
+			customStyle: "",
+			formName: "货品表单",
+			nickFormName: "HPBD",
+			mainTableName: "goods",
+			tdId: 1,
+		},
+	},
+]
+export default List

zkqy-ui/src/views/bussiness/detail/formList.vue

@@ -0,0 +1,33 @@
+<template>
+  <div class="list-wrap">
+    <k-form-build
+      v-if="jsonData"
+      class="formBuild"
+      ref="addFromRef"
+      :dynamicData="dynamicData"
+      :defaultValue="defaultValue"
+      :value="jsonData"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "FormList",
+  props: [],
+  components: {},
+  data() {
+    return {
+      formList: [
+        {
+          formJson: formList,
+        },
+      ],
+    };
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped></style>

zkqy-ui/src/views/bussiness/detail/index.vue

@@ -0,0 +1,78 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span class="el-icon-document">已发任务</span>
+        <el-button
+          style="float: right"
+          size="mini"
+          type="danger"
+          @click="() => {}"
+          >关闭</el-button
+        >
+      </div>
+      <el-tabs tab-position="top" v-model="activeName" @tab-click="() => {}">
+        <!--表单信息-->
+        <el-tab-pane label="表单信息" name="1">
+          <el-col :span="16" :offset="4">
+            <div class="test-form"></div>
+          </el-col>
+        </el-tab-pane>
+        <!--流程流转记录-->
+        <el-tab-pane label="流转记录" name="2">
+          <el-col :span="16" :offset="4"> </el-col>
+        </el-tab-pane>
+        <!--流程图-->
+        <el-tab-pane label="流程图" name="3"> </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import FormList from "./formList.vue";
+
+// 模拟表单列表数据
+import formList from "./formList.js";
+export default {
+  name: "Record",
+  components: { FormList },
+  props: {},
+  data() {
+    return {
+      activeName: "1",
+    };
+  },
+  created() {},
+  methods: {},
+};
+</script>
+<style lang="scss" scoped>
+.test-form {
+  margin: 15px auto;
+  width: 800px;
+  padding: 15px;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+}
+.clearfix:after {
+  clear: both;
+}
+
+.box-card {
+  width: 100%;
+  margin-bottom: 20px;
+}
+
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+
+.my-label {
+  background: #e1f3d8;
+}
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/GongYi/GY06.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="form-wrap">
-    <div class="cardwrap">
+    <!-- <div class="cardwrap">
       <div class="title-area">
         <span><i class="el-icon-s-order mr5"></i>请选择工艺文件</span>
         <div class="search ml10">
@@ -40,7 +40,7 @@
           </el-table-column>
         </el-table>
       </div>
-    </div>
+    </div> -->
     <div class="cardwrap">
       <div class="title-area">
         <span><i class="el-icon-help mr5"></i>工序</span>

zkqy-ui/src/views/bussiness/dialogCompments/Mec/AssignEmployees.vue

@@ -139,6 +139,7 @@ export default {
       }
     },
   },
+
 };
 </script>
 

zkqy-ui/src/views/bussiness/dialogCompments/Mec/PersonalDistribution.vue

@@ -1,323 +1,295 @@
 <template>
-  <div class="app-container">
-    <div class="leftMessage">
-      <div class="list" v-for="(item, index) in baseMessage" :key="index">
-        <span class="title">
-          {{ item.title }}
-        </span>
-        <span v-if="item.prop == 'taskNo'" class="content">
-          {{ form.masterTask[item.prop] }}
-        </span>
-        <span
-          v-else-if="item.prop == 'mapNumber'"
-          class="content"
-          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-        >
-          {{ form.masterTask[item.prop] }}
-        </span>
-        <span
-          v-else-if="item.prop == 'mapName'"
-          class="content"
-          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-        >
-          {{ form.masterTask[item.prop] }}
-        </span>
-        <span
-          v-else-if="item.prop == 'modelNumber'"
-          class="content"
-          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-        >
-          {{ form.masterTask[item.prop] }}
-        </span>
-        <span
-          v-else-if="item.prop == 'craftRoute'"
-          class="content"
-          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-        >
-          {{ form.masterTask[item.prop] }}
-        </span>
-        <span
-          v-else
-          class="content"
-          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-        >
-          {{ form.recordQualityControlCard[item.prop] }}
-        </span>
+    <div class="app-container">
+      <div class="leftMessage">
+        <div class="list" v-for="(item, index) in baseMessage" :key="index">
+          <span class="title">
+            {{ item.title }}
+          </span>
+          <template v-if="item.prop == 'qualityControlCard'">
+            <span
+              class="content"
+              style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+            >
+              {{ form.recordQualityControlCard[item.prop] }}
+            </span>
+          </template>
+          <template v-else>
+            <span class="content">
+              {{ form.masterTask[item.prop] }}
+            </span>
+          </template>
+        </div>
       </div>
-      <div></div>
-      <div class="content"></div>
-    </div>
-    <div class="rightMessage">
-      <div class="top">
-        <div class="state">
-          <div class="list">
-            <span>工序状态：</span>
-            <p id="state">
-              {{
-                form.taskNodeOtherState
-                  ? stateObj[form.taskNodeOtherState]
-                  : "初始"
-              }}
-            </p>
-          </div>
-          <div class="list">
-            <span>是否外协：</span>
-            <p>
-              <el-checkbox
-                @change="
-                  (val) => {
-                    updateHandler(form.taskNodeOtherState, val);
-                  }
-                "
-                v-model="checked"
-              ></el-checkbox>
-            </p>
+      <div class="rightMessage">
+        <div class="top">
+          <div class="state">
+            <div class="list">
+              <span>工序状态：</span>
+              <p id="state">
+                {{
+                  form.taskNodeOtherState
+                    ? stateObj[form.taskNodeOtherState]
+                    : "初始"
+                }}
+              </p>
+            </div>
+            <div class="list">
+              <span>是否外协：</span>
+              <p>
+                <el-checkbox
+                  @change="
+                    (val) => {
+                      updateHandler(form.taskNodeOtherState, val);
+                    }
+                  "
+                  v-model="checked"
+                ></el-checkbox>
+              </p>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="button">
-        <el-button-group prop="state">
-          <el-button
-            type="primary"
-            icon="el-icon-video-play"
-            plain
-            round
-            @click="updateHandler('1', checked)"
-            >开始</el-button
-          >
-          <el-button
-            type="danger"
-            icon="el-icon-video-pause"
-            plain
-            @click="updateHandler('2', checked)"
-            >暂停</el-button
-          >
-          <el-button
-            type="success"
-            icon="el-icon-circle-check"
-            plain
-            @click="updateHandler('3', checked)"
-            >完成</el-button
-          >
-          <el-button
-            type="info"
-            icon="el-icon-refresh"
-            plain
-            round
-            @click="updateHandler('0', checked)"
-            >重置</el-button
-          >
-        </el-button-group>
-      </div>
-      <div class="middle" v-show="!checked">
-        <el-table :data="oldTableData" border ref="addTableRowRef">
-          <el-table-column label="人员姓名">
-            <template slot-scope="scope">
-              <el-input
-                v-if="scope.row.isEdit"
-                v-model="editingRow.personnelName"
-              ></el-input>
-              <span v-else>{{ scope.row.personnelName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="分配工时">
-            <template slot-scope="scope">
-              <el-input-number
-                v-if="scope.row.isEdit"
-                v-model="editingRow.allottedTime"
-                controls-position="right"
-                @change="handleChange"
-                :min="0"
-                :step="0.25"
-                size="small"
-              ></el-input-number>
-              <span v-else>{{ scope.row.allottedTime }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="120" align="center">
-            <template slot-scope="scope">
-              <el-dropdown v-if="!scope.row.isEdit">
-                <el-button type="warning" plain size="small">
-                  处理<i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                    ><el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-edit"
-                      @click="changeHandler(scope.row)"
-                      >修改</el-button
-                    ></el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    ><el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      @click="deleteOne(scope.row)"
-                      v-hasPermi="['system:dict:remove']"
-                      >删除</el-button
+        <div class="button">
+          <el-button-group prop="state">
+            <el-button
+              type="primary"
+              icon="el-icon-video-play"
+              plain
+              round
+              @click="updateHandler('1', checked)"
+              >开始</el-button
+            >
+            <el-button
+              type="danger"
+              icon="el-icon-video-pause"
+              plain
+              @click="updateHandler('2', checked)"
+              >暂停</el-button
+            >
+            <el-button
+              type="success"
+              icon="el-icon-circle-check"
+              plain
+              @click="updateHandler('3', checked)"
+              >完成</el-button
+            >
+            <el-button
+              type="info"
+              icon="el-icon-refresh"
+              plain
+              round
+              @click="updateHandler('0', checked)"
+              >重置</el-button
+            >
+          </el-button-group>
+        </div>
+        <div class="middle" v-show="!checked">
+          <el-table :data="oldTableData" border ref="addTableRowRef">
+            <el-table-column label="人员姓名">
+              <template slot-scope="scope">
+                <el-input
+                  v-if="scope.row.isEdit"
+                  v-model="editingRow.personnelName"
+                ></el-input>
+                <span v-else>{{ scope.row.personnelName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="分配工时">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-if="scope.row.isEdit"
+                  v-model="editingRow.allottedTime"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :step="0.25"
+                  size="small"
+                ></el-input-number>
+                <span v-else>{{ scope.row.allottedTime }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="120" align="center">
+              <template slot-scope="scope">
+                <el-dropdown v-if="!scope.row.isEdit">
+                  <el-button type="warning" plain size="small">
+                    处理<i class="el-icon-arrow-down el-icon--right"></i>
+                  </el-button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item
+                      ><el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="changeHandler(scope.row)"
+                        >修改</el-button
+                      ></el-dropdown-item
                     >
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-              <el-dropdown v-else>
-                <el-button type="warning" plain size="small">
-                  处理<i class="el-icon-arrow-down el-icon--right"></i>
-                </el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                    ><el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-edit"
-                      @click="saveOne"
-                      >保存</el-button
-                    ></el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    ><el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      @click="cancelHandler(scope.row)"
-                      v-hasPermi="['system:dict:remove']"
-                      >取消</el-button
+                    <el-dropdown-item
+                      ><el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="deleteOne(scope.row)"
+                        v-hasPermi="['system:dict:remove']"
+                        >删除</el-button
+                      >
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+                <el-dropdown v-else>
+                  <el-button type="warning" plain size="small">
+                    处理<i class="el-icon-arrow-down el-icon--right"></i>
+                  </el-button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item
+                      ><el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-edit"
+                        @click="saveOne"
+                        >保存</el-button
+                      ></el-dropdown-item
                     >
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-              <!-- <el-button
+                    <el-dropdown-item
+                      ><el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="cancelHandler(scope.row)"
+                        v-hasPermi="['system:dict:remove']"
+                        >取消</el-button
+                      >
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+                <!-- <el-button
                   icon="el-icon-delete"
                   size="mini"
                   @click="deleteTableRow(scope.$index)"
                   >删除</el-button
                 > -->
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="name">人员及工时分配</div>
-        <el-table :data="tableData" border ref="addTableRowRef">
-          <el-table-column label="人员姓名">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.personnelName"></el-input>
-            </template>
-          </el-table-column>
-          <el-table-column label="分配工时">
-            <template slot-scope="scope">
-              <el-input-number
-                v-model="scope.row.allottedTime"
-                controls-position="right"
-                @change="handleChange"
-                :min="0"
-                :step="0.25"
-                size="small"
-              ></el-input-number>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="120" align="center">
-            <template slot-scope="scope">
-              <el-button
-                icon="el-icon-delete"
-                size="mini"
-                @click="deleteTableRow(scope.$index)"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="block">
-          <el-pagination layout="prev, pager, next" :total="50">
-          </el-pagination>
-        </div>
-        <el-button
-          size="mini"
-          icon="el-icon-plus"
-          type="primary"
-          @click="addTableRow"
-          >新 增</el-button
-        >
-        <el-button
-          size="mini"
-          icon="el-icon-check"
-          type="success"
-          @click="saveTableRow"
-          >保 存</el-button
-        >
-        <div class="total">
-          <span>当前工序总工时： 10</span>
-          <span>当前已分配工时： 10</span>
-          <span>当前剩余工时： 10</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="name">人员及工时分配</div>
+          <el-table :data="tableData" border ref="addTableRowRef">
+            <el-table-column label="人员姓名">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.personnelName"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="分配工时">
+              <template slot-scope="scope">
+                <el-input-number
+                  v-model="scope.row.allottedTime"
+                  controls-position="right"
+                  @change="handleChange"
+                  :min="0"
+                  :step="0.25"
+                  size="small"
+                ></el-input-number>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="120" align="center">
+              <template slot-scope="scope">
+                <el-button
+                  icon="el-icon-delete"
+                  size="mini"
+                  @click="deleteTableRow(scope.$index)"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="block">
+            <el-pagination layout="prev, pager, next" :total="50">
+            </el-pagination>
+          </div>
+          <el-button
+            size="mini"
+            icon="el-icon-plus"
+            type="primary"
+            @click="addTableRow"
+            >新 增</el-button
+          >
+          <el-button
+            size="mini"
+            icon="el-icon-check"
+            type="success"
+            @click="saveTableRow"
+            >保 存</el-button
+          >
+          <div class="total">
+            <span>当前工序总工时： 10</span>
+            <span>当前已分配工时： 10</span>
+            <span>当前剩余工时： 10</span>
+          </div>
         </div>
       </div>
     </div>
-  </div>
 </template>
 <script>
 import {
-  submitNodeForm,
-  changeNodeState,
+submitNodeForm,
+changeNodeState,
 } from "@/api/bpmprocess/runDialogApi/index";
 import { getProcessNodeFormInfoData } from "@/api/bpmprocess/run/executeProcess";
 export default {
-  name: "PersonalDistribution",
-  props: ["formData", "row"],
-  data() {
+name: "PersonalDistribution",
+props: ["formData", "row"],
+data() {
     return {
-      checked: true,
-      isEdit: false,
-      form: {
+    checked: true,
+    isEdit: false,
+    form: {
         taskNodeOtherState: "0",
-      },
-      tableData: [],
-      editingRow: {},
-      oldTableData: [
+    },
+    tableData: [],
+    editingRow: {},
+    oldTableData: [
         {
-          id: 1,
-          personnelName: "芝麻林",
-          allottedTime: 1,
-          isEdit: false,
+        id: 1,
+        personnelName: "芝麻林",
+        allottedTime: 1,
+        isEdit: false,
         },
-      ],
-      newRow: {},
+    ],
+    newRow: {},
 
-      baseMessage: [
+    baseMessage: [
         { title: "任务", prop: "taskNo" },
         { title: "图号", prop: "mapNumber" },
         { title: "名称", prop: "mapName" },
         { title: "数量", prop: "modelNumber" },
         { title: "工艺", prop: "craftRoute" },
         { title: "质控", prop: "qualityControlCard" },
-      ],
-      stateObj: {
+    ],
+    stateObj: {
         0: "初始",
         1: "开始",
         2: "暂停",
         3: "完成",
-      },
+    },
     };
-  },
-  computed: {
+},
+computed: {
     myFormData() {
-      return this.formData;
+    return this.formData;
     },
-  },
-  watch: {
+},
+watch: {
     myFormData: {
-      handler(nval) {
+    handler(nval) {
         if (!nval) return;
         this.initData(nval);
-      },
-      deep: true,
-      immediate: true,
     },
-  },
-  methods: {
-    resetForm() {},
+    deep: true,
+    immediate: true,
+    },
+},
+methods: {
     async updateHandler(state, flag) {
-      flag = flag ? "true" : "false";
-      let payLoad = {
+    flag = flag ? "true" : "false";
+    let payLoad = {
         // conditionMap: {
         taskProcessKey: this.row.benTaskProcessKey,
         taskNodeKey: this.row.benTaskNodeKey,
@@ -326,145 +298,145 @@ export default {
         taskNodeOtherState: state,
         task1: flag,
         // },
-      };
+    };
 
-      changeNodeState(payLoad).then((response) => {
+    changeNodeState(payLoad).then((response) => {
         if (response.code == 200) {
-          this.$modal.msgSuccess("修改成功");
-          this.form.taskNodeOtherState = state;
+        this.$modal.msgSuccess("修改成功");
+        this.form.taskNodeOtherState = state;
         } else {
-          this.$modal.error("修改失败,请稍后再试");
+        this.$modal.error("修改失败,请稍后再试");
         }
-      });
+    });
     },
     async submitHandler() {
-      console.log(this.row);
-      let res = await this.$refs.form?.validate();
-      if (res) {
+    console.log(this.row);
+    let res = await this.$refs.form?.validate();
+    if (res) {
         let payLoad = {};
         let { state } = this.form;
         console.log(this.form);
         if (this.isEdit) {
-          let { taskKey, taskNodeKey } = this.myFormData.resultMap;
-          payLoad.updateCommonEntityList = [
+        let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+        payLoad.updateCommonEntityList = [
             {
-              basicMap: {
+            basicMap: {
                 tableName: "bpm_execute_node",
-              },
-              conditionMap: {
+            },
+            conditionMap: {
                 task_key: taskKey,
                 task_node_key: taskNodeKey,
-              },
-              commMap: {
+            },
+            commMap: {
                 task_node_other_state: state,
-              },
             },
-          ];
+            },
+        ];
         } else {
-          payLoad.insertCommonEntityList = [
+        payLoad.insertCommonEntityList = [
             {
-              basicMap: {
+            basicMap: {
                 tableName: "bpm_execute_node",
-              },
-              addListMap: [
+            },
+            addListMap: [
                 {
-                  task_node_other_state: state,
-                  taskKey: this.row.benTaskProcessKey,
-                  taskNodeKey: this.row.benTaskNodeKey,
+                task_node_other_state: state,
+                taskKey: this.row.benTaskProcessKey,
+                taskNodeKey: this.row.benTaskNodeKey,
                 },
-              ],
+            ],
             },
-          ];
+        ];
         }
         submitNodeForm(payLoad).then((response) => {
-          if (response.code == 200) {
+        if (response.code == 200) {
             this.$modal.msgSuccess("保存成功");
-          } else {
+        } else {
             this.$modal.error("保存失败,请稍后再试");
-          }
+        }
         });
-      }
+    }
     },
     async getFormData() {
-      return {
+    return {
         flag: true,
         data: {},
-      };
+    };
 
-      let formData = {
+    let formData = {
         flag: false,
         msg: "",
-      };
-      try {
+    };
+    try {
         let valid = await this.$refs.form.validate();
         if (valid) {
-          formData.flag = true;
-          formData.data = this.form;
-          return formData;
+        formData.flag = true;
+        formData.data = this.form;
+        return formData;
         } else {
-          formData.msg = "表单校验异常,请规范填写表单数据";
-          return formData;
+        formData.msg = "表单校验异常,请规范填写表单数据";
+        return formData;
         }
-      } catch (error) {
+    } catch (error) {
         // console.log(error);
         formData.msg = "表单校验异常,请规范填写表单数据";
         return formData;
-      }
+    }
     },
     addTableRow() {
-      const newRow = {
+    const newRow = {
         personnelName: "",
         allottedTime: 0,
-      };
-      this.tableData.push(newRow);
+    };
+    this.tableData.push(newRow);
     },
     deleteTableRow(index) {
-      if (index !== -1) {
+    if (index !== -1) {
         this.tableData.splice(index, 1);
-      }
+    }
     },
     // 批量保存表格数据回调
     async saveTableRow() {
-      console.log(this.tableData);
-      let payLoad = {};
-      payLoad.insertCommonEntityList = [
+    console.log(this.tableData);
+    let payLoad = {};
+    payLoad.insertCommonEntityList = [
         {
-          basicMap: {
+        basicMap: {
             tableName: "process_inspect_personnel",
-          },
-          addListMap: [
+        },
+        addListMap: [
             // {
             //   task_node_other_state: state,
             //   taskKey: this.row.benTaskProcessKey,
             //   taskNodeKey: this.row.benTaskNodeKey,
             // },
-          ],
+        ],
         },
-      ];
-      payLoad.insertCommonEntityList[0].addListMap = this.tableData.map(
+    ];
+    payLoad.insertCommonEntityList[0].addListMap = this.tableData.map(
         (item) => {
-          let { personnelName, allottedTime } = item;
-          return {
+        let { personnelName, allottedTime } = item;
+        return {
             personnelName,
             allottedTime,
             taskProcessKey: this.row.benTaskProcessKey,
             taskNodeKey: this.row.benTaskNodeKey,
-          };
+        };
         }
-      );
-      // this.tableData = [];
-      let res = await submitNodeForm(payLoad);
-      if (res.code == 200) {
+    );
+    // this.tableData = [];
+    let res = await submitNodeForm(payLoad);
+    if (res.code == 200) {
         this.$message.success("保存成功");
         this.tableData = [];
         this.refreshData(this.row);
-      } else {
+    } else {
         this.$message.warning("网络异常,请稍后再试");
-      }
+    }
     },
     // 刷新弹窗数据
     async refreshData(row) {
-      let {
+    let {
         benTaskNodeFormKey,
         benTaskNodeFormType,
         bepTaskPlanKey,
@@ -473,196 +445,193 @@ export default {
         benTaskProcessKey,
         benmTaskAutomaticScriptTriggerType,
         bepTaskNodeNextKey,
-      } = row;
-      let payLoad = {
+    } = row;
+    let payLoad = {
         taskNodeKey: bepTaskNodeNextKey,
         taskProcessKey: benTaskProcessKey,
         taskAutomaticScriptTriggerType: benmTaskAutomaticScriptTriggerType,
         taskPlanKey: bepTaskPlanKey,
-      };
-      let res = await getProcessNodeFormInfoData(payLoad);
-      if (res.code == 200) {
+    };
+    let res = await getProcessNodeFormInfoData(payLoad);
+    if (res.code == 200) {
         this.updataTableData(res.data);
-      } else {
+    } else {
         this.$message.error("网络异常,请稍后再试");
-      }
+    }
     },
     // 修改某一条数据
     async saveOne() {
-      console.log(this.editingRow);
-      let payLoad = {};
-      let { taskKey, taskNodeKey } = this.myFormData.resultMap;
-      let { id, personnelName, allottedTime } = this.editingRow;
-      payLoad.updateCommonEntityList = [
+    console.log(this.editingRow);
+    let payLoad = {};
+    let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+    let { id, personnelName, allottedTime } = this.editingRow;
+    payLoad.updateCommonEntityList = [
         {
-          basicMap: {
+        basicMap: {
             tableName: "process_inspect_personnel",
-          },
-          conditionMap: {
+        },
+        conditionMap: {
             taskProcessKey: this.row.benTaskProcessKey,
             taskNodeKey: this.row.benTaskNodeKey,
             id,
-          },
-          commMap: {
+        },
+        commMap: {
             personnelName,
             allottedTime,
-          },
         },
-      ];
-      let res = await submitNodeForm(payLoad);
-      if (res.code == 200) {
+        },
+    ];
+    let res = await submitNodeForm(payLoad);
+    if (res.code == 200) {
         this.$message.success("保存成功");
         this.refreshData(this.row);
-      } else {
+    } else {
         this.$message.warning("网络异常,请稍后再试");
-      }
+    }
     },
     // 删除一条数据
     async deleteOne(row) {
-      let payLoad = {};
-      let { id } = row;
-      payLoad.deleteCommonEntityList = [
+    let payLoad = {};
+    let { id } = row;
+    payLoad.deleteCommonEntityList = [
         {
-          basicMap: {
+        basicMap: {
             tableName: "process_inspect_personnel",
-          },
-          conditionMap: {
+        },
+        conditionMap: {
             // taskProcessKey: this.row.benTaskProcessKey,
             // taskNodeKey: this.row.benTaskNodeKey,
             id: [id],
-          },
         },
-      ];
-      let res = await submitNodeForm(payLoad);
-      if (res.code == 200) {
+        },
+    ];
+    let res = await submitNodeForm(payLoad);
+    if (res.code == 200) {
         this.$message.success("删除成功");
         this.refreshData(this.row);
-      } else {
+    } else {
         this.$message.warning("网络异常,请稍后再试");
-      }
+    }
     },
     // 取消修改回调
     cancelHandler(row) {
-      row.isEdit = false;
+    row.isEdit = false;
     },
     handleChange(value) {
-      console.log(value);
+    console.log(value);
     },
     changeHandler(row) {
-      console.log(row);
-      row.isEdit = true;
-      this.editingRow = JSON.parse(JSON.stringify(row));
+    console.log(row);
+    row.isEdit = true;
+    this.editingRow = JSON.parse(JSON.stringify(row));
     },
     // 初始化数据
     initData(nval) {
-      // this.form = JSON.parse(JSON.stringify(nval?.resultMap));
-      Object.assign(this.form, nval?.resultMap);
-      console.log(this.form);
-      this.form.personnelList?.forEach((element) => {
+    // this.form = JSON.parse(JSON.stringify(nval?.resultMap));
+    Object.assign(this.form, nval?.resultMap);
+    this.form.personnelList.forEach((element) => {
         element.isEdit = false;
-      });
-      this.oldTableData = JSON.parse(
-        JSON.stringify(this.form.personnelList || [])
-      );
-      this.checked = this.form.task1 == "true" ? true : false;
-      // this.$set(this.form, 'card', nval?.resultMap.qualityControlCard);
-      this.$set(this.form, "state", nval?.resultMap.taskNnodeOtherState);
+    });
+    this.oldTableData = JSON.parse(JSON.stringify(this.form.personnelList));
+    this.checked = this.form.task1 == "true" ? true : false;
+    // this.$set(this.form, 'card', nval?.resultMap.qualityControlCard);
+    this.$set(this.form, "state", nval?.resultMap.taskNnodeOtherState);
     },
     // 更新表格数据
     updataTableData(nval) {
-      nval?.resultMap.personnelList.forEach((element) => {
+    nval?.resultMap.personnelList.forEach((element) => {
         element.isEdit = false;
-      });
-      this.oldTableData = JSON.parse(
+    });
+    this.oldTableData = JSON.parse(
         JSON.stringify(nval?.resultMap.personnelList)
-      );
+    );
     },
-  },
+},
 };
 </script>
 
 <style lang="scss" scoped>
 .app-container {
-  ::v-deep .el-checkbox {
+::v-deep .el-checkbox {
     /* font-size: 8px; */
     color: white;
-  }
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  .leftMessage {
+}
+display: flex;
+flex-direction: row;
+justify-content: space-between;
+.leftMessage {
     display: flex;
     flex-direction: column;
     width: 145px;
     .list {
-      padding: 10px 0px;
-      span {
+    padding: 10px 0px;
+    span {
         border-radius: 10px;
         padding: 5px;
         margin-right: 10px;
-      }
-      .title {
+    }
+    .title {
         background-color: rgb(52, 191, 163);
         color: white;
-      }
-      .content {
+    }
+    .content {
         background: rgb(235, 237, 242);
         color: rgb(232, 83, 152);
-      }
     }
-  }
-  .rightMessage {
+    }
+}
+.rightMessage {
     display: flex;
     width: 500px;
     flex-direction: column;
     .top {
-      background: #53b0f8;
-      color: white;
-      height: 60px;
-      .state {
+    background: #53b0f8;
+    color: white;
+    height: 60px;
+    .state {
         display: flex;
         flex-direction: row;
         padding: 10px 20px;
         .list:first-child {
-          padding-right: 180px;
+        padding-right: 180px;
         }
         /* p {
         padding-top: 5px;
         font-size: 10px;
         } */
-      }
+    }
     }
     .button {
-      width: 100%;
-      padding: 20px 0px;
-      .el-button {
+    width: 100%;
+    padding: 20px 0px;
+    .el-button {
         width: 140px;
         /* background: none; */
-      }
-      .el-button--info {
+    }
+    .el-button--info {
         width: 80px;
-      }
+    }
     }
     .middle {
-      .name {
+    .name {
         color: black;
         font-weight: bold;
         text-align: center;
         padding: 10px 0px;
-      }
-      .block {
+    }
+    .block {
         text-align: center;
-      }
-      .total {
+    }
+    .total {
         display: inline-block;
         flex-direction: row;
         margin-top: 10px;
         span {
-          font-weight: bold;
-          color: black;
+        font-weight: bold;
+        color: black;
         }
-      }
     }
-  }
+    }
+}
 }
 </style>

zkqy-ui/src/views/bussiness/dialogCompments/Mec/ProductionProcesses.vue

@@ -19,8 +19,6 @@
           </span>
         </template>
       </div>
-      <div></div>
-      <div class="content"></div>
     </div>
     <div class="rightMessage">
       <div class="top">

zkqy-ui/src/views/bussiness/dialogCompments/Mec/RecordQuality.vue

@@ -9,7 +9,7 @@
         <div class="list" v-for="(item, index) in message" :key="index">
           <div class="list-card">
             <p>{{ item.title }}</p>
-            <p class="content">{{ form.master_task[item.prop] }}</p>
+            <p class="content">{{ form.masterTask[item.prop] }}</p>
           </div>
         </div>
       </div>
@@ -23,7 +23,7 @@
         <div class="list" v-for="(item, index) in message" :key="index">
           <div class="list-card">
             <p>{{ item.title }}</p>
-            <p class="content">{{ form.master_task[item.prop] }}</p>
+            <p class="content">{{ form.masterTask[item.prop] }}</p>
           </div>
         </div>
       </div>

zkqy-ui/src/views/bussiness/progressShow.vue

@@ -121,7 +121,7 @@ export default {
       res = dataList.map((item) => {
         let baseObj = {
           benTaskProcessKey: item.taskKey, //任务编号
-          bepTaskName: item.taskName, //任务名称
+          bepTaskName: item.taskPlanName, //任务名称
           benCreateTime: item.nodeLogList[0].taskNodeType
             ? item.nodeLogList[0].createTime
             : "", //开始或结束时间  需要根据bepTaskProcessState状态 来判定