Przeglądaj źródła

添加拣货和上丝节点弹窗

lph 1 rok temu
rodzic
commit
4ecf47f7be

+ 209 - 0
zkqy-ui/src/views/bussiness/dialogCompments/GongYi/Sorting.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="app-containeteamIdr">
+    <el-row gutter="10">
+      <el-form
+        :model="form"
+        ref="form"
+        label-width="100px"
+        align="left"
+        :inline="false"
+        size="normal"
+      >
+        <el-col :span="12">
+          <el-form-item label="机台号:" prop="productionLineNo">
+            {{ form.productionLineNo }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="任务:" prop="taskName">
+            {{ form.taskName }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产品名:" prop="productName">
+            {{ form.productName }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="规格:" prop="productSpecifications">
+            {{ form.productSpecifications }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="类型:" prop="productType">
+            {{ form.productType }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="数量:" prop="productNumber">
+            {{ form.productNumber }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="18">
+          <el-form-item label="备注:" prop="remark">
+            <el-input
+              v-model="form.remark"
+              placeholder=""
+              size="normal"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              @click="submitHandler"
+              icon="el-icon-success"
+              >记录</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+  name: "Sorting",
+  props: ["formData", "row"],
+  data() {
+    return {
+      isEdit: false,
+      id: "",
+      form: {
+        remark: "",
+        productionLineNo: "", //机台号
+        taskName: "", //任务
+        productName: "", //产品名称
+        productSpecifications: "", //规格
+        productType: "", //类型
+        productNumber: "", //数量
+      },
+    };
+  },
+  computed: {
+    myFormData() {
+      return this.formData;
+    },
+  },
+  watch: {
+    myFormData: {
+      handler(nval) {
+        console.log("nval", nval);
+        console.log("row", this.row);
+        let { products, saleProducts, productAddAmmunition } = nval.resultMap;
+        if (products && saleProducts) {
+          let { production_line_no, task_name, product_number } =
+            saleProducts.resultMap;
+          let { product_name, product_specifications, product_type } =
+            products.resultMap;
+          this.form = {
+            remark: "",
+            productionLineNo: production_line_no, //机台号
+            taskName: task_name, //任务
+            productName: product_name, //产品名称
+            productSpecifications: product_specifications, //规格
+            productType: product_type, //类型
+            productNumber: product_number, //数量
+          };
+        }
+        this.isEdit = productAddAmmunition.resultMap.id ? true : false;
+        if (this.isEdit) {
+          this.form.remark = productAddAmmunition.resultMap.remark;
+          this.id = productAddAmmunition.resultMap.id;
+        }
+      },
+      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: "sale_product_add_ammunition",
+              },
+              conditionMap: {
+                // task_process_key: taskProcessKey,
+                // task_node_key: taskNodeKey,
+                id: this.id,
+              },
+              commMap: {
+                sale_product_id: this.row.bepTaskPlanKey,
+                add_ammunition_type: 1, //拣货1
+                remark: remark,
+              },
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "sale_product_add_ammunition",
+              },
+              addListMap: [
+                {
+                  sale_product_id: this.row.bepTaskPlanKey,
+                  add_ammunition_type: 1, //拣货1
+                  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>

+ 209 - 0
zkqy-ui/src/views/bussiness/dialogCompments/GongYi/UpSilk.vue

@@ -0,0 +1,209 @@
+<template>
+  <div class="app-containeteamIdr">
+    <el-row :gutter="10">
+      <el-form
+        :model="form"
+        ref="form"
+        label-width="100px"
+        align="left"
+        :inline="false"
+        size="normal"
+      >
+        <el-col :span="12">
+          <el-form-item label="机台号:" prop="productionLineNo">
+            {{ form.productionLineNo }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="任务:" prop="taskName">
+            {{ form.taskName }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="产品名:" prop="productName">
+            {{ form.productName }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="规格:" prop="productSpecifications">
+            {{ form.productSpecifications }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="类型:" prop="productType">
+            {{ form.productType }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="数量:" prop="productNumber">
+            {{ form.productNumber }}
+          </el-form-item>
+        </el-col>
+        <el-col :span="18">
+          <el-form-item label="备注:" prop="remark">
+            <el-input
+              v-model="form.remark"
+              placeholder=""
+              size="normal"
+              clearable
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item>
+            <el-button
+              type="primary"
+              size="small"
+              @click="submitHandler"
+              icon="el-icon-success"
+              >记录</el-button
+            >
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+  name: "Sorting",
+  props: ["formData", "row"],
+  data() {
+    return {
+      isEdit: false,
+      id: "",
+      form: {
+        remark: "",
+        productionLineNo: "", //机台号
+        taskName: "", //任务
+        productName: "", //产品名称
+        productSpecifications: "", //规格
+        productType: "", //类型
+        productNumber: "", //数量
+      },
+    };
+  },
+  computed: {
+    myFormData() {
+      return this.formData;
+    },
+  },
+  watch: {
+    myFormData: {
+      handler(nval) {
+        console.log("nval", nval);
+        console.log("row", this.row);
+        let { products, saleProducts, productAddAmmunition } = nval.resultMap;
+        if (products && saleProducts) {
+          let { production_line_no, task_name, product_number } =
+            saleProducts.resultMap;
+          let { product_name, product_specifications, product_type } =
+            products.resultMap;
+          this.form = {
+            remark: "",
+            productionLineNo: production_line_no, //机台号
+            taskName: task_name, //任务
+            productName: product_name, //产品名称
+            productSpecifications: product_specifications, //规格
+            productType: product_type, //类型
+            productNumber: product_number, //数量
+          };
+        }
+        this.isEdit = productAddAmmunition.resultMap.id ? true : false;
+        if (this.isEdit) {
+          this.form.remark = productAddAmmunition.resultMap.remark;
+          this.id = productAddAmmunition.resultMap.id;
+        }
+      },
+      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: "sale_product_add_ammunition",
+              },
+              conditionMap: {
+                // task_process_key: taskProcessKey,
+                // task_node_key: taskNodeKey,
+                id: this.id,
+              },
+              commMap: {
+                sale_product_id: this.row.bepTaskPlanKey,
+                add_ammunition_type: 2, //拣货1 上丝2
+                remark: remark,
+              },
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "sale_product_add_ammunition",
+              },
+              addListMap: [
+                {
+                  sale_product_id: this.row.bepTaskPlanKey,
+                  add_ammunition_type: 2, //拣货1
+                  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>

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

@@ -194,10 +194,7 @@
             v-if="myForm"
           ></component>
 
-          <!-- <AppearanceInspection
-            :formData="formData"
-            :row="row"
-          ></AppearanceInspection> -->
+          <!-- <Sorting ref="myFormRef" :formData="formData" :row="row"></Sorting> -->
           <!-- <PhysicalInspection
             :formData="formData"
             :row="row"
@@ -267,7 +264,9 @@ import Inspect from "./dialogCompments/GongYi/Inspect.vue";
 import PhysicalInspection from "./dialogCompments/GongYi/PhysicalInspection.vue";
 // 外观指标
 import AppearanceInspection from "./dialogCompments/GongYi/AppearanceInspection.vue";
-
+//
+import Sorting from "./dialogCompments/GongYi/Sorting.vue";
+import UpSilk from "./dialogCompments/GongYi/UpSilk.vue";
 export default {
   name: "processMange",
   props: [],
@@ -306,6 +305,8 @@ export default {
     WareHousing,
     PhysicalInspection,
     AppearanceInspection,
+    Sorting, //分拣
+    UpSilk, //上丝
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {