Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-ui/src/views/bussiness/dialogCompments/Edu/Assemble.vue

@@ -0,0 +1,132 @@
+<template>
+    <!-- 组装 -->
+    <div class="app-container">
+        <el-form ref="form" :model="form" label-width="80px" align="center">
+            <el-form-item label="任务号:">
+                {{form.name}}
+            </el-form-item>
+            <el-form-item label="投产数量:">
+                {{form.tNum}}
+            </el-form-item>
+            <el-form-item label="完成数量:">
+                {{form.cNum}}
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+    name: 'Assemble',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit: false,
+            form: {
+                name: '',
+                tNum: '',
+                cNum: '',
+            }
+        };
+    },
+    computed: {
+        myFormData() {
+            return this.formData;
+        },
+    },
+    watch: {
+        myFormData: {
+            handler(nval) {
+                this.form = nval.resultMap;
+                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+                this.$nextTick(() => {
+                this.$refs.form?.clearValidate();
+                });
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    mounted() {
+        
+    },
+
+    methods: {
+        async submitHandler() {
+            console.log(this.row);
+            let res = await this.$refs.form?.validate();
+            if (res) {
+                let payLoad = {};
+                let { teamId } = this.form;
+                if (this.isEdit) {
+                let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+                payLoad.updateCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    conditionMap: {
+                        task_process_key: taskProcessKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    addListMap: [
+                        {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                        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>
+
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/Edu/Detection.vue

@@ -0,0 +1,144 @@
+<template>
+    <!-- 检测 -->
+    <div class="app-container">
+        <el-form ref="form" :model="form" label-width="120px">
+            <el-form-item label="任务号:">
+                {{form.taskId}}
+            </el-form-item>
+            <el-form-item label="工序名:">
+                {{form.name}}
+            </el-form-item>
+            <el-form-item label="投产数量:">
+                {{form.tNum}}
+            </el-form-item>
+            <el-form-item label="完成数量:">
+                {{form.cNum}}
+            </el-form-item>
+            <el-form-item label="合格数量:">
+                {{form.qualifiedNum}}
+            </el-form-item>
+            <el-form-item label="不合格数量:">
+                {{form.noQualifiedNum}}
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+    name: 'Detection',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit: false,
+            form: {
+                taskId: '',
+                name: '',
+                tnum: '',
+                cnum: '',
+                qualifiedNum: '',
+                noQualifiedNum: ''
+            }
+        };
+    },
+    computed: {
+        myFormData() {
+            return this.formData;
+        },
+    },
+    watch: {
+        myFormData: {
+            handler(nval) {
+                this.form = nval.resultMap;
+                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+                this.$nextTick(() => {
+                this.$refs.form?.clearValidate();
+                });
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    mounted() {
+        
+    },
+
+    methods: {
+        async submitHandler() {
+            console.log(this.row);
+            let res = await this.$refs.form?.validate();
+            if (res) {
+                let payLoad = {};
+                let { teamId } = this.form;
+                if (this.isEdit) {
+                let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+                payLoad.updateCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    conditionMap: {
+                        task_process_key: taskProcessKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    addListMap: [
+                        {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                        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>
+
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/Edu/Loading.vue

@@ -0,0 +1,83 @@
+<template>
+    <!-- 上料 -->
+    <div class="app-container">
+        <el-form ref="form" :model="form" label-width="80px" align="center">
+            <el-form-item label="任务号:">
+                {{form.name}}
+            </el-form-item>
+            <el-form-item label="投产数量:">
+                {{form.tNum}}
+            </el-form-item>
+            <el-form-item label="完成数量:">
+                {{form.cNum}}
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+    name: 'Loading',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit: false,
+            form: {
+                name: '',
+                tNum: '',
+                cNum: '',
+            }
+        };
+    },
+    computed: {
+        myFormData() {
+            return this.formData;
+        },
+    },
+    watch: {
+        myFormData: {
+            handler(nval) {
+                this.form = nval.resultMap;
+                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+                this.$nextTick(() => {
+                this.$refs.form?.clearValidate();
+                });
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    mounted() {
+        
+    },
+
+    methods: {
+        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>
+
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/Edu/Processing.vue

@@ -0,0 +1,132 @@
+<template>
+    <!-- 加工 -->
+    <div class="app-container">
+        <el-form ref="form" :model="form" label-width="80px" align="center">
+            <el-form-item label="任务号:">
+                {{form.name}}
+            </el-form-item>
+            <el-form-item label="投产数量:">
+                {{form.tNum}}
+            </el-form-item>
+            <el-form-item label="完成数量:">
+                {{form.cNum}}
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+    name: 'processing',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit: false,
+            form: {
+                name: '',
+                tNum: '',
+                cNum: '',
+            }
+        };
+    },
+    computed: {
+        myFormData() {
+            return this.formData;
+        },
+    },
+    watch: {
+        myFormData: {
+            handler(nval) {
+                this.form = nval.resultMap;
+                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+                this.$nextTick(() => {
+                this.$refs.form?.clearValidate();
+                });
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    mounted() {
+        
+    },
+
+    methods: {
+        async submitHandler() {
+            console.log(this.row);
+            let res = await this.$refs.form?.validate();
+            if (res) {
+                let payLoad = {};
+                let { teamId } = this.form;
+                if (this.isEdit) {
+                let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+                payLoad.updateCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    conditionMap: {
+                        task_process_key: taskProcessKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    addListMap: [
+                        {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                        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>
+
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/Edu/WareHousing.vue

@@ -0,0 +1,132 @@
+<template>
+    <!-- 入库 -->
+    <div class="app-container">
+        <el-form ref="form" :model="form" label-width="80px" align="center">
+            <el-form-item label="任务号:">
+                {{form.name}}
+            </el-form-item>
+            <el-form-item label="投产数量:">
+                {{form.tNum}}
+            </el-form-item>
+            <el-form-item label="完成数量:">
+                {{form.cNum}}
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+    name: ' WareHousing',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit: false,
+            form: {
+                name: '',
+                tNum: '',
+                cNum: '',
+            }
+        };
+    },
+    computed: {
+        myFormData() {
+            return this.formData;
+        },
+    },
+    watch: {
+        myFormData: {
+            handler(nval) {
+                this.form = nval.resultMap;
+                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+                this.$nextTick(() => {
+                this.$refs.form?.clearValidate();
+                });
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    mounted() {
+        
+    },
+
+    methods: {
+        async submitHandler() {
+            console.log(this.row);
+            let res = await this.$refs.form?.validate();
+            if (res) {
+                let payLoad = {};
+                let { teamId } = this.form;
+                if (this.isEdit) {
+                let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+                payLoad.updateCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    conditionMap: {
+                        task_process_key: taskProcessKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "task_team_relevance",
+                    },
+                    addListMap: [
+                        {
+                        team_id: teamId,
+                        task_id: this.row.bepTaskPlanKey,
+                        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>
+
+</style>

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

@@ -180,14 +180,21 @@
             :value="jsonData"
           /> -->
 
-          <component
+         <!--  <component
             :is="myForm"
             :formData="formData"
             :row="row"
             ref="myFormRef"
             v-if="myForm"
-          ></component>
-          <!-- <QRCode :formData="formData" :row="row" ref="myFormRef" /> -->
+          ></component> -->
+
+          <!-- <Loading :formData="formData" :row="row" ref="myFormRef"></Loading> -->
+          <!--  <Processing :formData="formData" :row="row" ref="myFormRef"></Processing> -->
+          <!--  <Assemble :formData="formData" :row="row" ref="myFormRef"></Assemble> -->
+           <Detection :formData="formData" :row="row" ref="myFormRef"></Detection>
+         <!--  <WareHousing :formData="formData" :row="row" ref="myFormRef"></WareHousing> -->
+
+          <!-- <QRCode :formData="formData" :row="row" ref="myFormRef" /> -->    
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
             <el-button type="primary" @click="executeNode">确认运行</el-button>
@@ -224,6 +231,12 @@ import GY06 from "./dialogCompments/GongYi/GY06.vue";
 import KB01 from "./dialogCompments/KongBai/KB01.vue"; //空白提示组件
 import SC01 from "./dialogCompments/ShengChan/SC01.vue";
 
+import Loading from "./dialogCompments/Edu/Loading.vue";
+import Processing from "./dialogCompments/Edu/Processing.vue";
+import Assemble from "./dialogCompments/Edu/Assemble.vue";
+import Detection from "./dialogCompments/Edu/Detection.vue";
+import WareHousing from "./dialogCompments/Edu/WareHousing.vue";
+
 //Mec组件
 import AssignEmployees from "./dialogCompments/Mec/AssignEmployees.vue";
 import Notes from "./dialogCompments/Mec/Notes.vue";
@@ -273,6 +286,11 @@ export default {
     ScrapDisposition,
     QRCode,
     Inspect,
+    Loading,
+    Processing,
+    Assemble,
+    Detection,
+    WareHousing,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {