-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
-
-
- {{ index + 1 }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加信息
+
+
+
+
+
+ 查看历史包件
+
+
+ 移除
+
+
+
+
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
-
+
+
+
-
+
+
+
-
+
-
-
-
-
-
-
-
- 查看历史包件
-
-
+ 总件数:{{ Indexform.number }}
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
+
+ 添加信息
+
+
+
+
+
+
+
+
+
+
+
+
+ 责任方:
+
+
+
-
-
-
-
-
+
+
+
-
+ 责任人：
+
+
+
+ 占比:
+
+
+
+
+
-
+ 说明:
+
+
+
-
+
+
+ 公司占比:{{ companyProportion }}%
+
+
+
-
-
-
-
-
-
-
- 处理结果-理赔金额
+
+
-
+ {{ item.name }}:
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+ {{ item.payment ? item.text : '未选择支付方式' }}
+
+
+
+ 支付单位:
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
-
- {{ index + 1 }}
-
-
-
-
-
-
+
-
+ 总金额:{{ TotalClaimAmount }}元
+
+
+ 添加赔款方
+ 添加受款方
+
-
-
-
-
-
-
-
- 公司占比:{{ form.Proportion }}(%)
-
-
-
-
+
+
+
- {{ item.title }}
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+ {{ item.state == 0 ? '赔款方' : '受款方' }}{{ item.cld }}
+
-
-
+
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
- 移除
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- 重置
- 提交
- 处理完毕 -->
+
+
+
+
+
+
+ 移除
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
+ {{ item.dictValue }}
+
+
+
+
diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue
index 9d368a6d..10f67263 100644
--- a/src/views/basicdata/brand/basicClient.vue
+++ b/src/views/basicdata/brand/basicClient.vue
@@ -20,7 +20,7 @@
-
+
{{ data.label }}
({{ data.children.length }})
@@ -214,17 +214,21 @@
:before-close="beforeClose"
:close-on-click-modal="false"
append-to-body
+
>
+
+
+
+
@@ -303,14 +307,14 @@
-
+
@@ -511,6 +515,7 @@ export default {
data() {
return {
excelForm: {},
+ fromloading:true,
excelBox: false,
excelOption: {
submitBtn: false,
@@ -527,7 +532,7 @@ export default {
res: 'data',
},
tip: '请上传 .xls,.xlsx 标准格式文件',
- action: '/api/logpm-basicdata/basicdataClient/import-basicDataClient',
+ action: '/api/blade-resource/oss/endpoint/put-file',
},
{
label: '模板下载',
@@ -580,11 +585,21 @@ export default {
sortable: true,
head: false,
},
-
+ {
+ prop: 'brandName',
+ label: '品牌',
+ type: 2,
+ values: '',
+ width: '130',
+ checkarr: [],
+ fixed: false,
+ sortable: true,
+ head: false,
+ },
{
prop: 'linkman',
label: '联系人',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -595,7 +610,7 @@ export default {
{
prop: 'phone',
label: '联系电话',
- type: 1,
+ type: 2,
values: '',
width: '130',
checkarr: [],
@@ -606,10 +621,27 @@ export default {
{
prop: 'typeServiceName',
label: '配送类型',
- type: 1,
+ type: 3,
values: '',
width: '130',
- checkarr: [],
+ checkarr: [{
+ value: '1',
+ label: '商配',
+ },
+ {
+ value: '2',
+ label: '市配',
+ },
+ {
+ value: '3',
+ label: '自提',
+ },
+ {
+ value: '4',
+ label: '三方中转',
+ },
+
+ ],
fixed: false,
sortable: true,
head: false,
@@ -672,7 +704,7 @@ export default {
{
prop: 'contractStartTime',
label: '合同开始时间',
- type: 5,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -682,7 +714,7 @@ export default {
{
prop: 'contractEntTime',
label: '合同结束时间',
- type: 5,
+ type: 1,
values: '',
width: '150',
checkarr: [],
@@ -853,10 +885,9 @@ export default {
'Blade-Auth': 'Bearer ' + getToken(),
};
},
- // action() {
- // return '/api/blade-resource/oss/endpoint/put-file';
- // // return '/api/blade-resource/oss/endpoint/put-file-attach'
- // },
+ action() {
+ return '/api/blade-resource/oss/endpoint/put-file';
+ },
},
methods: {
uploadAfter(res, done, loading, column) {
@@ -1246,7 +1277,22 @@ export default {
this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
+
+
console.log('上传llll>>>', this.form);
+ // 将日期字符串转换为日期对象
+ const startTime = new Date(this.form.contractStartTime);//开始时间
+ const endTime = new Date(this.form.contractEntTime);//结束时间
+
+ // 检查开始时间是否大于结束时间
+ if (startTime.getTime() > endTime.getTime()) {
+ // 开始时间大于结束时间的处理逻辑
+ this.$message({
+ type: 'warning',
+ message: '结束时间不能小于开始时间!',
+ });
+ return
+ }
await add(this.form);
this.box = false;
this.onLoad(this.page);
@@ -1275,6 +1321,18 @@ export default {
this.form.bladeRegionCityId = this.form.bladeRegionProvinceId[1];
this.form.bladeRegionAreaId = this.form.bladeRegionProvinceId[2];
this.form.bladeRegionProvinceId = this.form.bladeRegionProvinceId[0];
+ // 将日期字符串转换为日期对象
+ const startTime = new Date(this.form.contractStartTime);//开始时间
+ const endTime = new Date(this.form.contractEntTime);//结束时间
+ // 检查开始时间是否大于结束时间
+ if (startTime.getTime() > endTime.getTime()) {
+ // 开始时间大于结束时间的处理逻辑
+ this.$message({
+ type: 'warning',
+ message: '结束时间不能小于开始时间!',
+ });
+ return
+ }
await update(this.form);
this.box = false;
this.onLoad(this.page);
@@ -1298,12 +1356,19 @@ export default {
this.title = '新增';
this.form = {};
this.fileList = [];
+ this.viewEntd = true;
this.box = true;
this.distriType = false;
this.viewClientEntd = false;
+ getListCode().then(res=>{
+ console.log(res);
+ if(res.data.code ==200){
+ this.form.clientCode=res.data.data
+ }
+ })
this.$nextTick(() => {
this.$refs.form.resetFields();
- this.form.defaultPaymentMethods = '1';
+ this.form.defaultPaymentMethods = '3';
});
},
handleAddSon(row) {
@@ -1533,10 +1598,10 @@ export default {
onLoad(page, params = {}) {
this.loading = true;
// console.log('-=-=', this.query);
- if (this.dataShi.length > 0) {
+ if (this.dataShi?.length) {
// console.log('-=-=', this.dataShi);
- this.query.contractStartTime = this.dataShi[0];
- this.query.contractEntTime = this.dataShi[1];
+ this.query.startDate = this.dataShi[0];
+ this.query.endDate = this.dataShi[1];
}
if (!!this.query.bladeRegionProvinceId) {
this.query.bladeRegionCityId = this.query.bladeRegionProvinceId[1];
@@ -1720,4 +1785,16 @@ export default {
font-weight: bold;
color: var(--el-color-primary);
}
+:deep(.header_search){
+ display: flex;
+ flex-wrap: nowrap;
+ justify-content: space-between;
+ .el-btn{
+ .el-form-item__content{
+
+ justify-content: flex-end;
+ }
+ }
+
+}
diff --git a/src/views/basicdata/brand/basicStorageServices.vue b/src/views/basicdata/brand/basicStorageServices.vue
index 3c025f7c..7c6c8764 100644
--- a/src/views/basicdata/brand/basicStorageServices.vue
+++ b/src/views/basicdata/brand/basicStorageServices.vue
@@ -123,12 +123,12 @@
multiple
reserve-keyword
placeholder="请输入发站仓库"
- :remote-method="remoteWarehouseList"
+ :remote-method="remoteServeWarehouseList"
:loading="loading"
style = "width: 100%"
>
res.id==this.form.sendWarehouseIds).id
+ ids= this.warehouseServeOptions.find(res=>res.id==this.form.sendWarehouseIds).id
this.form.sendWarehouseIds =[]
this.form.sendWarehouseIds.push(ids)
this.form.serveWarehouseId= this.warehouseServeOptions.find(res=>res.id==this.form.serveWarehouseId).id
this.form.serveWarehouseNam= this.warehouseServeOptions.find(res=>res.id==this.form.serveWarehouseId).name
- this.form.sendWarehouseId= this.warehouseOptions.find(res=>res.id==this.form.sendWarehouseIds).id
- this.form.sendWarehouseName= this.warehouseOptions.find(res=>res.id==this.form.sendWarehouseIds).name
+ this.form.sendWarehouseId= this.warehouseServeOptions.find(res=>res.id==this.form.sendWarehouseIds).id
+ this.form.sendWarehouseName= this.warehouseServeOptions.find(res=>res.id==this.form.sendWarehouseIds).name
console.log(this.form,'this.form');
update(this.form).then(() => {
this.box = false;
@@ -391,7 +391,9 @@ export default {
this.box = true
this.remoteWarehouseList();
this.remoteServeWarehouseList();
- getDetail(row.id).then(res => {
+ getDetail({
+ id:row.id,
+ }).then(res => {
console.log("编辑<<<<<",res.data.data);
this.form = res.data.data;
console.log(this.form,'form');
@@ -407,7 +409,9 @@ export default {
this.box = true;
this.remoteWarehouseList();
this.remoteWarehouseList();
- getDetail(row.id).then(res => {
+ getDetail({
+ id:row.id,
+ }).then(res => {
this.form = res.data.data;
this.form.shopId = row.storeName;
this.form.forwardingUnit = row.linkman;
diff --git a/src/views/basicdata/brand/basicStoreContact.vue b/src/views/basicdata/brand/basicStoreContact.vue
index e6370277..bf372ab0 100644
--- a/src/views/basicdata/brand/basicStoreContact.vue
+++ b/src/views/basicdata/brand/basicStoreContact.vue
@@ -207,6 +207,7 @@ export default {
//设置默认联系人
makeCargo(row) {
console.log('设置默认联系人！！', row);
+ row.defaultType =!row.defaultType
let r = {
id: row.id,
shopId: row.shopId,
@@ -218,6 +219,8 @@ export default {
row.defaultType = true;
return
}
+
+
this.$confirm(`确定要修改默认联系人吗？`, {
type: 'warning',
//beforeClose 阻止关闭弹窗
@@ -225,7 +228,9 @@ export default {
//下面这行代码就是弹出的确认删除和取消删除
if (action === 'confirm') {
// 调取接口
+ r.defaultType =!r.defaultType
updateCargoControl(r).then(res => {
+ console.log(this.data,'data===>11')
console.log(res);
if (res.statusText == 'OK') {
this.onLoad(this.page);
diff --git a/src/views/basicdata/brand/basicdataStoreBrand.vue b/src/views/basicdata/brand/basicdataStoreBrand.vue
index 7a7b8676..554b3f16 100644
--- a/src/views/basicdata/brand/basicdataStoreBrand.vue
+++ b/src/views/basicdata/brand/basicdataStoreBrand.vue
@@ -212,7 +212,7 @@ export default {
label: '品牌名称',
prop: 'brandId',
type: 'select',
- allowCreate: true,
+ allowCreate: false,
remote: true,
filterable: true,
search: true,
diff --git a/src/views/basicdata/brand/basicdataTripartiteMall.vue b/src/views/basicdata/brand/basicdataTripartiteMall.vue
index 0fa45a70..352bc3e1 100644
--- a/src/views/basicdata/brand/basicdataTripartiteMall.vue
+++ b/src/views/basicdata/brand/basicdataTripartiteMall.vue
@@ -317,7 +317,7 @@ export default {
remoteMethod(value) {
// if (!value) return;
- getBrandList(1, 20, { brandName: value }).then(res => {
+ getBrandList(1, 100, { brandName: value }).then(res => {
console.log('res ===>', res);
const {
code,
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index 5927f82b..3be41404 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -520,8 +520,9 @@
>
> ', res);
console.log(res.data.data.records, '获取到的包件');
const data = res.data.data;
+ if(res.data.code ==200){
+ if(res.data && res.data.data.records?.length){
+ console.log(this.PackageState,'包件状态');
+ res.data.data.records.forEach(item=>{
+ if(item.orderPackageStatus){
+ item.orderPackageStatus= this.PackageState.find(res=>res.dictKey == item.orderPackageStatus).dictValue
+ }
+ })
+ }
+ }
this.order.total = data.total;
this.order.orderDetails = data.records;
const _node = await document.querySelector('.orderChooseTable');
@@ -2462,15 +2485,15 @@ export default {
console.log(this.order.orderDetails,'当前列表的参数');
console.log(this.PackageCheckList,'当前勾选参数集合【去重过】');
//全部勾选的数据
-let uncheckedIds = this.Unchecked.map(item => item.id);
-// 过滤掉 _aa 中未勾选的项
-this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
-let _check =await this.order.orderDetails.filter(({ id }) => new Set(this.PackageCheckList.map(({ id }) => id)).has(id));
-console.log(this.order.selectList,'当前勾选的LIST');
-console.log(this.order.orderDetails,'当前获得数据LIST');
-console.log(this.PackageCheckList,'所有勾选的LIST');
-console.log(_check,'筛选出来的参数');
- if(_check.length){
+ let uncheckedIds = this.Unchecked.map(item => item.id);
+ // 过滤掉 _aa 中未勾选的项
+ this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
+ let _check =await this.order.orderDetails.filter(({ id }) => new Set(this.PackageCheckList.map(({ id }) => id)).has(id));
+ console.log(this.order.selectList,'当前勾选的LIST');
+ console.log(this.order.orderDetails,'当前获得数据LIST');
+ console.log(this.PackageCheckList,'所有勾选的LIST');
+ console.log(_check,'筛选出来的参数');
+ if(_check.length){
this.$refs.orderChooseTable.handleCheckSelect(_check);
}else{
this.$refs.orderChooseTable.handleCheckSelect(data.records);
@@ -2507,9 +2530,20 @@ console.log(_check,'筛选出来的参数');
...params,
...this.order.query,
}).then(async res => {
+ console.log(res,'当前包件列表');
if(res.data.code !=200){
return
}
+ if(res.data.code ==200){
+ if(res.data && res.data.data.records?.length){
+ console.log(this.PackageState,'包件状态');
+ res.data.data.records.forEach(item=>{
+ if(item.orderPackageStatus){
+ item.orderPackageStatus= this.PackageState.find(res=>res.dictKey == item.orderPackageStatus).dictValue
+ }
+ })
+ }
+ }
console.log('res :>> ', res);
const data = res.data.data;
this.order.total = data.total || 0;
@@ -2533,14 +2567,10 @@ console.log(_check,'筛选出来的参数');
let matchedItems = this.order.orderDetails.filter(item => _dataList.includes(item.id));
this.$refs.orderChooseTable.handleCheckSelect(matchedItems);
}
-
// 深拷贝数据
console.log('this.order.selectList :>> ', this.order.selectList);
row.originalList = JSON.parse(JSON.stringify(this.order.selectList));
this.order.orderChooseLoading = false;
-
-
-
}).catch((error)=>{
console.log(error,'error');
this.order.orderChooseLoading = false;
@@ -2589,35 +2619,35 @@ console.log(_check,'筛选出来的参数');
console.log(this.CheckId,'原本数据');
console.log(this.order.selectList,'当前勾选的数据');
console.log(this.order.orderDetails,'全部数据');
-// 找出新增数据对象
-let addedData = this.order.selectList.filter(item => !this.CheckId.includes(item.id));
-let addedObjects = this.order.orderDetails.filter(item => addedData.map(data => data.id).includes(item.id));
-if(addedObjects && addedObjects.length){
- this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList=[]
- this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = addedObjects.map(item => {
- return {
- parceListId: item.id,
- stockArticleId: item.stockArticleId,
- packetBarCode: item.orderPackageCode,
- };
- });
-}
+ // 找出新增数据对象
+ let addedData = this.order.selectList.filter(item => !this.CheckId.includes(item.id));
+ let addedObjects = this.order.orderDetails.filter(item => addedData.map(data => data.id).includes(item.id));
+ if(addedObjects && addedObjects.length){
+ this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList=[]
+ this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = addedObjects.map(item => {
+ return {
+ parceListId: item.id,
+ stockArticleId: item.stockArticleId,
+ packetBarCode: item.orderPackageCode,
+ };
+ });
+ }
-// 找出删除数据对象
-let deletedData = this.CheckId.filter(id => !this.order.selectList.find(item => item.id === id));
-let deletedObjects = this.order.orderDetails.filter(item => deletedData.includes(item.id));
-if(deletedObjects && deletedObjects.length){
- this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList=[]
- this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList = deletedObjects.map(item => {
- return {
- parceListId: item.id,
- stockArticleId: item.stockArticleId,
- packetBarCode: item.orderPackageCode,
- };
- });
-}
-console.log('新增的数据对象:', addedObjects);
-console.log('删除的数据对象:', deletedObjects);
+ // 找出删除数据对象
+ let deletedData = this.CheckId.filter(id => !this.order.selectList.find(item => item.id === id));
+ let deletedObjects = this.order.orderDetails.filter(item => deletedData.includes(item.id));
+ if(deletedObjects && deletedObjects.length){
+ this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList=[]
+ this.dataList.find(val => val.id === this.orderChooseId).unBillPackageEntityList = deletedObjects.map(item => {
+ return {
+ parceListId: item.id,
+ stockArticleId: item.stockArticleId,
+ packetBarCode: item.orderPackageCode,
+ };
+ });
+ }
+ console.log('新增的数据对象:', addedObjects);
+ console.log('删除的数据对象:', deletedObjects);
this.dialogChooseOrderVisible = false;
console.log( this.dataList.find(val => val.id === this.orderChooseId),' this.dataList.find(val => val.id === this.orderChooseId)筛选出来的');
@@ -2710,6 +2740,14 @@ console.log('删除的数据对象:', deletedObjects);
//单位
this.logpmUnit = res.data.data;
});
+ // 包件状态
+ getDictionaryBiz('order_package_status').then(res => {
+ //单位
+ console.log(res,'包件状态');
+ if(res.data.code == 200){
+ this.PackageState = res.data.data || [];
+ }
+ });
getDictionaryBiz('order_status').then(res => {
this.deliveryOrderStatus = res.data.data;
this.$functions.checkcColumnList('orderStatusName', this.columnList).checkarr =
diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
index 4cdeefe0..6d2aa931 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@@ -14,16 +14,16 @@
服务号：{{ data.serviceNumber }}
-
-
运单号：{{ data.waybillNumber }}
+
+
+
+
收货单位：{{ data.consigneeUnit }}
-
-
收货人：{{ data.customerName }}
@@ -33,6 +33,35 @@
+
+
+
+
+
+
+ 计划件数： {{ data.planNum}}
+
+
+ 实提件数：{{ data.realNum }}
+
+
+
+ 签收人： {{ data.signforUserName || '暂无'}}
+
+
+
+
+
+
+ 审核人： {{ data.examineUserName || '暂无' }}
+
+
+
+ 审核时间：{{ data.examineTime || '暂无'}}
+
+
+
+
签收图片
+
+
+
+
+ 查看详情
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 件数{{ item.number }}
+
+
+
+
+
+ 件数{{ item.number }}
+
+
+
+
+
@@ -329,7 +358,7 @@ export default {
head: false,
},
{
- prop: 'handQuantity',
+ prop: 'preparedQuantity',
label: '备货件数',
type: 1,
values: '',
@@ -1304,7 +1333,7 @@ export default {
},
{
label: '备货件数',
- prop: 'handQuantity',
+ prop: 'preparedQuantity',
search: true,
width: '100px',
},