Browse Source

自提搜索,待签收列表修复报错

dev-xx
马远东 11 months ago
parent
commit
edc8a7f99e
  1. 3
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 17
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 11
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  4. 78
      src/views/distribution/inventory/distrilbutionBillLading.vue
  5. 4
      src/views/distribution/signfor/distributionSignforedt.vue

3
src/views/aftersales/aftersalesWorkOrder.vue

@ -3458,9 +3458,10 @@ const ResultConfirmation = val => {
if (ConfirmStatus) { if (ConfirmStatus) {
// //
let state = details.selectionList.every(item => item.workOrderStatus == '21'); let state = details.selectionList.every(item => item.workOrderStatus == '21');
console.log(state,'state');
if (!state) { if (!state) {
ElMessage({ ElMessage({
message: '批量确认中有状态不符合的必须为处理结果已提交', message: '勾选单子中有已经确认的请取消勾选!',
type: 'warning', type: 'warning',
}); });
return; return;

17
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -605,8 +605,6 @@
</div> </div>
</div> </div>
</template> </template>
<!-- resultDescription -->
</div> </div>
<el-form-item label="处理结果说明"> <el-form-item label="处理结果说明">
<el-input <el-input
@ -631,7 +629,7 @@
class="demo-tabs responsibilities" class="demo-tabs responsibilities"
@tab-click="handleClick" @tab-click="handleClick"
v-loading="form.Packageloading" v-loading="form.Packageloading"
v-if="['1', '3'].includes(form.basis.discoveryNode)" v-if="['1', '3'].includes(form.basis.workOrderType)"
> >
<el-form-item label=""> <el-form-item label="">
<el-tab-pane label="照片" name="0"> <el-tab-pane label="照片" name="0">
@ -1069,7 +1067,6 @@ const CompanyProportionInput = value => {
// //
const Totalamount = () => { const Totalamount = () => {
console.log(form.value.Claimamount); console.log(form.value.Claimamount);
form.value.Totalamount = form.value.Claimamount.map(res => res.money).reduce( form.value.Totalamount = form.value.Claimamount.map(res => res.money).reduce(
(accumulator, currentValue) => accumulator + currentValue, (accumulator, currentValue) => accumulator + currentValue,
0 0
@ -1077,8 +1074,7 @@ const Totalamount = () => {
}; };
const Claimssettlement = value => { const Claimssettlement = value => {
console.log(value, '理赔金额'); if(value.length){
console.log(Processingresultsoptions.value, '参数列表');
let data = []; let data = [];
value.forEach(item => { value.forEach(item => {
let _data = Processingresultsoptions.value.find(res => res.value == item); let _data = Processingresultsoptions.value.find(res => res.value == item);
@ -1086,7 +1082,6 @@ const Claimssettlement = value => {
data.push(_data); data.push(_data);
} }
}); });
console.log(data, '筛选出来的值');
form.value.Claimamount = []; form.value.Claimamount = [];
if (data && data.length) { if (data && data.length) {
data.forEach(item => { data.forEach(item => {
@ -1100,6 +1095,7 @@ const Claimssettlement = value => {
}); });
}); });
} }
}
}; };
// TOKEN // TOKEN
const headers = computed(() => { const headers = computed(() => {
@ -1377,7 +1373,7 @@ const allFieldsFilled = computed(() => {
form.value.Processed = allFilled; form.value.Processed = allFilled;
return allFilled; return allFilled;
}); });
// //
const onSubmit = () => { const onSubmit = () => {
console.log(form.value); console.log(form.value);
ruleFormRef.value.validate(valid => { ruleFormRef.value.validate(valid => {
@ -1550,8 +1546,9 @@ const onSubmit = () => {
submitData.aftersalesProcessingResultsDTO.resultDescription = submitData.aftersalesProcessingResultsDTO.resultDescription =
form.value.basis.resultDescription; // form.value.basis.resultDescription; //
delete form.value.basis.resultDescription; // delete form.value.basis.resultDescription; //
}else{
delete submitData.result;//
} }
console.log(submitData, '处理好的参数'); console.log(submitData, '处理好的参数');
form.value.Pageloading = true; // form.value.Pageloading = true; //
@ -1559,6 +1556,8 @@ const onSubmit = () => {
if (form.value.Processed) { if (form.value.Processed) {
submitData.workOrderStatus = 30; submitData.workOrderStatus = 30;
} }
//()
delete submitData.processor;
$_submit(submitData) $_submit(submitData)
.then(res => { .then(res => {
ElMessage({ ElMessage({

11
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -312,6 +312,7 @@
</template> </template>
<div class="selector"> <div class="selector">
<el-select <el-select
disabled
v-model="Indexform.result" v-model="Indexform.result"
multiple multiple
filterable filterable
@ -554,7 +555,7 @@
>确定审核 >确定审核
</el-button> --> </el-button> -->
<el-button type="primary" v-if="PermissionButton.work_order_completion" @click="EndJump" <el-button type="primary" v-if="PermissionButton.work_order_completion" @click="EndJump"
>完结</el-button >完结工单</el-button
> >
<el-button type="primary" v-if="PermissionButton.repulse" @click="BatchReturn" <el-button type="primary" v-if="PermissionButton.repulse" @click="BatchReturn"
>打回</el-button >打回</el-button
@ -1114,7 +1115,6 @@ const onLoad = () => {
tripartite: res.tripartite, // tripartite: res.tripartite, //
}; };
}); });
console.log(FangAddList.value, '责任方回显问题');
res.data.data.processorVOList.forEach(item => { res.data.data.processorVOList.forEach(item => {
if (item) { if (item) {
if (item.typesOf == 2) { if (item.typesOf == 2) {
@ -2241,9 +2241,11 @@ const ResultDetermination = () => {
border-bottom: 1px solid #d5d5d563 !important; border-bottom: 1px solid #d5d5d563 !important;
border-right: 1px solid #d5d5d563 !important; border-right: 1px solid #d5d5d563 !important;
} }
.el-endtabs { .el-endtabs {
margin-top: 10px; margin-top: 10px;
:deep(.is-active){
font-weight: bold;
}
} }
:deep(.custom-tabs-label) { :deep(.custom-tabs-label) {
@ -2408,8 +2410,9 @@ const ResultDetermination = () => {
} }
} }
.el_top { .el_top {
display: flex;
width: 100%; width: 100%;
padding: 6px 0;
display: flex;
justify-content: space-between; justify-content: space-between;
:deep(.el-form-item) { :deep(.el-form-item) {
display: flex; display: flex;

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

@ -93,6 +93,7 @@
<el-form-item label-width="0" prop="certificateType"> <el-form-item label-width="0" prop="certificateType">
<el-tabs @tab-click="handleChlickTab" style="width: 100%"> <el-tabs @tab-click="handleChlickTab" style="width: 100%">
<el-tab-pane label="定制品"> <el-tab-pane label="定制品">
<el-button <el-button
type="primary" type="primary"
@ -102,6 +103,18 @@
v-if="orderAdd" v-if="orderAdd"
> </el-button > </el-button
> >
<div class="el_multifunctional">
<el-input
v-model="multifunctional"
placeholder="请输入要搜索的值,多条件用英文逗号拼接"
clearable
@clear="soclear"
/>
<el-button type="primary" @click="SearchFu"
><el-icon><Plus /></el-icon></el-button
>
</div>
<tablecmt <tablecmt
class="tablesc" class="tablesc"
:columnList="columnListedit" :columnList="columnListedit"
@ -112,6 +125,7 @@
@btnCheck="btnsc" @btnCheck="btnsc"
@selectCheck="selectsc" @selectCheck="selectsc"
@selection="selectionChange" @selection="selectionChange"
:searchInput="multifunctional"
> >
<template #default="slotProps"> <template #default="slotProps">
@ -646,6 +660,7 @@ export default {
data() { data() {
return { return {
tabletit: '', // tabletit: '', //
multifunctional:'', //
dialogImg: false, dialogImg: false,
Imgurl: undefined, Imgurl: undefined,
Selfpickuploading: false, // Selfpickuploading: false, //
@ -2063,6 +2078,57 @@ export default {
orderSelectChange(list) { orderSelectChange(list) {
this.order.selectList = list; this.order.selectList = list;
}, },
scrollToElementWithinTableRow(partialIdString) {
//
const tableRows = document.querySelectorAll('tr');
tableRows.forEach(function(row) {
const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) {
cell.style.backgroundColor = ''; //
cell.style.color = ''; //
});
});
//
const partialIds = partialIdString.replace(/,/g, ',').split(',').map(id => id.trim());
// partialIds
for (let row of tableRows) {
let allIdsFound = partialIds.every(partialId => {
return Array.from(row.querySelectorAll('[id]')).some(cell => cell.id.includes(partialId));
});
if (allIdsFound) {
// partialIds,
const cells = row.querySelectorAll('[id]');
cells.forEach(function(cell) {
cell.style.backgroundColor = '#ff0000';
cell.style.color = '#fff';
});
//
row.scrollIntoView({ behavior: 'smooth', block: 'center' });
break;
}
}
},
//
SearchFu(){
console.log(this.multifunctional, '搜索的参数值');
if (this.multifunctional) {
this.scrollToElementWithinTableRow(this.multifunctional);
} else {
document.querySelectorAll('[id]').forEach(function (el) {
el.style.backgroundColor = ''; //
el.style.color = ''; //
});
}
return;
// console.log(dataInfo.value, '');
},
soclear (){
this.SearchFu();
},
orderTimesc(index, row) { orderTimesc(index, row) {
if (!!index) { if (!!index) {
index = dayjs(index).format('YYYY-MM-DD'); index = dayjs(index).format('YYYY-MM-DD');
@ -3425,4 +3491,16 @@ if (val.orderPackageStatus == 70) {
height: 100%; height: 100%;
} }
} }
.el_multifunctional {
display: flex;
align-items: center;
justify-content: space-between;
width: 24%;
.el-input {
margin-right: 4px;
}
button {
width: 100px;
}
}
</style> </style>

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

@ -1828,10 +1828,6 @@ const onLoad = () => {
}; };
console.log(route.query,'route.query'); console.log(route.query,'route.query');
const { row } =route.query;
pageRow.value=JSON.parse(row)
console.log(pageRow.value,'pageRow.value');
// RouterId.value = '1721707916601487362'; // RouterId.value = '1721707916601487362';
// RouterReservationId.value = '1721707896171032578'; // RouterReservationId.value = '1721707896171032578';
// //

Loading…
Cancel
Save