diff --git a/src/api/distribution/SeparateTheList.js b/src/api/distribution/SeparateTheList.js index bdb7e2d5..6fe77883 100644 --- a/src/api/distribution/SeparateTheList.js +++ b/src/api/distribution/SeparateTheList.js @@ -9,11 +9,11 @@ export const $_alltasklist = params => { }; // 完成总任务 -export const $_finishalltask = params => { +export const $_finishalltask = data => { return request({ url: '/api/logpm-distribution/split-order-task/finish-all-task', method: 'post', - params, + data, }); }; // 子任务列表 @@ -43,10 +43,10 @@ export const $_gettaskdetail = params => { }); }; // 撤销总任务 -export const $_cancelalltask = params => { +export const $_cancelalltask = data => { return request({ url: '/api/logpm-distribution/split-order-task/cancel-all-task', method: 'post', - params, + data, }); }; diff --git a/src/api/distribution/VehicleArrivalManagement.js b/src/api/distribution/VehicleArrivalManagement.js index cd5da070..07990ed1 100644 --- a/src/api/distribution/VehicleArrivalManagement.js +++ b/src/api/distribution/VehicleArrivalManagement.js @@ -56,4 +56,18 @@ export const postUnloadByLoadId = (page, params) => { }); }; +/** + * 检测是否存在直发商家未卸车数据 + */ +export const postUnloadByLoadIdBefore = (page, params) => { + return request({ + url: '/api/logpm-trunkline/carsLoad/unloadByLoadIdBefore', + method: 'post', + data: { + ...page, + ...params, + }, + }); +}; + // /logpm-trunkline/carsLoad/unloadByLoadId diff --git a/src/option/basic/basicMaterial.js b/src/option/basic/basicMaterial.js index 6157e252..78fb8eec 100644 --- a/src/option/basic/basicMaterial.js +++ b/src/option/basic/basicMaterial.js @@ -160,6 +160,11 @@ export default { message: '请输入产品编码', trigger: 'blur', }, + { + pattern: /^[a-zA-Z0-9]{1,50}$/, + message: '产品编码只能包含字母和数字，长度不能超过50位', + trigger: 'blur', + } ], overHidden: true, }, @@ -174,6 +179,11 @@ export default { message: '请输入物品sku', trigger: 'blur', }, + { + pattern: /^[a-zA-Z0-9]{1,50}$/, + message: '物品sku只能包含字母和数字，长度不能超过50位', + trigger: 'blur', + } ], overHidden: true, }, diff --git a/src/option/distribution/SeparateTheList.js b/src/option/distribution/SeparateTheList.js index 08e3ec53..85773e76 100644 --- a/src/option/distribution/SeparateTheList.js +++ b/src/option/distribution/SeparateTheList.js @@ -69,15 +69,15 @@ export const columnList = [ checkarr: [ { label: '未完成', - value: 0, + value: 1, }, { label: '已完成', - value: 1, + value: 2, }, { label: '已撤销', - value: 2, + value: 3, }, ], }, diff --git a/src/option/distribution/directMerchantSign.js b/src/option/distribution/directMerchantSign.js index d17dd084..e27f1101 100644 --- a/src/option/distribution/directMerchantSign.js +++ b/src/option/distribution/directMerchantSign.js @@ -137,6 +137,7 @@ export const columnList = [ { label: '未签收', value: '0' }, { label: '部分签收', value: '10' }, { label: '已签收', value: '20' }, + { label: '已上传图片', value: '30' }, ], fixed: false, sortable: true, diff --git a/src/option/storagecost/Traincostbreakdown.js b/src/option/storagecost/Traincostbreakdown.js index f9857846..994712bb 100644 --- a/src/option/storagecost/Traincostbreakdown.js +++ b/src/option/storagecost/Traincostbreakdown.js @@ -365,15 +365,15 @@ export const columnList = [ head: false, }, - // { - // prop: 'createUserName', - // label: '操作', - // type: 6, - // values: '', - // width: '200', - // checkarr: [], - // fixed: 'right', - // sortable: false, - // }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '200', + checkarr: [], + fixed: 'right', + sortable: false, + }, ]; \ No newline at end of file diff --git a/src/page/login/aiqa.vue b/src/page/login/aiqa.vue index 99fbbcf8..99afd2c0 100644 --- a/src/page/login/aiqa.vue +++ b/src/page/login/aiqa.vue @@ -138,9 +138,9 @@ const Data = ref({ { content: '东集pad-q7恢复出厂设置', }, - { - content: '货无忧的汇通物流公司编码是多少', - }, + // { + // content: '货无忧的汇通物流公司编码是多少', + // }, { content: '蓝牙打印机芝柯tx453设备连接密码是多少', }, @@ -319,11 +319,11 @@ const AiData = (value = '') => { ) { aiResponse = '东集pad-q7恢复出厂设置教程地址:1、关机状态下，按下【电源键】、【两侧扫描键】； 2、出现开机画面，松开【电源键】，出现工厂模式界面，按键全部松开；3、进入工厂模式后通过方向键选择【wipe data/factory reset】, 按电源键确认进入子菜单，选择【yes】，按【电源键】确认，恢复出厂完成后选择第一个【reboot system now】 ，按【电源键】确认重启设备。视频教程如下:https://mp.weixin.qq.com/s/0CG-jYooh9LJ-9aLauVGfA'; } - else if ( - lowercaseValue.includes('货无忧的汇通物流公司编码是多少') - ) { - aiResponse = '货无忧的汇通物流公司编码是：627683'; - } + // else if ( + // lowercaseValue.includes('货无忧的汇通物流公司编码是多少') + // ) { + // aiResponse = '货无忧的汇通物流公司编码是：627683'; + // } else if ( lowercaseValue.includes('蓝牙打印机芝柯tx453设备连接密码是多少') || lowercaseValue.includes('tx453') ) { diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index 50ce03ee..26d387dd 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -1,6 +1,6 @@ @@ -750,6 +757,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageD(file)" /> @@ -780,6 +788,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageE(file)" /> @@ -809,17 +818,18 @@ @close="Abnormalshutdown" class="el_abnormalBox" > -
-
- 批量取消 - 批量查看二维码 -
- -
- +
+
+ 批量取消 + 批量审核 + 批量查看二维码 +
+ +
+ +
-
- +
- 请联系司机将货物带回仓库，并由文员或库管进行回库扫描 + 请联系司机将货物带回仓库，并由文员或库管进行回库扫描 ', res); + if (res.data.code == 200) { + this.$message({ + type: 'success', + message: '操作成功!', + }); + this.AbnormalReviewloading = false; //关闭加载 + console.log(); + this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据 + } + }) + .catch(error => { + console.log(error, 'error'); + }) + .finally(() => { + this.AbnormalReviewloading = false; //关闭加载 + }); + }) + .catch(() => {}); + }, + // 滞留 retention(row) { ElMessageBox.confirm('是否确认滞留操作?', '提示', { @@ -5393,12 +5457,12 @@ export default { this.loading = true; //开启加载 this.deliveryId = this.$route.query.id; - if(!this.deliveryId){ + if (!this.deliveryId) { ElMessage({ - message: '遇到异常，请刷新页面重试', - type: 'warning', - }) - return + message: '遇到异常，请刷新页面重试', + type: 'warning', + }); + return; } const res = await getDetail(this.deliveryId); @@ -5492,7 +5556,7 @@ export default { align-items: center; justify-content: center; } -.abnormalBox_flex{ +.abnormalBox_flex { display: flex; justify-content: space-between; } diff --git a/src/views/distribution/inventory/delivery/SeparateTheList.vue b/src/views/distribution/inventory/delivery/SeparateTheList.vue index 70890c01..9338a83e 100644 --- a/src/views/distribution/inventory/delivery/SeparateTheList.vue +++ b/src/views/distribution/inventory/delivery/SeparateTheList.vue @@ -378,7 +378,7 @@ const handleDelete = row => { }) .then(() => { let data = { - taskId: row.id, + allTaskId: row.id, }; details.loadingObj.list = true; $_cancelalltask(data) diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 0c802165..1d8e54e8 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -64,7 +64,7 @@ - + @@ -486,13 +486,15 @@ import dayjs from 'dayjs'; import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber'; import { setNodeHeight, removeZeroWidth } from '@/utils/util.js'; import { ElMessage, ElMessageBox } from 'element-plus'; -import error from '@/error'; +import { useStore } from 'vuex'; + export default { name: '/distribution/reservation/reservationAddFrom', data() { return { activeName: 'orderTab', Inventoryloading: true, //库存品加载 + Collectionfreightcharges:false,//是否收取运费权限 packageQuery: {}, reservationloading: false, orderRow: {}, @@ -1887,7 +1889,7 @@ export default { }, // 表单数据 form: { - isInstall: '1', //安装 + isInstall: '2', //安装 }, // 选择行 selectionList: [], @@ -1984,6 +1986,13 @@ export default { console.log('123 :>> ', 123); this.fetchData(); this.onLoad(this.page); + const $useStore = useStore(); + console.log($useStore,'$useStore.getters'); + + if ($useStore.getters && $useStore.getters.permission) { + this.Collectionfreightcharges = $useStore.getters.permission.Collectionfreightcharges; //批量签收权限 + console.log(this.Collectionfreightcharges, 'Collectionfreightchargesl按钮权限'); + } // this.$watch( // () => this.$route.params, // () => { diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index bdae0062..09701422 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -280,9 +280,14 @@ - + + + + + +
上门照 @@ -305,6 +310,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageA(file)" /> @@ -337,6 +343,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageB(file)" /> @@ -368,6 +375,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageC(file)" /> @@ -399,6 +407,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageD(file)" /> @@ -430,6 +439,7 @@ :src="file.url" alt="photo" style="width: 100%; height: 100%; cursor: pointer" + @click="EnlargeTheTmageE(file)" /> @@ -440,10 +450,7 @@
-
-
司机备注：
-
{{ form.driverRemarks }}
-
+
确定 diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue index 1d987bb7..6183865f 100644 --- a/src/views/waybill/WaybillOrderList.vue +++ b/src/views/waybill/WaybillOrderList.vue @@ -468,7 +468,7 @@ const onLoad = async (page?: any, params = {}) => { delete submitData.createTime; delete submitData.documentMakingTime; - // 获取暂存单列表 + // 获取运单列表 const res = await postWarehouseWaybillPageWaybillList(submitData); console.log('res :>> ', res); const { code, data } = res.data;