pref_mail@163.com 1 year ago
parent
commit
9333a7717e
  1. 10
      src/api/aftersales/aftersalesWorkOrder.js
  2. 42
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 34
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  4. 1
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  5. 151
      src/views/aftersales/aftersalesWorkOrderend.vue
  6. 1
      src/views/distribution/inventory/distrilbutionBillLading.vue
  7. 22
      src/views/distribution/signfor/distributionSignforedt.vue
  8. 30
      src/views/distribution/turndelivery/deliveryDiscuss.vue

10
src/api/aftersales/aftersalesWorkOrder.js

@ -374,11 +374,19 @@ export const $_updateWorkList = (data) => {
})
}
// 处理结果存储
// 处理结果确定
export const $_updateWorkOrderStatus = (data) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/updateWorkOrderStatus',
method: 'put',
data
})
}
// 完结结果确定
export const $_updateManagerConfirmed = (data) => {
return request({
url: '/api/logpm-aftersales/aftersalesWorkOrder/updateManagerConfirmed',
method: 'put',
data
})
}

42
src/views/aftersales/aftersalesWorkOrder.vue

@ -672,7 +672,6 @@ const TabList = ref([
{ name: 8, label: '待回复' },
{ name: 1, label: '处理中' },
{ name: 2, label: '处理完毕' },
{ name: 9, label: '预订单' },
{ name: 6, label: '完结' },
{ name: 5, label: '仲裁中' },
{ name: 4, label: '理赔金额未出' },
@ -1950,30 +1949,23 @@ const tabChenge = val => {
details.query.workOrderStatus = 20;
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data);
IndexTable(data);
} else {
data.workOrderStatus = 40;
details.query.workOrderStatus = 40;
Tableheaderswitching(columnList);
empty();
IndexTable(data);
ProcessingPartyFun(data);
}
ProcessingPartyState.value = false; //
ArbitrationStatus.value = true; //
} else if (val == 2) {
if (UserPermissions.value == '仓库客服') {
console.log('处理完毕');
data.workOrderStatus = 30;
details.query.workOrderStatus = 30;
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data);
} else {
data.workOrderStatus = 50;
details.query.workOrderStatus = 50;
Tableheaderswitching(columnList);
empty();
IndexTable(data);
}
//
ProcessingPartyState.value = false; //
ArbitrationStatus.value = false; //
@ -1981,13 +1973,21 @@ const tabChenge = val => {
//
console.log(UserPermissions.value, '当前身份');
console.log('待处理');
ProcessingPartyState.value = true; //
data.workOrderStatus = 10;
details.query.workOrderStatus = 10;
ArbitrationStatus.value = true; //
Tableheaderswitching(columnList);
empty();
IndexTable(data);
if (UserPermissions.value == '仓库客服') {
ProcessingPartyState.value = true; //
data.workOrderStatus = 10;
details.query.workOrderStatus = 10;
ArbitrationStatus.value = true; //
Tableheaderswitching(columnList);
empty();
IndexTable(data);
} else {
data.workOrderStatus = 50;
details.query.workOrderStatus = 50;
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data); //
}
} else if (val == 4) {
ProcessingPartyState.value = false; //
//
@ -2030,7 +2030,8 @@ const tabChenge = val => {
ArbitrationStatus.value = true; //
Tableheaderswitching(columnList);
empty();
ProcessingPartyFun(data); //
IndexTable(data);
} else {
console.log('待处理');
ProcessingPartyState.value = true; //
@ -2039,7 +2040,7 @@ const tabChenge = val => {
ArbitrationStatus.value = true; //
Tableheaderswitching(columnList);
empty();
IndexTable(data);
ProcessingPartyFun(data); //
}
}
};
@ -2737,6 +2738,7 @@ const CompletedSubmission = () => {
.name {
display: flex;
margin: 10px 5%;
span {
display: block;
width: 90px;

34
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -488,7 +488,7 @@
<div class="title">处理结果-理赔金额</div>
<div class="Listadmiration">
<div class="name" v-for="(item, index) in ProcessingList" :key="index">
<span>{{ item.name }}:</span>
<span style="width: 120px">{{ item.name }}:</span>
<div class="payment_right">
<el-input-number
v-model="item.input"
@ -499,6 +499,12 @@
<div class="Paymentname" @click="PaymentSelection(item)">
{{ item.payment ? item.text : '支付方式' }}
</div>
<div class="el_PaymentUnit">
<el-input
v-model="item.paymentUnit"
placeholder="请输入支付单位"
/>
</div>
<el-date-picker
v-model="item.compensationTime"
type="datetime"
@ -859,6 +865,7 @@ const changeProcessingResults = val => {
payment: '',
text: '',
compensationTime: '',
paymentUnit:'',
};
// numnewItemname
switch (num) {
@ -1055,17 +1062,17 @@ const CompanyProportionInput = () => {
const ConfirmForm = () => {
//
//
if(ProcessingList.value.length){
if (ProcessingList.value.length) {
for (let item of ProcessingList.value) {
if (!item.payment) {
ElMessage({
message: `请选择${item.name}的支付方式`,
type: 'warning',
});
return;
if (!item.payment) {
ElMessage({
message: `请选择${item.name}的支付方式`,
type: 'warning',
});
return;
}
}
}
}
console.log(Indexform.value.businessMame, '提货责任方');
let DataSubmit = {
personResponsibleDTO: [],
@ -1269,6 +1276,7 @@ const ConfirmForm = () => {
: '未知支付方式',
resultName: item.name, //
compensationTime: item.compensationTime, //
paymentUnit:item.paymentUnit,//
};
} else {
return null;
@ -1806,7 +1814,7 @@ const ViewPackageDetails = val => {
display: flex;
margin-bottom: 20px;
height: 30px;
width: 42%;
width: 48%;
justify-content: space-between;
.payment_right {
display: flex;
@ -1863,4 +1871,10 @@ const ViewPackageDetails = val => {
.el_Processingresults {
margin-top: 12px;
}
.el_PaymentUnit{
margin: 0 4px;
}
:deep(.el-input-number){
width: 180px !important;
}
</style>

1
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -757,6 +757,7 @@ const ButtonPermissions = computed(() => {
ArbitrationCompleted: false, //
edit: false, //
};
case RouteIndexs.value == 8: //
return {
reply: UserPermissions.value == '仓库客服', //

151
src/views/aftersales/aftersalesWorkOrderend.vue

@ -329,6 +329,10 @@
<div class="Paymentname" @click="PaymentSelection(item)">
{{ item.payment ? item.text : '支付方式' }}
</div>
<div class="el_PaymentUnit">
<span>支付单位:</span>
<el-input v-model="item.paymentUnit" placeholder="请输入支付单位" />
</div>
<div>
<el-date-picker
v-model="item.compensationTime"
@ -342,7 +346,7 @@
</div>
</div>
</div>
<div class="el_tool">
<span>总金额:{{ TotalClaimAmount }}</span>
</div>
@ -548,7 +552,11 @@
>提交</el-button
>
<el-button @click="DetermineStorage" v-if="$route.query.index != '0'" type="primary" class="button"
<el-button
@click="DetermineStorage"
v-if="$route.query.index != '0'"
type="primary"
class="button"
>确定</el-button
>
@ -799,6 +807,7 @@ import {
$_getList,
$_getProcessor,
$_updateWorkOrderStatus,
$_updateManagerConfirmed,
} from '@/api/aftersales/aftersalesWorkOrder';
import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
import { getToken } from '@/utils/auth';
@ -822,6 +831,7 @@ const TotalamountReceived = ref(0); //收款金额合计
const personResponsibleList = ref([]); //
const msgHight = ref(100); //
const msgTop = ref(0); //
const paymentUnit = ref(''); //
const scrollContainer = ref(null); //
const KFfeel = ref([]); //
const MessageResponsibility = ref([]); //
@ -1094,6 +1104,7 @@ const onLoad = () => {
name: item.resultTypeName,
text: item.compensationMethodName,
compensationTime: item.compensationTime,
paymentUnit:item.paymentUnit,
};
}
);
@ -1281,6 +1292,7 @@ const changeProcessingResults = val => {
payment: '',
text: '',
compensationTime: '',
paymentUnit:'',
};
// numnewItemname
switch (num) {
@ -1346,7 +1358,6 @@ const fellSuccess = (response, uploadFile) => {
}
};
//
const ViodSuccess = response => {
if (response.success == true) {
@ -1620,87 +1631,39 @@ const PaymentConfirmation = val => {
};
//
const DetermineStorage=()=>{
console.log($route.query.id, '异常ID');
console.log(ProcessingList.value, 'ProcessingList12312');
let data = {
aftersalesProcessingResultsDTO: {
},
processingMoneyEntityList: [], //
assignList:[{}]
};
let a={}
a=$route.query.id
data['assignList'].push(a)
data.id = $route.query.id;
data.aftersalesProcessingResultsDTO['workOrderId'] = $route.query.id; //ID
let sum = 0; //
for (let i = 0; i < ProcessingList.value.length; i++) {
console.log(ProcessingList.value[i].input);
sum = computeNumber(sum, '+', ProcessingList.value[i].input).result;
}
data.aftersalesProcessingResultsDTO.money = sum; //
// data['compensationMethod'] = Paymentmethod.value.filter(
// item => item.dictKey == endFrom.value.compensationMethod
// )[0].dictValue; //
// data['compensationMethod'] = endFrom.value.compensationMethod.join(','); //
// console.log(data['compensationMethod']);
console.log(Paymentmethod.value, 'Paymentmethod.value');
data.aftersalesProcessingResultsDTO['compensationMethod'] = ProcessingList.value
.map(item => item.text)
.join(',');
data['processingMoneyEntityList'] = ProcessingList.value
.map(item => {
console.log(item);
let match = ProcessingResults.value.find(element => element.dictValue == item.name);
if (match) {
let paymentMethodMatch = Paymentmethod.value.find(
paymentMethod => paymentMethod.dictKey == item.payment
);
return {
resultType: match.dictKey, //key
money: item.input, //
typesOf: 1, //
compensationMethod: paymentMethodMatch ? paymentMethodMatch.dictKey : '未知支付方式',
compensationMethodName: paymentMethodMatch
? paymentMethodMatch.dictValue
: '未知支付方式',
resultName: item.name, //
compensationTime: item.compensationTime, //
};
} else {
return null;
}
})
.filter(item => item !== null);
data.aftersalesProcessingResultsDTO.processingMoneyEntityList =
data['processingMoneyEntityList'];
console.log('走到了这一步');
data.aftersalesProcessingResultsDTO.workOrderId = $route.query.id; //ID
data.aftersalesProcessingResultsDTO['resultType'] = ProcessingList.value
.map(item => item.name)
.join(','); //
let imgLink = ''; //
//
// if (endFrom.value['packageImage'].length) {
// imgLink = endFrom.value['packageImage'].map(item => item.response.data.link).join(','); //
// }
if (videoUrl.value && imgLink) {
data.aftersalesProcessingResultsDTO['annex'] = videoUrl.value + ',' + imgLink;
} else {
data.aftersalesProcessingResultsDTO['annex'] = imgLink;
}
console.log(data, '处理好的数据');
delete data.aftersalesProcessingResultsDTO.id; //ID
data.aftersalesProcessingResultsDTO.warehouseId = info.warehouseId; //ID
const DetermineStorage = () => {
let data = {
assignList: [],
};
let a = {};
a = $route.query.id;
data['assignList'].push(a);
if (routerState.value == 'end') {
$_updateManagerConfirmed(data).then(res => {
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
}
console.log(res, '完结确定');
});
//
console.log(data, '处理好的值');
} else {
console.log(a);
console.log(data, '处理好的数据');
// $_updateWorkOrderStatus(data).then(res=>{
// console.log(res,'');
// })
}
$_updateWorkOrderStatus(data).then(res => {
console.log(res, '确定提交存储');
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
}
});
}
};
//
const submit = () => {
@ -1842,12 +1805,14 @@ const submit = () => {
: '未知支付方式',
resultName: item.name, //
compensationTime: item.compensationTime, //
paymentUnit: item.paymentUnit, //
};
} else {
return null;
}
})
.filter(item => item !== null);
// data.aftersalesProcessingResultsDTO.paymentUnit = paymentUnit.value; //
data.aftersalesProcessingResultsDTO.processingMoneyEntityList =
data['processingMoneyEntityList'];
console.log('走到了这一步');
@ -1888,7 +1853,6 @@ const submit = () => {
//
const replyMessage = () => {
console.log(MessageContent.value, '当前的聊天记录');
console.log(warehouseData.value, '参数1212312312312312');
console.log(MessageResponsibility, '责任方');
let msgData = {
@ -2119,10 +2083,11 @@ const CustomerServiceCompleted = () => {
display: flex;
margin-bottom: 20px;
height: 30px;
width: 46%;
width: 100%;
justify-content: space-between;
span {
display: block;
width: 30%;
width:140px;
color: #606266;
font-size: 16px;
}
@ -2297,7 +2262,7 @@ const CustomerServiceCompleted = () => {
}
//
:deep(.el-input-number) {
width: 47%;
width: 160px;
}
.contemtMax {
display: flex;
@ -2567,4 +2532,16 @@ const CustomerServiceCompleted = () => {
.el-endtabs {
margin-top: 26px;
}
.el_PaymentUnit {
display: flex;
align-items: center;
span {
display: flex;
width: 80px !important;
align-items: center;
}
:deep(.el-input) {
width: 150px;
}
}
</style>

1
src/views/distribution/inventory/distrilbutionBillLading.vue

@ -2257,6 +2257,7 @@ export default {
this.order.orderChooseLoading = true;
this.order.query.stockArticleId = this.orderChooseId;
this.order.query.conditions = '1';
this.order.query.orderPackageReservationStatus = '10';
await getList(this.order.currentPage, this.order.pageSize, {
...params,
...this.order.query,

22
src/views/distribution/signfor/distributionSignforedt.vue

@ -1141,6 +1141,28 @@ const menuData2 = ref([
sortable: true,
head: false,
},
{
prop: 'loadingTime',
label: '装车时间',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'signingUser',
label: '签收人',
type: 1,
values: '',
width: '150',
checkarr: [],
fixed: false,
sortable: true,
head: false,
},
{
prop: 'trainNumber',
label: '包件类型',

30
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -403,14 +403,15 @@
</template>
</el-table>
<div class="el-Cart-button-btn">
<!-- <div>
已选择:3
<div>
已选择:{{dataInfo.length}}
<span>合计:</span>
<div>
<span>订单总件数:22</span>
<span>在库件数:33</span>
</div>
</div> -->
<span>订单总件数:{{Totalnumberoforders}}</span>
<span>/</span>
<span>在库总件数:{{Totalnumberofitemsinstock}}</span>
</div>
</div>
<el-button type="primary" @click="SubmitCommercial"
><el-icon><Select /></el-icon>()</el-button
>
@ -855,6 +856,8 @@ const numTab = ref([
},
]);
const num = ref(null); //
const Totalnumberoforders=ref(0);//
const Totalnumberofitemsinstock =ref(0);//
const kind = ref(true); //
const currentPage = ref(1); //
const pageSize = ref(20); //
@ -1233,7 +1236,7 @@ const menuData = ref([
statistics: true, //
},
{
prop: 'handQuantity',
prop: 'handQuantity',
label: '在库件数',
type: 1,
values: '',
@ -1878,7 +1881,14 @@ const selectChange = (selection, row) => {
}
}
};
function tooSUM(){
Totalnumberoforders.value=0
Totalnumberofitemsinstock.value=0
dataInfo.value.forEach(item=>{
Totalnumberoforders.value+= item.totalNumber,
Totalnumberofitemsinstock.value+=item.handQuantity
})
};
//
const submit = () => {
//
@ -1919,6 +1929,8 @@ const submit = () => {
}
//
dataInfo.value = removeDuplicates(dataInfo.value);
//
tooSUM()
//
dataTmp.value = removeDuplicates(dataTmp.value);
AddLalog.value = false; //
@ -2028,6 +2040,7 @@ const SearchFu = () => {
//
const DeleteEvent = val => {
if (route.query.id) {
//
let data = {
@ -2086,6 +2099,7 @@ const DeleteEvent = val => {
});
}
}
tooSUM()
};
//
const EditEvent = val => {

Loading…
Cancel
Save