java_project
/
logpm_page
4
1
Fork 0
Code Issues Pull Requests Activity
Browse Source

修复自提bug，新增导出

pre-production
马远东 11 months ago
parent
4172c34771
commit
74bb2b1cb7
8 changed files with 1092 additions and 1019 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/api/distribution/distributionSignfor.js
  2. 1
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 5
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  4. 340
      src/views/aftersales/aftersalesWorkOrderend.vue
  5. 366
      src/views/distribution/inventory/distrilbutionBillLading.vue
  6. 322
      src/views/distribution/signfor/distributionSignforedt.vue
  7. 1
      src/views/distribution/signfor/distributionSignfortreat.vue
  8. 9
      src/views/distribution/turndelivery/deliveryDiscuss.vue

9
src/api/distribution/distributionSignfor.js
Unescape View File

@ -351,7 +351,16 @@ export const $_distributionSignforPackageList = data => {
responseType: 'blob',
});
};
// 库存品导出(3-1)
export const $_distributionSignforDetailExcel = params => {
return request({
url: '/api/logpm-distribution/signfor/export-distributionSignforDetailExcel',
method: 'get',
params,
responseType: 'blob',
});
};
// 订单导出
export const $_distributionSignforOrderList = data => {
return request({

1
src/views/aftersales/aftersalesWorkOrderAdd.vue
Unescape View File

@ -558,6 +558,7 @@
:max="9999999"
:controls="false"
:value-on-clear="0"
:precision="2"
@change="Totalamount"
/>
</el-form-item>

5
src/views/aftersales/aftersalesWorkOrderInfo.vue
Unescape View File

@ -214,7 +214,7 @@
label="调查经过"
v-if="displaySettings.investigationPocess"
>
<el-input v-model="Indexform.investigationProcess" disabled />
<el-input :rows="2" type="textarea" v-model="Indexform.investigationProcess" disabled />
</el-form-item>
</div>
</div>
@ -1728,7 +1728,8 @@ const ResultDetermination = () => {
align-items: center;
justify-content: space-between;
:deep(.el-form-item) {
width: 16%;
width: 17%;
margin-right: 4px;
align-items: flex-start;
.el-form-item__label {
margin-left: 0;

340
src/views/aftersales/aftersalesWorkOrderend.vue
Unescape View File

@ -47,9 +47,8 @@
<div class="leftbox">
<el-form-item label="包条码">
<el-tooltip :content="item.packageCode" placement="top">
<el-input v-model="item.packageCode" disabled/>
<el-input v-model="item.packageCode" disabled />
</el-tooltip>
</el-form-item>
<el-form-item label="运单号">
@ -207,7 +206,6 @@
</el-tab-pane>
</el-tabs>
<el-tabs type="border-card" class="Responsible_box">
<el-tab-pane label="责任方信息">
<div class="ResponsibilityBox">
@ -339,8 +337,9 @@
:min="0"
:controls="false"
:value-on-clear="0"
:precision="2"
@change="Totalamount"
:disabled="$route.query.RouterState=='end'"
:disabled="$route.query.RouterState == 'end'"
/>
</el-form-item>
@ -349,7 +348,7 @@
v-model="item.paymentUnit"
placeholder="请输入支付单位"
clearable
:disabled="$route.query.RouterState=='end'"
:disabled="$route.query.RouterState == 'end'"
/>
</el-form-item>
<el-form-item label="理赔支付时间">
@ -360,7 +359,7 @@
value-format="YYYY-MM-DD HH:mm:ss"
placeholder="理赔支付时间"
size="default"
:disabled="$route.query.RouterState=='end'"
:disabled="$route.query.RouterState == 'end'"
/>
</el-form-item>
<el-form-item label="支付方式">
@ -369,7 +368,7 @@
placeholder="请选择支付方式"
style="width: 100%"
clearable
:disabled="$route.query.RouterState=='end'"
:disabled="$route.query.RouterState == 'end'"
>
<el-option
v-for="items in item.Paymentmethod"
@ -384,7 +383,6 @@
</template>
</div>
<!-- 处理结果说明 -->
<el-form-item label="处理结果说明" class="el_resj">
<el-input
@ -405,8 +403,6 @@
</div>
</div>
<el-tabs type="border-card" class="demo-tabs el-endtabs" v-if="routerState == 'end'">
<el-tab-pane>
<template #label>
@ -422,22 +418,9 @@
</div>
<div class="payanindemnity" v-for="(item, index) in CompensationParty" :key="index">
<div class="el_pklab">
<!-- {{ item.cld }} -->
<span class="title" :style="{ color: item.state != 0 ? '#000' : '#F56C6C' }"
>{{ item.state == 0 ? '赔款方' : '受款方' }}</span
<div style="display: flex">
<el-form-item :label="item.state == 0 ? '赔款方' : '受款方'"
>
</div>
<div class="el_pkLi">
<!-- <div class="sk_input">
<el-input
v-model="item.name"
:placeholder="item.state == 0 ? '请填写赔款方' : '请填写受款方'"
/>
</div> -->
<!-- 赔款方是那个仓库的 -->
<div class="sk_input">
<el-select v-model="item.warehouseId" filterable placeholder="请选择仓库">
<el-option
v-for="item in warehouseData"
@ -446,35 +429,36 @@
:value="item.value"
/>
</el-select>
</div>
</el-form-item>
<div class="sk_input">
<span>原因</span>
<el-form-item label="原因"
>
<el-input v-model="item.reason" placeholder="请填写原因" />
</div>
<div class="sk_input">
<span>金额</span>
</el-form-item>
<el-form-item label="金额(元)"
>
<el-input-number
v-model="item.num"
:min="0"
:controls="false"
:value-on-clear="0"
:precision="2"
@change="amountMoney"
/>
</el-form-item>
</div>
<div class="sk_input" v-if="item.state == 0">
<span>责任人</span>
<el-form-item label="责任人" v-if="item.state == 0"
>
<el-input
v-model="item.compensationPersonnel"
placeholder="请填写责任人"
clearable
:rows="2"
/>
</el-form-item>
</div>
<div class="sk_input" v-if="item.state == 1"></div>
<div style="display: flex">
<div class="el_cwBtn">
<!-- <el-button
type="primary"
@ -802,7 +786,7 @@
@input="appoint(Msgtextarea)"
/>
<div class="msgHf">
<el-button type="primary" @click="replyMessage()"> 结束回复 </el-button>
<el-button type="primary" @click="replyMessageEnd()"> 结束回复 </el-button>
<el-button type="primary" @click="replyMessage()"> 回复 </el-button>
</div>
</div>
@ -955,13 +939,14 @@ const TotalClaimAmount = ref(0); //理赔总金额
const TotalamountReceived = ref(0); //收款金额合计
const personResponsibleList = ref([]); //责任人列表
const msgHight = ref(100); //聊天框消息高度
const msgTop = ref(0); //聊天框吸顶距离
const msgTop = ref(10); //聊天框吸顶距离
const paymentUnit = ref(''); //支付单位
const scrollContainer = ref(null); //客服实例
const KFfeel = ref([]); //附件链接
const MessageResponsibility = ref([]); //消息的处理方选择
const separateMessageResponsibility = ref([]); //消息的处理方单独选择
const Msgtextarea = ref(''); //回复框消息
const ruleFormRef = ref(null); //表单实例
const msgState = ref(0); //回复消息状态
const Msgloading = ref(false); //消息回复的加载效果
const companyProportion = ref(0); //公司占比
@ -1164,22 +1149,25 @@ async function updateDictionary(targetArray, dictionaryType) {
});
}
// 页面初始化数据
const onLoad =async () => {
Pageloading.value=true;//开启页面加载
const onLoad = async () => {
Pageloading.value = true; //开启页面加载
if (localStorage.getItem('my_data')) {
Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
}
updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节
updateDictionary(Paymentmethodoptions.value, 'payment_method'); //支付方式
getDictionaryBiz('result_handling').then(res => {ProcessingResults.value = res.data.data});//处理结果
getDictionaryBiz('result_handling').then(res => {
ProcessingResults.value = res.data.data;
}); //处理结果
// 获取角色权限
getDictionaryBiz('after_sales_visits').then(res => {
getDictionaryBiz('after_sales_visits')
.then(res => {
console.log(res, '角色字典');
const matchingItem = res.data.data.find(
item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
item =>
item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
);
if (matchingItem) {
UserPermissions.value = matchingItem.dictValue;
@ -1281,10 +1269,10 @@ const onLoad =async () => {
money: Number(item.money), //金额
paymentUnit: item.paymentUnit, //支付单位
compensationTime: item.compensationTime, //理赔时间
compensationMethod:item.compensationMethod, //支付方式Value
compensationMethod: item.compensationMethod, //支付方式Value
compensationMethodName: item.compensationMethodName, //支付方式lable
resultName:item.resultName, //处理方式lable
resultType:item.resultType, //处理方式Value
resultName: item.resultName, //处理方式lable
resultType: item.resultType, //处理方式Value
typesOf: 1, //固定参数
Paymentmethod: [...JSON.parse(JSON.stringify(Paymentmethodoptions.value))],
};
@ -1330,7 +1318,7 @@ const onLoad =async () => {
});
}
endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
Pageloading.value=false;
Pageloading.value = false;
});
}
console.log(endFrom.value, '表单信息');
@ -1346,11 +1334,11 @@ const onLoad =async () => {
});
});
});
}).catch(error=>{
console.log(error,'error');
Pageloading.value=false;
})
.catch(error => {
console.log(error, 'error');
Pageloading.value = false;
});
};
// 多开页面的时候刷新参数
@ -1386,8 +1374,9 @@ const Chathistory = res => {
console.log(UserPermissions.value, '当前不是仓库客服');
$_getTrackRecord({
id: $route.query.id,
}).then(res => {
console.log(res,'res调查记录');
})
.then(res => {
console.log(res, 'res调查记录');
res.data.data.surveyRecordEntities.forEach(item => {
MessageContent.value.unshift({
time: item.createTime, //时间
@ -1409,9 +1398,11 @@ const Chathistory = res => {
}
}, 0);
console.log(res, '聊天记录');
}).catch(error=>{
console.log(error,'error');
}).finally(res=>{
})
.catch(error => {
console.log(error, 'error');
})
.finally(res => {
Msgloading.value = false; //关闭加载效果
});
} else {
@ -1471,12 +1462,11 @@ onMounted(() => {
// 处理结果事件
const changeProcessingResults = value => {
// 重置总金额
TotalClaimAmount.value=0;
TotalClaimAmount.value = 0;
// 重置循环列表
ProcessingList.value=[];
ProcessingList.value = [];
console.log(value, 'value');
if (value.length) {
let data = [];
value.forEach(item => {
let _data = ProcessingResults.value.find(res => res.dictKey == item);
@ -1500,10 +1490,9 @@ const changeProcessingResults = value => {
});
});
}
console.log(ProcessingList.value,'处理好的值');
console.log(ProcessingList.value, '处理好的值');
}
return;
form.value.Claimamount = [];
if (data && data.length) {
@ -1727,24 +1716,20 @@ const AddPayee = () => {
warehouseId: '',
});
}
// CompensationParty.value.push({
// name: '',
// state: 1,
// num: 0,
// reason: '',
// cld: som,
// compensationPersonnel: '',
// warehouseId: '',
// });
// explains: ''
};
// 表单校验
const ruleForm = reactive({
// warehouseId: [{ required: true, message: '请选择仓库', trigger: ['bulr', 'change'] }],
// reason: [{ required: true, message: '请输入原因', trigger: ['bulr', 'change'] }],
// num: [{ required: fal, message: '请输入金额', trigger: ['bulr', 'change'] }],
// compensationPersonnel: [{ required: true, message: '请连写责任人', trigger: ['bulr', 'change'] }],
});
// 总金额计算
const Totalamount = () => {
TotalClaimAmount.value = ProcessingList.value.map(res => res.money).reduce(
(accumulator, currentValue) => accumulator + currentValue,
0
);
TotalClaimAmount.value = ProcessingList.value
.map(res => res.money)
.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
};
// 移除按钮
const payremove = (state, val) => {
@ -1941,10 +1926,8 @@ const PaymentConfirmation = val => {
// }
// };
// 处理结果提交
const submitresults=async(value)=>{
const submitresults = async value => {
if (!endFrom.value.result.length) {
ElMessage({
message: `请选择选择处理结果`,
@ -1952,10 +1935,10 @@ const submitresults=async(value)=>{
});
return;
}
let _title=value==1?'提交':'保存'
let _message = `注意信息填写正确!点击确定将<span style="color: red;">${ _title}处理结果</span>是否继续?`;
let _title = value == 1 ? '提交' : '保存';
let _message = `注意信息填写正确!点击确定将<span style="color: red;">${_title}处理结果</span>是否继续?`;
ElMessageBox.confirm(_message, '提示', {
dangerouslyUseHTMLString: true,//启用此选项以解析 HTML
dangerouslyUseHTMLString: true, //启用此选项以解析 HTML
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
@ -1965,39 +1948,51 @@ const submitresults=async(value)=>{
let data = {
resultIdentification: value == 1 ? '1' : '2', //1为直接提交不需要外部确定，2为保存需要外部确定
aftersalesProcessingResultsDTO: {
processingMoneyEntityList:[],//处理结果
processingMoneyEntityList: [], //处理结果
},
};
console.log(ProcessingResults.value,'ProcessingResults.value');
ProcessingList.value.forEach((item)=>{
let _DATA=item.Paymentmethod.find(res=>res.value==item.compensationMethod)
console.log(ProcessingResults.value, 'ProcessingResults.value');
ProcessingList.value.forEach(item => {
let _DATA = item.Paymentmethod.find(res => res.value == item.compensationMethod);
data.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
resultType:ProcessingResults.value.find(res=>res.dictValue ==item.title).dictKey, //赔方式的key
resultType: ProcessingResults.value.find(res => res.dictValue == item.title).dictKey, //赔方式的key
resultName: item.title, //处理结果名字
money: item.money, //金额
compensationMethod: item.compensationMethod,//支付方式Value
compensationMethodName: _DATA?_DATA.label:'',//支付方式lable
compensationMethod: item.compensationMethod, //支付方式Value
compensationMethodName: _DATA ? _DATA.label : '', //支付方式lable
compensationTime: item.compensationTime, //支付时间
paymentUnit: item.paymentUnit, //支付付单位
typesOf: 1, //固定参数
})
})
});
});
// 支付方式拼接
data.aftersalesProcessingResultsDTO.compensationMethod=data.aftersalesProcessingResultsDTO['processingMoneyEntityList'].map(res=>res.compensationMethodName).join(',')
data.aftersalesProcessingResultsDTO.compensationMethod = data.aftersalesProcessingResultsDTO[
'processingMoneyEntityList'
]
.map(res => res.compensationMethodName)
.join(',');
// 支付单位拼接
data.aftersalesProcessingResultsDTO.paymentUnit= data.aftersalesProcessingResultsDTO['processingMoneyEntityList'].map(res=>res.paymentUnit).join(',')
data.aftersalesProcessingResultsDTO.paymentUnit = data.aftersalesProcessingResultsDTO[
'processingMoneyEntityList'
]
.map(res => res.paymentUnit)
.join(',');
//处理结果说明
data.aftersalesProcessingResultsDTO.resultDescription=endFrom.value.resultDescription,
(data.aftersalesProcessingResultsDTO.resultDescription = endFrom.value.resultDescription),
// 赔付方式拼接
data.aftersalesProcessingResultsDTO.resultType=data.aftersalesProcessingResultsDTO['processingMoneyEntityList'].map(res=>res.resultName).join(',')
(data.aftersalesProcessingResultsDTO.resultType = data.aftersalesProcessingResultsDTO[
'processingMoneyEntityList'
]
.map(res => res.resultName)
.join(','));
// 总金额
data.aftersalesProcessingResultsDTO.money =TotalClaimAmount.value
data.aftersalesProcessingResultsDTO.money = TotalClaimAmount.value;
//异常工单ID
data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id;
//仓库ID
data.aftersalesProcessingResultsDTO.warehouseId = endFrom.value.warehouseId; //仓库ID
//工单ID
data.id=$route.query.id
data.id = $route.query.id;
//是否提交到理赔金额未出(点击保存并且金额都为0才执行)
if (!data.aftersalesProcessingResultsDTO.money && value == '1') {
let _message = `检测到您<span style="color: red;">未填写金额</span>是否提交到理赔金额未出?`;
@ -2006,15 +2001,17 @@ const submitresults=async(value)=>{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {
})
.then(() => {
data.claimIdentification = '1';
ElMessage({
type: 'success',
message: '已确定选择',
});
}).catch(()=>{})
})
.catch(() => {});
}
console.log(data,'要提交的参数');
console.log(data, '要提交的参数');
Pageloading.value = true;
$_addProcessingResults(data)
.then(res => {
@ -2029,18 +2026,21 @@ const submitresults=async(value)=>{
}
})
.catch(res => {
console.log(error,'error');
}).finally(res=>{
console.log(error, 'error');
})
.finally(res => {
Pageloading.value = false;
});
})
.catch((error) => {
console.log(error,'error');
})
}
.catch(error => {
console.log(error, 'error');
});
};
// 完结信息提交()
const submitCompletion = () => {
// 完结信息提交(弃用)
const submitCompletion=()=>{
ElMessageBox.confirm('是否提交完结信息?', '完结', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -2062,13 +2062,13 @@ const submitCompletion=()=>{
console.log(endFrom.value.duty, '责任方');
console.log('赔款总计金额', TotalamountCompensation.value);
console.log('收款总计金额', TotalamountReceived.value);
if( CompensationParty.value.length){
CompensationParty.value.forEach(item => {
if (item.state == 0) {
// 赔款
data[0]['completionRecordEntities'].push({
reason: item.reason, //原因
money: Number(item.num), //金额
money: item.num, //金额
reasonArbitration: endFrom.value.arbitrate, //仲裁说明
compensationPersonnel: item.compensationPersonnel, //责任人（手动填写）
warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
@ -2079,14 +2079,22 @@ const submitCompletion=()=>{
// 受款方
data[0]['completionRecipientEntities'].push({
reasonReceivingPayment: item.reason, //受款原因
money: Number(item.num), //金额
responsibleParty: FangAddList.value.map(aItem =>warehouseData.value.filter(bItem => bItem.value === aItem.businessName).map(match => match.label).join(',')).join(','),
money:item.num, //金额
responsibleParty: FangAddList.value
.map(aItem =>
warehouseData.value
.filter(bItem => bItem.value === aItem.businessName)
.map(match => match.label)
.join(',')
)
.join(','),
warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
workOrderNumber: info.workOrderNumber, //工单号
workOrderId: info.id, //异常工单
});
}
});
}
console.log(data, '处理好的值');
// 赔款方
Pageloading.value = true; //开启页面加载
@ -2103,16 +2111,16 @@ const submitCompletion=()=>{
AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
}
})
.catch(res => {
Pageloading.value = false; //开启页面加载
console.log(res, '提交失败');
.catch(error => {
Pageloading.value = false; //关闭页面加载
console.log(error, '提交失败');
});
})
.catch(() => {});
}
};
// 提交信息
const submitCompletions = async val => {
return
return;
console.log(UserPermissions.value, '当前角色');
// 完结的逻辑
// 异常问题描述非必填
@ -2167,7 +2175,14 @@ const submitCompletions = async val => {
// recipient: item.name, //受款方
reasonReceivingPayment: item.reason, //受款原因
money: Number(item.num), //金额
responsibleParty: FangAddList.value.map(aItem =>warehouseData.value.filter(bItem => bItem.value === aItem.businessName).map(match => match.label).join(',')).join(','),
responsibleParty: FangAddList.value
.map(aItem =>
warehouseData.value
.filter(bItem => bItem.value === aItem.businessName)
.map(match => match.label)
.join(',')
)
.join(','),
warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
workOrderNumber: info.workOrderNumber, //工单号
workOrderId: info.id, //异常工单
@ -2210,25 +2225,26 @@ const submitCompletions = async val => {
let data = {
resultIdentification: val == 1 ? '1' : '2', //1为直接提交不需要外部确定，2为保存需要外部确定
aftersalesProcessingResultsDTO: {
processingMoneyEntityList:[],//处理结果
processingMoneyEntityList: [], //处理结果
},
// processingMoneyEntityList: [], //赔付方式
};
ProcessingList.value.forEach((item)=>{
ProcessingList.value.forEach(item => {
data.aftersalesProcessingResultsDTO['processingMoneyEntityList'].push({
resultType:ProcessingResults.value.find(res=>res.dictValue ==item.title).dictValue, //赔方式的key
resultType: ProcessingResults.value.find(res => res.dictValue == item.title).dictValue, //赔方式的key
resultName: item.title, //处理结果名字
money: item.money, //金额
compensationMethod: item.compensationMethod,//支付方式Value
compensationMethodName: item.Paymentmethod.find(res=>res.value==item.compensationMethod).label || '',//支付方式lable
compensationMethod: item.compensationMethod, //支付方式Value
compensationMethodName:
item.Paymentmethod.find(res => res.value == item.compensationMethod).label || '', //支付方式lable
compensationTime: item.compensationTime, //支付时间
paymentUnit: item.paymentUnit, //支付付单位
typesOf: 1, //固定参数
})
})
console.log(data,'要提交的参数');
});
});
console.log(data, '要提交的参数');
return
return;
ElMessageBox.confirm('是否进行处理结果操作?', '处理结果', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -2240,21 +2256,22 @@ const submitCompletions = async val => {
aftersalesProcessingResultsDTO: {},
// processingMoneyEntityList: [], //赔付方式
};
ProcessingList.value.forEach(()=>{
ProcessingList.value.forEach(() => {
data['aftersalesProcessingResultsDTO'].push({
resultType:ProcessingResults.value.find(res=>res.dictValue ==item.title).dictValue, //赔方式的key
resultType: ProcessingResults.value.find(res => res.dictValue == item.title).dictValue, //赔方式的key
resultName: item.title, //处理结果名字
money: item.money, //金额
compensationMethod: item.compensationMethod,//支付方式Value
compensationMethodName: item.Paymentmethod.find(res=>res.value==item.compensationMethod).label || '',//支付方式lable
compensationMethod: item.compensationMethod, //支付方式Value
compensationMethodName:
item.Paymentmethod.find(res => res.value == item.compensationMethod).label || '', //支付方式lable
compensationTime: item.compensationTime, //支付时间
paymentUnit: item.paymentUnit, //支付付单位
typesOf: 1, //固定参数
})
})
console.log(data,'要提交的参数');
});
});
console.log(data, '要提交的参数');
return
return;
// 新增记录处理结果
console.log($route.query.id, '异常ID');
console.log(ProcessingList.value, 'ProcessingList12312');
@ -2386,11 +2403,26 @@ const submitCompletions = async val => {
Pageloading.value = false; //开启页面加载
});
})
.catch(() => {
});
.catch(() => {});
}
};
// 结束回复
const replyMessageEnd = () => {
const message = `是否确定<span style="color: red;">结束回复</span>?`;
ElMessageBox.confirm(message, '提示', {
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
ElMessage({
message: '功能维护中...',
type: 'warning',
});
})
.catch(() => {});
};
// 消息回复
const replyMessage = () => {
console.log(endFrom.value, 'endFrom.value');
@ -2600,7 +2632,7 @@ const CustomerServiceCompleted = () => {
}
:deep(.el-input--prefix) {
width: 100%;
height:100% !important;
height: 100% !important;
}
}
.el_Transport {
@ -2745,7 +2777,7 @@ const CustomerServiceCompleted = () => {
}
:deep(.selector) {
margin-bottom: 40px;
.is-active{
.is-active {
font-weight: bold;
}
}
@ -2754,9 +2786,9 @@ const CustomerServiceCompleted = () => {
}
.el_pkLi {
width: 90%;
width: 96%;
display: flex;
justify-content: space-between;
justify-content: flex-start;
}
}
.payanindemnity {
@ -2788,6 +2820,9 @@ const CustomerServiceCompleted = () => {
.el-button {
border: none;
}
:deep(.el-form-item) {
margin-right: 8px;
}
}
.arbitrate {
width: 100%;
@ -3056,7 +3091,7 @@ const CustomerServiceCompleted = () => {
}
}
.el_cwBtn {
width: 20%;
width: 8%;
display: flex;
justify-content: flex-end;
}
@ -3080,7 +3115,6 @@ const CustomerServiceCompleted = () => {
align-items: flex-start;
flex: none;
width: 16.4%;
}
}
@ -3229,7 +3263,7 @@ const CustomerServiceCompleted = () => {
}
}
:deep(.el_resj) {
width: 100% ;
width: 100%;
margin-top: 10px;
flex-direction: column;
align-items: flex-start;
@ -3309,10 +3343,10 @@ const CustomerServiceCompleted = () => {
margin-right: 11px;
.el-form-item {
width: 24%;
height:auto;
height: auto;
display: flex;
flex-direction: row;
.el-form-item__content{
.el-form-item__content {
width: 100% !important;
}
.el-input-number {
@ -3326,20 +3360,20 @@ const CustomerServiceCompleted = () => {
}
}
}
:deep(.Responsible_box){
:deep(.Responsible_box) {
width: 100%;
margin-top: 10px;
.is-active{
.is-active {
font-weight: bold;
}
}
.el-endtabs {
margin-top: 10px;
:deep(.is-active){
:deep(.is-active) {
font-weight: bold;
}
}
:deep(.el-loading-mask){
:deep(.el-loading-mask) {
position: fixed;
left: 12%;
top: 10%;

366
src/views/distribution/inventory/distrilbutionBillLading.vue
Unescape View File

@ -93,7 +93,6 @@
<el-form-item label-width="0" prop="certificateType">
<el-tabs @tab-click="handleChlickTab" style="width: 100%">
<el-tab-pane label="定制品">
<div style="display: flex;justify-content: space-between;margin-bottom: 6px;">
<el-button
@ -128,7 +127,6 @@
@selectCheck="selectsc"
@selection="selectionChange"
:searchInput="multifunctional"
>
<template #default="slotProps">
<el-button
@ -650,7 +648,7 @@ import { mapGetters } from 'vuex';
import { getDictionaryBiz } from '@/api/system/dict';
import { getToken } from '@/utils/auth';
import { getListStockList } from '@/api/distribution/distributionStockList';
import { getListOne ,$_getListOne} from '@/api/distribution/distributionStockArticle';
import { getListOne, $_getListOne } from '@/api/distribution/distributionStockArticle';
import dayjs from 'dayjs';
import { detail } from '@/api/flow/flow';
import { nextTick, ref } from 'vue';
@ -663,12 +661,12 @@ export default {
return {
PackageCheckList:[],//包件勾选的数据
tabletit: '', //记录当前点击的标题栏
multifunctional:'', //编辑订单搜索
multifunctional: '', //编辑订单搜索
dialogImg: false,
Imgurl: undefined,
Selfpickuploading: false, //页面加载
mydata:{},//仓库信息
packageRow:{},//当前选择的包件
mydata: {}, //仓库信息
packageRow: {}, //当前选择的包件
OrdercolumnList: [
{
prop: 'serviceNumber',
@ -688,6 +686,7 @@ export default {
dialogFormZeroOrderVisible: false, // 零担订单弹出层
// 选择包件弹出层
dialogChooseOrderVisible: false,
CheckId:[],//需要勾选ID
height: 0,
// 弹框标题
title: '',
@ -1903,7 +1902,7 @@ export default {
mounted() {
console.log('123 :>> ', 123);
this.setTableHeight();
this.mydata= JSON.parse(localStorage.getItem('my_data'))
this.mydata = JSON.parse(localStorage.getItem('my_data'));
this.init();
if (this.$route.query.type == '2') {
@ -2060,7 +2059,7 @@ export default {
const _type = this.$route.query.type;
// 编辑状态
if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow);
this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose();
},
orderSelectSc(index, row) {
@ -2076,16 +2075,19 @@ export default {
scrollToElementWithinTableRow(partialIdString) {
// 清空之前的样式
const tableRows = document.querySelectorAll('tr');
tableRows.forEach(function(row) {
tableRows.forEach(function (row) {
const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) {
cells.forEach(function (cell) {
cell.style.backgroundColor = ''; // 移除背景颜色
cell.style.color = ''; // 移除文字颜色
});
});
// 统一逗号分隔符：将中文逗号替换为英文逗号，并去除可能的前后空格
const partialIds = partialIdString.replace(/，/g, ',').split(',').map(id => id.trim());
const partialIds = partialIdString
.replace(/，/g, ',')
.split(',')
.map(id => id.trim());
// 逐行检查是否含有所有partialIds
for (let row of tableRows) {
@ -2096,7 +2098,7 @@ export default {
if (allIdsFound) {
// 行包含所有partialIds, 则高亮显示并滚动到该行
const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) {
cells.forEach(function (cell) {
cell.style.backgroundColor = '#ff0000';
cell.style.color = '#fff';
});
@ -2106,9 +2108,9 @@ export default {
break;
}
}
},
},
// 编辑多功能搜索
SearchFu(){
SearchFu() {
console.log(this.multifunctional, '搜索的参数值');
if (this.multifunctional) {
this.scrollToElementWithinTableRow(this.multifunctional);
@ -2120,8 +2122,8 @@ export default {
}
return;
// console.log(dataInfo.value, '搜索结果');
},
soclear (){
},
soclear() {
this.SearchFu();
},
orderTimesc(index, row) {
@ -2135,7 +2137,7 @@ export default {
const _type = this.$route.query.type;
// 编辑状态
if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow);
this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose();
},
@ -2144,10 +2146,10 @@ export default {
this.orderAdd = true;
getDetail(this.$route.query.id).then(res => {
let s = res.data.data;
console.log(res,'res');
console.log(res, 'res');
this.form = s;
let f = [];
if(s.chargeList){
if (s.chargeList) {
s.chargeList.forEach(c => {
let a = this.clientType.find(i => c.cost == i.dictKey);
@ -2226,13 +2228,12 @@ export default {
},
//订单选择确定
callFordeliveryOrder() {
console.log(this.selectionList,'this.selectionList');
let scID= this.selectionList[0].mallId;//获取第一个商场DI用于匹配后面的是否选择的一样
let mallIdState=this.selectionList.find(res=>res.mallId !=scID)
if(mallIdState){
console.log(this.selectionList, 'this.selectionList');
let scID = this.selectionList[0].mallId; //获取第一个商场DI用于匹配后面的是否选择的一样
let mallIdState = this.selectionList.find(res => res.mallId != scID);
if (mallIdState) {
this.$message.warning('请选择同一商场');
return
return;
}
console.log('111 :>> ', 111);
@ -2279,8 +2280,8 @@ export default {
let isa = false;
this.selectionList.some(i => {
let a = this.dataList.filter(ele => ele.id == i.id).length >= 1;
if(!this.$route.query.id){
i.reservationNum=i.handQuantity
if (!this.$route.query.id) {
i.reservationNum = i.handQuantity;
}
if (!a) {
@ -2298,16 +2299,16 @@ export default {
this.$message.warning('至少选择一条数据！');
return;
}
console.log(this.selectionList,'22');
console.log(this.selectionList, '22');
if( this.dataList && this.dataList.length){
if( this.dataList[0].mallId !=this.selectionList[0].marketId){
if (this.dataList && this.dataList.length) {
if (this.dataList[0].mallId != this.selectionList[0].marketId) {
this.$message.warning('请选择和定制品一样的商场！');
return;
}
}
let scID= this.selectionList[0].marketId
if(this.selectionList.find(res=>res.marketId !=scID)){
let scID = this.selectionList[0].marketId;
if (this.selectionList.find(res => res.marketId != scID)) {
this.$message.warning('请选同一商场！');
return;
}
@ -2347,7 +2348,7 @@ export default {
this.order.query={}
this.order.currentPage=1
console.log('row :>> ', row);
this.packageRow=row
this.packageRow = row;
// 页面类型
const _type = this.$route.query.type;
this.orderChooseId = row.id;
@ -2355,7 +2356,7 @@ export default {
if (Number(_type) === 2) {
await this.onLoadEditChoose({}, row);
} else await this.onLoadOrderChoose();
this.dialogChooseOrderVisible = true;
},
// 每页数量改变
sizeChangeOrderChoose(size) {
@ -2364,7 +2365,7 @@ export default {
const _type = this.$route.query.type;
// 编辑状态
if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow);
this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose();
},
// 页码改变
@ -2387,7 +2388,7 @@ export default {
this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id));
// 编辑状态
if (Number(_type) === 2) {
this.onLoadEditChoose(this.order.query,this.packageRow);
this.onLoadEditChoose(this.order.query, this.packageRow);
} else this.onLoadOrderChoose();
},
// 请求包件数据 -- 新增
@ -2449,6 +2450,7 @@ console.log(_check,'筛选出来的参数');
console.log(res,'必须参数ID');
if(res.data.code==200){
_dataList=res.data.data
this.CheckId=res.data.data;//需要勾选的ID
}
})
@ -2515,7 +2517,7 @@ console.log(_check,'筛选出来的参数');
this.Unchecked = this.order.orderDetails.filter(b => !this.order.selectList.some(c => c.id === b.id));
//全部勾选的数据
let uncheckedIds = this.Unchecked.map(item => item.id);
// 过滤掉 _aa 中未勾选的项
// 过滤掉 中未勾选的项
this.PackageCheckList = this.PackageCheckList.filter(a => !uncheckedIds.includes(a.id));
console.log(this.PackageCheckList,'准备提交的参数');
console.log('111 :>> ', 111);
@ -2523,29 +2525,61 @@ console.log(_check,'筛选出来的参数');
return this.$message({ type: 'warning', message: '最少选择一项数据' });
}
if(this.order.selectList){
this.packageRow.reservationNum=this.PackageCheckList.length
this.packageRow.reservationNum=this.order.selectList.length
}
// billPackageEntityList
console.log('this.order.dataList :>> ', this.dataList);
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList =
this.PackageCheckList.map(val => {
console.log('val :>> ', val);
console.log('最外层表格', this.dataList);
// this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = this.order.selectList.map(val => {
// console.log('val :>> ', val);
// return {
// parceListId: val.id,
// stockArticleId: val.stockArticleId,
// packetBarCode: val.orderPackageCode,
// };
// });
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: val.id,
stockArticleId: val.stockArticleId,
packetBarCode: val.orderPackageCode,
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);
this.dialogChooseOrderVisible = false;
console.log( this.dataList.find(val => val.id === this.orderChooseId),' this.dataList.find(val => val.id === this.orderChooseId)筛选出来的');
},
ProhibitSelection(val, index) {
if (val.orderPackageStatus == 70) {
ProhibitSelection(val, index) {
if (val.orderPackageStatus == 70) {
return false;
} else {
return true;
}
},
},
// 数量校验
handleNumberRange(e, row) {
console.log(e, 'ee=====');
@ -2701,12 +2735,11 @@ if (val.orderPackageStatus == 70) {
}
}
},
lastpage(){
this.$router.push('/distribution/inventory/distrilbutionBillLadingList')
lastpage() {
this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
},
// 最后提交
async handleSubmit() {
// console.log(this.dataList,'this.dataList');
// if (this.$route.query.type !== '2') {
@ -2735,36 +2768,33 @@ if (val.orderPackageStatus == 70) {
// // if ()
// }
this.$refs.form.validate(async valid => {
if (valid) {
// if(!this.dataList.length){
// return ElMessage({
// message: '请选择定制品',
// type: 'warning',
// });
// }
console.log(this.data,'11');
console.log(this.data, '11');
if( !this.data.every(res=>res.inventoryQuantity)){
if (!this.data.every(res => res.inventoryQuantity)) {
return ElMessage({
message: '请移除库存品预约数量为0的订单',
type: 'warning',
});
}
let zeroOrderList=null
if(this.dataList.length){
let resState=this.dataList.find(res=>!res.reservationNum)
console.log(resState,'123');
if(resState){
let zeroOrderList = null;
if (this.dataList.length) {
let resState = this.dataList.find(res => !res.reservationNum);
console.log(resState, '123');
if (resState) {
return ElMessage({
message: `单自编号为${resState.orderCode}的计划数量为0请移除或者重新录入预约数量`,
type: 'warning',
plain: true,
})
});
}
zeroOrderList = this.dataList.filter(val => val.isZero === '1');
@ -2776,17 +2806,11 @@ if (val.orderPackageStatus == 70) {
message: '请移除添加数量为0的订单',
type: 'warning',
});
}
}
}
if (!this.form.id) {
// if (this.fileListSell.length === 0) {
// this.$message.warning('请上传提货证件！！！');
// return;
@ -2856,19 +2880,22 @@ if (val.orderPackageStatus == 70) {
}
// ParcelLisList
const submitFormData = this.form;
console.log(this.form,'this.form');
console.log(submitFormData,'this.sub');
console.log(this.form, 'this.form');
console.log(submitFormData, 'this.sub');
// 当有零担数据时
if (zeroOrderList && zeroOrderList.length !== 0) {
console.log(zeroOrderList,'zeroOrderList222');
console.log(zeroOrderList, 'zeroOrderList222');
// console.log(1);
submitFormData.parcelLisList = [];
submitFormData.zeroType = '2';
zeroOrderList.forEach(valE => {
console.log(valE,'valE==>');
if(valE.ParcelLisList){
if(valE.ParcelLisList.length){
submitFormData.parcelLisList = [...submitFormData.parcelLisList, ...valE.ParcelLisList];
console.log(valE, 'valE==>');
if (valE.ParcelLisList) {
if (valE.ParcelLisList.length) {
submitFormData.parcelLisList = [
...submitFormData.parcelLisList,
...valE.ParcelLisList,
];
}
}
});
@ -2886,7 +2913,7 @@ if (val.orderPackageStatus == 70) {
});
submitFormData.billPackageEntityList = _billPackageEntityList;
// SM24010411
console.log(submitFormData,'submitFormData');
console.log(submitFormData, 'submitFormData');
this.Selfpickuploading = true; //开启加载效果
add(submitFormData)
@ -2902,6 +2929,10 @@ if (val.orderPackageStatus == 70) {
this.Selfpickuploading = false; //关闭加载效果
console.log(this.Selfpickuploading, '当前状态');
this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: true,
});
this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
})
.catch(res => {
@ -2970,7 +3001,7 @@ if (val.orderPackageStatus == 70) {
up.deliveryDocument = this.form.deliveryDocument;
up.certificateType = this.form.certificateType;
up.totalCost = this.form.totalCost;
up.remark=this.form.remark;
up.remark = this.form.remark;
up.mark = mark;
up.stockArticleList = this.dataList;
// 当有零担数据时
@ -2990,36 +3021,57 @@ if (val.orderPackageStatus == 70) {
up.zeroType = '1';
}
// 新增列表
let _billPackageEntityList = [];
// 删除列表
let _unBillPackageEntityList = [];
// submitFormData.billPackageEntityList
this.dataList.forEach(val => {
if (val.originalIdList) {
let _billPackageEntityList = [];
// 删除列表
let _unBillPackageEntityList = [];
// submitFormData.billPackageEntityList
this.dataList.forEach(val => {
console.log(val,'value');
if(val.billPackageEntityList && val.billPackageEntityList.length){
val.billPackageEntityList.forEach(item => {
// 新增
if (!val.originalIdList.includes(item.parceListId)) {
_billPackageEntityList.push(item);
}
});
}
// 删除
val.originalList.forEach(item => {
const _flag = val.billPackageEntityList.findIndex(
value => value.parceListId === item.id
);
if (_flag === -1) {
if(val.unBillPackageEntityList && val.unBillPackageEntityList.length){
val.unBillPackageEntityList.forEach(item=>{
console.log(item,'item===>');
_unBillPackageEntityList.push({
parceListId: item.id,
parceListId: item.parceListId,
stockArticleId: item.stockArticleId,
packetBarCode: item.orderPackageCode,
});
}
packetBarCode: item.packetBarCode,
});
})
}
});
up.billPackageEntityList = _billPackageEntityList;
up.unBillPackageEntityList = _unBillPackageEntityList;
this.Selfpickuploading = true; //开启加载效果
// if(val.originalList && val.originalList.length){
// val.originalList.forEach(item => {
// const _flag = val.billPackageEntityList.findIndex(
// value => value.parceListId === item.id
// );
// if (_flag === -1) {
// _unBillPackageEntityList.push({
// parceListId: item.id,
// stockArticleId: item.stockArticleId,
// packetBarCode: item.orderPackageCode,
// });
// }
// });
// }
});
console.log(_unBillPackageEntityList,'删除的');
up.billPackageEntityList = _billPackageEntityList;
up.unBillPackageEntityList = _unBillPackageEntityList;
this.Selfpickuploading = true; //开启加载效果
console.log(up,'要提交的数据');
update(up)
.then(() => {
this.Selfpickuploading = false; //开启加载效果
@ -3030,6 +3082,10 @@ if (val.orderPackageStatus == 70) {
this.PackageCheckList=[]
this.Selfpickuploading = false; //关闭加载效果
this.$store.commit('DEL_TAG_CURRENT');
this.$store.commit('EDIT_REFRESHITEM', {
title: 'distrilbutionBillLadingList',
status: true,
});
this.$router.push('/distribution/inventory/distrilbutionBillLadingList');
})
.catch(res => {
@ -3094,16 +3150,15 @@ if (val.orderPackageStatus == 70) {
params.genre = 1;
params.typeService = 3;
params.isAll = 0;
if(this.data && this.data.length){
params.mallId =this.data[0].marketId
console.log(params,'params');
if (this.data && this.data.length) {
params.mallId = this.data[0].marketId;
console.log(params, 'params');
}
$_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder)).then(
res => {
console.log(res,'res===>');
if(res.data.code !=200 || !res.data.data){
return
$_getListOne(page.currentPage, page.pageSize, Object.assign(params, this.queryOrder))
.then(res => {
console.log(res, 'res===>');
if (res.data.code != 200 || !res.data.data) {
return;
}
const data = res.data.data;
this.pageOrder.total = data.total || 0;
@ -3138,10 +3193,9 @@ if (val.orderPackageStatus == 70) {
});
this.loading = false;
this.selectionClear();
}
).catch(res=>{
}).finally(()=>{
})
.catch(res => {})
.finally(() => {
this.loading = false;
});
},
@ -3150,14 +3204,14 @@ if (val.orderPackageStatus == 70) {
// if (this.dataList.length === 0) {
// return this.$message.warning('请选择最少一条定制品');
// }
if(!JSON.parse(localStorage.getItem('my_data'))){
if (!JSON.parse(localStorage.getItem('my_data'))) {
ElMessage({
message: '请选择仓库!',
type: 'warning',
})
return
});
return;
}
console.log(this.dataList,'dataList');
console.log(this.dataList, 'dataList');
this.selectionList = [];
this.dialogFormVisible = true;
@ -3237,23 +3291,22 @@ if (val.orderPackageStatus == 70) {
// 定制品新增 -- 页码改变
currentChangeOrder(currentPage) {
this.pageOrder.currentPage = currentPage;
this.onLoadOrder(this.pageOrder,this.query);
this.onLoadOrder(this.pageOrder, this.query);
},
sizeChangeOrder(pageSize) {
this.pageOrder.pageSize = pageSize;
this.onLoadOrder(this.pageOrder,this.query);
this.onLoadOrder(this.pageOrder, this.query);
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
this.onLoad(this.page,this.query);
this.onLoad(this.page, this.query);
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
this.onLoad(this.page,this.query);
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
params.ids = this.$route.query.id;
this.orderAdd = false;
@ -3264,9 +3317,6 @@ if (val.orderPackageStatus == 70) {
this.loading = false;
this.selectionClear();
});
},
/**
* 创建自提
@ -3281,11 +3331,11 @@ if (val.orderPackageStatus == 70) {
let data = {
current: this.pageStock.currentPage,
size: this.pageStock.pageSize,
warehouseId:this.mydata.id,
warehouseId: this.mydata.id,
...dataso,
};
if(this.dataList && this.dataList.length){
data.marketId= this.dataList[0].mallId
if (this.dataList && this.dataList.length) {
data.marketId = this.dataList[0].mallId;
}
console.log(data, '处理好的值');
getListStockList(data).then(res => {
@ -3298,50 +3348,7 @@ if (val.orderPackageStatus == 70) {
});
this.loading = false;
this.selectionClear();
return
console.log('111 :>> ', 111);
this.loading = true;
let a = {};
if (this.$route.query.type == '1') {
a = this.dataList[0];
} else if (this.$route.query.type === '2') {
a = this.dataList[0];
} else if (this.$route.query.type == '3') {
a = this.dataList[0];
}
console.log('a :>> ', a);
console.log(' this.dataOrder :>> ', this.dataOrder);
// let a = this.dataList[0];
if (!!a.mallId) {
// params.marketId = a.mallId;
// params.warehouseId = a.warehouseId;
let data = {
current: this.pageStock.currentPage,
size: this.pageStock.pageSize,
//marketId: a.mallId,
// warehouseId: a.warehouseId,
...dataso,
};
console.log(data, '处理好的值');
// return
getListStockList(data).then(res => {
const dataOwn = res.data.data;
this.pageStock.total = dataOwn.total;
this.dataOwn = dataOwn.records;
this.dataOwn.forEach(i => {
i.available = i.quantityStock - i.quantityOccupied;
});
this.loading = false;
this.selectionClear();
});
} else {
this.$message({
type: 'warning',
message: '无法获取商场信息',
});
this.loading = false;
this.pageStock.total = 0;
}
return;
},
//包件信息
onLoadOwn(page, params = {}) {
@ -3410,22 +3417,21 @@ if (val.orderPackageStatus == 70) {
},
// 修改零担零担信息
handleRowZeroOrder() {
console.log(this.zeroOrderFormList,'12121212');
let sum =0
this.zeroOrderFormList.forEach(res=>{
sum+= res.tiQuantity
})
console.log(sum,'总和');
this.dataList.find(res=>res.id==this.zeroOrderFormList[0].stockArticleId).reservationNum=sum
console.log(this.zeroOrderFormList, '12121212');
let sum = 0;
this.zeroOrderFormList.forEach(res => {
sum += res.tiQuantity;
});
console.log(sum, '总和');
this.dataList.find(res => res.id == this.zeroOrderFormList[0].stockArticleId).reservationNum =
sum;
// 将修改的零担信息存入dataList中
this.dataList.find(val => val.id === this.zeroOrderFormList[0].stockArticleId).ParcelLisList = this.zeroOrderFormList;
this.dataList.find(val => val.id === this.zeroOrderFormList[0].stockArticleId).ParcelLisList =
this.zeroOrderFormList;
// 关闭零担蒙层弹框
this.dialogFormZeroOrderVisible = false;
},
/**
* 显示维护在库零担数量

322
src/views/distribution/signfor/distributionSignforedt.vue
Unescape View File

@ -18,28 +18,21 @@
<el-icon><List /></el-icon>
<span class="title-name">预约单号:</span>
<el-tooltip
:content="form.reservationCode ? form.reservationCode : '暂无商场名称'"
:content="form.reservationCode ? form.reservationCode : '暂无预约单号'"
placement="top"
>
<el-input v-model="form.reservationCode" disabled placeholder="预约单号" />
<el-input v-model="form.reservationCode" disabled placeholder="暂无预约单号" />
</el-tooltip>
</div>
<div class="el-txt">
<el-icon><School /></el-icon>
<span class="title-name">商场名称:</span>
<el-tooltip :content="form.mallName ? form.mallName : '暂无商场名称'" placement="top">
<el-input v-model="form.mallName" disabled placeholder="商场名称" />
</el-tooltip>
<el-input v-model="form.mallName" disabled placeholder="暂无商场名称" />
</div>
<div class="el-txt">
<el-icon><Calendar /></el-icon>
<span class="title-name"> 预约时间:</span>
<el-tooltip
:content="form.reservationDate ? form.reservationDate : '暂无预约时间'"
placement="top"
>
<el-input v-model="form.reservationDate" disabled placeholder="预约时间" />
</el-tooltip>
<el-input v-model="form.reservationDate" disabled placeholder="暂无预约时间" />
</div>
</div>
@ -49,50 +42,32 @@
<div class="el-txt">
<el-icon><Van /></el-icon>
<span class="title-name">配送车次:</span>
<el-tooltip :content="form.trainNumber ? form.trainNumber : '暂无司机姓名'" placement="top">
<el-input v-model="form.trainNumber" disabled placeholder="配送车次" />
</el-tooltip>
<el-input v-model="form.trainNumber" disabled placeholder="暂无配送车次" />
</div>
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">司机姓名:</span>
<el-tooltip :content="form.driverName ? form.driverName : '暂无司机姓名'" placement="top">
<el-input v-model="form.driverName" disabled placeholder="司机姓名" />
</el-tooltip>
<el-input v-model="form.driverName" disabled placeholder="暂无司机姓名" />
</div>
<div class="el-txt">
<el-icon><Postcard /></el-icon>
<span class="title-name"> 车辆牌照:</span>
<el-tooltip :content="form.vehicleName ? form.vehicleName : '暂无车辆牌照'" placement="top">
<el-input v-model="form.vehicleName" disabled placeholder="车辆牌照" />
</el-tooltip>
<el-input v-model="form.vehicleName" disabled placeholder="暂无车辆牌照" />
</div>
<div class="el-txt">
<el-icon><Van /></el-icon>
<span class="title-name"> 装车班组:</span>
<el-tooltip
:content="form.loadingTeamName ? form.loadingTeamName : '暂无装车班组'"
placement="top"
>
<el-input v-model="form.loadingTeamName" disabled placeholder="装车班组" />
</el-tooltip>
<el-input v-model="form.loadingTeamName" disabled placeholder="暂无装车班组" />
</div>
<div class="el-txt" style="margin-top: 20px">
<el-icon><Van /></el-icon>
<span class="title-name"> 卸车班组:</span>
<el-tooltip
:content="form.unLoadingTeamName ? form.unLoadingTeamName : '暂无卸车班组'"
placement="top"
>
<el-input v-model="form.unLoadingTeamName" disabled placeholder="卸车班组" />
</el-tooltip>
<el-input v-model="form.unLoadingTeamName" disabled placeholder="暂无卸车班组" />
</div>
<div class="el-txt" style="margin-top: 20px">
<el-icon><Stopwatch /></el-icon>
<span class="title-name"> 实际配送时间:</span>
<el-input v-model="pageRow.taskTime" disabled placeholder="卸车班组" />
</div>
</div>
@ -102,9 +77,7 @@
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">收货人姓名:</span>
<el-tooltip :content="form.consignee ? form.consignee : '暂无收货人姓名'" placement="top">
<el-input v-model="form.consignee" disabled placeholder="收货人姓名" />
</el-tooltip>
<el-input v-model="form.consignee" disabled placeholder="暂无收货人姓名" />
</div>
<div class="el-txt">
<el-icon><User /></el-icon>
@ -113,7 +86,7 @@
:content="form.deliveryPhone ? form.deliveryPhone : '暂无收货人号码'"
placement="top"
>
<el-input v-model="form.deliveryPhone" disabled placeholder="收货人号码" />
<el-input v-model="form.deliveryPhone" disabled placeholder="暂无收货人号码" />
</el-tooltip>
</div>
<div class="el-txt">
@ -123,22 +96,18 @@
:content="form.deliveryAddress ? form.deliveryAddress : '暂无收货人地址'"
placement="top"
>
<el-input v-model="form.deliveryAddress" disabled placeholder="收货人地址" />
<el-input v-model="form.deliveryAddress" disabled placeholder="暂无收货人地址" />
</el-tooltip>
</div>
<div class="el-txt">
<el-icon><Van /></el-icon>
<span class="title-name"> 是否加急:</span>
<el-tooltip :content="form.isUrgent ? form.isUrgent : '暂无加急信息'" placement="top">
<el-input v-model="form.isUrgent" disabled placeholder="是否加急" />
</el-tooltip>
</div>
<div class="el-txt notes">
<el-icon><Edit /></el-icon>
<span class="title-name title-notes"> 客户备注:</span>
<el-tooltip :content="form.remarks ? form.remarks : '暂无备注信息'" placement="top">
<el-input v-model="form.remarks" disabled placeholder="客户备注" />
</el-tooltip>
<el-input v-model="form.remarks" disabled placeholder="暂无客户备注" />
</div>
</div>
<!-- 签收信息 -->
@ -155,17 +124,12 @@
<div class="el-txt el-positioning">
<el-icon><LocationInformation /></el-icon>
<span class="title-name">定位打卡:</span>
<el-tooltip
:content="form.positioningAdr ? form.positioningAdr : '暂无定位打卡'"
placement="top"
>
<el-input
class="positioning"
v-model="form.positioningAdr"
disabled
placeholder="定位打卡位置"
placeholder="暂无定位打卡"
/>
</el-tooltip>
</div>
<div class="el-sw">
<div class="el-box">
@ -173,17 +137,13 @@
<el-icon><LocationInformation /></el-icon>
<span class="title-name">文员备注:</span>
</div>
<el-tooltip
:content="form.clerkSignRemarks ? form.clerkSignRemarks : '暂无文员备注'"
placement="top"
>
<el-input
class="positioning"
v-model="form.clerkSignRemarks"
disabled
placeholder="文员备注"
placeholder="暂无文员备注"
/>
</el-tooltip>
</div>
<div class="el-box">
@ -191,86 +151,59 @@
<el-icon><LocationInformation /></el-icon>
<span class="title-name">司机备注:</span>
</div>
<el-tooltip
:content="form.driverRemarks ? form.driverRemarks : '暂无司机备注'"
placement="top"
>
<el-input
class="positioning"
v-model="form.driverRemarks"
disabled
placeholder="司机备注"
placeholder="暂无司机备注"
/>
</el-tooltip>
</div>
</div>
</div>
<div class="Basic-information">
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">计划件数:</span>
<el-input v-model="pageRow.reservationNum" disabled placeholder="收货人姓名" />
<el-input v-model="pageRow.reservationNum" disabled placeholder="暂无计划件数"/>
</div>
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">装车件数:</span>
<el-input v-model="pageRow.loadedNumber" disabled placeholder="收货人号码" />
<el-input v-model="pageRow.loadedNumber" disabled placeholder="暂无装车件数"/>
</div>
<div class="el-txt">
<el-icon><Postcard /></el-icon>
<span class="title-name"> 签收件数:</span>
<el-input v-model="pageRow.receivedQuantity" disabled placeholder="收货人地址" />
<el-input v-model="pageRow.receivedQuantity" disabled placeholder="暂无签收件数"/>
</div>
<div class="el-txt">
<el-icon><Van /></el-icon>
<span class="title-name"> 复核人:</span>
<el-input v-model="pageRow.examineUserName" disabled placeholder="是否加急" />
<el-input v-model="pageRow.examineUserName" disabled placeholder="暂无复核人"/>
</div>
<div class="el-txt" style=" margin-top: 24px;">
<el-icon><Van /></el-icon>
<span class="title-name"> 签收人:</span>
<el-input v-model="pageRow.signeeName" disabled placeholder="是否加急" />
<el-input v-model="pageRow.signeeName" disabled placeholder="暂无签收人"/>
</div>
<div class="el-txt" style=" margin-top: 24px;">
<el-icon><Van /></el-icon>
<span class="title-name"> 签收完成时间:</span>
<el-input v-model="pageRow.sjsigningTime" disabled placeholder="是否加急" />
<el-input v-model="pageRow.sjsigningTime" disabled placeholder="暂无签收完成时间" />
</div>
<div class="el-txt" style=" margin-top: 24px;">
<el-icon><Van /></el-icon>
<span class="title-name"> 文员复核时间:</span>
<el-input v-model="pageRow.signingTime" disabled placeholder="是否加急" />
<el-input v-model="pageRow.signingTime" disabled placeholder="暂无文员复核时间" />
</div>
</div>
<div class="FImg">
<div class="imgName">
<span
@ -767,6 +700,7 @@ import {
$_updateSignAddValuePackage,
$_distributionSignforPackageList,
$_distributionSignforOrderList,
$_distributionSignforDetailExcel,
} from '@/api/distribution/distributionSignfor';
import { getToken } from '@/utils/auth';
import { ElMessage } from 'element-plus';
@ -1464,9 +1398,9 @@ const menuData2 = ref([
// 库存品列表
const menuData3 = ref([
{
prop: 'sku',
label: 'sku',
type: 2,
prop: 'cargoNorms',
label: '物料规格',
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1475,9 +1409,9 @@ const menuData3 = ref([
head: false,
},
{
prop: 'descriptionGoods',
label: '物料名称',
type: 2,
prop: 'cargoNumber',
label: '物料编号',
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1486,9 +1420,9 @@ const menuData3 = ref([
head: false,
},
{
prop: 'cargoNumber',
label: '物料编号',
type: 2,
prop: 'cargoUnit',
label: '物料单位',
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1499,7 +1433,7 @@ const menuData3 = ref([
{
prop: 'cargoNorms',
label: '物料规格',
type: 2,
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1508,8 +1442,8 @@ const menuData3 = ref([
head: false,
},
{
prop: 'cargoUnit',
label: '物料单位',
prop: 'descriptionGoods',
label: '物料名称',
type: 1,
values: '',
width: '200',
@ -1519,9 +1453,9 @@ const menuData3 = ref([
head: false,
},
{
prop: 'category',
label: '品分类',
type: 2,
prop: 'incomingBatch',
label: '批次号',
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1530,8 +1464,8 @@ const menuData3 = ref([
head: false,
},
{
prop: 'reservationNum',
label: '计划出库数',
prop: 'loadingNum',
label: '装车件数',
type: 1,
values: '',
width: '200',
@ -1542,8 +1476,8 @@ const menuData3 = ref([
head: false,
},
{
prop: 'loadedinNumber',
label: '实际出库数',
prop: 'loadingStatus',
label: '装车状态',
type: 1,
values: '',
width: '200',
@ -1554,9 +1488,9 @@ const menuData3 = ref([
head: false,
},
{
prop: 'loadingStatusName',
label: '装车状态',
type: 2,
prop: 'loadingTime',
label: '装车时间',
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1565,8 +1499,63 @@ const menuData3 = ref([
head: false,
},
{
prop: 'signingStatusName',
prop: 'loadingUser',
label: '装车人',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'marketName',
label: '商场名称',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'planNum',
label: '计划数量',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingNum',
label: '签收数量',
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingStatus',
label: '签收状态',
type:1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingTime',
label: '签收时间',
type: 1,
values: '',
width: '200',
@ -1576,9 +1565,20 @@ const menuData3 = ref([
head: false,
},
{
prop: 'signUser',
prop: 'signingUser',
label: '签收人',
type: 2,
type: 1,
values: '',
width: '200',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'stockupNum',
label: '备货数量',
type: 1,
values: '',
width: '200',
checkarr: [],
@ -1825,6 +1825,7 @@ const pageRow=ref({});//页面参数
const onLoad = () => {
menuData.value = menuData1.value; //页面初始化默认显示第一个表格
data.value = InitializeTable.value; //默认显示第一个表格数据
pageRow.value=JSON.parse(route.query.row)
};
console.log(route.query,'route.query');
@ -2217,11 +2218,13 @@ function InventoryList() {
editLoading.value = true; //表格加载开启
data.value = [];
signforInventoryList(RouterId.value).then(res => {
console.log(res,'库存品');
if (res.data.code !== 200) return;
console.log(res, '库存品列表');
// data.value = res.data.data || [];
Tabs.value[2].data = data || [];
Tabs.value[2].renderData = data || [];
Tabs.value[2].data = res.data.data || [];
Tabs.value[2].renderData = res.data.data || [];
editLoading.value = false; //表格加载结束
});
}
@ -2252,13 +2255,6 @@ const tabClick = val => {
// 导出
const Signforexport = () => {
if (SignforMenu.value.label == '库存品列表') {
ElMessage({
message: '库存品导出维护中',
type: 'warning',
});
return;
}
console.log(SignforMenu.value);
ElMessageBox.confirm(`是否导出${SignforMenu.value.label}`, '提示', {
confirmButtonText: '确定',
@ -2267,14 +2263,12 @@ const Signforexport = () => {
})
.then(() => {
let data = {
signforId: RouterId.value,
id: RouterId.value,
};
editLoading.value = true;
// 订单列表
if (SignforMenu.value.label == '订单列表') {
return $_distributionSignforOrderList(data)
return $_distributionSignforDetailExcel(data)
.then(res => {
downloadXls(res.data, `订单列表.xlsx`);
downloadXls(res.data, `${SignforMenu.value.label}.xlsx`);
ElMessage({
type: 'success',
message: '导出成功',
@ -2284,26 +2278,52 @@ const Signforexport = () => {
.finally(() => {
editLoading.value = false;
});
}
// 订单列表
// if (SignforMenu.value.label == '订单列表') {
// return $_distributionSignforOrderList(data)
// .then(res => {
// downloadXls(res.data, `订单列表.xlsx`);
// ElMessage({
// type: 'success',
// message: '导出成功',
// });
// })
// .catch(() => {})
// .finally(() => {
// editLoading.value = false;
// });
// }
// 包件列表
if (SignforMenu.value.label == '包件列表') {
return $_distributionSignforPackageList(data)
.then(res => {
downloadXls(res.data, `包件列表.xlsx`);
ElMessage({
type: 'success',
message: '导出成功',
});
})
.catch(() => {})
.finally(() => {
editLoading.value = false;
});
}
// 库存品列表
if (SignforMenu.value.label == '库存品列表') {
}
// // 包件列表
// if (SignforMenu.value.label == '包件列表') {
// return $_distributionSignforPackageList(data)
// .then(res => {
// downloadXls(res.data, `包件列表.xlsx`);
// ElMessage({
// type: 'success',
// message: '导出成功',
// });
// })
// .catch(() => {})
// .finally(() => {
// editLoading.value = false;
// });
// }
// // 库存品列表
// if (SignforMenu.value.label == '库存品列表') {
// return $_distributionSignforDetailExcel(data)
// .then(res => {
// downloadXls(res.data, `库存品列表.xlsx`);
// ElMessage({
// type: 'success',
// message: '导出成功',
// });
// })
// .catch(() => {})
// .finally(() => {
// editLoading.value = false;
// });
// }
})
.catch(() => {});
};

1
src/views/distribution/signfor/distributionSignfortreat.vue
Unescape View File

@ -2088,6 +2088,7 @@ export default {
id: row.id,
reservationId: row.reservationId,
name: '待签收查看',
row: JSON.stringify(row),
},
});
},

9
src/views/distribution/turndelivery/deliveryDiscuss.vue
Unescape View File

@ -1220,9 +1220,10 @@ const menuData = ref([
statistics: true, //开启统计
isshowSummary: true,
},
{
prop: 'reservationNum',
label: '计划数量',
prop: 'handQuantity',
label: '在库件数',
type: 1,
values: '',
width: '110',
@ -1234,8 +1235,8 @@ const menuData = ref([
isshowSummary: true,
},
{
prop: 'handQuantity',
label: '在库件数',
prop: 'reservationNum',
label: '计划数量',
type: 1,
values: '',
width: '110',

Write Preview
Loading…
Cancel
Save