Browse Source

fix:管道节点管理回显异常处理

lph 1 year ago
parent
commit
b874f44998

+ 32 - 17
zkqy-ui/src/views/bpmprocess/scriptManage.vue

@@ -180,22 +180,34 @@
         class-name="small-padding fixed-width"
         class-name="small-padding fixed-width"
       >
       >
         <template slot-scope="scope">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:script:edit']"
-            >修改</el-button
-          >
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:script:remove']"
-            >删除</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="handleUpdate(scope.row)"
+                  v-hasPermi="['system:script:edit']"
+                  >修改</el-button
+                >
+              </el-dropdown-item>
+
+              <el-dropdown-item>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:script:remove']"
+                  >删除</el-button
+                >
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
@@ -522,7 +534,10 @@ export default {
       const id = row.id || this.ids;
       const id = row.id || this.ids;
       getScript(id).then((response) => {
       getScript(id).then((response) => {
         response.data.scriptType = response.data.scriptType.toString();
         response.data.scriptType = response.data.scriptType.toString();
-        response.data.tableName = response.data.tableName?.split(",");
+        response.data.tableName = response.data.tableName
+          ? response.data.tableName.split(",")
+          : [];
+        console.log(response.data.tableName);
         this.form = response.data;
         this.form = response.data;
         this.open = true;
         this.open = true;
         this.title = "修改流程节点脚本";
         this.title = "修改流程节点脚本";

+ 153 - 0
zkqy-ui/src/views/bussiness/dialogCompments/Mec/RecordSplitData.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="app-containeteamIdr">
+    <el-form
+      :model="form"
+      ref="form"
+      label-position="top"
+      label-width="100px"
+      align="left"
+      :inline="false"
+      size="normal"
+    >
+      <el-col :span="12">
+        <span>质控卡号</span>
+      </el-col>
+      <el-col :span="12">
+        <span>数量</span>
+      </el-col>
+      <el-col :span="12">
+        <span>ZL</span>
+      </el-col>
+      <el-col :span="12">
+        <span>1</span>
+      </el-col>
+      <el-form-item label="备注:" prop="remark">
+        <el-input v-model="form.remark"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="small"
+          @click="submitHandler"
+          icon="el-icon-success"
+          >记录</el-button
+        >
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+  name: "RecordSplitData",
+  props: ["formData", "row"],
+  data() {
+    return {
+      isEdit: false,
+      form: {
+        remark: "",
+      },
+    };
+  },
+  computed: {
+    myFormData() {
+      return this.formData;
+    },
+  },
+  watch: {
+    myFormData: {
+      handler(nval) {
+        this.form = nval.resultMap;
+        // this.form.hp = this.form.goodId
+        console.log(this.form);
+        // this.isEdit = this.form.id ? true : false;
+        this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted() {},
+  methods: {
+    async submitHandler() {
+      console.log(this.row);
+      let res = await this.$refs.form?.validate();
+      if (res) {
+        let payLoad = {};
+        let { remark } = this.form;
+        if (this.isEdit) {
+          let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+          payLoad.updateCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "material_matching",
+              },
+              conditionMap: {
+                task_process_key: taskProcessKey,
+                task_node_key: taskNodeKey,
+              },
+              commMap: {
+                task_id: this.row.bepTaskPlanKey,
+                remark: remark,
+              },
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "material_matching",
+              },
+              addListMap: [
+                {
+                  task_id: this.row.bepTaskPlanKey,
+                  remark: remark,
+                  taskProcessKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
+                },
+              ],
+            },
+          ];
+        }
+        submitNodeForm(payLoad).then((response) => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("保存成功");
+          } else {
+            this.$modal.error("保存失败,请稍后再试");
+          }
+        });
+      }
+    },
+    async getFormData() {
+      let formData = {
+        flag: false,
+        msg: "",
+      };
+      try {
+        let valid = await this.$refs.form.validate();
+        if (valid) {
+          formData.flag = true;
+          formData.data = this.form;
+          return formData;
+        } else {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      } catch (error) {
+        // console.log(error);
+        formData.msg = "表单校验异常,请规范填写表单数据";
+        return formData;
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-button {
+  background: rgb(123, 213, 195);
+  border: rgb(123, 213, 195);
+  float: right;
+}
+</style>

+ 5 - 15
zkqy-ui/src/views/bussiness/processMange.vue

@@ -190,26 +190,14 @@
             @addList="() => {}"
             @addList="() => {}"
           ></DialogTemplate> -->
           ></DialogTemplate> -->
           <!-- ></DialogTemplate> -->
           <!-- ></DialogTemplate> -->
-          <component
+          <!-- <component
             :is="myForm"
             :is="myForm"
             :formData="formData"
             :formData="formData"
             :row="row"
             :row="row"
             ref="myFormRef"
             ref="myFormRef"
             v-if="myForm"
             v-if="myForm"
-          ></component>
-          <!-- <AssignEmployees :formData="formData"
-          :row="row"></AssignEmployees> -->
-          <!-- <NodeShow ref="myFormRef" :formData="formData" :row="row"></NodeShow>
-          -->
-
-          <!-- <SC01 :formData="formData"
-          :row="row"></SC01> -->
-
-          <!-- <AssignEmployees></AssignEmployees> -->
-
-          <!-- <CG1 ref="myFormRef"></CG1>
-          <KC1 ref="myFormRef"></KC1> -->
-          <!-- <GY06 ref="myFormRef" :formData="formData" :row="row"></GY06> -->
+          ></component> -->
+          <RecordSplitData />
           <span slot="footer" class="dialog-footer">
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
             <el-button @click="closeExecuteNode">取消</el-button>
             <el-button type="primary" @click="executeNode">运行</el-button>
             <el-button type="primary" @click="executeNode">运行</el-button>
@@ -254,6 +242,7 @@ import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
 import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
 import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
+import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
 
 
 export default {
 export default {
   name: "processMange",
   name: "processMange",
@@ -278,6 +267,7 @@ export default {
     RecordQuality,
     RecordQuality,
     ProductionProcesses,
     ProductionProcesses,
     PersonalDistribution,
     PersonalDistribution,
+    RecordSplitData,
   },
   },
   dicts: ["bpm_type", "task_process_state"],
   dicts: ["bpm_type", "task_process_state"],
   data() {
   data() {