工艺弹窗相关接口处理及交互

zkqy-ui/src/api/bpmprocess/runDialogApi/index.js

@@ -16,7 +16,7 @@ export function submitNodeForm(data) {
 export function changeNodeState(data) {
   return request({
     url: '/system/execute/node',
-    method: 'post',
+    method: 'put',
     data: data,
     baseURL: process.env.VUE_APP_BASE_API4
   })

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

@@ -0,0 +1,616 @@
+<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="year"
+              size="normal"
+              placeholder="选择日期时间"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="medium"
+              @click="onSubmit"
+              icon="el-icon-search"
+              >搜索</el-button
+            >
+            <el-button size="medium" icon="el-icon-refresh">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="show-body">
+        <!--    流程任务列表    -->
+        <el-table :data="tableData" border stripe>
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column type="index" width="50" align="center" />
+          <el-table-column
+            v-for="col in columns"
+            :prop="col.prop"
+            :key="col.prop"
+            :label="col.label"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <span v-if="col.prop == 'benCreateTime'">{{
+                scope.row.benCreateTime.replace("T", " ")
+              }}</span>
+              <span v-else-if="col.prop == 'bepTaskProcessType'">{{
+                getDictLabel(scope.row.bepTaskProcessType, dict.type.bpm_type)
+              }}</span>
+              <span v-else-if="col.prop == 'benTaskNodeState'">{{
+                scope.row.benTaskNodeState == "0" ? "未执行" : "已执行"
+              }}</span>
+              <span v-else-if="col.prop == 'bepTaskProcessState'">{{
+                getDictLabel(
+                  scope.row.bepTaskProcessState,
+                  dict.type.task_process_state
+                )
+              }}</span>
+              <span v-else>{{ scope.row[col.prop] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scope">
+              <div class="excute-wrap">
+                <el-button
+                  type="warning"
+                  plain
+                  size="small"
+                  class="mr10 mb5"
+                  v-show="scope.row.bepTaskProcessState == '0'"
+                  @click="opneExecuteNode(scope.row)"
+                >
+                  运行
+                </el-button>
+                <el-dropdown>
+                  <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="excuteHandler(scope.row)"
+                        v-hasPermi="['system:user:edit']"
+                      >处理
+                      </el-button>
+                    </el-dropdown-item> -->
+                    <el-dropdown-item>
+                      <el-dropdown size="mini">
+                        <el-button
+                          size="mini"
+                          type="text"
+                          icon="el-icon-d-arrow-right"
+                          >触发异常
+                        </el-button>
+                        <el-dropdown-menu slot="dropdown">
+                          <el-dropdown-item
+                            v-for="item in scope.row.exceptionScriptList"
+                            :key="item.id"
+                          >
+                            <el-button
+                              @click="exceptionTrigger(scope.row, item)"
+                              size="mini"
+                              type="text"
+                              >{{ item.scriptName }}
+                            </el-button>
+                          </el-dropdown-item>
+                        </el-dropdown-menu>
+                      </el-dropdown>
+                    </el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown>
+              </div>
+            </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 GY02 from "./dialogCompments/GongYi/GY02.vue";
+import ZL01 from "./dialogCompments/ZhiLiang/ZL1.vue";
+import { getForm } from "@/api/dragform/form";
+import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
+
+// 弹窗表单组件
+import GY01 from "./dialogCompments/GongYi/GY01.vue";
+import GY03 from "./dialogCompments/GongYi/GY03.vue";
+import CG1 from "./dialogCompments/test-component/CaiGou/CG1.vue";
+import CG02 from "./dialogCompments/test-component/CaiGou/CG02.vue";
+import KC01 from "./dialogCompments/test-component/KuCun/KC1.vue";
+import KC02 from "./dialogCompments/test-component/KuCun/KC02.vue";
+import GY06 from "./dialogCompments/GongYi/GY06.vue";
+import KB01 from "./dialogCompments/KongBai/KB01.vue"; //空白提示组件
+import SC01 from "./dialogCompments/ShengChan/SC01.vue";
+
+//Mec组件
+import AssignEmployees from "./dialogCompments/Mec/AssignEmployees.vue";
+import Notes from "./dialogCompments/Mec/Notes.vue";
+import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
+import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
+import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
+
+export default {
+  name: "processMange",
+  props: [],
+  components: {
+    GY01,
+    DialogTemplate,
+    CG1,
+    CG02,
+    KC01,
+    GY06,
+    GY03,
+    KC02,
+    GY02,
+    KB01,
+    SC01,
+    ZL01,
+    NodeShow,
+    AssignEmployees,
+    Notes,
+    RecordQuality,
+    ProductionProcesses,
+  },
+  dicts: ["bpm_type", "task_process_state"],
+  data() {
+    return {
+      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() {
+    this.getList();
+  },
+  methods: {
+    // 获取列表数据
+    getList() {
+      processList(this.queryParams).then((res) => {
+        if (res.code == 200) {
+          this.tableData = res.rows.map((item) => item.resultMap);
+          this.total = res.total;
+          console.log(this.tableData);
+        } else {
+          this.$message.error("网络异常,请稍后再试");
+        }
+      });
+    },
+    // 获取表单数据
+    async getFormData() {
+      let formData = {};
+      // switch (this.formType) {
+      //   case "dragForm":
+      //     try {
+      //       formData = await this.$refs.addFromRef.getData();
+      //     } catch (error) {
+      //       console.log(error);
+      //       this.$message.error("表单校验异常,请稍后重试");
+      //       return {};
+      //     }
+      //     break;
+      //   case "designForm":
+      //     let temp = await this.$refs.myFormRef.getFormData();
+      //     if (!temp.flag) {
+      //       this.$message.error(temp.msg);
+      //       return {};
+      //     } else {
+      //       formData = temp.data;
+      //     }
+      //     break;
+      //   default:
+      //     break;
+      // }
+      let temp = await this.$refs.myFormRef?.getFormData();
+      if (!temp?.flag) {
+        this.$message.error(temp.msg);
+        return false;
+      } else {
+        formData = temp.data;
+      }
+      return formData;
+    },
+    // 重置弹窗数据
+    resetDialogForm() {
+      this.formType = ""; //表单类型 dragForm:拖拽表单 composeForm:工艺组合表单   designForm:定制表单
+      // k-form-build 数据
+      this.dynamicData = {};
+      this.defaultValue = {};
+      this.jsonData = {};
+    },
+    // 打开运行节点弹窗
+    async opneExecuteNode(row) {
+      this.resetDialogForm();
+      console.log(row);
+      this.nodeTitle = row.benTaskNodeName;
+      // let preFix = row.benTaskNodeName.split("-")[0];
+      let preFix = row.benTaskNodeFormKey;
+      let {
+        benTaskNodeFormKey,
+        benTaskNodeFormType,
+        bepTaskPlanKey,
+        bepTaskKey,
+        bepTaskNodeKey,
+        benTaskProcessKey,
+        benmTaskAutomaticScriptTriggerType,
+        bepTaskNodeNextKey,
+      } = row;
+      // 新的运行逻辑
+      let payLoad = {
+        taskNodeKey: bepTaskNodeNextKey,
+        taskProcessKey: benTaskProcessKey,
+        taskAutomaticScriptTriggerType: benmTaskAutomaticScriptTriggerType,
+        taskPlanKey: bepTaskPlanKey,
+      };
+
+      // let formData = await getProcessNodeFormTemplate(payLoad);
+      // console.log(formData);
+      // if (benTaskNodeFormKey) {
+      //   if (benTaskNodeFormType == "dragForm") {
+      //     let templateInfo = formData.data[0]?.template;
+      //     //拖拽表单
+      //     this.formType = "dragForm";
+      //     this.jsonData = JSON.parse(templateInfo.dfVueTemplate);
+      //     this.tableName = templateInfo.dfTableName;
+      //     if (Object.keys(JSON.parse(templateInfo.dfFormSql)).length) {
+      //       this.dynamicData = JSON.parse(templateInfo.dfFormSql);
+      //     }
+      //     // await this.getDragFormInfo(benTaskNodeFormKey);
+      //   } else if (benTaskNodeFormType == "composeForm") {
+      //     //工艺组合表单
+      //     this.formType = "composeForm";
+      //     this.groupKey = benTaskNodeFormKey;
+      //     let queryPayload = {
+      //       row,
+      //       groupKey: benTaskNodeFormKey,
+      //     };
+      //     this.$nextTick(() => {
+      //       this.$refs.dialogRef.getLists(queryPayload);
+      //     });
+      //   }
+      // } else if (preFix) {
+      //   //定制表单
+      //   this.formType = "designForm";
+      //   this.myForm = preFix;
+      // }
+      //定制表单
+      this.formType = "designForm";
+      this.myForm = preFix;
+      let res = await getProcessNodeFormInfoData(payLoad);
+      if (res.code == 200) {
+        this.formData = res.data;
+      } else {
+        this.$message.error("网络异常,请稍后再试");
+      }
+
+      this.row = row; //记录当前行数据
+      // if (!this.formType) return; //没有表单,直接掉运行逻辑
+      this.open = true; // 打开弹窗
+      this.$nextTick(() => {
+        this.$refs.myFormRef?.resetForm();
+      });
+      // 根据当前节点绑定的表单信息查询对应的表单进行展示
+    },
+    // 运行节点按钮 确认运行回调
+    async executeNode() {
+      let { benTaskNodeKey, bepTaskProcessXmlContent, implementationName } =
+        this.row;
+      let { nodeId, nextNodeId } = this.getNextNodeKey(
+        benTaskNodeKey,
+        bepTaskProcessXmlContent
+      );
+      // 只有完成状态的可以运行
+      if (this.formType == "composeForm") {
+        let res = this.$refs.dialogRef.getComposeFormData();
+        if (!res.isSuccess) {
+          this.$message.warning("非完成状态节点不能运行!");
+          return;
+        }
+      }
+      // return;
+      let formData = await this.getFormData();
+      if (!formData) return;
+      formData.taskPlanKey = this.row.bepTaskPlanKey;
+      let payLoad = {
+        taskProcessKey: this.row.bepTaskKey, //当前任务流程编码
+        taskNodeKey: nodeId, //当前执行节点唯一编码
+        nextNodeKey: nextNodeId, //下一节点编码
+        implementationName: this.row.benmTaskAutomaticScriptTriggerType, //当前节点绑定的脚本名
+        // taskProcessXmlContent: this.row.bepTaskProcessXmlContent, //当前流程xml
+        tableName: this.tableName,
+        formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
+        taskNodeType: this.backExceptionTaskList.includes(
+          this.row.benTaskNodeFormKey
+        )
+          ? "backExceptionTask"
+          : this.row.benTaskNodeType,
+      };
+      let fileXML = new File(
+        [this.row.bepTaskProcessXmlContent],
+        this.row.bepTaskKey + ".bpmn",
+        {
+          type: "text/bpmn",
+        }
+      );
+      const subformData = new FormData();
+      subformData.append("fileXML", fileXML);
+      for (let key in payLoad) {
+        subformData.append(key, payLoad[key] == null ? "" : payLoad[key]);
+      }
+      runProcessNodeExecution(subformData).then((res) => {
+        if (res.code == 200) {
+          this.$message.success("运行成功!");
+          this.getList();
+          this.open = false;
+        }
+      });
+    },
+    // 获取拖拽表单数据
+    async getDragFormInfo(fid) {
+      try {
+        let res = await getForm(fid);
+        console.log(res);
+        if (res.code == 200) {
+          this.jsonData = JSON.parse(res.data.dfVueTemplate);
+          this.tableName = res.data.dfTableName;
+          if (res.data.dfFormSql) {
+            this.dynamicData = JSON.parse(res.data.dfFormSql);
+            console.log(this.dynamicData);
+          }
+        } else {
+          console.log(res);
+          throw new Error(res);
+        }
+      } catch (error) {
+        console.log(error);
+        this.$message.error("网络异常,请稍后再试");
+      }
+    },
+    // 关闭运行节点弹窗
+    closeExecuteNode(row) {
+      this.open = false;
+    },
+    // 获取下一个节点的nodekey
+    getNextNodeKey(nodeKey, xmlStr) {
+      let xmlObj = this.xmlStr2XmlObj(xmlStr);
+      let nodeSequence = getNodeSequence(xmlObj);
+      return nodeSequence.find((item) => item.nodeId == nodeKey) || {};
+    },
+    // xml字符串转xml对象
+    xmlStr2XmlObj(xmlStr) {
+      var xmlObj = {};
+      if (document.all) {
+        var xmlDom = new ActiveXObject("Microsoft.XMLDOM");
+        xmlDom.loadXML(xmlStr);
+        xmlObj = xmlDom;
+      } else {
+        xmlObj = new DOMParser().parseFromString(xmlStr, "text/xml");
+      }
+      return xmlObj;
+    },
+    // 触发异常回调
+    exceptionTrigger(row, scriptData) {
+      let _this = this;
+      this.$modal
+        .confirm("是否确认触发<" + scriptData.scriptName + ">异常？")
+        .then(function (val) {
+          console.log(val);
+          // 发送触发异常节点的请求
+          let payLoad = {
+            taskProcessKey: row.bepTaskKey,
+            taskNodeKey: row.benTaskNodeKey,
+            sysBpmNodeScriptVO: scriptData,
+          };
+          triggerExceptionNode(payLoad).then((res) => {
+            console.log(res);
+            if (res.code == 200) {
+              _this.$message.success("触发成功");
+              _this.open = false;
+              _this.getList();
+            } else {
+              _this.$message.error("触发失败请稍后再试");
+            }
+          });
+        })
+        .catch(() => {
+          _this.open = false;
+          _this.$message.info("取消成功");
+        });
+    },
+    // 获取字典对应label
+    getDictLabel(value, dictLsit = []) {
+      return dictLsit.find((item) => {
+        return item.value == value;
+      })?.label;
+    },
+  },
+};
+</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/dialogCompments/Mec/ProductionProcesses.vue

@@ -2,17 +2,10 @@
   <div class="app-container">
     <div class="leftMessage">
       <div class="list" v-for="(item, index) in baseMessage" :key="index">
-        <span
-          class="titile"
-          style="background: rgb(52, 191, 163); color: white"
-        >
+        <span class="title">
           {{ item.title }}
         </span>
-        <span
-          v-if="item.prop == 'taskNo'"
-          class="content"
-          style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-        >
+        <span v-if="item.prop == 'taskNo'" class="content">
           {{ form.master_task[item.prop] }}
         </span>
         <span
@@ -51,9 +44,7 @@
           {{ form.record_quality_control_card[item.prop] }}
         </span>
       </div>
-      <div>
-        
-      </div>
+      <div></div>
       <div class="content"></div>
     </div>
     <div class="rightMessage">
@@ -61,47 +52,167 @@
         <div class="state">
           <div class="list">
             <span>工序状态：</span>
-            <p id="state">{{form.state? stateObj[form.state] : '初始'}}</p>
+            <p id="state">
+              {{
+                form.taskNodeOtherState
+                  ? stateObj[form.taskNodeOtherState]
+                  : "初始"
+              }}
+            </p>
           </div>
           <div class="list">
             <span>是否外协：</span>
-            <p><el-checkbox @change="(val)=>{updateHandler(form.state,val)}" v-model="checked"></el-checkbox></p>
+            <p>
+              <el-checkbox
+                @change="
+                  (val) => {
+                    updateHandler(form.taskNodeOtherState, val);
+                  }
+                "
+                v-model="checked"
+              ></el-checkbox>
+            </p>
           </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
+            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
+            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
+            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
+            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
+                    >
+                  </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-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.name"></el-input>
+              <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.time"
+                v-model="scope.row.allottedTime"
                 controls-position="right"
                 @change="handleChange"
-                :min="0.25"
-                :max="8"
+                :min="0"
                 :step="0.25"
+                size="small"
               ></el-input-number>
             </template>
           </el-table-column>
@@ -110,7 +221,7 @@
               <el-button
                 icon="el-icon-delete"
                 size="mini"
-                @click="deleteTableRow(scope.row)"
+                @click="deleteTableRow(scope.$index)"
                 >删除</el-button
               >
             </template>
@@ -131,7 +242,7 @@
           size="mini"
           icon="el-icon-check"
           type="success"
-          @click="saveTableRow(newRow)"
+          @click="saveTableRow"
           >保 存</el-button
         >
         <div class="total">
@@ -139,12 +250,16 @@
           <span>当前已分配工时： 10</span>
           <span>当前剩余工时： 10</span>
         </div>
-      </div>     
+      </div>
     </div>
   </div>
 </template>
 <script>
-import { submitNodeForm,changeNodeState } from "@/api/bpmprocess/runDialogApi/index";
+import {
+  submitNodeForm,
+  changeNodeState,
+} from "@/api/bpmprocess/runDialogApi/index";
+import { getProcessNodeFormInfoData } from "@/api/bpmprocess/run/executeProcess";
 export default {
   name: "ProductionProcesses",
   props: ["formData", "row"],
@@ -152,8 +267,19 @@ export default {
     return {
       checked: true,
       isEdit: false,
-      form:{},
+      form: {
+        taskNodeOtherState: "0",
+      },
       tableData: [],
+      editingRow: {},
+      oldTableData: [
+        {
+          id: 1,
+          personnelName: "芝麻林",
+          allottedTime: 1,
+          isEdit: false,
+        },
+      ],
       newRow: {},
 
       baseMessage: [
@@ -164,12 +290,12 @@ export default {
         { title: "工艺", prop: "craftRoute" },
         { title: "质控", prop: "qualityControlCard" },
       ],
-      stateObj:{
-        '0':'初始',
-        '1':'开始',
-        '2':'暂停',
-        '3':'完成',
-      }
+      stateObj: {
+        0: "初始",
+        1: "开始",
+        2: "暂停",
+        3: "完成",
+      },
     };
   },
   computed: {
@@ -180,40 +306,35 @@ export default {
   watch: {
     myFormData: {
       handler(nval) {
-        if(!nval) return
-        this.form = JSON.parse(JSON.stringify(nval?.resultMap));
-        // this.$set(this.form, 'card', nval?.resultMap.qualityControlCard);
-        this.$set(this.form, 'state', nval?.resultMap.taskNnodeOtherState);
-        this.isEdit = this.form.taskKey && this.form.taskNodeKey;
+        if (!nval) return;
+        this.initData(nval);
       },
       deep: true,
       immediate: true,
     },
   },
   methods: {
-    async updateHandler(state,flag){
-      flag=flag ? 'true' : 'false'
-      let payLoad={
-        conditionMap: 
-                {
-                  taskProcessKey: this.row.benTaskProcessKey,
-                  taskNodeKey: this.row.benTaskNodeKey,
-                },
-          commMap: {
-                taskNodeOtherState: state,
-                task1:flag
-              },
-      }
-      
-      changeNodeState(payLoad).then((response) => {
-          if (response.code == 200) {
-            this.$modal.msgSuccess("修改成功");
-            this.form.state=state;
+    async updateHandler(state, flag) {
+      flag = flag ? "true" : "false";
+      let payLoad = {
+        // conditionMap: {
+        taskProcessKey: this.row.benTaskProcessKey,
+        taskNodeKey: this.row.benTaskNodeKey,
+        // },
+        // commMap: {
+        taskNodeOtherState: state,
+        task1: flag,
+        // },
+      };
 
-          } else {
-            this.$modal.error("修改失败,请稍后再试");
-          }
-        });
+      changeNodeState(payLoad).then((response) => {
+        if (response.code == 200) {
+          this.$modal.msgSuccess("修改成功");
+          this.form.taskNodeOtherState = state;
+        } else {
+          this.$modal.error("修改失败,请稍后再试");
+        }
+      });
     },
     async submitHandler() {
       console.log(this.row);
@@ -234,7 +355,7 @@ export default {
                 task_node_key: taskNodeKey,
               },
               commMap: {
-                task_node_other_state: state
+                task_node_other_state: state,
               },
             },
           ];
@@ -265,9 +386,9 @@ export default {
     },
     async getFormData() {
       return {
-        flag:true,
-        data:{}
-      }
+        flag: true,
+        data: {},
+      };
 
       let formData = {
         flag: false,
@@ -291,34 +412,173 @@ export default {
     },
     addTableRow() {
       const newRow = {
-        name: "",
-        time: 0.25,
+        personnelName: "",
+        allottedTime: 0,
       };
       this.tableData.push(newRow);
     },
-    deleteTableRow(row) {
-      const index = this.tableData.indexOf(row);
+    deleteTableRow(index) {
       if (index !== -1) {
         this.tableData.splice(index, 1);
       }
     },
-    saveTableRow(tableData) {
-      let item = "";
-      for (let i = 0; i < this.tableData.length; i++) {
-        item += tableData[i];
+    // 批量保存表格数据回调
+    async saveTableRow() {
+      console.log(this.tableData);
+      let payLoad = {};
+      payLoad.insertCommonEntityList = [
+        {
+          basicMap: {
+            tableName: "process_get_materials_personnel",
+          },
+          addListMap: [
+            // {
+            //   task_node_other_state: state,
+            //   taskKey: this.row.benTaskProcessKey,
+            //   taskNodeKey: this.row.benTaskNodeKey,
+            // },
+          ],
+        },
+      ];
+      payLoad.insertCommonEntityList[0].addListMap = this.tableData.map(
+        (item) => {
+          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.$message.success("保存成功");
+        this.tableData = [];
+        this.refreshData(this.row);
+      } else {
+        this.$message.warning("网络异常,请稍后再试");
+      }
+    },
+    // 刷新弹窗数据
+    async refreshData(row) {
+      let {
+        benTaskNodeFormKey,
+        benTaskNodeFormType,
+        bepTaskPlanKey,
+        bepTaskKey,
+        bepTaskNodeKey,
+        benTaskProcessKey,
+        benmTaskAutomaticScriptTriggerType,
+        bepTaskNodeNextKey,
+      } = row;
+      let payLoad = {
+        taskNodeKey: bepTaskNodeNextKey,
+        taskProcessKey: benTaskProcessKey,
+        taskAutomaticScriptTriggerType: benmTaskAutomaticScriptTriggerType,
+        taskPlanKey: bepTaskPlanKey,
+      };
+      let res = await getProcessNodeFormInfoData(payLoad);
+      if (res.code == 200) {
+        this.updataTableData(res.data);
+      } else {
+        this.$message.error("网络异常,请稍后再试");
       }
-      this.tableData = [];
+    },
+    // 修改某一条数据
+    async saveOne() {
+      console.log(this.editingRow);
+      let payLoad = {};
+      let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+      let { id, personnelName, allottedTime } = this.editingRow;
+      payLoad.updateCommonEntityList = [
+        {
+          basicMap: {
+            tableName: "process_get_materials_personnel",
+          },
+          conditionMap: {
+            taskProcessKey: this.row.benTaskProcessKey,
+            taskNodeKey: this.row.benTaskNodeKey,
+            id,
+          },
+          commMap: {
+            personnelName,
+            allottedTime,
+          },
+        },
+      ];
+      let res = await submitNodeForm(payLoad);
+      if (res.code == 200) {
+        this.$message.success("保存成功");
+        this.refreshData(this.row);
+      } else {
+        this.$message.warning("网络异常,请稍后再试");
+      }
+    },
+    // 删除一条数据
+    async deleteOne(row) {
+      let payLoad = {};
+      let { id } = row;
+      payLoad.deleteCommonEntityList = [
+        {
+          basicMap: {
+            tableName: "process_get_materials_personnel",
+          },
+          conditionMap: {
+            // taskProcessKey: this.row.benTaskProcessKey,
+            // taskNodeKey: this.row.benTaskNodeKey,
+            id: [id],
+          },
+        },
+      ];
+      let res = await submitNodeForm(payLoad);
+      if (res.code == 200) {
+        this.$message.success("删除成功");
+        this.refreshData(this.row);
+      } else {
+        this.$message.warning("网络异常,请稍后再试");
+      }
+    },
+    // 取消修改回调
+    cancelHandler(row) {
+      row.isEdit = false;
     },
     handleChange(value) {
       console.log(value);
     },
+    changeHandler(row) {
+      console.log(row);
+      row.isEdit = true;
+      this.editingRow = JSON.parse(JSON.stringify(row));
+    },
+    // 初始化数据
+    initData(nval) {
+      this.form = JSON.parse(JSON.stringify(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);
+    },
+    // 更新表格数据
+    updataTableData(nval) {
+      nval?.resultMap.personnelList.forEach((element) => {
+        element.isEdit = false;
+      });
+      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;
   }
@@ -336,6 +596,14 @@ export default {
         padding: 5px;
         margin-right: 10px;
       }
+      .title {
+        background-color: rgb(52, 191, 163);
+        color: white;
+      }
+      .content {
+        background: rgb(235, 237, 242);
+        color: rgb(232, 83, 152);
+      }
     }
   }
   .rightMessage {
@@ -381,16 +649,15 @@ export default {
         text-align: center;
       }
       .total {
-      display: inline-block;
-      flex-direction: row;
-      margin-top: 10px;
-      span {
-        font-weight: bold;
-        color: black;
+        display: inline-block;
+        flex-direction: row;
+        margin-top: 10px;
+        span {
+          font-weight: bold;
+          color: black;
+        }
       }
     }
-    }
-    
   }
 }
 </style>