diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 7956fd32..fc1b8a01 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -36,7 +36,7 @@ import search from './search.vue'; import logo from './logo.vue'; import top from './top/index.vue'; import sidebar from './sidebar/index.vue'; -import { getMyCurrentWarehouse } from '@/api/work/work'; +// import { getMyCurrentWarehouse } from '@/api/work/work'; export default { mixins: [index], components: { @@ -76,15 +76,15 @@ export default { }; }, created() { - getMyCurrentWarehouse().then(res => { - if (res.data.data == null) { - console.log('当前没有数据'); - localStorage.setItem('WarehouseName', void 0); - return; - } - localStorage.setItem('WarehouseName', res.data.data.name); - localStorage.setItem('my_data', JSON.stringify(res.data.data)) - }); + // getMyCurrentWarehouse().then(res => { + // if (res.data.data == null) { + // console.log('当前没有数据'); + // localStorage.setItem('WarehouseName', void 0); + // return; + // } + // localStorage.setItem('WarehouseName', res.data.data.name); + // localStorage.setItem('my_data', JSON.stringify(res.data.data)) + // }); }, mounted() { if (this.userInfo.tenant_id == '000000') { diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index b5511180..e840d071 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -32,7 +32,7 @@
- {{ datalist[checkwarehousevalue]?.name || '' }} + {{ dataName || '' }}
@@ -67,7 +67,13 @@
- + { + if (res.data.data == null) { + console.log('当前没有数据'); + localStorage.setItem('WarehouseName', void 0); + return; + } + localStorage.setItem('WarehouseName', res.data.data.name); + if(!res.data.data.name){ + this.dataName = ''; + }else{ + this.dataName = res.data.data.name;//仓库名字 + } + }); + }, computed: { ...mapGetters([ @@ -154,6 +167,7 @@ export default { ]), }, methods: { + // 确定切换仓库 async confirmcks() { if (typeof this.warehousevalue != 'number') { return; @@ -173,6 +187,8 @@ export default { setTimeout(() => { window.location.reload(); }, 1000); + this.dataName = '全部'; + localStorage.setItem('WarehouseName', this.dataName); } else { this.$message({ message: res.data.msg, type: 'error' }); } @@ -187,10 +203,17 @@ export default { setTimeout(() => { window.location.reload(); }, 1000); + this.dataName = this.warehouseList[this.warehousevalue - 1].name; + localStorage.setItem('WarehouseName', this.dataName); } else { this.$message({ message: res.data.msg, type: 'error' }); } } + this.$store.commit('DEL_TAG_CURRENT'); + this.$store.commit('DEL_TAG_OTHER'); + }, + warehouseChange(val) { + console.log(val); }, setCollapse() { this.$store.commit('SET_COLLAPSE'); @@ -207,12 +230,15 @@ export default { }); }, showcl(flg) { + console.log(this.datalist[this.warehousevalue], '当前选择的仓库'); this.isshow = flg; if (this.isshow) { getMyWarehouseList().then(res => { console.log(res.data.data, 'getMyWarehouseList'); let arr = [{ name: '全部', id: '0' }]; this.datalist = arr.concat(res.data.data); + this.warehouseList = res.data.data; + console.log(this.warehouseList, '存储的仓库'); }); } }, diff --git a/src/store/modules/tags.js b/src/store/modules/tags.js index 5b20f51a..fceef25f 100644 --- a/src/store/modules/tags.js +++ b/src/store/modules/tags.js @@ -17,6 +17,7 @@ const navs = { state.tagList.push(action); setStore({ name: 'tagList', content: state.tagList }); }, + // 关闭指定标签 DEL_TAG: (state, action) => { state.tagList = state.tagList.filter(item => { return item.fullPath !== action.fullPath; @@ -27,6 +28,7 @@ const navs = { state.tagList = tagList; setStore({ name: 'tagList', content: state.tagList }); }, + // 关闭除了当前页面的所有页面 DEL_TAG_OTHER: state => { state.tagList = state.tagList.filter(item => { console.log("关闭其他111state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item); @@ -35,6 +37,7 @@ const navs = { console.log("2222state.tagList",state.tagList); setStore({ name: 'tagList', content: state.tagList }); }, + // 关闭当前页面 DEL_TAG_CURRENT: state => { state.tagList = state.tagList.filter(item => { console.log("state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item); diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index b2e6793c..70683ae5 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1927,8 +1927,8 @@ const tabChenge = val => { } else if (val == 3) { console.log(UserPermissions.value, '当前身份'); if (UserPermissions.value == '仓库客服') { - data.workOrderStatus = 10; - details.query.workOrderStatus = 10; + data.workOrderStatus = ''; + details.query.workOrderStatus = ''; ArbitrationStatus.value = true; //可以申请仲裁 Tableheaderswitching(columnList); empty(); diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index 9ecd28fe..2ccd8cda 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -42,55 +42,60 @@ - + - -
-
添加信息
-
-
-
- 包条码: - -
- -
- 订单自编码: - -
- -
- 运单号: - + +
+
添加信息
+
+
+
+ 包条码: + +
+ +
+ 订单自编码: + +
+ +
+ 运单号: + +
+ +
+ 品牌: + +
-
- 品牌: - +
+ + 查看历史包件 + + 移除
- -
- - 查看历史包件 - - 移除 +
+ 总件数:{{ NumberPackages }}
-
- 总件数:{{ NumberPackages }} -
-
- - + + - - + - @@ -223,7 +226,7 @@ v-model="Indexform.deliverGoodsTime" type="datetime" format="YYYY-MM-DD" - value-format="YYYY-MM-DD" + value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择发货时间" /> @@ -404,7 +407,6 @@ -
占比: @@ -417,11 +419,11 @@ /> %
-
+
三方责任人: - +
- +
说明: { // 车次号自动带出时间司机 function DeliveryTrainnumber() { - if(!Indexform.value.trainNumber){ - Indexform.value.deliveryTime='' - Indexform.value.deliveryDriver='' - DeliveryDriver.value =[] + if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) { + Indexform.value.deliveryTime = null; + Indexform.value.deliveryDriver = ''; + DeliveryDriver.value = []; } - if(!Indexform.value.trainNumber){ - return + if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) { + return; } let data = { trainNumber: Indexform.value.trainNumber, taskTime: Indexform.value.deliveryTime, }; data.current = 1; //页码 - data.size = 999; //条数 + data.size = 200; //条数 $_shippingInformation(data).then(res => { console.log(res, '查询返回值'); DeliveryDriver.value = res.data.data.records; //获取到的信息 @@ -799,7 +807,7 @@ const responsibleParty = () => { FangAddList.value.push({ businessName: '', personResponsibleName: '', - tripartite:'', + tripartite: '', responsibilityRatio: '', description: '', }); @@ -975,7 +983,7 @@ const ConfirmForm = () => { personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || null, //责任人名称 responsibilityRatio: item.responsibilityRatio, //责任比例 - tripartite:item.tripartite,//三方责任人 + tripartite: item.tripartite, //三方责任人 }); }); } @@ -991,7 +999,7 @@ const ConfirmForm = () => { personResponsibleId: '', personResponsibleName: item.personResponsibleName, //责任人名称 responsibilityRatio: item.responsibilityRatio, //责任比例 - tripartite:item.tripartite,//三方责任人 + tripartite: item.tripartite, //三方责任人 }); }); } @@ -1169,7 +1177,7 @@ const ChangePackageInfo = (val, index) => { // PackageInfo.value[index].second = ''; //二级品 // PackageInfo.value[index].mallName = ''; //客户名称 // PackageInfo.value[index].mallId = ''; //客户ID - + Statistics(); //调用统计包件信息 let data = { packageCode: val, @@ -1179,28 +1187,33 @@ const ChangePackageInfo = (val, index) => { console.log(res.data.data, '包件信息'); if (res.data.data.length) { const packageData = res.data.data[0]; + console.log(packageData,'获取的第一个参数'); PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码 PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号 PackageInfo.value[index].orderId = packageData.orderId; //运单号 PackageInfo.value[index].brandName = packageData.brandName; //品牌 PackageInfo.value[index].state = false; //状态 - Indexform.value.first=packageData.first;//一级品 - Indexform.value.secondary=packageData.secondary;//二级品 - console.log(packageData,'处理的包件参数'); - console.log(Indexform.value.firsts,'一级品'); - console.log(Indexform.value.second,'二 级品'); + + console.log(packageData, '处理的包件参数'); + console.log(Indexform.value.firsts, '一级品'); + console.log(Indexform.value.second, '二 级品'); res.data.data.find(item => { if (item.workOrderId && item.workOrderNumber) { HistoricalPackageList.value = res.data.data; PackageInfo.value[index].state = true; //状态 } - }); + }); + + Indexform.value.first = packageData.firsts; //一级品 + Indexform.value.secondary = packageData.second; //二级品 + Indexform.value.waybillMall = packageData.mallName;//客户名称（运单商场） } // packageCode; //包件码 // //订单自编码 // orderCode: orderId; //运单号 // workOrderId; //工单id // workOrderNumber; //工单名称 + console.log(PackageInfo.value, '处理好的参数'); }); }; @@ -1458,7 +1471,7 @@ const ViewPackageDetails = val => { margin-bottom: 10px; width: 97%; border-left: none; - .el-tabs__header{ + .el-tabs__header { } } .NumTotal { diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index 8693c81e..07f8ae0a 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -1032,8 +1032,8 @@ const onLoad = () => { res.data.data.processorVOList.forEach(item => { if (item.typesOf == 2) { // 处理方 - endFrom.value.processor.push(item.businessId); - //MessageResponsibility.value.push(item.businessId) + endFrom.value.processor.push(item.businessId); + MessageResponsibility.value.push(item.businessId) } }); console.log(endFrom.value.processor, ' endFrom.value.processor'); @@ -1068,7 +1068,7 @@ const onLoad = () => { item.responsibilityRatio = item.responsibilityRatio + '%'; }); companyProportion.value = 100 - sum; - if (res.data.data.processingResultsVO.processingMoneyEntityList.length) { + if (res.data.data.processingResultsVO.processingMoneyEntityList) { ProcessingList.value = res.data.data.processingResultsVO.processingMoneyEntityList.map( item => { endFrom.value.result.push(item.resultType); diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index b0d401ab..15ad806c 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -1158,7 +1158,6 @@ export default { display: flex; } .order-info { - margin-right: 3%; ul { list-style: none; display: flex; diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 4caad91e..81f2bbf9 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -128,7 +128,8 @@ - + 一键签收 + @@ -394,7 +396,7 @@ - + --> - + @@ -515,7 +529,8 @@
------------------------------
--> -
+
@@ -550,7 +565,13 @@ :on-remove="handleRemove" :on-success="ImgSuccessA" :headers="headers" + multiple > + + + + + @@ -568,6 +589,7 @@ :on-remove="handleRemove" :on-success="ImgSuccessB" :headers="headers" + multiple > @@ -576,6 +598,9 @@
+ + +
易碎照 @@ -594,6 +620,8 @@
+ +
家配照 @@ -612,6 +641,7 @@
+
签收照 @@ -685,6 +716,7 @@ export default { data() { return { html: '', + checkloading:false,//复核签收加载 dialogImageUrl: '', //图片放大地址 dialogVisible: false, //图片状态 dialogImageUrlA: '', @@ -714,6 +746,7 @@ export default { SignForPhotos: [], reservationId: null, //当前行的ID windowHeight: null, + CheckStore:null, columnList: [ { prop: 'trainNumber', @@ -1254,6 +1287,16 @@ export default { fixed: false, sortable: true, }, + { + prop: 'signingNumber', + label: '签收数量', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderStatusName', label: '订单状态', @@ -1668,6 +1711,17 @@ export default { sortable: true, head: false, }, + { + prop: 'signingUser', + label: '签收人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'signingTime', label: '签收扫描时间', @@ -2428,46 +2482,46 @@ export default { fixed: false, sortable: true, }, - { - label: '发站仓', - prop: 'sendWarehouseName', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - label: '目的仓', - prop: 'acceptWarehouseName', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - label: '发货时间', - prop: 'waybillNumber', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - label: '入库时间', - prop: 'warehouseEntryTimeEnd', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // label: '发站仓', + // prop: 'sendWarehouseName', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // label: '目的仓', + // prop: 'acceptWarehouseName', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // label: '发货时间', + // prop: 'waybillNumber', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // label: '入库时间', + // prop: 'warehouseEntryTimeEnd', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, // { // label: '客户车次号', // prop: 'trainNumber', @@ -2536,67 +2590,103 @@ export default { { label: '包件状态', prop: 'orderPackageStatusName', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - label: '冻结状态', - prop: 'orderPackageFreezeStatusName', - type: 2, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, - { - label: '上架状态', - prop: 'orderPackageGroundingStatusName', - type: 2, + type: 3, values: '', width: '130', - checkarr: [], + checkarr: [ + { + label: '未签收', + value: '10' + }, + { + label: '已签收', + value: '70' + }, + ], fixed: false, sortable: true, }, + // { + // label: '冻结状态', + // prop: 'orderPackageFreezeStatusName', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + // { + // label: '上架状态', + // prop: 'orderPackageGroundingStatusName', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { label: '备货状态', prop: 'orderPackageStockupStatusName', - type: 2, + type: 3, values: '', width: '130', - checkarr: [], + checkarr: [ + { + label: '待备货', + value: '10' + }, + { + label: '已备货', + value: '20' + }, + ], fixed: false, sortable: true, }, { label: '预约状态', prop: 'orderPackageReservationStatusName', - type: 2, + type: 3, values: '', width: '130', - checkarr: [], + checkarr: [ + { + label: '待预约', + value: '10' + }, + { + label: '已预约', + value: '20' + }, + ], fixed: false, sortable: true, }, { label: '装车状态', prop: 'orderPackageLoadingStatusName', - type: 2, + type: 3, values: '', width: '130', - checkarr: [], + checkarr: [ + { + label: '待装车', + value: '10' + }, + { + label: '已装车', + value: '20' + }, + ], fixed: false, sortable: true, }, { label: '装车时间', prop: 'loadingTime', - type: 2, + type: 4, values: '', width: '130', checkarr: [], @@ -2618,10 +2708,27 @@ export default { { label: '装车方式', prop: 'scanStatus', - type: 2, + type: 3, values: '', width: '130', - checkarr: [], + checkarr: [ + { + label: '扫描', + value: '2' + }, + { + label: '订单', + value: '3' + }, + { + label: '一键装车', + value: '4' + }, + { + label: '补录', + value: '5' + }, + ], fixed: false, sortable: true, }, @@ -2634,7 +2741,7 @@ export default { { label: '计划装车人', prop: 'driverName', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -2654,7 +2761,7 @@ export default { { label: '签收扫描时间', prop: 'signingTime', - type: 2, + type: 4, values: '', width: '130', checkarr: [], @@ -3138,6 +3245,39 @@ export default { if (!index) delete this.inventoryQuery[row.prop]; this.handleInventory(this.page); }, + inputscReservationPackage(index, row) { + console.log('index', index); + console.log('row', row); + this.wrapoption.query[row.prop] = index; + if (!index) delete this.inventoryQuery[row.prop]; + this.getWrapdetails(this.page); + }, + timescReservationPackage(index, row) { + if (!!index) { + index = dayjs(index).format('YYYY-MM-DD'); + } + this.wrapoption.query[row.prop] = index; + if (!index) { + delete this.wrapoption.query[row.prop]; + } + this.getWrapdetails(this.page); + }, + selectscReservationPackage(index, row) { + console.log(index, row); + if (row.prop === 'orderPackageStatusName') { + this.wrapoption.query['orderPackageStatus'] = index; + } else if (row.prop === 'orderPackageStockupStatusName') { + this.wrapoption.query['orderPackageStockupStatus'] = index; + } else if (row.prop === 'orderPackageReservationStatusName') { + this.wrapoption.query['orderPackageReservationStatus'] = index; + } else if (row.prop === 'orderPackageLoadingStatusName') { + this.wrapoption.query['orderPackageLoadingStatus'] = index; + } else { + this.wrapoption.query[row.prop] = index; + } + this.getWrapdetails(this.page); + }, + timesc() {}, btnsc() {}, selectsc() {}, @@ -3178,6 +3318,17 @@ export default { this.dialogVisibleF = true; }, + cancelReservationPackage(row){ + console.log("row",row); + this.$message.warning("功能维护中..."); + return; + + }, + signingReservationPackage(row){ + console.log("row",row); + this.$message.warning("功能维护中..."); + return; + }, /** * 打印 */ @@ -3284,8 +3435,12 @@ export default { this.dialogImageUrlE = uploadFile.url; this.dialogVisibleE = true; }, - + // 复核签收确认弹窗 submitForm() { + console.log(this.reservationId); + console.log(this.CheckStore,'要处理的值'); + this.checkloading=true;//开启复核签收加载效果 + // this.signBox = false; // console.log('--------------->this.signtitle', this.signtitle); // console.log('--------------->this.signtitle', this.submitForm); let row = {}; @@ -3298,6 +3453,7 @@ export default { }; // 提交图片处理 //最后提交 + row.reservationId = this.reservationId; // row.clerkSignPictures = this.signform.clerkSignPictures; row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注 @@ -3316,26 +3472,26 @@ export default { // } const pushPhotoToRow = (photoArray, photoType) => { + photoArray.forEach(item => { row.map[photoType].push({ - name: item.response.data.originalName, + name: item.response && item.response.data ? item.response.data.originalName : '', reservationId: this.reservationId, type: photoType, - urlRoute: item.response.data.link, + urlRoute: item.response && item.response.data ? item.response.data.link : item.url, }); }); }; - pushPhotoToRow(this.DoorstepPhoto, 'photo_1'); pushPhotoToRow(this.StackingPhoto, 'photo_2'); pushPhotoToRow(this.FragilePhotos, 'photo_3'); pushPhotoToRow(this.HomePhotos, 'photo_4'); pushPhotoToRow(this.SignForPhotos, 'photo_5'); - console.log(row, '准备提交的参数'); this.TCloading = true; //禁止确定 this.signBox = false; getOneclickq(row) .then(res => { + this.checkloading=false;//关闭复核签收加载效果 if (res.data.code == 200) { this.TCloading = false; //取消限制 ElMessage({ @@ -3522,14 +3678,52 @@ export default { }, handleSign(row) { console.log('签收>>>>>>>>>>', row); - console.log(row.id, '复合签收'); - $_getDetail({ id: row.id }).then(res => { + console.log(row.signId, '复合签收'); + this.reservationId =row.id + $_getDetail({ id: row.signId }).then(res => { console.log(res, '复合返回值'); + if(res.data.data){ + this.CheckStore=res.data.data + + if(res.data.data.printVOList){ + // DoorstepPhoto 上门照片 + // StackingPhoto 堆码照片 + // FragilePhotos 易碎照 + // HomePhotos 家配照 + // SignForPhotos 签收照 + this.DoorstepPhoto=[] + this.StackingPhoto=[] + this.FragilePhotos=[] + this.HomePhotos=[] + this.SignForPhotos=[] + res.data.data.printVOList.forEach(item=>{ + if(item.type =='photo_1'){ + this.DoorstepPhoto.push({name:'',url:item.urlRoute}) + } + if(item.type =='photo_2'){ + this.StackingPhoto.push({name:'',url:item.urlRoute}) + } + if(item.type =='photo_3'){ + this.FragilePhotos.push({name:'',url:item.urlRoute}) + } + if(item.type =='photo_4'){ + this.HomePhotos.push({name:'',url:item.urlRoute}) + } + if(item.type =='photo_5'){ + this.SignForPhotos.push({name:'',url:item.urlRoute}) + } + + }) + } + console.log(this.CheckStore,'data'); + console.log(res.data.data,'res'); + } + }); this.signtitle = '复核签收'; // this.view = true; this.signform = row; - this.signBox = true; + this.signBox = true;//开启复合弹窗 // this.wid= row.id // this.getWrapdetails(this.wpage) }, @@ -3554,6 +3748,12 @@ export default { }, //一键签收 handleSignone(row) { + // 清空图片缓存 + this.DoorstepPhoto=[] + this.StackingPhoto=[] + this.FragilePhotos=[] + this.HomePhotos=[] + this.SignForPhotos=[] console.log('一键签收222>>>>>>>>>>', row); if (row.loadingStatus != '已装车') { ElMessage({ @@ -3563,10 +3763,10 @@ export default { return; } this.reservationId = row.reservationId; //存储当前行的ID + console.log(row,'当前行数据'); this.signtitle = '一键签收'; this.signform = row; this.TcForm = row; - this.signBox = true; }, inventoryDetail(row) { diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index 9d2ec96f..0a41aecd 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -1787,14 +1787,16 @@ export default { // }; // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default; // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default; - i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; + // i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity; i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity; i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity; i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity; i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity; // console.log("i.totalNumber",i.totalNumber,"i.handQuantitys",i.handQuantity); - i.notReceived = parseInt(i.totalNumber) - parseInt(i.handQuantity); + i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum); + i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity) + return i; }); this.loading = false; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index 63070828..47f3bafa 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -1570,13 +1570,16 @@ export default { // }; // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default; // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default; - i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; + // i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity; i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity; i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity; i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity; i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity; - i.notReceived = parseInt(i.totalNumber) - parseInt(i.handQuantity); + // i.notReceived = parseInt(i.totalNumber) -parseInt(i.signinQuantity)- parseInt(i.handQuantity); + i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum); + i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity) + return i; }); this.loading = false; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index 63192a1e..e07a60fe 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1642,13 +1642,15 @@ export default { // }; // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default; // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default; - i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; + // i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity; i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity; i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity; i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity; i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity; - i.notReceived = parseInt(i.totalNumber) -parseInt(i.signinQuantity)- parseInt(i.handQuantity); + i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum); + i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity) + return i; }); this.loading = false; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 45f6125e..53d336b0 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1934,13 +1934,16 @@ export default { '-1': '0', }; i.notification = notificationMap[i.notification] || notificationMap.default; - i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; + // i.handQuantity = nuMap[i.handQuantity] || i.handQuantity; i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity; i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity; i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity; i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity; i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity; - i.notReceived = parseInt(i.totalNumber) - parseInt(i.handQuantity); + // i.notReceived = parseInt(i.totalNumber) -parseInt(i.signinQuantity)- parseInt(i.handQuantity); + i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum); + i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity) + return i; }); this.loading = false; diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index f66e6e18..82faffe5 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -381,7 +381,9 @@ @@ -570,6 +573,7 @@ import { setNodeHeight, removeZeroWidth } from '@/utils/util.js'; export default { data() { return { + Inventoryloading:true,//库存品加载 packageQuery: {}, orderRow: {}, columnList: [ @@ -2099,7 +2103,9 @@ export default { return true; } }, - handleAddInventory() { + handleAddInventory() { + this.loading = true; + this.Inventoryloading=true;//开启加载效果 let page = this.page; let params = {}; this.query.serviceType = '2'; @@ -2135,14 +2141,15 @@ export default { } this.loading = false; this.selectionClear(); + this.stockListShow = true; - this.$nextTick(() => { const _node = document.querySelector('.stockListShow .maboxhi'); _node.style.transition = 'all 0.3s'; setNodeHeight(_node, '500px'); this.setTableHeight(); + this.Inventoryloading=false;//关闭加载效果 }); } ); @@ -3275,4 +3282,5 @@ input[type='number'] { .footer-container { height: 60px; } + diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index b3d5512b..1e967eba 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -191,6 +191,7 @@