计划管理前端逻辑修改

src/api/orderManagement/moldPlan.js

@@ -2,7 +2,7 @@ import request from '@/axios';
 //列表接口
 export const getList = (current, size, params) => {
   return request({
-    url: '/blade-desk/order/moldPlan/page',
+    url: '/blade-desk/order/moldDemand/page',
     method: 'get',
     params: {
       ...params,
@@ -14,7 +14,7 @@ export const getList = (current, size, params) => {
 //新增
 export const add = row => {
   return request({
-    url: '/blade-desk/order/moldPlan/save',
+    url: '/blade-desk/order/moldApply/saveBatch',
     method: 'post',
     data: row,
   });
@@ -30,7 +30,7 @@ export const update = row => {
 // 获取详情
 export const getOrderMoldPlanCaDeatils = (params) => {
   return request({
-    url: `/blade-desk/order/moldPlan/detail`,
+    url: `/blade-desk/order/moldDemand/detail`,
     method: 'get',
     params,
   });
@@ -46,7 +46,7 @@ export const removeByIds = ids => {
 //批量关闭
 export const closeBatchs = ids => {
   return request({
-    url: '/blade-desk/order/moldPlan/closeBatch',
+    url: '/blade-desk/order/moldDemand/closeBatch',
     method: 'post',
     data: ids,
   });
@@ -93,7 +93,7 @@ export const getUserByRoleAlias = (params) => {
 // 获取申报记录列表
 export const getApplyList = (params) => {
   return request({
-    url: '/api/blade-desk/order/moldPlan/pageApply',
+    url: '/api/blade-desk/order/moldApply/page',
     method: 'get',
     params
   });

src/views/orderManagement/components/mold/detailsInfoDialog.vue

@@ -17,23 +17,23 @@
       <el-descriptions-item label="占用数量">{{ form.occupyNum || "-" }}</el-descriptions-item>
     </el-descriptions>
     <el-descriptions class="margin-top" :column="4" border title="工装占用信息"></el-descriptions>
-    <el-table :data="tableData" style="width: 100%">
+    <el-table :data="toolUseList" style="width: 100%">
       <el-table-column prop="shuliang" label="工作订单号" align="center"> </el-table-column>
       <el-table-column prop="shuliang" label="占用数" align="center"> </el-table-column>
       <el-table-column prop="shuliang" label="占用时间" align="center"> </el-table-column>
     </el-table>
     <el-descriptions class="margin-top" :column="4" border title="关联订单"></el-descriptions>
-    <el-table :data="tableData" style="width: 100%">
+    <el-table :data="linkOrderList" style="width: 100%">
       <el-table-column type="index" width="80" label="序号" align="center"> </el-table-column>
-      <el-table-column prop="id" label="计划单号" align="center"> </el-table-column>
+      <el-table-column prop="ypCode" label="计划单号" align="center"> </el-table-column>
       <el-table-column prop="partCode" label="零件号" align="center"> </el-table-column>
       <el-table-column prop="partName" label="产品名称" align="center"> </el-table-column>
       <el-table-column prop="quantity" label="零件数量" align="center"> </el-table-column>
-      <el-table-column prop="needDate" label="需求交期" align="center"> </el-table-column>
+      <el-table-column prop="demandDate" label="需求交期" align="center"> </el-table-column>
       <el-table-column prop="shuliang" label="工装需求数量" align="center"> </el-table-column>
       <el-table-column prop="shuliang" label="已交付数量" align="center"> </el-table-column>
       <el-table-column prop="shuliang" label="未交付数量" align="center"> </el-table-column>
-      <el-table-column prop="shuliang" label="计划下达时间" align="center"> </el-table-column>
+      <el-table-column prop="releaseDate" label="计划下达时间" align="center"> </el-table-column>
     </el-table>
     <el-descriptions
       class="margin-top"
@@ -41,21 +41,21 @@
       border
       title="申报记录(近一个的记录)"
     ></el-descriptions>
-    <el-table :data="tableData" style="width: 100%">
+    <el-table :data="nearlyApplyList" style="width: 100%">
       <el-table-column prop="partCode" label="零件号" align="center"></el-table-column>
       <el-table-column prop="partName" label="零件名称" align="center"></el-table-column>
-      <el-table-column prop="moCode" label="对应工装号" align="center"></el-table-column>
+      <el-table-column prop="toolCode" label="对应工装号" align="center"></el-table-column>
-      <el-table-column prop="moName" label="工装名称" align="center"></el-table-column>
+      <el-table-column prop="toolName" label="工装名称" align="center"></el-table-column>
-      <el-table-column prop="quantity" label="数量" align="center"></el-table-column>
+      <el-table-column prop="applyNum" label="数量" align="center"></el-table-column>
-      <el-table-column prop="shuliang" label="计划类型" align="center"></el-table-column>
+      <el-table-column prop="mafTypeName" label="计划类型" align="center"></el-table-column>
       <el-table-column prop="needDate" label="需求日期" align="center"></el-table-column>
       <el-table-column prop="quaLevel" label="生产标识" align="center"></el-table-column>
       <el-table-column prop="keeper" label="保管员" align="center"></el-table-column>
       <el-table-column prop="releaser" label="下达人" align="center"></el-table-column>
       <el-table-column prop="createTime" label="建立时间" align="center"></el-table-column>
-      <el-table-column prop="creatUser" label="建立人员" align="center"></el-table-column>
+      <el-table-column prop="createUserName" label="建立人员" align="center"></el-table-column>
       <el-table-column prop="memo" label="备注" align="center"></el-table-column>
-      <el-table-column prop="mafStatusTitle" label="状态" align="center"></el-table-column>
+      <el-table-column prop="mafStatusName" label="状态" align="center"></el-table-column>
     </el-table>
     <template #footer>
       <span class="dialog-footer">
@@ -83,6 +83,9 @@ export default {
       openShow: false,
       form: {},
       tableData: [],
+      toolUseList:[],   //工装占用列表
+      linkOrderList:[], //关联列表
+      nearlyApplyList:[],   //申报记录
     };
   },
   mounted() {
@@ -91,6 +94,9 @@ export default {
       if (res.data.code == 200) {
         console.log(res.data.data);
         this.form = res.data.data;
+        this.toolUseList = res.data.data.toolUseList;
+        this.linkOrderList = res.data.data.linkOrderList;
+        this.nearlyApplyList = res.data.data.nearlyApplyList;
         // this.form = { ...res.data };
       }
     });

src/views/productionManagement/components/addQuantity.vue

@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import {getTestValueList,getWorkCenter,getAddRequireList} from "@/api/productionManagement/addRequirements"
+import {getTestValueList,getWorkCenter,getAddRequireList,add} from "@/api/productionManagement/addRequirements"
 export default {
     props: {
         addQuantity: {
@@ -124,6 +124,7 @@ export default {
             const res1 = await getTestValueList(params)
             const res2 = await getAddRequireList(this.ruleForm)
             this.materialNeedsData = res1.data.data
+            this.tableData = res2.data.data
 
             console.log('res1------------',res1)
             console.log('res2------------',res2)
@@ -199,11 +200,21 @@ export default {
                 { slot: '#49 镀金', testVal: '3.1', actualVal: 'XX', testProject: '氧化亚金钾', testUser: '张珊', value: 'XX', testTime: '2023-12-22 07:15:22', addValue: '' },
             ]
         },
-        closeDialog() {
+        closeDialog(val) {
-            this.$emit('closeDialog');
+            this.$emit('closeDialog',val);
         },
         submit() {
-            this.closeDialog()
+            let params = {
+                assayContentDetailList:this.materialNeedsData,
+                recordIdList:this.tableData.map(item => item.id)
+            }
+            add(params).then(res => { 
+                if(res.data.code == 200) { 
+                    this.$message.success('新增成功')
+                    this.closeDialog(true)
+                }
+            })
+            // this.closeDialog()
         }
     },
 

src/views/productionManagement/components/coatingAddDialog.vue

@@ -110,7 +110,7 @@
 </template>
 
 <script>
-import { getListlistNoFinished,getAddRequireList,getWorkCenter } from '@/api/productionManagement/coatingMaterial';
+import { getListlistNoFinished,getAddRequireList,getWorkCenter,add } from '@/api/productionManagement/coatingMaterial';
 export default {
   props: {
     showDialog: {
@@ -164,7 +164,6 @@ export default {
         }
         const res = await getAddRequireList( params);
         this.tableData = res.data.data.records;
-        console.log('res', res);
         // if (res && res.code === 200) {
         //   this.data = res.data?.data?.records || [];
         //   this.$refs?.multipleTable?.clearSelection();
@@ -188,17 +187,30 @@ export default {
       console.log('total-----------',total)
       this.submitForm.goodsQuantity = total ? total : 0;
     },
-    closeDialog() {
+    closeDialog(val) {
-      this.$emit('closeDialog');
+      this.$emit('closeDialog',val);
     },
     submit() {
       // this.submitForm
       //this.selectionList
-      const form = {
+      // const form = {
-        data: this.submitForm,
+      //   data: this.submitForm,
-        list: this.selectionList,
+      //   list: this.selectionList,
-      };
+      // };
-      console.log(form);
+      // console.log(form);
+      let params = {
+        assayContent:{},
+        detailList:this.selectionList.map(item =>{
+          return {yoId :item.id}
+        })
+      }
+      console.log('params------------',params)
+      add(params).then(res =>{
+        if(res.data.code == 200){
+          this.$message.success('新增成功')
+          this.closeDialog(true)
+        }
+      })
     },
   },
 };

src/views/productionManagement/components/coatingMater/addRequirements.vue

@@ -176,10 +176,13 @@ export default {
       this.showDialog = true;
     },
     // 关闭弹窗
-    closeDialog() {
+    closeDialog(val) {
       this.showDialog = false;
       this.addQuantity = false;
       this.addDialog = false;
+      if(val){
+        this.onLoad()
+      }
     },
     addQuantityClick() {
       // if (this.selectionList.length == 0) {

src/views/productionManagement/components/coatingMater/materialRequirements.vue

@@ -212,11 +212,14 @@ export default {
       this.showDialog = true;
     },
     // 关闭弹窗
-    closeDialog() {
+    closeDialog(val) {
       this.showDialog = false;
       this.materialDialog = false;
       this.addQuantity = false;
       this.addDialog = false;
+      if(val){
+        this.onLoad()
+      }
     },
     addQuantityClick() {
       if (this.selectionList.length == 0) {