diff --git a/src/api/distribution/disStockListDetail.js b/src/api/distribution/disStockListDetail.js index d0713238..daaec472 100644 --- a/src/api/distribution/disStockListDetail.js +++ b/src/api/distribution/disStockListDetail.js @@ -21,7 +21,14 @@ export const getDisStockList = (params) => { } }) } - +// 库存品查看详情 +export const $_detailOwnSelfInventoryDetail = (params) => { + return request({ + url: '/api/logpm-distribution/distributionStockup/detailOwnSelfInventoryDetail', + method: 'get', + params, + }) +} /** * 库存品打印模板 * @param params diff --git a/src/option/warehouse/distributionStockArticle.js b/src/option/warehouse/distributionStockArticle.js index 31bdf679..02c0078d 100644 --- a/src/option/warehouse/distributionStockArticle.js +++ b/src/option/warehouse/distributionStockArticle.js @@ -11,7 +11,7 @@ export const columnList = [ label: '序号', type: 12, values: '', - width: 55, + width:80, fixed: true, }, { @@ -39,9 +39,9 @@ export const columnList = [ { prop: 'orderCode', label: '订单自编号', - type: 2, + type: 13, values: '', - width: '150', + width: '280', checkarr: [], fixed: false, sortable: true, @@ -140,9 +140,9 @@ export const columnList = [ { prop: 'earliestWarehouseEntryTime', label: '首次入库时间', - type: 2, + type: 4, values: '', - width: '150', + width: '180', checkarr: [], fixed: false, sortable: true, @@ -153,7 +153,7 @@ export const columnList = [ label: '最新入库时间', type: 4, values: '', - width: '150', + width: '180', checkarr: [], fixed: false, sortable: true, @@ -195,7 +195,7 @@ export const columnList = [ { prop: 'orderStatusName', label: '订单状态', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -206,7 +206,7 @@ export const columnList = [ { prop: 'orderReservationStatusName', label: '预约状态', - type: 2, + type: 1, values: '', width: '150', checkarr: [], @@ -217,7 +217,7 @@ export const columnList = [ { prop: 'reservationInfo', label: '预约信息', - type: 2, + type: 13, values: '', width: '150', checkarr: [], @@ -307,7 +307,7 @@ export const columnList = [ { prop: 'createTime', label: '创建时间', - type: 4, + type: 1, values: '', width: '150', checkarr: [], @@ -318,7 +318,7 @@ export const columnList = [ { prop: 'createUserName', label: '创建人', - type: 2, + type: 1, values: '', width: '150', checkarr: [], diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index eed8deba..a950ba15 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -1483,7 +1483,6 @@ const ConfirmForm = () => { delete DataSubmit.processor; //移除多余字段 console.log(DataSubmit, '处理好的数据'); // 提交表单信息stringify - return; Addloading.value = true; //开启页面加载 $_submit(DataSubmit) .then(res => { diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 2fddedf7..a840a304 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -124,8 +124,8 @@ - - + + 新 增 - + 新 增 { + async onSubmit(formEl) { +this.$refs.ruleForm.validate(async valid => { if (valid) { console.log('submit!'); try { @@ -2646,17 +2645,52 @@ export default { message: '操作成功!', }); this.back(); - } else { - this.form.reservationStatus = '20'; + } else { + this.form.reservationStatus = '20'; const res = await autonomouslySave(this.form); console.log('res :>> ', res); if (res.data.code !== 200) return; - - this.$message({ + ElMessageBox.confirm( + '当前预约已完成，是否继续添加预约?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { +this.form=this.Copyfrom +this.Copyfrom= JSON.parse(JSON.stringify(this.form)) +this.$refs.ruleForm.resetFields(); // 调用重置验证状态的方法 +this.renderOrderData=[]//订单重置 +this.serveType=[];//服务类型重置 +this.renderInventoryData=[]//库存品重置 +this.orderList=[] +this.orderData = [] +this.packageListInfo=[] +this.stockArticleInfo=[] +this.inventoryDat= [] +this.inventoryData=[] +this.inventoryList=[] +delete this.query.marketName +this.marketName='' +this.activeName='orderTab', +console.log(this.orderList,''); + }) + .catch(() => { + this.$message({ type: 'success', message: '操作成功!', }); this.back(); + }) + + // this.$message({ + // type: 'success', + // message: '操作成功!', + // }); + // this.back(); } } catch (error) { console.log('error :>> ', error); @@ -3274,6 +3308,7 @@ export default { if (code !== 200) return; + console.log('this.orderList',this.orderList) const _chooseArr = [...this.orderList]; this.stockArticleInfo = records; diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index eb0f067f..3293d5e5 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -74,6 +74,7 @@ > 备货 批量打印 明细 + + + +
@@ -259,6 +274,7 @@ >
+ + + + + + + + + + + @@ -374,10 +420,11 @@ import { getListUser, } from '@/api/distribution/distributionStockup'; import option from '@/option/distribution/distributionStockup'; +import { setNodeHeight } from '@/utils/util'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList'; -import { getDisStockList, getPrintDetail } from '@/api/distribution/disStockListDetail'; +import { getDisStockList, getPrintDetail,$_detailOwnSelfInventoryDetail } from '@/api/distribution/disStockListDetail'; import { stockUp } from '@/api/basicdata/basicdataGoodsArea'; import { getStockDetail } from '@/api/distribution/distributionStock'; import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; @@ -389,11 +436,97 @@ export default { data() { return { html: '', // 页面包条码内容 + Inventoryform:{}, + dialogInventory:false,//库存品详情弹窗 dialogVisible: false, //二维码控制 dialogPack: false, //包件控制 height: 0, + TcloadingInventory:false, activeName: 'reservation', packageCodeList: [], + TccolumnInventoryData:[], + TccolumnInventory:[ + { + prop: 'pickupBatch', + label: '自提批次号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'reservationTime', + label: '计划创建时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'codeCreatedTime', + label: '二维码生成时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'stockScanTime', + label: '备货扫描时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'descriptionGoods', + label: '物料名称', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'stockPackageCode', + label: '包条码', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'qrCode', + label: '下架库位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + + + + ], columnInventoryBatch: [ { prop: '', @@ -1474,6 +1607,38 @@ export default { this.packageCodeList = s; }); }, + + heightTC(){ + const _node = document.querySelectorAll('.tableNode'); + setNodeHeight(_node, '', true); + }, + // 库存品查看详情 + Inventorydetails(val){ + this.TcloadingInventory=true + console.log(val,'val'); + this.Inventoryform={} + this.dialogInventory=true;//开启弹窗 + let data={ + billLadingId:val.billLadingId, + stockListId:val.stockListId, + } + + if(this.$route.query.type==3){ + $_detailOwnSelfInventoryDetail(data).then(res=>{ +console.log(res,'库存品详情'); + if(res.data.code == 200){ + this.TccolumnInventoryData=res.data.data + }else{ + this.TccolumnInventoryData=[] + } +const _node = document.querySelector('.tableNodeS'); +setNodeHeight(_node, '', true); + this.TcloadingInventory=false; +}) + } + + + }, //打印 printTemplate() { // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div'); @@ -1589,20 +1754,22 @@ export default { this.goodsAreaIdData = fo; }); }, - handleClick(tab, event) { + async handleClick(tab, event) { + console.log(tab, event); console.log(tab.props.name); this.leibiao = tab.props.name; if (this.leibiao == 'library') { //订单 - this.getOrderList(this.page); + await this.getOrderList(this.page); } else if (this.leibiao == 'outbound') { //包件 - this.getStockUpParcelsList(this.page1); + await this.getStockUpParcelsList(this.page1); } else if (this.leibiao == 'enter') { //库存品 - this.getInventoryList(this.page2); + await this.getInventoryList(this.page2); } + this.heightTC() }, init() { this.height = this.setPx(document.body.clientHeight - 570); @@ -1839,6 +2006,7 @@ export default { this.loading = false; this.billStockListPage(page); + this.heightTC() }); }, @@ -1916,6 +2084,7 @@ export default { this.page1.total = a.data.data.total; this.loading = false; this.selectionClear(); + this.heightTC() }, //查询订单列表 async getOrderList(page) { @@ -1934,6 +2103,7 @@ export default { this.page.total = a.data.data.total; this.loading = false; this.selectionClear(); + this.heightTC() }, //查询库存品列表 async getInventoryList(page) { @@ -1952,6 +2122,7 @@ export default { this.page2.total = a.data.data.total; this.loading = false; this.selectionClear(); + this.heightTC() }, //转换类型 getOwnServer(row, name, list) { diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 3bf02a31..7cfadcc7 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -1000,6 +1000,7 @@ export default { query: { id: row.row.id, name: '备货明细', + type:'3' }, }); }, diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index 8be97719..9a35e670 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -15,13 +15,19 @@ :model="StockInfo" v-if="kind" > -
+
+ + - + + { + if (sjInput.value) { + console.log(sjInput.value, '查询的司机'); + console.log(StockInfo.value, '司机'); + StockInfo.value.DriverInformation[1].options = StockInfo.value.DriverInformation[1].options.filter(res => res.name.includes(sjInput.value)); + console.log(sjSelect.value, 'sjSelect.value'); + } else { + StockInfo.value.DriverInformation[1].options = DriverInformationCopy.value; + } + sjSelect.value[0].visible = true; // 展开下拉框 +} + +// 车牌查询 +const CLCxChange = () => { + if (clInput.value) { + console.log(clInput.value, '查询的车牌'); + console.log(StockInfo.value, '车辆信息'); + StockInfo.value.VehicleInformation[1].options = StockInfo.value.VehicleInformation[1].options.filter(res => res.vehicleNub.includes(clInput.value)); + } else { + StockInfo.value.VehicleInformation[1].options = VehicleInformationCopy.value; + } + clSelect.value[0].visible = true; // 展开下拉框 +} + + +function deepCopy(obj) { + if (obj === null || typeof obj !== 'object') { + return obj; + } + + // 创建一个新的对象，用于存储拷贝后的数据 + const copy = Array.isArray(obj) ? [] : {}; + + // 遍历原始对象的所有属性，并递归进行拷贝 + for (let key in obj) { + if (Object.prototype.hasOwnProperty.call(obj, key)) { + copy[key] = deepCopy(obj[key]); + } + } + + return copy; +} const selectable = (row, index) => { // row.orderPackageReservationStatusName == '已预约' || @@ -807,6 +870,7 @@ const selectable = (row, index) => { return true; //非禁用状态 } }; +const DataSubmitCopy=ref({}) // 提交的表单 const DataSubmit = ref({ allocationInfo: [ @@ -871,19 +935,31 @@ const btnClass = type => { //页面初始化请求需要的数据 async function Info() { // 车辆信息 - getVehicleList().then(res => { + await getVehicleList().then(res => { console.log(res, '车辆信息'); StockInfo.value.VehicleInformation[1].options = res.data.data; vehicle.value = res.data.data; //存一份初始化信息 用于清空选择使用 + VehicleInformationCopy.value = res.data.data; //查询车辆 + console.log(StockInfo.value.VehicleInformation, 'StockInfo.VehicleInformation'); + }).catch(()=>{ + + }).finally(()=>{ + clloading.value=false }); // 司机信息 - getDriverList().then(res => { + await getDriverList().then(res => { + console.log(res, '司机信息'); // StockInfo.value.DriverInformation = res.data.data; StockInfo.value.DriverInformation[1].options = res.data.data; + DriverInformationCopy.value=res.data.data;//完整的司机信息 driver.value = res.data.data; //存一份初始化信息 用于清空选择使用 console.log(StockInfo.value.DriverInformation, '全部司机信息'); + }).catch(()=>{ + + }).finally(()=>{ + sjloading.value=false }); // 备货人员信息 await getListUser().then(res => { @@ -903,7 +979,7 @@ async function Info() { StockInfo.value.StockPersonnel = data; }); // 备货区域 - $_stockUpInfo({ + await $_stockUpInfo({ params: deptId.value, }).then(res => { console.log(res, '备货区域'); @@ -911,16 +987,23 @@ async function Info() { console.log(StockInfo.value.StockUpArea, ' StockInfo.value.StockUpArea'); }); // 装卸班组 - getListTeamInfo(deptId.value).then(res => { + await getListTeamInfo(deptId.value).then(res => { console.log(res.data.data, '装卸班组'); StockInfo.value.UnloadingTeam = res.data.data; //卸车 StockInfo.value.LoadingTeam = res.data.data; //装车 }); // 外协来源-数据字典数据获取 - getDictionaryBiz('tripartite_source').then(res => { + await getDictionaryBiz('tripartite_source').then(res => { StockInfo.value.OutsourcingSources = res.data.data; console.log(StockInfo.value.OutsourcingSources, '外协来源'); }); + + StockInfoCopy.value = deepCopy(StockInfo.value); +console.log(StockInfoCopy.value,'StockInfoCopy.value123'); + + + +DataSubmitCopy.value= deepCopy(DataSubmit.value); } // 导航标签切换 const tabClick = val => { @@ -1036,7 +1119,7 @@ const menuData = ref([ label: '序号', type: 12, values: '', - width: 55, + width: 80, checkarr: [], fixed: true, sortable: false, @@ -1092,7 +1175,7 @@ const menuData = ref([ label: '订单总件数', type: 2, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1118,7 +1201,7 @@ const menuData = ref([ label: '运单收货人', type: 2, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1129,7 +1212,7 @@ const menuData = ref([ label: '运单收货人电话', type: 1, values: '', - width: '150', + width: '170', checkarr: [], fixed: false, sortable: true, @@ -1151,7 +1234,7 @@ const menuData = ref([ label: '商场编号', type: 1, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1162,7 +1245,7 @@ const menuData = ref([ label: '经销商编码', type: 1, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1400,7 +1483,7 @@ const wrap = ref([ label: '序号', type: 12, values: '', - width: 55, + width: 100, checkarr: [], fixed: true, sortable: false, @@ -2450,11 +2533,14 @@ function removeDuplicatesById(arr) { } // 选择备货人员触发 const StockPersonnel = val => { - console.log(val); + if(val){ + console.log(val); let data = []; data = findObjectById(val, StockInfo.value.StockPersonnel); DataSubmit.value.stockup.forkliftId = data.id; //备货人员ID DataSubmit.value.stockup.forkliftName = data.realName; //备货人员姓名 + } + }; // 选择备货区域触发 const StockUpSera = val => { @@ -2466,35 +2552,44 @@ const StockUpSera = val => { }; //装车班组触发 const Loading = val => { + if(val){ let data = []; data = findObjectById(val, StockInfo.value.LoadingTeam); console.log(data, '装车'); DataSubmit.value.stockup.loaderId = data.id; //装车ID DataSubmit.value.stockup.loaderName = data.groupName; //装车名称 + } + }; // 卸车班组触发 const unload = val => { + if(val){ let data = []; data = findObjectById(val, StockInfo.value.UnloadingTeam); //卸车ID DataSubmit.value.stockup.unloaderId = data.id; DataSubmit.value.stockup.unloaderName = data.groupName; //卸车ID console.log(data, '卸车'); + } + }; // 外协来源触发 const Outsourcing = val => { - let data = []; + if(val){ + let data = []; data = findObjectById(val, StockInfo.value.OutsourcingSources); console.log(data); DataSubmit.value.tripartite.distributionCompany = data.dictValue; //外协来源赋值 + } + }; // 选择司机触发 const SJchangeSelect = val => { - if (val.length === 0) { + if (!val.length) { DataSubmit.value.masterDriverName = null; //清空司机信息 StockInfo.value.VehicleInformation[1].options = vehicle.value; //初始化车辆 return; } - if (val.length > 0) { + if (val.length) { let SJname = null; //用来少选第一选择的司机名称 SJname = CurrentVehicle(val, StockInfo.value.DriverInformation[1].options); console.log(SJname[0].name, '司机'); @@ -2534,7 +2629,7 @@ const SJchangeSelect = val => { // 选择车辆触发 const CLchangeSelect = val => { - if (val.length === 0) { + if (!val.length) { StockInfo.value.DriverInformation[1].options = driver.value; //初始化司机信息 DataSubmit.value.masterVehicleNub = null; //清空司机牌照 return; @@ -2544,7 +2639,7 @@ const CLchangeSelect = val => { let dataInfo = []; //临时存储的当前车辆的所有司机信息 let ClData = []; //临时存放车辆信息 let ClName = null; //用来筛选第一选择的车牌信息 - if (val.length > 0) { + if (val.length) { ClName = CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options); DataSubmit.value.masterVehicleNub = ClName[0].vehicleNub; //处理好的车牌 data = CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options); @@ -2729,6 +2824,7 @@ const handleBack = () => { // 最后提交订单 const SubmitCommercial = async () => { + let code = null; try { //kind为假就说明目前是在外协页面 @@ -2807,18 +2903,27 @@ const SubmitCommercial = async () => { if (code !== 200) return; state.value = false; //重置满足条件 - ElMessage.success('操作成功'); - - ElMessageBox.alert('操作成功', '', { - confirmButtonText: '关闭', - callback: (action: Action) => { - handleBack(); - }, - type: 'success', - draggable: true, - }).catch(() => { + ElMessageBox.confirm( + '计划添加成功,是否继续添加?', + '提示', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + } + ) + .then(() => { +StockInfo.value = StockInfoCopy.value +StockInfoCopy.value = deepCopy(StockInfo.value); +DataSubmit.value = DataSubmitCopy.value +DataSubmitCopy.value= deepCopy(DataSubmit.value); +dataInfo.value=[] + }) + .catch(() => { handleBack(); - }); + }) + + } console.log(DataSubmit.value, '准备提交的信息'); }; @@ -3396,4 +3501,23 @@ const SubmitCommercial = async () => { min-width: 300px; font-size: 14px; } + + + +:deep(.el_sj){ + position: relative; + .el-form-item__label{ + margin-bottom: 30px; + } +} +.el_msj{ + position: absolute; + top: -32px; + width: 66.8%; +} +.el_mcl{ + position: absolute; + top: -32px; + width: 66.8%; +} diff --git a/src/views/warehouse/parcelList/distributionParcelList.vue b/src/views/warehouse/parcelList/distributionParcelList.vue index 452d526e..696402d7 100644 --- a/src/views/warehouse/parcelList/distributionParcelList.vue +++ b/src/views/warehouse/parcelList/distributionParcelList.vue @@ -314,7 +314,7 @@ export default { label: '服务类型', type: 2, values: '', - width: '80', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -325,7 +325,7 @@ export default { label: '提货批次', type: 2, values: '', - width: '80', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -336,7 +336,7 @@ export default { label: '装车时间', type: 2, values: '', - width: '100', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -348,7 +348,7 @@ export default { label: '客户车次号', type: 2, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -390,7 +390,7 @@ export default { label: '备货状态', type: 3, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -439,7 +439,7 @@ export default { label: '上架状态', type: 3, values: '', - width: '90', + width: '140', checkarr: [ { label: '待上架', @@ -468,7 +468,7 @@ export default { label: '预约单编号', type: 2, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -508,7 +508,7 @@ export default { label: '实际装车人', type: 2, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -528,7 +528,7 @@ export default { label: '实际签收人', type: 2, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -548,7 +548,7 @@ export default { label: '配送车次号', type: 2, values: '', - width: '130', + width: '150', checkarr: [], fixed: false, sortable: true, diff --git a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue index 36e6c5c7..6ec95195 100644 --- a/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue +++ b/src/views/warehouse/warehousesignedorder/distributionStockArticle.vue @@ -5,12 +5,48 @@ - + + - - 搜 索 - 清 空 - + +
+
+ + + + + + + + +
+ + + + 搜 索 + 清 空 + +
@@ -19,8 +55,7 @@
- - 导出导出
@@ -36,7 +71,7 @@