From 60ec9e2bf70e7b777894b9af96bed05c9037d77b Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Tue, 8 Aug 2023 17:36:57 +0800 Subject: [PATCH] up --- .env.development | 16 ++++++------- src/views/component/dialog.vue | 2 +- .../outbounds/component/addoutbounds.vue | 6 ++++- src/views/outbounds/index.vue | 14 +++++++---- src/views/stocks/component/addRuku.vue | 23 ++++++++++++++----- 5 files changed, 41 insertions(+), 20 deletions(-) diff --git a/.env.development b/.env.development index 3d31e78..1d25804 100644 --- a/.env.development +++ b/.env.development @@ -2,15 +2,15 @@ ENV='development' # base api -VUE_APP_BASE_API = http://192.168.60.99:9004/ -VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file -VUE_APP_OA_URL = http://192.168.60.18:2021 -VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' +#VUE_APP_BASE_API = http://192.168.60.99:9004/ +#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file +#VUE_APP_OA_URL = http://192.168.60.18:2021 +#VUE_APP_OA_URL_TYPE = '{"领用":"37","处置":"38","应急":"39"}' -#VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ -#VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file -#VUE_APP_OA_URL= http://suzhouhedaooa.langye.net -#VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' +VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ +VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file +VUE_APP_OA_URL= http://suzhouhedaooa.langye.net +VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' diff --git a/src/views/component/dialog.vue b/src/views/component/dialog.vue index 3de0beb..d9254c5 100644 --- a/src/views/component/dialog.vue +++ b/src/views/component/dialog.vue @@ -366,7 +366,7 @@ export default { if (validate) { this.formInfo.forEach((info) => { if (info.edit_input === "files") { - this.form[info.field] = info._fileList.map( + this.form[info.field] = info._fileList?.map( (i) => i?.response?.id ); } diff --git a/src/views/outbounds/component/addoutbounds.vue b/src/views/outbounds/component/addoutbounds.vue index b0ee046..4a5d27b 100644 --- a/src/views/outbounds/component/addoutbounds.vue +++ b/src/views/outbounds/component/addoutbounds.vue @@ -391,7 +391,11 @@ { title: '物资类型', key: 'wuzileixing', - } + }, + { + title: '入库批次', + key: 'rukupici', + }, ], wuziList: [] } diff --git a/src/views/outbounds/index.vue b/src/views/outbounds/index.vue index 1e81dd0..a2b319e 100644 --- a/src/views/outbounds/index.vue +++ b/src/views/outbounds/index.vue @@ -214,15 +214,21 @@ } let default_json = { + // 'yewukeshi':row.jieyongbumen, + // 'bianhao':row.chukushijian+'-'+row.id, + // 'wuzimingcheng':row.id_outbounds_items_outbounds_id_relation[0].zichanmingcheng, + // 'lingyongshijian':row.chukushijian, + // 'shuliang':row.id_outbounds_items_outbounds_id_relation[0].jieyongshuliang, + // 'xinghaoguige':row.id_outbounds_items_outbounds_id_relation[0].guigexinghao, + // 'jingbanren':row.jilurenyuan, + // 'beizhu':row.beizhu, + // 'gudingzichanbianhao':row.gudingzichanbianhao, + // 'baofeiyuanyin':row.baofeiyuanyin, 'yewukeshi':row.jieyongbumen, 'bianhao':row.chukushijian+'-'+row.id, - 'wuzimingcheng':row.id_outbounds_items_outbounds_id_relation[0].zichanmingcheng, 'lingyongshijian':row.chukushijian, - 'shuliang':row.id_outbounds_items_outbounds_id_relation[0].jieyongshuliang, - 'xinghaoguige':row.id_outbounds_items_outbounds_id_relation[0].guigexinghao, 'jingbanren':row.jilurenyuan, 'beizhu':row.beizhu, - 'gudingzichanbianhao':row.gudingzichanbianhao, 'baofeiyuanyin':row.baofeiyuanyin, 'link_id':row.id } diff --git a/src/views/stocks/component/addRuku.vue b/src/views/stocks/component/addRuku.vue index 7ade640..5d86ab7 100644 --- a/src/views/stocks/component/addRuku.vue +++ b/src/views/stocks/component/addRuku.vue @@ -215,10 +215,10 @@
- 入库批次： + *入库批次：
- @@ -688,8 +688,8 @@ this.showLoading = true }) }, 500) - - if (this.mingxiObj.wuzibianma == '' || this.mingxiObj.rukushuliang == '') { + console.log("this.mingxiObj",this.mingxiObj.rukupici) + if (this.mingxiObj.wuzibianma == '' || this.mingxiObj.rukushuliang == '' || this.mingxiObj.rukupici == '') { Message({ type: 'warning', message: '请填写完整数据' @@ -843,6 +843,9 @@ label: m.rukupici }) } + }, + selectPici(e){ + console.log("pici",e) }, wuziSelect(e) { console.log(e) @@ -909,8 +912,16 @@ rukumingxi: '' } this.editHt = res?.caigouhetong - this.editQs = res?.qingshiliucheng - this.mingxiList = res.id_stocks_items_stocks_id_relation + this.editQs = res?.qingshiliucheng + this.mingxiList = [] + // this.mingxiList = res.id_stocks_items_stocks_id_relation + // if(res.rukuleixing=='回库'){ + for(var r of res.id_stocks_item_links_stocks_id_relation){ + this.mingxiList.push(JSON.parse(r.yuanshishuju)) + } + // }else{ + // this.mingxiList = res.id_stocks_items_stocks_id_relation + // } }, submit() { this.form.id_stocks_items_stocks_id_relation = this.mingxiList