From bdc747876d1d90b44dae30939d32b02cd56d4265 Mon Sep 17 00:00:00 2001 From: jinna Date: Tue, 24 Mar 2026 20:44:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97=E8=81=94?= =?UTF-8?q?=E8=B0=83=E5=8F=8A=E7=BC=BA=E9=99=B7=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + public/config.js | 2 +- .../inspectionArchiving/rbFilePreserve.js | 7 +-- .../storeManagement/warehouseMaintenance.js | 9 ++++ src/views/basicData/warehouseMaintenance.vue | 52 ++++++++++++++++++- .../components/trialStandard.vue | 2 +- .../inspectionArchiving/ERecord/index.vue | 5 +- .../rbFilePreserve/addPreserve.vue | 18 +++++-- .../rbFilePreserve/templatePreserve.vue | 45 +++++++++------- .../rbFilePreserve/templatePreserve2.vue | 31 +++++++---- .../tankSolutionSystem/inspectionReport.vue | 2 +- .../tankSolutionTaskDispose.vue | 12 +++-- 12 files changed, 141 insertions(+), 45 deletions(-) diff --git a/index.html b/index.html index dc1538b..5275750 100644 --- a/index.html +++ b/index.html @@ -46,6 +46,7 @@ + diff --git a/public/config.js b/public/config.js index 1742def..eb3980e 100644 --- a/public/config.js +++ b/public/config.js @@ -26,4 +26,4 @@ window.WARE_MATERIAL_STOCK_TAG = "http://192.168.169.172:9000/jmreport/view/1181 window.PROCESS_INSPECTION_RECORD ="http://192.168.169.172:9000/jmreport/view/1188648621968805888" //检验记录地址 //测厚打印 -window.THICKNESS_PRINT = "http://192.168.169.172:9000/jmreport/view/1192318619566641152?woId=&&&&&&&&" \ No newline at end of file +window.THICKNESS_PRINT = "http://192.168.169.172:9000/jmreport/view/1192318619566641152" \ No newline at end of file diff --git a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js index b4db94b..b52c44d 100644 --- a/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js +++ b/src/api/qualityManagement/inspectionArchiving/rbFilePreserve.js @@ -39,9 +39,9 @@ export const deleteRecords = (params) =>{ // 电子档案详情 export const getWordDetail = (params) =>{ return request({ - url:'/api/blade-desk/QA/ProReTemplate/detail', + // url:'/api/blade-desk/QA/ProReTemplate/detail', + url:`/api/blade-desk/QA/InspectionTask/getByRfpId/${params.id}`, method:'get', - params }) } @@ -75,7 +75,8 @@ export const getProcessList = (params) =>{ // 维护电子档案 export const editTable = (data) =>{ return request({ - url:'/api/blade-desk/QA/ProReTemplate/updateDetail', + url:'/api/blade-desk/QA/InspectionTask/saveOrEdit', + // url:'/api/blade-desk/QA/ProReTemplate/updateDetail', method:'post', data }) diff --git a/src/api/storeManagement/warehouseMaintenance.js b/src/api/storeManagement/warehouseMaintenance.js index 08eda63..0771fe5 100644 --- a/src/api/storeManagement/warehouseMaintenance.js +++ b/src/api/storeManagement/warehouseMaintenance.js @@ -131,4 +131,13 @@ export const getAllUser = (params) => { method: 'get', params, }); + }; + +// 获取物料下拉 +export const getMaterialSelect = (params) => { + return request({ + url: '/api/blade-wms/stGoods/page', + method: 'get', + params, + }); }; \ No newline at end of file diff --git a/src/views/basicData/warehouseMaintenance.vue b/src/views/basicData/warehouseMaintenance.vue index 5530095..12e68cc 100644 --- a/src/views/basicData/warehouseMaintenance.vue +++ b/src/views/basicData/warehouseMaintenance.vue @@ -48,10 +48,18 @@ @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad" + :beforeOpen="beforeOpen" > + @@ -132,7 +140,7 @@ import addEditDialog from "./components/addEditDialog.vue" import {warehouseOption,storageOption} from "./js/warehouseMain"; import {getWareList,addWare,editWare,deleteWare,getLocationList,delLocation, editLocation,getUserByRoleAlias,getWareByUser,getWareSelect,getUserByWare,saveUserWare,getAllUser, -saveWareUser} from "@/api/storeManagement/warehouseMaintenance"; +saveWareUser,getMaterialSelect} from "@/api/storeManagement/warehouseMaintenance"; export default { components: { addEditDialog,treeTransfer }, data() { @@ -144,6 +152,8 @@ export default { noChooseWare:[], //未选库房 noChooseUser:[], //未选人员 chooseUser:[], //已选人员 + goodsList:[], + goodsLoading:false, form: {}, query:{}, dialogTitle:'新增', @@ -228,6 +238,46 @@ export default { }) }, methods: { + // getGoodsList(){ + // getMaterialSelect().then(res =>{ + + // }) + // }, + beforeOpen(done, type){ + if(type == 'edit'){ + getMaterialSelect().then(res =>{ + this.goodsList = res.data.data.records + done() + }) + }else{ + done() + } + }, + remoteMethodGoods(query){ + console.log("query",query) + if(query){ + this.goodsLoading = true + getMaterialSelect({ + goodsCode:query + }).then(res =>{ + this.goodsList = res.data.data.records + this.goodsLoading = false + }) + }else{ + this.goodsLoading = true + getMaterialSelect().then(res =>{ + this.goodsList = res.data.data.records + this.goodsLoading = false + }) + } + }, + changeGoods(val){ + console.log("val",val) + let tmp = this.goodsList.find(item => item.id == val) + this.form.goodsName = tmp.goodsName + this.form.specifications = tmp.specifications + this.form.mtltmrk = tmp.mtltmrk + }, searchChange(params, done){ if(this.tabPosition == "warehouseSetup"){ this.query = params diff --git a/src/views/productionTesting/components/trialStandard.vue b/src/views/productionTesting/components/trialStandard.vue index 1a48412..8008cb9 100644 --- a/src/views/productionTesting/components/trialStandard.vue +++ b/src/views/productionTesting/components/trialStandard.vue @@ -9,7 +9,7 @@