From e06ad4f7fe40490da1d9d85bac8cd0b7d8c0d4ed Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Tue, 18 Jul 2023 16:58:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E7=AD=BE=E6=94=B6=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionSignfor.js | 2 +- src/option/basicdata/basicdataCarrier.js | 1 - .../driverArtery/basicdataDriverArtery.vue | 1 + .../deliverylist/distributionDeliveryList.vue | 10 + .../distributionDeliveryListedt.vue | 205 ++++++- .../signdetail/distributionSigndetail.vue | 2 +- .../signfor/distributionSignfor.vue | 27 +- .../signfor/distributionSignforedt.vue | 500 +++++++++++++----- .../signfor/distributionSignfortreat.vue | 191 ++++++- 9 files changed, 777 insertions(+), 162 deletions(-) diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js index 6a1bc714..65729727 100644 --- a/src/api/distribution/distributionSignfor.js +++ b/src/api/distribution/distributionSignfor.js @@ -74,7 +74,7 @@ export const add = (row) => { export const update = (row) => { return request({ - url: '/api/logpm-distribution/signfor/submit', + url: '/api/logpm-distribution/signfor/update', method: 'post', data: row }) diff --git a/src/option/basicdata/basicdataCarrier.js b/src/option/basicdata/basicdataCarrier.js index 50f2db61..e658b91a 100644 --- a/src/option/basicdata/basicdataCarrier.js +++ b/src/option/basicdata/basicdataCarrier.js @@ -387,7 +387,6 @@ export default { res: 'data', url: 'link', }, - }, { label: "合同附件", diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index 7086e9e4..ba5bd9f2 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -613,6 +613,7 @@ }); }, rowUpdate(row, index, done, loading) { + console.log("swx>>>>>>>>>>>>>>"); update(row).then(() => { this.onLoad(this.page); this.$message({ diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 124973ef..1dff85cb 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -315,6 +315,16 @@ export default { fixed: false, sortable: true, }, + { + prop: 'fee', + label: '增值服务', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderNumber', label: '订单总数', diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 5b1ffeaf..aaebeb78 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -79,7 +79,8 @@ @@ -183,12 +184,32 @@ + + + + +
+
+ 确定 + 取消 +
+
+ + + + diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index c1b5582a..930d0c80 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -73,7 +73,7 @@ > @@ -173,6 +173,24 @@ + + + +
+
+ 确定 + 取消 +
+
+ + import { getList, getDetail, add, update, remove ,getPage,getstatistics} from '@/api/distribution/distributionSignfor'; +import { update as updatesign } from "@/api/distribution/distributionSignfor"; import option from '@/option/distribution/distributionSignfor'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; @@ -214,7 +233,7 @@ export default { // head: false, // }, { - prop: 'shoppingName', + prop: 'mallName', label: '商城名称', type: 2, values: '', @@ -422,8 +441,138 @@ export default { loading: true, // 是否为查看模式 view: false, + //签收是否显示 + signBox: false, + // 签收表单数据 + signform: {}, + // 签收列表 + signdata: [], // 查询信息 query: {}, + // 表单配置 + signoption: { + height:'auto', + width:'40px', + calcHeight: 30, + tip: false, + searchShow: true, + searchMenuSpan: 6, + border: true, + index: true, + viewBtn: true, + dialogClickModal: false, + emptyBtn: false, //隐藏清空按钮 + submitBtn: false, //隐藏提交按钮 + column: [ + { + label: "收货人姓名", + labelWidth:'150', + span:11, + prop: "consignee", + type: "input", + width:"150px", + align:'center', + disabled:true, + // rules: [{ + // required: true, + // message: "输入承运商编号", + // trigger: "blur" + // }], + }, + { + label: "收货人电话", + prop: "deliveryPhone", + labelWidth:'150', + span:11, + type: "input", + width:"150px", + align:'center', + disabled:true, + }, + { + label: "收货地址", + prop: "deliveryAddress", + labelWidth:'150', + span:11, + type: "input", + width:"150px", + align:'center', + disabled:true, + }, + { + label: "签收类型", + prop: "signingType", + labelWidth:'150', + span:11, + type: "radio", + width:"150px", + align:'center', + disabled:true, + dicData: [ + { + label: '签收', + value: '1', + }, + { + label: '代签收', + value: '2', + } + ], + }, + { + label: "司机签收图片", + prop: "deliverySignPictures", + labelWidth:'150', + type: 'upload', + listType: 'picture-card', + width:"150px", + span:15, + multiple:true, + align:'left', + action: '/blade-resource/oss/endpoint/put-file', + limit: 5, + propsHttp: { + res: 'data', + url: 'link', + }, + disabled:true, + }, + { + label: "复核图片", + prop: "clerkSignPictures", + type: 'upload', + listType: 'picture-card', + dataType: 'string', + labelWidth:'150', + span:15, + multiple:true, + width:"200px", + align:'left', + action: '/blade-resource/oss/endpoint/put-file', + limit: 15, + propsHttp: { + res: 'data', + url: 'link', + }, + rules: [{ + required: true, + message: "请上传图片", + trigger: "blur" + }], + }, + + { + label: "备注", + prop: "clerkSignRemarks", + labelWidth:'150', + span:15, + type: "input", + width:"150px", + align:'center', + }, + + ] + }, //数量 statistics:{}, //签收类型 @@ -558,6 +707,35 @@ export default { } }, + //取消 + cancellation(){ + this.signBox = false; + }, + //签收 + submitForm(){ + // this.isDis = true; + this.$refs.signform.validate(valid => { + if (valid) { + let row = {} + row.id = this.signform.id + row.clerkSignPictures = this.signform.clerkSignPictures + row.clerkSignRemarks = this.signform.clerkSignRemarks + row.signingStatus = '2' + // if (!!row.id){ + updatesign(row).then(() => { + this.$message({ + type: "success", + message: "操作成功!" + }); + this.signBox = false; + this.onLoad(this.page); + }, error => { + console.log(error); + this.signBox = false; + }); + } + }); + }, selectionsc(value) { console.log(value); }, @@ -565,6 +743,15 @@ export default { const { row } = scope; console.log(row); }, + handleSign(row) { + console.log("签收>>>>>>>>>>",row); + // this.title = '查看'; + // this.view = true; + this.signform = row + this.signBox = true; + // this.wid= row.id + // this.getWrapdetails(this.wpage) + }, editsolt(scope) { const { row } = scope; console.log("row>>>>>>>>>>>>>>>>>>>",row); From cad6722e10cdad3d087a2bd4ac4794d5d9731f92 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 18 Jul 2023 17:01:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/basicdata/basicdataStoreBrand.js | 1 + .../warehouse/warehouseWarehousingDetail.js | 5 + .../distributionStockListDiscuss.vue | 2 +- .../inventory/distributionStockListMarket.vue | 2 +- .../inventory/distributionStockListSelf.vue | 2 +- .../stockup/distributionStockup.vue | 2 +- .../stockup/distributionStockupDiscuss.vue | 104 +++++++++++---- .../stockup/distributionStockupMarket.vue | 94 ++++++++++---- .../stockup/distributionStockupSelf.vue | 94 ++++++++++---- .../warehouseWarehouseingAddReceipt.vue | 118 +++++++++++++++--- .../warehouseWarehousingEntry.vue | 61 +++++---- 11 files changed, 366 insertions(+), 119 deletions(-) diff --git a/src/option/basicdata/basicdataStoreBrand.js b/src/option/basicdata/basicdataStoreBrand.js index e86275a8..5b5d0b14 100644 --- a/src/option/basicdata/basicdataStoreBrand.js +++ b/src/option/basicdata/basicdataStoreBrand.js @@ -9,6 +9,7 @@ export default { indexLabel:'序号', indexWidth: '80', index: true, + addBtn: true, viewBtn: true, selection: true, dialogClickModal: false, diff --git a/src/option/warehouse/warehouseWarehousingDetail.js b/src/option/warehouse/warehouseWarehousingDetail.js index 7001598d..984743cf 100644 --- a/src/option/warehouse/warehouseWarehousingDetail.js +++ b/src/option/warehouse/warehouseWarehousingDetail.js @@ -113,6 +113,11 @@ export default { prop: "packagingSpecifications", search: true, }, + { + label: "品牌", + prop: "brandName", + search: true, + }, { label: "入库数量", prop: "createInventory", diff --git a/src/views/distribution/inventory/distributionStockListDiscuss.vue b/src/views/distribution/inventory/distributionStockListDiscuss.vue index 099134ce..e25632f5 100644 --- a/src/views/distribution/inventory/distributionStockListDiscuss.vue +++ b/src/views/distribution/inventory/distributionStockListDiscuss.vue @@ -780,7 +780,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; - this.query.typeService = '1'; + this.query.serviceType = '1'; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue index e138468f..27bc2545 100644 --- a/src/views/distribution/inventory/distributionStockListMarket.vue +++ b/src/views/distribution/inventory/distributionStockListMarket.vue @@ -784,7 +784,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; - this.query.typeService = '2'; + this.query.serviceType = '2'; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/distribution/inventory/distributionStockListSelf.vue b/src/views/distribution/inventory/distributionStockListSelf.vue index 084d1d8e..5a690fdd 100644 --- a/src/views/distribution/inventory/distributionStockListSelf.vue +++ b/src/views/distribution/inventory/distributionStockListSelf.vue @@ -784,7 +784,7 @@ export default { }, onLoad (page, params = {}) { this.loading = true; - this.query.typeService = '3'; + this.query.serviceType = '3'; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; this.page.total = data.total; diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue index b0c4f2ad..54d2277c 100644 --- a/src/views/distribution/stockup/distributionStockup.vue +++ b/src/views/distribution/stockup/distributionStockup.vue @@ -833,7 +833,7 @@ export default { i.forkliftId =a.data.data.name; }*/ let s =this.distributionType.find(d => d.dictKey == i.typeService); - console.log("sssss",s); + // console.log("sssss",s); i.typeServiceName = s.dictValue; i.loader = i.groupName; i.stockupArea = i.headline; diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index 319fa96e..c298a01e 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -261,6 +261,7 @@ import { getListOwn, getUser } from '@/api/system/user'; import option from '@/option/distribution/distributionStockup'; import { mapGetters } from 'vuex'; import { getListTeam } from '@/api/basicdata/basicdataTeamGroup'; +import { getDictionaryBiz } from '@/api/system/dict'; export default { data() { @@ -278,7 +279,7 @@ export default { { prop: 'stockupDate', label: '备货时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -297,12 +298,29 @@ export default { sortable: true, }, { - prop: 'stockupStatus', + prop: 'stockupStatusName', label: '备货状态', - type: 2, + type: 3, values: '', width: '180', - checkarr: [], + checkarr: [ + { + label: '未备货', + value: '1', + }, + { + label: '待备货', + value: '2', + }, + { + label: '备货中', + value: '3', + }, + { + label: '已备货', + value: '4', + }, + ], fixed: false, sortable: true, }, @@ -317,12 +335,21 @@ export default { sortable: true, }, { - prop: 'assignStatus', + prop: 'assignStatusName', label: '指派状态', - type: 2, + type: 3, values: '', width: '150', - checkarr: [], + checkarr: [ + { + label: '未指派', + value: '1', + }, + { + label: '已指派', + value: '2', + }, + ], fixed: false, sortable: true, }, @@ -336,21 +363,31 @@ export default { fixed: false, sortable: true, }, + // { + // prop: 'goodsAreaId', + // label: '备货区编号', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: true, + // }, { - prop: 'goodsAreaId', - label: '备货区编号', + prop: 'forkliftName', + label: '叉车司机', type: 2, values: '', width: '150', checkarr: [], fixed: false, sortable: true, - head: true, }, { - prop: 'forklift', - label: '叉车司机', - type: 2, + prop: 'typeServiceName', + label: '服务类型', + type: 3, values: '', width: '150', checkarr: [], @@ -358,7 +395,7 @@ export default { sortable: true, }, { - prop: 'loader', + prop: 'loaderName', label: '装卸班组', type: 2, values: '', @@ -370,7 +407,7 @@ export default { { prop: 'fixTime', label: '确认完成备货时间', - type: 5, + type: 1, values: '', width: '220', checkarr: [], @@ -380,7 +417,7 @@ export default { { prop: 'assignTime', label: '指派时间', - type: 5, + type: 1, values: '', width: '220', checkarr: [], @@ -438,7 +475,7 @@ export default { }, mounted() { this.init(); - this.onLoad(this.page); + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 @@ -687,6 +724,16 @@ export default { }, init() { this.height = this.setPx(document.body.clientHeight - 340); + getDictionaryBiz('distribution_type').then(res => { + // console.log("8908098080",res.data.data); + this.distributionType = res.data.data; + this.columnList[8].checkarr =res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); + }); + this.onLoad(this.page); }, searchHide() { this.search = !this.search; @@ -813,19 +860,22 @@ export default { i.forklift = a.data.data.name; }*/ + let s =this.distributionType.find(d => d.dictKey == i.typeService); + // console.log("sssss",s); + i.typeServiceName = s.dictValue; i.loader = i.groupName; i.stockupArea = i.headline; - if (i.assignStatus == '2') { - i.assignStatus = '已指派'; - } else { - i.assignStatus = '未指派'; + if(i.assignStatus == '2'){ + i.assignStatusName = '已指派'; + }else{ + i.assignStatusName = '未指派'; } - if (i.stockupStatus == '2') { - i.stockupStatus = '待备货'; - } else if (i.stockupStatus == '3') { - i.stockupStatus = '已备货'; - } else { - i.stockupStatus = '未备货'; + if(i.stockupStatus == '2'){ + i.stockupStatusName = '待备货'; + }else if(i.stockupStatus == '3'){ + i.stockupStatusName = '已备货'; + }else{ + i.stockupStatusName = '未备货'; } }); // this.selectionClear(); diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 3fc7308f..b2ebc75b 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -210,6 +210,7 @@ import { getListOwn,getUser } from '@/api/system/user'; import option from "@/option/distribution/distributionStockup"; import { mapGetters } from "vuex"; import { getListTeam } from '@/api/basicdata/basicdataTeamGroup'; +import { getDictionaryBiz } from '@/api/system/dict'; export default { data () { @@ -227,7 +228,7 @@ export default { { prop: 'stockupDate', label: '备货时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -246,12 +247,29 @@ export default { sortable: true, }, { - prop: 'stockupStatus', + prop: 'stockupStatusName', label: '备货状态', - type: 2, + type: 3, values: '', width: '180', - checkarr: [], + checkarr: [ + { + label: '未备货', + value: '1', + }, + { + label: '待备货', + value: '2', + }, + { + label: '备货中', + value: '3', + }, + { + label: '已备货', + value: '4', + }, + ], fixed: false, sortable: true, }, @@ -266,12 +284,21 @@ export default { sortable: true, }, { - prop: 'assignStatus', + prop: 'assignStatusName', label: '指派状态', - type: 2, + type: 3, values: '', width: '150', - checkarr: [], + checkarr: [ + { + label: '未指派', + value: '1', + }, + { + label: '已指派', + value: '2', + }, + ], fixed: false, sortable: true, }, @@ -285,21 +312,31 @@ export default { fixed: false, sortable: true, }, + // { + // prop: 'goodsAreaId', + // label: '备货区编号', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: true, + // }, { - prop: 'goodsAreaId', - label: '备货区编号', + prop: 'forkliftName', + label: '叉车司机', type: 2, values: '', width: '150', checkarr: [], fixed: false, sortable: true, - head: true, }, { - prop: 'forklift', - label: '叉车司机', - type: 2, + prop: 'typeServiceName', + label: '服务类型', + type: 3, values: '', width: '150', checkarr: [], @@ -307,7 +344,7 @@ export default { sortable: true, }, { - prop: 'loader', + prop: 'loaderName', label: '装卸班组', type: 2, values: '', @@ -319,7 +356,7 @@ export default { { prop: 'fixTime', label: '确认完成备货时间', - type: 5, + type: 1, values: '', width: '220', checkarr: [], @@ -329,7 +366,7 @@ export default { { prop: 'assignTime', label: '指派时间', - type: 5, + type: 1, values: '', width: '220', checkarr: [], @@ -387,7 +424,7 @@ export default { }, mounted () { this.init(); - this.onLoad(this.page); + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 @@ -572,6 +609,16 @@ export default { }, init () { this.height = this.setPx(document.body.clientHeight - 340); + getDictionaryBiz('distribution_type').then(res => { + // console.log("8908098080",res.data.data); + this.distributionType = res.data.data; + this.columnList[8].checkarr =res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); + }); + this.onLoad(this.page); }, searchHide () { this.search = !this.search; @@ -698,19 +745,22 @@ export default { i.forklift =a.data.data.name; }*/ + let s =this.distributionType.find(d => d.dictKey == i.typeService); + // console.log("sssss",s); + i.typeServiceName = s.dictValue; i.loader = i.groupName; i.stockupArea = i.headline; if(i.assignStatus == '2'){ - i.assignStatus = '已指派'; + i.assignStatusName = '已指派'; }else{ - i.assignStatus = '未指派'; + i.assignStatusName = '未指派'; } if(i.stockupStatus == '2'){ - i.stockupStatus = '待备货'; + i.stockupStatusName = '待备货'; }else if(i.stockupStatus == '3'){ - i.stockupStatus = '已备货'; + i.stockupStatusName = '已备货'; }else{ - i.stockupStatus = '未备货'; + i.stockupStatusName = '未备货'; } }); this.selectionClear(); diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index dbd16e63..22c10182 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -210,6 +210,7 @@ import { getListOwn,getUser } from '@/api/system/user'; import option from "@/option/distribution/distributionStockup"; import { mapGetters } from "vuex"; import { getListTeam } from '@/api/basicdata/basicdataTeamGroup'; +import { getDictionaryBiz } from '@/api/system/dict'; export default { data () { @@ -227,7 +228,7 @@ export default { { prop: 'stockupDate', label: '备货时间', - type: 2, + type: 4, values: '', width: '150', checkarr: [], @@ -246,12 +247,29 @@ export default { sortable: true, }, { - prop: 'stockupStatus', + prop: 'stockupStatusName', label: '备货状态', - type: 2, + type: 3, values: '', width: '180', - checkarr: [], + checkarr: [ + { + label: '未备货', + value: '1', + }, + { + label: '待备货', + value: '2', + }, + { + label: '备货中', + value: '3', + }, + { + label: '已备货', + value: '4', + }, + ], fixed: false, sortable: true, }, @@ -266,12 +284,21 @@ export default { sortable: true, }, { - prop: 'assignStatus', + prop: 'assignStatusName', label: '指派状态', - type: 2, + type: 3, values: '', width: '150', - checkarr: [], + checkarr: [ + { + label: '未指派', + value: '1', + }, + { + label: '已指派', + value: '2', + }, + ], fixed: false, sortable: true, }, @@ -285,21 +312,31 @@ export default { fixed: false, sortable: true, }, + // { + // prop: 'goodsAreaId', + // label: '备货区编号', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: true, + // }, { - prop: 'goodsAreaId', - label: '备货区编号', + prop: 'forkliftName', + label: '叉车司机', type: 2, values: '', width: '150', checkarr: [], fixed: false, sortable: true, - head: true, }, { - prop: 'forklift', - label: '叉车司机', - type: 2, + prop: 'typeServiceName', + label: '服务类型', + type: 3, values: '', width: '150', checkarr: [], @@ -307,7 +344,7 @@ export default { sortable: true, }, { - prop: 'loader', + prop: 'loaderName', label: '装卸班组', type: 2, values: '', @@ -319,7 +356,7 @@ export default { { prop: 'fixTime', label: '确认完成备货时间', - type: 5, + type: 1, values: '', width: '220', checkarr: [], @@ -329,7 +366,7 @@ export default { { prop: 'assignTime', label: '指派时间', - type: 5, + type: 1, values: '', width: '220', checkarr: [], @@ -387,7 +424,7 @@ export default { }, mounted () { this.init(); - this.onLoad(this.page); + /** * 初始化获取本地缓存的编辑隐藏的列表 * 固定搭配，不能更改 @@ -572,6 +609,16 @@ export default { }, init () { this.height = this.setPx(document.body.clientHeight - 340); + getDictionaryBiz('distribution_type').then(res => { + // console.log("8908098080",res.data.data); + this.distributionType = res.data.data; + this.columnList[8].checkarr =res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); + }); + this.onLoad(this.page); }, searchHide () { this.search = !this.search; @@ -698,19 +745,22 @@ export default { i.forklift =a.data.data.name; }*/ + let s =this.distributionType.find(d => d.dictKey == i.typeService); + // console.log("sssss",s); + i.typeServiceName = s.dictValue; i.loader = i.groupName; i.stockupArea = i.headline; if(i.assignStatus == '2'){ - i.assignStatus = '已指派'; + i.assignStatusName = '已指派'; }else{ - i.assignStatus = '未指派'; + i.assignStatusName = '未指派'; } if(i.stockupStatus == '2'){ - i.stockupStatus = '待备货'; + i.stockupStatusName = '待备货'; }else if(i.stockupStatus == '3'){ - i.stockupStatus = '已备货'; + i.stockupStatusName = '已备货'; }else{ - i.stockupStatus = '未备货'; + i.stockupStatusName = '未备货'; } }); this.selectionClear(); diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue index f17c5826..1922fa95 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue @@ -75,14 +75,14 @@ - - - + + + - + - + {{item.dictValue}} @@ -123,10 +123,10 @@ -
- - -
+ + + + @@ -264,12 +264,30 @@ + + + + + + - - - + @@ -278,7 +296,7 @@ @@ -296,6 +314,7 @@ import { getListClient } from '@/api/basicdata/basicClient'; import { getDept } from '@/api/system/dept'; import { getListMaterial } from '@/api/basic/basicMaterial'; import { getListCopy } from '@/api/basicdata/basicdataWarehouse'; +import { getListIdsName} from '@/api/basicdata/basicdataStoreBrand'; import dayjs from 'dayjs'; @@ -306,6 +325,7 @@ export default { height: 0, distributionType: [], distributionUnit: [], + distributionBrand: [], // 主键 warehouseWarehousingEntryId: '', // 弹框标题 @@ -345,6 +365,7 @@ export default { stuffName: [],//物品名称 stuffCode: [],//物品编码 stuff: [],//物品集合 + brandList: [],//品牌集合 shop: [],//门店 options: [],//客户 rules: { @@ -372,6 +393,10 @@ export default { productUnit: [ { required: true, message: '请选择物品单位', trigger: 'change' } ], + brandId: [ + { required: true, message: '请选择品牌', trigger: 'change' } + ], + receiptBatch: [ { required: true, message: '请填写入库批次', trigger: 'blur' } @@ -409,6 +434,7 @@ export default { '$route.query.id': { handler(newVal, oldVal) { console.log(newVal, oldVal); + console.log("$route.query.id",this.$route.query.type); this.getOwnDeliver(); }, deep: true, @@ -427,6 +453,13 @@ export default { }, methods: { + //物品名称回显 + async getBanerqd(row){ + let a = this.brandList.find(i =>i.value== row); + console.log("aA",a); + this.formDetail.brandName = a.label; + }, + //查询详情信息 async getOwnDeliver(){ let a = this.$route.query.id; @@ -549,6 +582,29 @@ export default { this.stuffCode = [] } }, + //查询品牌信息 + async getBrandName(query){ + if (query) { + console.log("客户ID",this.form.clientId); + if(!!this.form.clientId){ + let si = !!this.form.storeId ? this.form.storeId : this.form.clientId; + let cl = await getListIdsName(this.page.currentPage, this.page.pageSize,{ brandName: query,ids: si }); + console.log(">>>>",cl.data.data); + cl.data.data.forEach(i => { + let st = { + label: i.brandName, + value: i.id + } + this.brandList.push(st); + }); + }else{ + this.$message.warning("请先填写客户信息，在选择品牌！！") + } + + } else { + this.brandList = [] + } + }, //门店查询 async getMen(row,type){ if(type == 1){ @@ -740,6 +796,10 @@ export default { } else { // console.log("修改！！！"); + if(!this.form.orderNumber){ + this.$message.warning("请完善订单自编号！！"); + return ; + } console.log("this.form",this.form); this.form.list = this.data; update(this.form).then(() => { @@ -877,15 +937,35 @@ export default { async getWareHoust(page, params = {}){ let a = await getListUser(); let b = await getDept(a.data.data.deptId); - console.log("aaa",a); - console.log("bbb",b); + // console.log("aaa",a); + // console.log("bbb",b); + //查询全部仓库 + let sl = {}; if(b.data.data.deptCategory == "4"){ - //部门 + sl.department= b.data.data.id; + } + let li = await getListCopy(page.currentPage, page.pageSize,sl); + // console.log("li>>>>",li.data.data); + this.store = []; + li.data.data.records.forEach(i =>{ let st= { - label: b.data.data.deptName, - value: b.data.data.id + label: i.name, + value: i.id } this.store.push(st); + }); + + /* if(b.data.data.deptCategory == "4"){ + //部门 + let li = await getListCopy(page.currentPage, page.pageSize,{department: b.data.data.id}); + console.log("li>>>>",li.data.data); + li.data.data.some( i =>{ + let st= { + label: b.data.data.deptName, + value: b.data.data.id + } + this.store.push(st); + }) this.form.warehouseId = b.data.data.id; }else{ //查询全部仓库 @@ -900,7 +980,7 @@ export default { } this.store.push(st); }); - } + }*/ }, } }; diff --git a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue index 1a16cbf5..2e42fdf5 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue @@ -1,25 +1,25 @@