feat:教育节点页面开发

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

@@ -1,17 +1,27 @@
 <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>
+      <el-form ref="form" :model="form" label-width="80px" align="center">
+        <el-form-item label="任务号:" :label-width="'90px'">
+          <el-input v-model="form.taskNumber" readonly disabled></el-input>
+        </el-form-item>
+        <el-form-item label="投产数量:" :label-width="'90px'">
+          <el-input v-model="form.productQuantity" readonly disabled></el-input>
+        </el-form-item>
+        <el-form-item label="已组装数量"  :label-width="'90px'">
+          <el-input v-model="form.assembled" readonly disabled></el-input>
+        </el-form-item>
+        <!--记录信息-->
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="btn"
+            @click="submitHandler"
+            style="margin-left:-500px"
+          >记录信息</el-button
+          >
+        </el-form-item>
+      </el-form>
     </div>
 </template>
 
@@ -24,9 +34,9 @@ export default {
         return {
             isEdit: false,
             form: {
-                name: '',
-                tNum: '',
-                cNum: '',
+              taskNumber: '',
+              productQuantity: '',
+              assembled: '',
             }
         };
     },
@@ -49,9 +59,8 @@ export default {
         },
     },
     mounted() {
-        
-    },
 
+    },
     methods: {
         async submitHandler() {
             console.log(this.row);
@@ -64,7 +73,7 @@ export default {
                 payLoad.updateCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "task_team_relevance",
+                        tableName: "product_assembly",
                     },
                     conditionMap: {
                         task_process_key: taskProcessKey,
@@ -77,17 +86,19 @@ export default {
                     },
                 ];
                 } else {
+                  console.log("新增")
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "task_team_relevance",
+                        tableName: "product_assembly",
                     },
                     addListMap: [
                         {
-                        team_id: teamId,
-                        task_id: this.row.bepTaskPlanKey,
-                        taskProcessKey: this.row.benTaskProcessKey,
-                        taskNodeKey: this.row.benTaskNodeKey,
+                          taskNumber: this.form.taskNumber,
+                          taskQuantity:this.form.productQuantity,
+                          overNumber:this.form.assembled,
+                          taskProcessKey: this.row.benTaskProcessKey,
+                          taskNodeKey: this.row.benTaskNodeKey,
                         },
                     ],
                     },
@@ -129,4 +140,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

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

@@ -3,23 +3,30 @@
     <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-input v-model="form.taskNumber" readonly disabled></el-input>
             </el-form-item>
             <el-form-item label="投产数量:">
-                {{form.tNum}}
+              <el-input v-model="form.productQuantity" readonly disabled></el-input>
             </el-form-item>
-            <el-form-item label="完成数量:">
-                {{form.cNum}}
+            <el-form-item label="组装数量:">
+              <el-input v-model="form.assembled" readonly disabled></el-input>
             </el-form-item>
             <el-form-item label="合格数量:">
-                {{form.qualifiedNum}}
+              <el-input v-model="form.qualified"></el-input>
             </el-form-item>
             <el-form-item label="不合格数量:">
-                {{form.noQualifiedNum}}
+              <el-input v-model="form.unqualified"></el-input>
             </el-form-item>
+              <!--记录信息-->
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  class="btn"
+                  @click="submitHandler"
+                  style=""
+                >质检信息记录</el-button
+                >
+              </el-form-item>
         </el-form>
     </div>
 </template>
@@ -33,12 +40,11 @@ export default {
         return {
             isEdit: false,
             form: {
-                taskId: '',
-                name: '',
-                tnum: '',
-                cnum: '',
-                qualifiedNum: '',
-                noQualifiedNum: ''
+              taskNumber: '',
+                productQuantity: '',
+                assembled: '',
+                qualified: '',
+                unqualified: ''
             }
         };
     },
@@ -51,9 +57,11 @@ export default {
         myFormData: {
             handler(nval) {
                 this.form = nval.resultMap;
-                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+              console.log(this.form,"ddddd")
+                this.isEdit = this.form.taskProcessKey&&this.form.taskNodeKey;
+               console.log(this.isEdit,"acd")
                 this.$nextTick(() => {
-                this.$refs.form?.clearValidate();
+                      this.$refs.form?.clearValidate();
                 });
             },
             deep: true,
@@ -61,7 +69,7 @@ export default {
         },
     },
     mounted() {
-        
+
     },
 
     methods: {
@@ -70,40 +78,44 @@ export default {
             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,
-                    },
-                    },
-                ];
+                      console.log("修改")
+                      let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+                      payLoad.updateCommonEntityList = [
+                          {
+                          basicMap: {
+                              tableName: "quality_inspection",
+                          },
+                          conditionMap: {
+                              task_process_key: taskProcessKey,
+                              task_node_key: taskNodeKey,
+                          },
+                          commMap: {
+                            qualifiedQuantity:this.form.qualifiedNum,
+                            unqualifiedQuantity:this.form.unqualifiedQuantity
+                          },
+                          },
+                      ];
                 } 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,
-                        },
-                    ],
-                    },
-                ];
+                  console.log("新增")
+                      payLoad.insertCommonEntityList = [
+                          {
+                          basicMap: {
+                              tableName: "quality_inspection",
+                          },
+                          addListMap: [
+                              {
+                                taskNumber: this.form.taskNumber,
+                                taskQuantity:this.form.productQuantity,
+                                overNumber:this.form.assembled,
+                                taskProcessKey: this.row.benTaskProcessKey,
+                                taskNodeKey: this.row.benTaskNodeKey,
+                                qualifiedQuantity:this.form.qualified,
+                                unqualifiedQuantity:this.form.unqualified
+                              },
+                          ],
+                          },
+                      ];
                 }
                 submitNodeForm(payLoad).then((response) => {
                 if (response.code == 200) {
@@ -141,4 +153,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

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

@@ -3,13 +3,22 @@
     <div class="app-container">
         <el-form ref="form" :model="form" label-width="80px" align="center">
             <el-form-item label="任务号:">
-                {{form.name}}
+              <el-input v-model="form.taskNumber" readonly disabled></el-input>
             </el-form-item>
             <el-form-item label="投产数量:">
-                {{form.tNum}}
+              <el-input v-model="form.productQuantity" readonly disabled></el-input>
             </el-form-item>
-            <el-form-item label="完成数量:">
-                {{form.cNum}}
+            <el-form-item label="上料数量">
+              <el-input v-model="form.materials" readonly disabled></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button
+                type="primary"
+                class="btn"
+                @click="submitHandler"
+                style="margin-left:-500px"
+                >记录信息</el-button
+               >
             </el-form-item>
         </el-form>
     </div>
@@ -24,36 +33,104 @@ export default {
         return {
             isEdit: false,
             form: {
-                name: '',
-                tNum: '',
-                cNum: '',
+                taskNumber: '',
+                productQuantity: '',
+                materials: '',
             }
         };
     },
     computed: {
+        //属性计算
         myFormData() {
-            return this.formData;
-        },
+             //父组件-传递过来的
+             return this.formData;
+        }
     },
     watch: {
+        //监听的是计算属性里的myFormData
         myFormData: {
             handler(nval) {
                 this.form = nval.resultMap;
+                //有这个两个值代表是从新编辑
                 this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
                 this.$nextTick(() => {
-                this.$refs.form?.clearValidate();
+                    this.$refs.form?.clearValidate();
                 });
             },
             deep: true,
             immediate: true,
         },
     },
+    created(){
+        this.aa("created")
+    },
     mounted() {
-        
+      this.aa("mounted")
     },
-
     methods: {
-        async getFormData() {
+      //处理请求
+      async submitHandler() {
+        //获取父组件传递过来的数据
+        console.log(this.row);
+        //校验表单数据
+        let res = await this.$refs.form?.validate();
+        //校验通过
+        if (res) {
+          //放准备发给后端的数据
+          let payLoad = {};
+          let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+          //判断是否编辑
+          if (this.isEdit) {
+            //准备更新节点的数据
+            payLoad.updateCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "load_material_info",
+                },
+                conditionMap: {
+                  task_process_key: taskProcessKey,
+                  task_node_key: taskNodeKey,
+                },
+                commMap: {
+                  qualityControlCard:this.form.qualityControlCard,
+                  cardNum:this.form.cardNum
+                },
+              },
+            ];
+          } else {
+            console.log("新增")
+            //插入节点数据总不能被数据
+            payLoad.insertCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "load_material_info",
+                },
+                addListMap: [
+                  {
+                    taskNumber: this.form.taskNumber,
+                    taskQuantity:this.form.productQuantity,
+                    overNumber:this.form.materials,
+                    taskProcessKey: this.row.benTaskProcessKey,
+                    taskNodeKey: this.row.benTaskNodeKey,
+                  },
+                ],
+              },
+            ];
+          }
+          //提交请求
+          submitNodeForm(payLoad).then((response) => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess("保存成功");
+            } else {
+              this.$modal.error("保存失败,请稍后再试");
+            }
+          });
+        }
+      },
+      aa(str){
+        console.log(str)
+      },
+      async getFormData() {
             let formData = {
                 flag: false,
                 msg: "",
@@ -80,4 +157,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

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

@@ -3,13 +3,23 @@
     <div class="app-container">
         <el-form ref="form" :model="form" label-width="80px" align="center">
             <el-form-item label="任务号:">
-                {{form.name}}
+              <el-input v-model="form.taskNumber" readonly disabled></el-input>
             </el-form-item>
             <el-form-item label="投产数量:">
-                {{form.tNum}}
+              <el-input v-model="form.productQuantity" readonly disabled></el-input>
             </el-form-item>
-            <el-form-item label="完成数量:">
-                {{form.cNum}}
+            <el-form-item label="加工完成数量" :label-width="'90px' ">
+              <el-input v-model="form.processed"  readonly disabled></el-input>
+            </el-form-item>
+            <!--记录信息-->
+            <el-form-item>
+              <el-button
+                type="primary"
+                class="btn"
+                @click="submitHandler"
+                style="margin-left:-500px"
+              >记录信息</el-button
+              >
             </el-form-item>
         </el-form>
     </div>
@@ -24,9 +34,9 @@ export default {
         return {
             isEdit: false,
             form: {
-                name: '',
-                tNum: '',
-                cNum: '',
+                taskNumber: '',
+                productQuantity: '',
+                processed: '',
             }
         };
     },
@@ -49,7 +59,7 @@ export default {
         },
     },
     mounted() {
-        
+
     },
 
     methods: {
@@ -58,36 +68,36 @@ export default {
             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",
+                        tableName: "product_processing_info",
                     },
                     conditionMap: {
                         task_process_key: taskProcessKey,
                         task_node_key: taskNodeKey,
                     },
                     commMap: {
-                        team_id: teamId,
-                        task_id: this.row.bepTaskPlanKey,
+                      overNumber:this.form.overNumber,
                     },
                     },
                 ];
                 } else {
+                  console.log("新增")
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "task_team_relevance",
+                        tableName: "product_processing_info",
                     },
                     addListMap: [
                         {
-                        team_id: teamId,
-                        task_id: this.row.bepTaskPlanKey,
-                        taskProcessKey: this.row.benTaskProcessKey,
-                        taskNodeKey: this.row.benTaskNodeKey,
+                          taskNumber: this.form.taskNumber,
+                          taskQuantity:this.form.productQuantity,
+                          overNumber:this.form.processed,
+                          taskProcessKey: this.row.benTaskProcessKey,
+                          taskNodeKey: this.row.benTaskNodeKey,
                         },
                     ],
                     },
@@ -129,4 +139,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>

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

@@ -2,15 +2,25 @@
     <!-- 入库 -->
     <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 label="任务号:">
+            <el-input v-model="form.taskNumber" readonly disabled></el-input>
+          </el-form-item>
+          <el-form-item label="投产数量:">
+            <el-input v-model="form.productQuantity" readonly disabled></el-input>
+          </el-form-item>
+            <el-form-item label="入库数量:">
+              <el-input v-model="form.qualifiedQuantity" readonly disabled></el-input>
             </el-form-item>
+          <!--记录信息-->
+          <el-form-item>
+            <el-button
+              type="primary"
+              class="btn"
+              @click="submitHandler"
+              style="margin-left:-500px"
+            >记录信息</el-button
+            >
+          </el-form-item> <!--记录信息-->
         </el-form>
     </div>
 </template>
@@ -24,9 +34,9 @@ export default {
         return {
             isEdit: false,
             form: {
-                name: '',
-                tNum: '',
-                cNum: '',
+                taskNumber: '',
+                productQuantity: '',
+                qualifiedQuantity: '',
             }
         };
     },
@@ -39,6 +49,7 @@ export default {
         myFormData: {
             handler(nval) {
                 this.form = nval.resultMap;
+                console.log(this.form)
                 this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
                 this.$nextTick(() => {
                 this.$refs.form?.clearValidate();
@@ -49,7 +60,7 @@ export default {
         },
     },
     mounted() {
-        
+
     },
 
     methods: {
@@ -58,36 +69,33 @@ export default {
             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",
+                        tableName: "finished",
                     },
                     conditionMap: {
                         task_process_key: taskProcessKey,
                         task_node_key: taskNodeKey,
                     },
                     commMap: {
-                        team_id: teamId,
-                        task_id: this.row.bepTaskPlanKey,
+                      finished_weight: this.form.qualifiedQuantity,
                     },
                     },
                 ];
                 } else {
+                  console.log("新增")
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "task_team_relevance",
+                        tableName: "finished",
                     },
                     addListMap: [
                         {
-                        team_id: teamId,
-                        task_id: this.row.bepTaskPlanKey,
-                        taskProcessKey: this.row.benTaskProcessKey,
-                        taskNodeKey: this.row.benTaskNodeKey,
+                          finished_weight: this.form.qualifiedQuantity,
                         },
                     ],
                     },
@@ -129,4 +137,4 @@ export default {
 
 <style lang="scss" scoped>
 
-</style>
+</style>