接口联调

src/api/orderManagement/planYieIdOrder.js

@@ -10,6 +10,22 @@ export const getList = (current, size, params) => {
       size,
     },
   });
+};
+// 获取热表生产订单
+export const getHotOrderList = params => {
+  return request({
+    url: '/api/blade-desk/order/yieldOrder/pageElectroplate',
+    method: 'get',
+    params,
+  });
+};
+// 获取烧结生产订单
+export const getSinterOrderList = params => {
+  return request({
+    url: '/api/blade-desk/order/yieldPlan/pageSintering',
+    method: 'get',
+    params,
+  });
 };
  // 修改
 export const update = row => {

src/api/orderManagement/sinTerPlanOrder.js

@@ -10,6 +10,22 @@ export const getList = (current, size, params) => {
       size,
     },
   });
+};
+// 获取热表计划列表接口
+export const getHotList = params => {
+  return request({
+    url: '/api/blade-desk/order/yieldPlan/pageElectroplate',
+    method: 'get',
+    params:params
+  });
+};
+// 获取烧结计划列表接口
+export const getShootList = params => {
+  return request({
+    url: '/api/blade-desk/order/yieldPlan/pageSintering',
+    method: 'get',
+    params:params
+  });
 };
  // 修改
 export const update = row => {

src/api/qualityManagement/productionTesting/productionQuality.js

@@ -1,3 +1,4 @@
+// 生产质量检验
 import request from '@/axios';
 
 // 获取主加工单位-供应商下拉列表
@@ -7,4 +8,13 @@ export const getSupplierList = (params) => {
     method: 'get',
     params
   });
+};
+
+// 获取生产质量检验
+export const getInspectionList = (data) => {
+  return request({
+    url: '/api/blade-desk/QA/InspectionTask/listSearch',
+    method: 'post',
+    data
+  });
 };

src/api/qualityManagement/remindRedeem/remindRedeem.js

@@ -42,4 +42,12 @@ export const deleteRemind = (params) =>{
     method:'post',
     params
   })
+}
+
+// 零件下拉
+export const getPartList = () =>{
+  return request({
+    url:'/api/blade-desk/dsPart/getPartList',
+    method:'get'
+  })
 }

src/api/storeManagement/workwearPlan.js

@@ -0,0 +1,38 @@
+// 工装计划申报
+import request from '@/axios';
+
+// 工装计划列表
+export const getList = params => { 
+    return request({
+      url: '/api/blade-wms/stMoldApplyFor/list',
+      method: 'get',
+      params
+    });
+};
+
+// 工装计划单条新增
+export const save = data => { 
+    return request({
+      url: '/api/blade-wms/stMoldApplyFor/save',
+      method: 'post',
+      data
+    });
+};
+
+// 工装计划修改
+export const update = data => { 
+    return request({
+      url: '/api/blade-wms/stMoldApplyFor/update',
+      method: 'post',
+      data
+    });
+};
+
+// 工装计划删除
+export const del = params => { 
+    return request({
+      url: '/api/blade-wms/stMoldApplyFor/remove',
+      method: 'post',
+      params
+    });
+};

src/views/orderManagement/sinTerPlanOrder.vue

@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { getList, closeBatchs } from '@/api/orderManagement/sinTerPlanOrder';
+import {  closeBatchs,getShootList } from '@/api/orderManagement/sinTerPlanOrder';
 import rushDialog from './components/rushDialog.vue';
 import basicImport from '@/components/basic-import/main.vue';
 import lookProcess from './components/lookProcess.vue';
@@ -819,143 +819,24 @@ export default {
 
     async onLoad(page, params = {}) {
       this.loading = true;
-      this.data = [
-        {
-          id: 1,
-          alreadyBranchQty: 104.0,
-          bsPlatingSmall: null,
-          bsProcedureQua: null,
-          closeMan: null,
-          closeTime: null,
-          curStatus: 4,
-          curStatusText: '已派工',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2025-03-13 00:00:00',
-          dominantDept: '3400',
-          dsPart: null,
-          keyValue: 43933,
-          memo: '最多三个批次0159BKFX',
-          partCode: '21E6-575-1710_003-H14-C-N',
-          partName: '09-J599_25烧结插座',
-          planType: 2,
-          planUser: '0300009',
-          plate: 'Ep.Ni3b',
-          poArea: 0.0,
-          createName: '0300009',
-          poCode: 'WO-2211134240',
-          poId: 43933,
-          poQty: 104,
-          primaryCraft: '4（封接、表、涂色带）-库2',
-          priority: 1,
-          prodIdent: 'JHT',
-          prodLine: null,
-          productType: 'JY599',
-          releaseDate: '2022-11-24 11:59:21',
-          roamNo: 'B5199029',
-          routeNo: 'LX08-05-002',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-10 20:58:11',
-          undeliveredQty: 104.0,
-          useDept: '3502',
-          wcName: null,
-        },
-        {
-          id: 2,
-          alreadyBranchQty: 104.0,
-          bsPlatingSmall: null,
-          bsProcedureQua: null,
-          closeMan: null,
-          closeTime: null,
-          curStatus: 4,
-          curStatusText: '已派工',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2025-03-13 00:00:00',
-          dominantDept: '3400',
-          dsPart: null,
-          keyValue: 43948,
-          memo: '最多三个批次0159BKFX',
-          partCode: '21E6-575-1710_003-H14-C-N',
-          partName: '09-J599_25烧结插座',
-          planType: 2,
-          planUser: '0300009',
-          plate: 'Ep.Ni3b',
-          poArea: 0.0,
-          poCode: 'WO-2211134240',
-          poId: 43948,
-          poQty: 104,
-          primaryCraft: '4（封接、表、涂色带）-库2',
-          priority: 1,
-          prodIdent: 'JHT',
-          prodLine: null,
-          productType: 'JY599',
-          releaseDate: '2022-11-24 11:59:21',
-          roamNo: null,
-          routeNo: 'LX08-05-002',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-10 20:58:11',
-          undeliveredQty: 104.0,
-          useDept: '3502',
-          wcName: null,
-        },
-        {
-          id: 3,
-          alreadyBranchQty: 19.0,
-          bsPlatingSmall: null,
-          bsProcedureQua: null,
-          closeMan: null,
-          closeTime: null,
-          curStatus: 4,
-          curStatusText: '已派工',
-          custodian: null,
-          deliveryQty: 0.0,
-          demandDate: '2025-02-23 00:00:00',
-          dominantDept: '3400',
-          dsPart: null,
-          keyValue: 43932,
-          memo: '最多三个批次0159BKFX',
-          partCode: '21E6-575-1710_002-H14-N-N',
-          partName: '09-J599_25烧结插座',
-          planType: 2,
-          planUser: '0300009',
-          plate: 'Ep.Ni3b',
-          poArea: 0.0,
-          poCode: 'WO-2211134211',
-          poId: 43932,
-          poQty: 19,
-          primaryCraft: '4（封接、表、涂色带）-库2',
-          priority: 1,
-          prodIdent: 'JHT',
-          prodLine: null,
-          productType: 'JY599',
-          releaseDate: '2022-11-24 11:59:21',
-          roamNo: null,
-          routeNo: 'LX08-05-002',
-          sureType: null,
-          sureTypeTitle: '未确认',
-          syncTime: '2023-02-10 20:58:11',
-          undeliveredQty: 19.0,
-          useDept: '3502',
-          wcName: null,
-        },
-      ];
-      this.page.total = this.data.length;
-      this.query.sureType = '';
       try {
-        const res = await getList(
-          page.currentPage,
-          page.pageSize,
+        const res = await getShootList({
+          current:this.page.currentPage,
+          size:this.page.pageSize
+        })
+        this.data = res.data.data.records;
+        this.page.total = res.data.data.total;
+        // const res = await getList(
+        //   page.currentPage,
+        //   page.pageSize,
 
-          Object.assign(params, this.query)
-        );
-        if (res.code) {
-          this.data = res.data.data.records;
-          this.page.total = res.data.data.total;
-          this.selectionClear();
-        }
+        //   Object.assign(params, this.query)
+        // );
+        // if (res.code) {
+        //   this.data = res.data.data.records;
+        //   this.page.total = res.data.data.total;
+        //   this.selectionClear();
+        // }
       } catch (err) {
         console.log(err);
       }

src/views/productionDisposition/hearingDialog.vue

@@ -308,12 +308,20 @@ export default {
             form: {},
             testType: 1,
             disposalType:1,     //处置类型
+            faultList:[],
+            dutyList:[],
         }
     },
     mounted() {
         this.openShow = this.showDialog
     },
     methods: {
+        insertFaultEvent(){
+            this.faultList.push({_select:false})
+        },
+        insertDutyEvent(){
+            this.dutyList.push({_select:false})
+        },
         closeDialog() {
             this.openShow = false
             this.$emit('closeDialog');

src/views/qualityManagement/remindRedeem/components/batchAdd.vue

@@ -38,7 +38,7 @@
                   v-for="item in partData"
                   :key="item.id"
                   :value="item.id"
-                  :label="item.code"
+                  :label="item.partCode"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -175,7 +175,7 @@
 
 <script>
 // import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
-import {getPqList,addBatch} from '@/api/qualityManagement/remindRedeem/remindRedeem'
+import {getPqList,addBatch,getPartList} from '@/api/qualityManagement/remindRedeem/remindRedeem'
 // import { submitBatchData } from '@/api/processManagement/periodical.js'; // 实际提交接口
 
 export default {
@@ -242,20 +242,27 @@ export default {
     };
   },
   mounted() {
+    this.getPart()
     this.openShow = this.showDialog;
     // this.getWorkCenterList();
     this.getPqData()
-    this.partData = [
-        {id:'001',code:'编号001',name:'零件名称1'},
-        {id:'002',code:'编号002',name:'零件名称2'},
-        {id:'003',code:'编号003',name:'零件名称3'},
-    ]
+    // this.partData = [
+    //     {id:'001',code:'编号001',name:'零件名称1'},
+    //     {id:'002',code:'编号002',name:'零件名称2'},
+    //     {id:'003',code:'编号003',name:'零件名称3'},
+    // ]
     // 初始添加一行（可选）
     if (this.moldAddMore && this.form.tableData.length === 0) {
       this.addTable();
     }
   },
   methods: {
+    getPart(){
+      getPartList().then(res =>{
+        console.log('res----------------',res)
+        this.partData = res.data.data
+      })
+    },
     getPqData(){
         getPqList().then(res =>{
             this.pqList = res.data.data
@@ -270,7 +277,7 @@ export default {
     // 修改零件号
     changePart(val,index){
         let tmp = this.partData.find(item => item.id == val)
-        this.form.tableData[index].partName = tmp.name
+        this.form.tableData[index].partName = tmp.partName
     },
 
     selectChange(list, row) {
@@ -298,9 +305,9 @@ export default {
         })
     },
 
-    closeDialog() {
+    closeDialog(val) {
       this.openShow = false;
-      this.$emit('closeDialog');
+      this.$emit('closeDialog',val);
       // 重置表单
       this.form.tableData = [];
       this.formError = '';
@@ -337,6 +344,7 @@ export default {
           const { _select, ...validData } = row; // 剔除选择状态字段
           return validData;
         });
+        console.log('submitData---------------',submitData)
 
         // 调用接口提交（实际项目替换）
         try {
@@ -349,12 +357,12 @@ export default {
           //   this.$message.error(res.msg || '提交失败');
           // }
         
-        this.form.tableData.map(item =>{
+        submitData.map(item =>{
             item.isHeatTreatment = item.isHeatTreatment ? 1 : 0,
             item.isAfterPlating = item.isAfterPlating ? 1 : 0
         })
-        console.log('form----------------',this.form.tableData)
-        addBatch(this.form.tableData).then(res =>{
+        console.log('form----------------',submitData)
+        addBatch(submitData).then(res =>{
             if(res.data.code == 200){
                 this.$message.success('新增成功')
                 this.closeDialog(true)

src/views/qualityManagement/remindRedeem/index.vue

@@ -3,6 +3,7 @@
         
         <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
             @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+            @row-update="rowUpdate"
             @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
             @refresh-change="refreshChange" @on-load="onLoad">
             <template #menu-left>
@@ -46,7 +47,7 @@ import {
     remove,
     update,
 } from '@/api/system/role';
-import {getList,deleteRemind} from '@/api/qualityManagement/remindRedeem/remindRedeem'
+import {getList,deleteRemind,editRemind} from '@/api/qualityManagement/remindRedeem/remindRedeem'
 import { mapGetters } from 'vuex';
 import { validatenull } from '@/utils/validate';
 import basicImport from '@/components/basic-import/main.vue'
@@ -147,6 +148,15 @@ export default {
                                 trigger: 'blur',
                             },
                         ],
+                        dicUrl:'/api/blade-desk/dsPart/getPartList',
+                        props:{
+                            label: 'partCode',
+                            value:'id'
+                        },
+                        onChange:val =>{
+                            console.log('val-------------',val)
+                            this.form.partName = val.item.partName
+                        }
                     },
                     {
                         label: '零件名称',
@@ -155,6 +165,7 @@ export default {
                         search: true,
                         sortable: true,
                         width: 150,
+                        editDisabled:true,
                         span: 12,
                     },
                     {
@@ -256,8 +267,8 @@ export default {
                         span: 12,
                         type: 'switch',
                         dicData: [
-                            { label: '关', value: 0 },
-                            { label: '开', value: 1 }
+                            { label: '关', value: '0' },
+                            { label: '开', value: '1' }
                         ],
                     },
                     {
@@ -269,8 +280,8 @@ export default {
                         span: 12,
                         type: 'switch',
                         dicData: [
-                            { label: '关', value: 0 },
-                            { label: '开', value: 1 }
+                            { label: '关', value: '0' },
+                            { label: '开', value: '1' }
                         ],
                     },
                 ],
@@ -338,6 +349,7 @@ export default {
             this.isRushOpen = false
             this.isBatchOpen = false
             this.showDialog = false
+            console.log('partName---------------------',val)
             if(val){
                 this.onLoad()
             }
@@ -414,6 +426,15 @@ export default {
                 }
             );
         },
+        rowUpdate( row, index, done, loading){
+            editRemind(row).then(res =>{
+                if(res.data.code == 200){
+                    this.$message.success('修改成功')
+                    this.onLoad()
+                    done()
+                }
+            })
+        },
         rowDel(row) {
             this.$confirm('确定将选择数据删除?', {
                 confirmButtonText: '确定',
@@ -546,7 +567,8 @@ export default {
             this.loading = true;
             getList({
                 current:this.page.currentPage,
-                size:this.page.pageSize
+                size:this.page.pageSize,
+                ...this.query
             }).then(res =>{
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total

src/views/warehouseManagement/workwearPlan/index.vue

@@ -126,6 +126,7 @@
 </template>
 
 <script>
+import {getList,save} from '@/api/storeManagement/workwearPlan'
 import workColumnData from './js/workColumnData';
 export default {
     data() {
@@ -351,33 +352,40 @@ export default {
             done();
         },
         onLoad() {
-            this.data = [
-                {
-                    id: 1,
-                    partCode: '001', moCodee: '002', planType: '备件', quantity: 10, quaLevel: '002',
-                    urgentTypeText: '正常', urgentType: '0', needDate: '2022-10-30', createTime: '2022-10-15',
-                    memo: '', mafStatusTitle: '正常',
-                    keeper: {
-                        userName: '张三',
-                    },
-                    createMan: {
-                        userName: '李四'
-                    }
-                },
-                {
-                    id: 2,
-                    partCode: '001', moCodee: '002', planType: '备件', quantity: 10, quaLevel: '002',
-                    urgentTypeText: '正常', urgentType: '0', needDate: '2022-10-30', createTime: '2022-10-15',
-                    memo: '', mafStatusTitle: '正常',
-                    keeper: {
-                        userName: '张三',
-                    },
-                    createMan: {
-                        userName: '李四'
-                    }
-                },
-            ]
-            this.page.total = this.data.length
+            getList({
+                current:this.page.currentPage,
+                size:this.page.pageSize,
+            }).then(res =>{
+                this.data = res.data.data.records
+                this.page.total = res.data.data.total
+            })
+            // this.data = [
+            //     {
+            //         id: 1,
+            //         partCode: '001', moCodee: '002', planType: '备件', quantity: 10, quaLevel: '002',
+            //         urgentTypeText: '正常', urgentType: '0', needDate: '2022-10-30', createTime: '2022-10-15',
+            //         memo: '', mafStatusTitle: '正常',
+            //         keeper: {
+            //             userName: '张三',
+            //         },
+            //         createMan: {
+            //             userName: '李四'
+            //         }
+            //     },
+            //     {
+            //         id: 2,
+            //         partCode: '001', moCodee: '002', planType: '备件', quantity: 10, quaLevel: '002',
+            //         urgentTypeText: '正常', urgentType: '0', needDate: '2022-10-30', createTime: '2022-10-15',
+            //         memo: '', mafStatusTitle: '正常',
+            //         keeper: {
+            //             userName: '张三',
+            //         },
+            //         createMan: {
+            //             userName: '李四'
+            //         }
+            //     },
+            // ]
+            // this.page.total = this.data.length
         }
     }
 }