From 1b9ad4b2ed8557572f2475502e2e4dc44beab1c3 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 2 Apr 2024 18:20:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=96=B0=E5=A2=9E=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=BB=98=E6=AC=BE=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/distribution/BookingNote.js | 10 +- .../waybill/WarehousingByTrainNumber.js | 2 +- src/views/basicdata/brand/basicClient.vue | 286 ++++++++++-------- src/views/waybill/CreateZeroOrder.vue | 22 +- src/views/waybill/TemporaryStorageList.vue | 113 +++---- .../waybill/WarehousingByTrainNumber.vue | 104 ++++++- 6 files changed, 331 insertions(+), 206 deletions(-) diff --git a/src/option/distribution/BookingNote.js b/src/option/distribution/BookingNote.js index 6d424c95..cc547aa9 100644 --- a/src/option/distribution/BookingNote.js +++ b/src/option/distribution/BookingNote.js @@ -136,7 +136,7 @@ export const ChangeOrderColumnList = [ head: false, }, { - prop: 'unloadNumber', + prop: 'operationRemark', label: '修改内容', type: 1, values: '', @@ -146,7 +146,7 @@ export const ChangeOrderColumnList = [ sortable: true, }, { - prop: 'NumberOfPiecesInTheCar', + prop: 'createTime', label: '申请时间', type: 1, values: '', @@ -156,7 +156,7 @@ export const ChangeOrderColumnList = [ sortable: true, }, { - prop: 'unloadNumber', + prop: 'warehouseName', label: '申请网点', type: 1, values: '', @@ -166,7 +166,7 @@ export const ChangeOrderColumnList = [ sortable: true, }, { - prop: 'NumberOfPiecesInTheCar', + prop: 'createUserName', label: '申请人', type: 1, values: '', @@ -176,7 +176,7 @@ export const ChangeOrderColumnList = [ sortable: true, }, { - prop: 'unloadNumber', + prop: 'aaa', label: '修改原因', type: 1, values: '', diff --git a/src/option/waybill/WarehousingByTrainNumber.js b/src/option/waybill/WarehousingByTrainNumber.js index 433db9b6..9b0fd507 100644 --- a/src/option/waybill/WarehousingByTrainNumber.js +++ b/src/option/waybill/WarehousingByTrainNumber.js @@ -16,7 +16,7 @@ export const columnList = [ fixed: true, }, { - prop: 'billladingCode', + prop: 'orderCode', label: '订单自编号', type: 1, values: '', diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index fcd9534b..0ccaedbc 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -287,6 +287,16 @@ + + + + + @@ -319,7 +329,7 @@ :limit="3" :on-exceed="handleExceed" > - 上传 + 上传 @@ -333,35 +343,23 @@ /> - -
-
- - -
-
+ - -
-
- - -
-
+ @@ -756,24 +754,26 @@ export default { { required: true, message: '请输入客户名称', trigger: 'blur' }, // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } ], - typeService: [{ required: true, message: '请选择客户端类型', trigger: 'blur' }], + typeService: [{ required: true, message: '请选择客户端类型', trigger: ['blur', 'change'] }], businessType: [ { required: true, message: '请选择配送业务类型', trigger: 'change' }, - // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } + // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: ['blur', 'change'] } ], clientType: [{ required: true, message: '请选择客户类型', trigger: 'change' }], typeServiceList: [{ required: true, message: '请选择服务类型', trigger: 'change' }], - linkman: [{ required: true, message: '请填写联系人', trigger: 'blur' }], - detailedly: [{ required: true, message: '请填写详细地址', trigger: 'blur' }], - phone: [{ required: true, message: '请填写联系电话', trigger: 'blur' }], - contractEntTime: [ - { type: 'date', required: true, message: '请选择合同结束时间', trigger: 'change' }, - ], - contractStartTime: [ - { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' }, - ], + linkman: [{ required: true, message: '请填写联系人', trigger: ['blur', 'change'] }], + detailedly: [{ required: true, message: '请填写详细地址', trigger: ['blur', 'change'] }], + phone: [{ required: true, message: '请填写联系电话', trigger: ['blur', 'change'] }], + // contractEntTime: [ + // { type: 'date', required: true, message: '请选择合同结束时间', trigger: 'change' }, + // ], + // contractStartTime: [ + // { type: 'date', required: true, message: '请选择合同开始时间', trigger: 'change' }, + // ], bladeRegionProvinceId: [{ required: true, message: '请选择地址', trigger: 'change' }], - // leaseAccessories: [{ required: true, message: '请上传合同文件', trigger: 'blur' }], + defaultPaymentMethods: [ + { required: true, message: '请选择默认付款方式', trigger: 'change' }, + ], }, bianji: false, @@ -782,6 +782,29 @@ export default { name: '', phone: '', }, + /** 付款方式 */ + defaultPaymentMethodsOptions: [ + { + value: '1', + label: '现付', + }, + { + value: '2', + label: '到付', + }, + { + value: '3', + label: '月结', + }, + { + value: '4', + label: '回付', + }, + { + value: '5', + label: '内部结算', + }, + ], }; }, created() {}, @@ -1218,6 +1241,10 @@ export default { this.box = true; this.distriType = false; this.viewClientEntd = false; + this.$nextTick(() => { + this.$refs.form.resetFields(); + this.form.defaultPaymentMethods = '1'; + }); }, handleAddSon(row) { console.log(row); @@ -1455,102 +1482,104 @@ export default { this.query.bladeRegionAreaId = this.query.bladeRegionProvinceId[2]; this.query.bladeRegionProvinceId = this.query.bladeRegionProvinceId[0]; } - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { - const data = res.data.data; - console.log(data); + getList(page.currentPage, page.pageSize, Object.assign(params, this.query)) + .then(res => { + const data = res.data.data; + console.log(data); - data.records.forEach(i => { - let ke = this.clientType.find(kh => parseInt(kh.dictKey) == parseInt(i.clientType)); - // console.log("客户类型<><><>",ke); - if (!!ke) { - i.clientTypeName = ke.dictValue; - // console.log('==-=-=', i.clientType, ke.dictKey, ke.dictValue); - } - if (!i.clientType) { - i.clientTypeName = '无'; - } - let typeServiceName = []; + data.records.forEach(i => { + let ke = this.clientType.find(kh => parseInt(kh.dictKey) == parseInt(i.clientType)); + // console.log("客户类型<><><>",ke); + if (!!ke) { + i.clientTypeName = ke.dictValue; + // console.log('==-=-=', i.clientType, ke.dictKey, ke.dictValue); + } + if (!i.clientType) { + i.clientTypeName = '无'; + } + let typeServiceName = []; - if (!i.typeServiceBusiness) { - i.typeServiceName = '无'; - } else { - i.typeServiceBusiness.forEach(ty => { - let fuw = this.freightType.find( - fw => parseInt(fw.dictKey) == parseInt(ty.typeService) - ); - if (!!fuw) { - // console.log("fuw",fuw); - typeServiceName.push(fuw.dictValue); - // console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue); - } - }); - i.typeServiceNameFy = typeServiceName.join(','); - } - }); - // 缺少判断 - // let dz = ''; - // data.records.forEach(it => { - // let arrsheng = this.optioner.filter(i => { - // return it.bladeRegionProvinceId == i.value; - // }); - // if (arrsheng.length == 0) return; - // // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); - // let arrshi = arrsheng[0].children.filter(i => { - // return it.bladeRegionCityId == i.value; - // }); - // // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); - // let arrqu = arrshi[0].children.filter(i => { - // return it.bladeRegionAreaId == i.value; - // }); - - // // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); - // dz = - // arrsheng[0].label + - // (arrshi[0].label ? `/${arrshi[0].label}` : ``) + - // (arrqu[0]?.label ? `/${arrqu[0]?.label}` : ''); - // it.bladeRegionProvinceId = dz; - // }); - // 修改后 - let dz = ''; - data.records.forEach(it => { - let arrsheng = this.optioner.filter(i => { - return it.bladeRegionProvinceId == i.value; + if (!i.typeServiceBusiness) { + i.typeServiceName = '无'; + } else { + i.typeServiceBusiness.forEach(ty => { + let fuw = this.freightType.find( + fw => parseInt(fw.dictKey) == parseInt(ty.typeService) + ); + if (!!fuw) { + // console.log("fuw",fuw); + typeServiceName.push(fuw.dictValue); + // console.log('==-=-=', i.typeService, fuw.dictKey, fuw.dictValue); + } + }); + i.typeServiceNameFy = typeServiceName.join(','); + } }); - let shengLabel = arrsheng.length > 0 ? arrsheng[0].label : ''; // 保存省级地址 + // 缺少判断 + // let dz = ''; + // data.records.forEach(it => { + // let arrsheng = this.optioner.filter(i => { + // return it.bladeRegionProvinceId == i.value; + // }); + // if (arrsheng.length == 0) return; + // // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); + // let arrshi = arrsheng[0].children.filter(i => { + // return it.bladeRegionCityId == i.value; + // }); + // // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); + // let arrqu = arrshi[0].children.filter(i => { + // return it.bladeRegionAreaId == i.value; + // }); - if (arrsheng.length === 0) { - it.bladeRegionProvinceId = shengLabel; // 若未找到省数据，直接将省级地址作为结果 - return; - } + // // console.log("========",JSON.parse(JSON.stringify(arrsheng)) ); + // dz = + // arrsheng[0].label + + // (arrshi[0].label ? `/${arrshi[0].label}` : ``) + + // (arrqu[0]?.label ? `/${arrqu[0]?.label}` : ''); + // it.bladeRegionProvinceId = dz; + // }); + // 修改后 + let dz = ''; + data.records.forEach(it => { + let arrsheng = this.optioner.filter(i => { + return it.bladeRegionProvinceId == i.value; + }); + let shengLabel = arrsheng.length > 0 ? arrsheng[0].label : ''; // 保存省级地址 - let arrshi = arrsheng[0].children.filter(i => { - return it.bladeRegionCityId == i.value; - }); - let shiLabel = arrshi.length > 0 ? arrshi[0].label : ''; // 保存市级地址 + if (arrsheng.length === 0) { + it.bladeRegionProvinceId = shengLabel; // 若未找到省数据，直接将省级地址作为结果 + return; + } - if (arrshi.length === 0) { - dz = shengLabel; // 若未找到市数据，直接将省级地址作为结果 - } else { - let arrqu = arrshi[0].children.filter(i => { - return it.bladeRegionAreaId == i.value; + let arrshi = arrsheng[0].children.filter(i => { + return it.bladeRegionCityId == i.value; }); + let shiLabel = arrshi.length > 0 ? arrshi[0].label : ''; // 保存市级地址 - let quLabel = arrqu.length > 0 ? arrqu[0].label : ''; // 保存区级地址 + if (arrshi.length === 0) { + dz = shengLabel; // 若未找到市数据，直接将省级地址作为结果 + } else { + let arrqu = arrshi[0].children.filter(i => { + return it.bladeRegionAreaId == i.value; + }); - dz = shengLabel + (shiLabel ? `/${shiLabel}` : '') + (quLabel ? `/${quLabel}` : ''); - } + let quLabel = arrqu.length > 0 ? arrqu[0].label : ''; // 保存区级地址 - it.bladeRegionProvinceId = dz; + dz = shengLabel + (shiLabel ? `/${shiLabel}` : '') + (quLabel ? `/${quLabel}` : ''); + } + + it.bladeRegionProvinceId = dz; + }); + this.page.total = data.total; + this.data = data.records; + this.data = this.$functions.newdatas(this.columnList, this.data); + this.loading = false; + this.selectionClear(); + }) + .catch(() => { + this.data = []; + this.loading = false; }); - this.page.total = data.total; - this.data = data.records; - this.data = this.$functions.newdatas(this.columnList, this.data); - this.loading = false; - this.selectionClear(); - }).catch(()=>{ - this.data =[] - this.loading = false; - }); }, }, }; @@ -1577,4 +1606,13 @@ export default { :deep(.el-cascader) { width: 100%; } + +:deep(.el-date-editor.el-input) { + height: 100% !important; + width: 100% !important; +} + +:deep(.el-select) { + width: 100% !important; +} diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index acf96e80..ed35c0aa 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -1764,22 +1764,22 @@ let _ant1 = null; const remoteMethod = val => { if (_ant1) clearTimeout(_ant1); _ant1 = setTimeout(async () => { - if (val) { - try { - details.loadingObj.loading = true; - const res = await getOpenOrderAdvanceFindWarehouseList({ warehouseName: val }); - const { data, code } = res.data; - if (code !== 200) return; - details.options = data || []; - } catch (error) { - } finally { - details.loadingObj.loading = false; - } + try { + details.loadingObj.loading = true; + const res = await getOpenOrderAdvanceFindWarehouseList({ warehouseName: val }); + const { data, code } = res.data; + if (code !== 200) return; + details.options = data || []; + } catch (error) { + } finally { + details.loadingObj.loading = false; } clearTimeout(_ant1); }, 1000); }; +remoteMethod(''); + /** 目的仓选择时给目的仓名称赋值 */ const destinationWarehouseNameChange = val => { details.query.destinationWarehouseName = details.options.find( diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index b9ac67de..d43e1980 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -311,27 +311,25 @@ - +
+ 取 消 + + 重 置 + + + 提 交 + +
@@ -1237,50 +1235,63 @@ const handleClose = res => { }; /** 开标签提交 */ -const handleSubmitAddTag = async (formEl: FormInstance | undefined) => { +const handleSubmitAddTag = (formEl: FormInstance | undefined) => { if (!formEl) return; - await formEl.validate(async (valid, fields) => { - if (valid) { - console.log('submit!'); - - console.log('details.addTagForm :>> ', details.addTagForm); - try { - if (details.addTagForm.area.length < 2) return ElMessage.warning('区域最少选择到市'); - - details.loadingObj.addTagLoading = true; - - const res = await postOpenLabel({ - ...details.addTagForm, - area: details.addTagForm.area.join(','), - }); - const { code } = res.data; - - if (code !== 200) return; - ElMessage.success('添加成功'); - details.popUpShow.addTagVisited = false; - initOnLoad({}, true); - } catch (error) { - console.log('error :>> ', error); - } finally { - details.loadingObj.addTagLoading = false; + formEl.validate((valid, fields) => { + ElMessageBox.confirm('确认提交吗?', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(async () => { + if (valid) { + console.log('submit!'); + + console.log('details.addTagForm :>> ', details.addTagForm); + try { + if (details.addTagForm.area.length < 2) return ElMessage.warning('区域最少选择到市'); + + details.loadingObj.addTagLoading = true; + + const res = await postOpenLabel({ + ...details.addTagForm, + area: details.addTagForm.area.join(','), + }); + const { code } = res.data; + + if (code !== 200) return; + ElMessage.success('添加成功'); + details.popUpShow.addTagVisited = false; + initOnLoad({}, true); + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.addTagLoading = false; + } + } else { + console.log('error submit!', fields); } - } else { - console.log('error submit!', fields); - } + }); }); }; /** 开标签重置 */ const handleRefreshAddTag = (formEl: FormInstance | undefined) => { + console.log('123123 :>> ', 123123); if (!formEl) return; - formEl.resetFields(); + ElMessageBox.confirm('确认重置吗?', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + formEl.resetFields(); + }); }; /** 开启开标签弹窗 */ const handleOpenAddTagDlog = () => { details.popUpShow.addTagVisited = true; - handleRefreshAddTag(ruleFormRef.value); + ruleFormRef.value.resetFields(); }; onActivated(() => { diff --git a/src/views/waybill/WarehousingByTrainNumber.vue b/src/views/waybill/WarehousingByTrainNumber.vue index 90085b95..c9fee6a9 100644 --- a/src/views/waybill/WarehousingByTrainNumber.vue +++ b/src/views/waybill/WarehousingByTrainNumber.vue @@ -1,6 +1,6 @@