qb 11 months ago
parent
commit
ef7becda86
  1. 56
      src/router/views/index.js
  2. 29
      src/views/aftersales/aftersalesWorkOrder.vue
  3. 3261
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  4. 3273
      src/views/aftersales/aftersalesWorkOrderAddTemp.vue
  5. 2
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  6. 84
      src/views/aftersales/aftersalesWorkOrderend.vue
  7. 1990
      src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
  8. 20
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue
  9. 19
      src/views/distribution/inventory/distrilbutionBillLading.vue
  10. 1
      src/views/distribution/signfor/distributionSignfor.vue
  11. 79
      src/views/distribution/signfor/distributionSignforedt.vue
  12. 21
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  13. 99
      src/views/financialsector/Financialse/FinancialDelivery.vue
  14. 47
      src/views/financialsector/Financialse/FinancialWarehousing.vue

56
src/router/views/index.js

@ -1391,18 +1391,34 @@ export default [
}, },
{ {
path: '/aftersales/aftersalesWorkOrderInfoTemp', path: '/aftersales/aftersalesWorkOrdermodifyTemp',
component: Layout, component: Layout,
redirect: '/aftersales/aftersalesWorkOrderInfoTemp', redirect: '/aftersales/aftersalesWorkOrdermodifyTemp',
children: [ children: [
{ {
meta: { meta: {
i18n: 'dict', i18n: 'dict',
keepAlive: false, keepAlive: false,
}, },
path: '/aftersales/aftersalesWorkOrderInfoTemp', path: '/aftersales/aftersalesWorkOrdermodifyTemp',
name: '重构详情', name: '重构详情',
component: () => import('@/views/aftersales/aftersalesWorkOrderInfoTemp.vue'), component: () => import('@/views/aftersales/aftersalesWorkOrdermodifyTemp.vue'),
},
],
},
{
path: '/aftersales/aftersalesWorkOrdermodifyTemp',
component: Layout,
redirect: '/aftersales/aftersalesWorkOrdermodifyTemp',
children: [
{
meta: {
i18n: 'dict',
keepAlive: false,
},
path: '/aftersales/aftersalesWorkOrdermodifyTemp',
name: '编辑重构',
component: () => import('@/views/aftersales/aftersalesWorkOrdermodifyTemp.vue'),
}, },
], ],
}, },
@ -1634,22 +1650,22 @@ export default [
// 工单新增重构页面 // 工单新增重构页面
{ // {
path: '/aftersales/aftersalesWorkOrderAddTemp', // path: '/aftersales/aftersalesWorkOrderAddTemp',
component: Layout, // component: Layout,
redirect: '/aftersales/aftersalesWorkOrderAddTemp', // redirect: '/aftersales/aftersalesWorkOrderAddTemp',
children: [ // children: [
{ // {
meta: { // meta: {
i18n: 'dict', // i18n: 'dict',
keepAlive: true, // keepAlive: true,
}, // },
path: '/aftersales/aftersalesWorkOrderAddTemp', // path: '/aftersales/aftersalesWorkOrderAddTemp',
name: '工单新增重构页面', // name: '工单新增重构页面',
component: () => import('@/views/aftersales/aftersalesWorkOrderAddTemp.vue'), // component: () => import('@/views/aftersales/aftersalesWorkOrderAddTemp.vue'),
}, // },
], // ],
}, // },
// { // {
// // 这是父路由,财务主页面 // // 这是父路由,财务主页面
// path: '/financialsector/FinanceHome', // path: '/financialsector/FinanceHome',

29
src/views/aftersales/aftersalesWorkOrder.vue

@ -1,5 +1,5 @@
<template> <template>
<div class="content_max"> <div class="content_max" v-loading="pageLoad">
<!-- 菜单 --> <!-- 菜单 -->
<el-tabs type="border-card" v-model="tabValue" @tab-change="tabChenge" class="el_tabs"> <el-tabs type="border-card" v-model="tabValue" @tab-change="tabChenge" class="el_tabs">
<div></div> <div></div>
@ -368,7 +368,7 @@
<!-- <el-button v-if="AppealStatusT" @click="Appealeditor">编辑</el-button> --> <!-- <el-button v-if="AppealStatusT" @click="Appealeditor">编辑</el-button> -->
<!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> --> <!-- <el-button @click="ViewEvent(slotProps.scope)">编辑</el-button> -->
<!-- <el-button @click="reply(slotProps.scope)">回复</el-button> --> <!-- <el-button @click="reply(slotProps.scope)">回复</el-button> -->
<!-- <el-button @click="ViewDelete(slotProps.scope)">删除</el-button> --> <el-button @click="ViewDelete(slotProps.scope)">删除</el-button>
<!-- <el-button @click="CompletionButton(slotProps.scope)">完结</el-button> --> <!-- <el-button @click="CompletionButton(slotProps.scope)">完结</el-button> -->
<!-- <el-button v-if="ClaimStatus" @click="appeal(slotProps.scope)" <!-- <el-button v-if="ClaimStatus" @click="appeal(slotProps.scope)"
>申诉</el-button >申诉</el-button
@ -1088,6 +1088,7 @@ const $useStore = useStore();
const $route = useRoute(); const $route = useRoute();
/** vuex */ /** vuex */
const customerData = ref([]); // const customerData = ref([]); //
const pageLoad=ref(false)
const accessControl = $useStore.getters.permission; const accessControl = $useStore.getters.permission;
console.log(accessControl, '权限按钮'); console.log(accessControl, '权限按钮');
const loadingFinancial = ref(false); const loadingFinancial = ref(false);
@ -1770,6 +1771,7 @@ const IndexTable = (val, Refresh) => {
TimeoutStatus.value = false; // TimeoutStatus.value = false; //
// ProcessingPartyState.value = false; // // ProcessingPartyState.value = false; //
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
columnList[2].checkarr = []; // columnList[2].checkarr = []; //
columnList[3].checkarr = []; columnList[3].checkarr = [];
columnList[10].checkarr = []; columnList[10].checkarr = [];
@ -1816,6 +1818,7 @@ const IndexTable = (val, Refresh) => {
Tableheaderswitching(columnList); Tableheaderswitching(columnList);
console.log(res, '初始化返回值'); console.log(res, '初始化返回值');
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
if (res.data.data) { if (res.data.data) {
console.log(res.data.data, '初始化返回值===>'); console.log(res.data.data, '初始化返回值===>');
// page.value.total = res.data.data.total; // // page.value.total = res.data.data.total; //
@ -2348,6 +2351,7 @@ const DetermineClaims = val => {
workOrderStatus: 30, workOrderStatus: 30,
}; };
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
console.log(data, '处理好的值'); console.log(data, '处理好的值');
$_settlementUpdate(data) $_settlementUpdate(data)
.then(res => { .then(res => {
@ -2358,6 +2362,7 @@ const DetermineClaims = val => {
}) })
.catch(res => { .catch(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}; };
// //
@ -2713,6 +2718,7 @@ const settlementclaim = (val, Refresh) => {
return; return;
} }
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
console.log(Claimsfield, '理赔数据'); console.log(Claimsfield, '理赔数据');
ClaimStatus.value = true; // ClaimStatus.value = true; //
AppealStatus.value = false; // AppealStatus.value = false; //
@ -2759,6 +2765,7 @@ const settlementclaim = (val, Refresh) => {
$_listSettlement(data) $_listSettlement(data)
.then(res => { .then(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
console.log(res, '查询理赔数据'); console.log(res, '查询理赔数据');
if (res.data.data) { if (res.data.data) {
if (res.data.data.records.length) { if (res.data.data.records.length) {
@ -2779,11 +2786,13 @@ const settlementclaim = (val, Refresh) => {
}) })
.catch(res => { .catch(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}; };
// //
const appealFn = val => { const appealFn = val => {
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
AppealStatus.value = true; // AppealStatus.value = true; //
TimeoutStatus.value = false; // TimeoutStatus.value = false; //
ClaimStatus.value = false; // ClaimStatus.value = false; //
@ -2801,6 +2810,7 @@ const appealFn = val => {
$_listAppeal(data) $_listAppeal(data)
.then(res => { .then(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
console.log(res, '申诉列表返回值'); console.log(res, '申诉列表返回值');
if (res.data.data.records.length) { if (res.data.data.records.length) {
@ -2820,6 +2830,7 @@ const appealFn = val => {
}) })
.catch(res => { .catch(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}; };
@ -2933,6 +2944,7 @@ const TimeoutHandling = (val, Refresh) => {
AppealStatus.value = false; // AppealStatus.value = false; //
TimeoutStatus.value = true; // TimeoutStatus.value = true; //
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
updateDictionary(timeoutList[3].checkarr, 'pc_work_order'); // updateDictionary(timeoutList[3].checkarr, 'pc_work_order'); //
updateDictionary(timeoutList[4].checkarr, 'pc_discovery_node'); // updateDictionary(timeoutList[4].checkarr, 'pc_discovery_node'); //
let data = { let data = {
@ -2943,6 +2955,7 @@ const TimeoutHandling = (val, Refresh) => {
$_listOwn(data) $_listOwn(data)
.then(res => { .then(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
console.log(res, '超时记录'); console.log(res, '超时记录');
if (res.data.data.records.length) { if (res.data.data.records.length) {
@ -2963,6 +2976,7 @@ const TimeoutHandling = (val, Refresh) => {
}) })
.catch(res => { .catch(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}; };
@ -3158,6 +3172,7 @@ const ProcessingPartyFun = (val, Refresh) => {
AppealStatus.value = false; // AppealStatus.value = false; //
// details.query.workOrderStatus = null; // details.query.workOrderStatus = null;
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
let data = { let data = {
...val, ...val,
}; };
@ -3171,6 +3186,7 @@ const ProcessingPartyFun = (val, Refresh) => {
$_getProcessor(data) $_getProcessor(data)
.then(res => { .then(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
// page.value.total = res.data.data.total; // // page.value.total = res.data.data.total; //
if (res.data.data.records.length) { if (res.data.data.records.length) {
Statusprocessing(res.data.data.records); Statusprocessing(res.data.data.records);
@ -3322,6 +3338,7 @@ const DetermineStorage = val => {
data['assignList'] = details.selectionList.map(item => item.id); data['assignList'] = details.selectionList.map(item => item.id);
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
// //
$_updateManagerConfirmed(data) $_updateManagerConfirmed(data)
.then(res => { .then(res => {
@ -3339,6 +3356,7 @@ const DetermineStorage = val => {
}) })
.finally(res => { .finally(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
// //
console.log(data, '处理好的值'); console.log(data, '处理好的值');
@ -3351,6 +3369,7 @@ const EndArbitration = val => {
assignList: [val.row.id], assignList: [val.row.id],
}; };
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
$_updateArbitrateStatu(data) $_updateArbitrateStatu(data)
.then(res => { .then(res => {
console.log(res, '处理成功'); console.log(res, '处理成功');
@ -3367,6 +3386,7 @@ const EndArbitration = val => {
}) })
.finally(() => { .finally(() => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}; };
// //
@ -3401,6 +3421,7 @@ const AllEndArbitration = () => {
.finally(() => { .finally(() => {
details.selectionList = []; // details.selectionList = []; //
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}; };
// //
@ -3460,6 +3481,7 @@ const ResultConfirmation = val => {
}) })
.then(() => { .then(() => {
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
console.log(data, '处理好的数据'); console.log(data, '处理好的数据');
$_updateWorkOrderStatus(data) $_updateWorkOrderStatus(data)
.then(res => { .then(res => {
@ -3477,6 +3499,7 @@ const ResultConfirmation = val => {
}) })
.finally(() => { .finally(() => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
}) })
.catch(() => { .catch(() => {
@ -3536,6 +3559,7 @@ const ResultConfirmation = val => {
}) })
.then(() => { .then(() => {
details.loadingObj.list = true; // details.loadingObj.list = true; //
pageLoad.value=true
// //
$_updateManagerConfirmed(data) $_updateManagerConfirmed(data)
.then(res => { .then(res => {
@ -3553,6 +3577,7 @@ const ResultConfirmation = val => {
}) })
.finally(res => { .finally(res => {
details.loadingObj.list = false; // details.loadingObj.list = false; //
pageLoad.value=false
}); });
// //
console.log(data, '处理好的值'); console.log(data, '处理好的值');

3261
src/views/aftersales/aftersalesWorkOrderAdd.vue

File diff suppressed because it is too large Load Diff

3273
src/views/aftersales/aftersalesWorkOrderAddTemp.vue

File diff suppressed because it is too large Load Diff

2
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -499,7 +499,7 @@
<el-tabs <el-tabs
type="border-card" type="border-card"
class="demo-tabs el-photo" class="demo-tabs el-photo"
v-if="['1', '3'].includes(Indexform.workOrderType)" v-if="Indexform.packList.length"
> >
<el-tab-pane> <el-tab-pane>
<template #label> <template #label>

84
src/views/aftersales/aftersalesWorkOrderend.vue

@ -137,7 +137,7 @@
</div> </div>
<div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index"> <div class="el_btbox" v-for="(item, index) in PackageInfo" :key="index">
<div class="leftbox"> <div class="leftbox">
<div class="maxBox"> <!-- <div class="maxBox">
<span class="title">包条码:</span> <span class="title">包条码:</span>
<el-input <el-input
disabled disabled
@ -147,37 +147,38 @@
:rows="2" :rows="2"
@change="ChangePackageInfo(item.packageCode, index)" @change="ChangePackageInfo(item.packageCode, index)"
/> />
</div> </div> -->
<div class="maxBox"> <el-form-item label="包条码">
<span class="title">订单自编码:</span>
<el-input <el-input
v-model="item.orderCode" v-model="item.packageCode"
placeholder="请输入订单自编号" @change="ChangePackageInfo(item.packageCode, index)"
clearable
disabled disabled
/> />
</div> </el-form-item>
<div class="maxBox"> <el-form-item label="运单号">
<span class="title">运单号:</span> <el-input v-model="item.waybillNumber" disabled />
<el-input </el-form-item>
v-model="item.waybillNumber"
placeholder="请输入运单号"
clearable
disabled
/>
</div>
</div>
<div class="el-btn"> <el-form-item label="订单自编码">
<el-button v-if="item.state" type="primary" @click="historicalPackages(index)"> <el-input v-model="item.orderCode" disabled />
查看历史包件 </el-form-item>
</el-button>
<!-- <el-button type="primary" @click="PackagRemoval(index)" disabled> <el-form-item label="一级品">
移除 <el-input v-model="item.first" disabled />
</el-button> --> </el-form-item>
<el-form-item label="二级品">
<el-input v-model="item.secondary" disabled />
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="item.brandName" disabled />
</el-form-item>
</div> </div>
</div> </div>
<div class="NumTotal"> <div class="NumTotal">
<span>总件数:{{ PackageInfo.length }}</span> <span>总件数:{{ PackageInfo.length }}</span>
@ -273,11 +274,6 @@
/> />
</div> </div>
</div> </div>
<div class="el-btn">
<!-- <el-button type="primary" disabled @click="ResponsibilityRemoval(index)">
移除
</el-button> -->
</div>
</div> </div>
<div class="Proportion"> <div class="Proportion">
<span class="title">公司占比:{{ companyProportion }}%</span> <span class="title">公司占比:{{ companyProportion }}%</span>
@ -508,8 +504,8 @@
</div> --> </div> -->
<!-- 图片 --> <!-- 图片 -->
<div class="Transport_damage_photos"> <div class="Transport_damage_photos" v-if="endFrom.packageImage.length">
<span class="title"></span> <span class="title"></span>
<el-upload <el-upload
disabled disabled
v-model:file-list="endFrom.packageImage" v-model:file-list="endFrom.packageImage"
@ -1749,12 +1745,12 @@ const AddPackage = () => {
const PackagRemoval = val => { const PackagRemoval = val => {
PackageInfo.value.splice(val, 1); // PackageInfo.value.splice(val, 1); //
}; };
// // //
const historicalPackages = val => { // const historicalPackages = val => {
dialogHistoricalPackage.value = true; // // dialogHistoricalPackage.value = true; //
HistorIndex.value = val; // HistorIndex.value = val;
console.log(val); // console.log(val);
}; // };
// //
const ChangePackageInfo = (val, index) => { const ChangePackageInfo = (val, index) => {
let data = { let data = {
@ -2844,11 +2840,21 @@ const CustomerServiceCompleted = () => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 10px; margin-bottom: 10px;
justify-content: flex-start;
.leftbox { .leftbox {
width: 100%; width: 100%;
display: flex; display: flex;
justify-content: space-between; justify-content: flex-start;
flex-wrap: wrap;
.el-form-item{
margin-right:24px;
flex-direction: column;
align-items: flex-start;
flex: none;
width: 12%;
} }
}
.maxBox { .maxBox {
display: flex; display: flex;
align-items: center; align-items: center;

1990
src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue

File diff suppressed because it is too large Load Diff

20
src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@ -487,7 +487,7 @@
<el-button @click="QRcodes" style="margin-bottom: 4px" type="primary" <el-button @click="QRcodes" style="margin-bottom: 4px" type="primary"
>批量查看二维码</el-button >批量查看二维码</el-button
> >
<el-button @click="Batchpackages" style="margin-bottom: 4px" type="primary" <el-button v-if="accessControl" @click="Batchpackages" style="margin-bottom: 4px" type="primary"
>批量签收</el-button >批量签收</el-button
> >
<el-button @click="PackBatchcancellation" style="margin-bottom: 4px" type="primary" <el-button @click="PackBatchcancellation" style="margin-bottom: 4px" type="primary"
@ -548,7 +548,7 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="库存品包件" name="reservationInventoryPackage"> <el-tab-pane label="库存品包件" name="reservationInventoryPackage">
<el-button @click="Batchsigning" style="margin-bottom: 4px" type="primary" <el-button v-if="accessControl" @click="Batchsigning" style="margin-bottom: 4px" type="primary"
>批量签收</el-button >批量签收</el-button
> >
<el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary" <el-button @click="Batchcancellation" style="margin-bottom: 4px" type="primary"
@ -610,7 +610,7 @@
<!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>--> <!-- <el-tab-pane label="定时任务补偿" name="fourth">定时任务补偿</el-tab-pane>-->
<el-tab-pane label="零担列表" name="LessThantruckloadList"> <el-tab-pane label="零担列表" name="LessThantruckloadList">
<el-button @click="LdBatchsigning" style="margin-bottom: 4px" type="primary" <el-button v-if="accessControl" @click="LdBatchsigning" style="margin-bottom: 4px" type="primary"
>批量签收</el-button >批量签收</el-button
> >
<el-button @click="Ldcancellation" style="margin-bottom: 4px" type="primary" <el-button @click="Ldcancellation" style="margin-bottom: 4px" type="primary"
@ -950,10 +950,12 @@ import { getToken } from '@/utils/auth';
import { setNodeHeight } from '@/utils/util.js'; import { setNodeHeight } from '@/utils/util.js';
import { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js'; import { AbnormalReview } from '@/option/distribution/DeliveryExceptionReview.js';
import print from '@/utils/print'; import print from '@/utils/print';
import { useStore } from 'vuex';
export default { export default {
data() { data() {
return { return {
accessControl:'',
html: '', html: '',
reservationActiveName: 'reservationPackage', reservationActiveName: 'reservationPackage',
checkloading: false, // checkloading: false, //
@ -3838,6 +3840,14 @@ export default {
this.setTableHeight(); this.setTableHeight();
}, },
created() { created() {
const $useStore = useStore();
if($useStore.getters && $useStore.getters.permission){
this.accessControl = $useStore.getters.permission.Batch_signing;//
console.log(this.accessControl,'accessControl按钮权限');
}
// this.onLoad(); // this.onLoad();
// // // //
// this.queryDictionary(); // this.queryDictionary();
@ -3904,9 +3914,7 @@ export default {
if (!this.selectionList.length) { if (!this.selectionList.length) {
this.AbnormalReviewloading = true; // this.AbnormalReviewloading = true; //
this.AbnormalReviewData.forEach(item => { this.AbnormalReviewData.forEach(item => {
if (item.auditingStatusName == '待审核') {
DataSubmit.push(item.id); DataSubmit.push(item.id);
}
}); });
} else { } else {
const allGreaterThanTen = this.selectionList.every( const allGreaterThanTen = this.selectionList.every(
@ -3942,7 +3950,7 @@ export default {
this.AbnormalReviewloading = false; // this.AbnormalReviewloading = false; //
}); });
this.viewAbnormalLoading(this.toexamineID); //
}, },
// //
Abnormalshutdown() { Abnormalshutdown() {

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

@ -112,6 +112,7 @@
@btnCheck="btnsc" @btnCheck="btnsc"
@selectCheck="selectsc" @selectCheck="selectsc"
@selection="selectionChange" @selection="selectionChange"
> >
<template #default="slotProps"> <template #default="slotProps">
<el-button <el-button
@ -580,6 +581,7 @@
@btnCheck="btnsc" @btnCheck="btnsc"
@selectCheck="orderSelectSc" @selectCheck="orderSelectSc"
@selection="orderSelectChange" @selection="orderSelectChange"
:isselectfun="ProhibitSelection"
> >
</tablecmt> </tablecmt>
<div class="avue-crud__pagination" style="width: 100%"> <div class="avue-crud__pagination" style="width: 100%">
@ -647,6 +649,7 @@ export default {
Imgurl: undefined, Imgurl: undefined,
Selfpickuploading: false, // Selfpickuploading: false, //
mydata:{},// mydata:{},//
packageRow:{},//
OrdercolumnList: [ OrdercolumnList: [
{ {
prop: 'serviceNumber', prop: 'serviceNumber',
@ -2161,6 +2164,7 @@ export default {
}, },
// //
callFordeliveryOrder() { callFordeliveryOrder() {
console.log(this.selectionList,'this.selectionList'); console.log(this.selectionList,'this.selectionList');
let scID= this.selectionList[0].mallId;//DI let scID= this.selectionList[0].mallId;//DI
let mallIdState=this.selectionList.find(res=>res.mallId !=scID) let mallIdState=this.selectionList.find(res=>res.mallId !=scID)
@ -2271,9 +2275,11 @@ export default {
this.dialogFormVisible = false; this.dialogFormVisible = false;
} }
}, },
// //
async handleChooseOrder(row) { async handleChooseOrder(row) {
console.log('row :>> ', row); console.log('row :>> ', row);
this.packageRow=row
// //
const _type = this.$route.query.type; const _type = this.$route.query.type;
this.orderChooseId = row.id; this.orderChooseId = row.id;
@ -2282,6 +2288,7 @@ export default {
await this.onLoadEditChoose({}, row); await this.onLoadEditChoose({}, row);
} else await this.onLoadOrderChoose(); } else await this.onLoadOrderChoose();
this.dialogChooseOrderVisible = true; this.dialogChooseOrderVisible = true;
}, },
// //
sizeChangeOrderChoose(size) { sizeChangeOrderChoose(size) {
@ -2367,6 +2374,10 @@ export default {
if (this.order.selectList.length === 0) { if (this.order.selectList.length === 0) {
return this.$message({ type: 'warning', message: '最少选择一项数据' }); return this.$message({ type: 'warning', message: '最少选择一项数据' });
} }
if(this.order.selectList){
this.packageRow.reservationNum=this.order.selectList.length
}
// billPackageEntityList // billPackageEntityList
console.log('this.order.dataList :>> ', this.dataList); console.log('this.order.dataList :>> ', this.dataList);
this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList = this.dataList.find(val => val.id === this.orderChooseId).billPackageEntityList =
@ -2379,6 +2390,14 @@ export default {
}; };
}); });
this.dialogChooseOrderVisible = false; this.dialogChooseOrderVisible = false;
},
ProhibitSelection(val, index) {
if (val.orderPackageStatus == 70) {
return false;
} else {
return true;
}
}, },
// //
handleNumberRange(e, row) { handleNumberRange(e, row) {

1
src/views/distribution/signfor/distributionSignfor.vue

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

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

@ -87,6 +87,13 @@
<el-input v-model="form.unLoadingTeamName" disabled placeholder="卸车班组" /> <el-input v-model="form.unLoadingTeamName" disabled placeholder="卸车班组" />
</el-tooltip> </el-tooltip>
</div> </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> </div>
<!-- 收货人信息 --> <!-- 收货人信息 -->
@ -199,6 +206,71 @@
</div> </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="收货人姓名" />
</div>
<div class="el-txt">
<el-icon><User /></el-icon>
<span class="title-name">装车件数:</span>
<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="收货人地址" />
</div>
<div class="el-txt">
<el-icon><Van /></el-icon>
<span class="title-name"> 复核人:</span>
<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="是否加急" />
</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="是否加急" />
</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="是否加急" />
</div>
</div>
<div class="FImg"> <div class="FImg">
<div class="imgName"> <div class="imgName">
<span <span
@ -1748,11 +1820,18 @@ const btnClass = type => {
ElBtnClass.value = 'el-Btn-btn'; ElBtnClass.value = 'el-Btn-btn';
} }
}; };
const pageRow=ref({});//
// //
const onLoad = () => { const onLoad = () => {
menuData.value = menuData1.value; // menuData.value = menuData1.value; //
data.value = InitializeTable.value; // data.value = InitializeTable.value; //
}; };
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';
// //

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

@ -1210,7 +1210,20 @@ const menuData = ref([
{ {
prop: 'totalNumber', prop: 'totalNumber',
label: '订单总件数', label: '订单总件数',
type: 2, type: 1,
values: '',
width: '110',
checkarr: [],
fixed: false,
sortable: true,
head: false,
statistics: true, //
isshowSummary: true,
},
{
prop: 'reservationNum',
label: '计划数量',
type: 1,
values: '', values: '',
width: '110', width: '110',
checkarr: [], checkarr: [],
@ -2062,6 +2075,8 @@ const submit = () => {
console.log(wrapTemp.value, '包件订单被缓存'); console.log(wrapTemp.value, '包件订单被缓存');
console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面'); console.log(dataInfo.value[dataId.value].packageListInfo, '被添加到当前订单下面');
console.log(dataInfo.value, '所有订单信息'); console.log(dataInfo.value, '所有订单信息');
console.log(Packageow.value,'Packageow.value');
Packageow.value.reservationNum =dataTmp.value.length
} }
} else { } else {
if (!dataTmp.value.length && wrapLoading.value) { if (!dataTmp.value.length && wrapLoading.value) {
@ -2094,9 +2109,12 @@ const submit = () => {
dataInfo.value[dataId.value].packageListInfo = dataTmp.value; // dataInfo.value[dataId.value].packageListInfo = dataTmp.value; //
console.log(wrapTemp.value, '包件订单被缓存222'); console.log(wrapTemp.value, '包件订单被缓存222');
console.log(dataInfo.value, '处理好的订单'); console.log(dataInfo.value, '处理好的订单');
console.log(Packageow.value,'Packageow.value');
Packageow.value.reservationNum =dataTmp.value.length
// //
} else { } else {
dataInfo.value = dataTmp.value; dataInfo.value = dataTmp.value;
} }
console.log('提交后的参数', dataInfo.value); console.log('提交后的参数', dataInfo.value);
@ -2397,6 +2415,7 @@ function ViewEvent(val, index) {
editLoading.value = true; // editLoading.value = true; //
dataId.value = findIndexById(val.id); dataId.value = findIndexById(val.id);
console.log(val.id); console.log(val.id);
console.log(Packageow.value,'Packageow.value');
//; //;
// //

99
src/views/financialsector/Financialse/FinancialDelivery.vue

@ -32,6 +32,7 @@
style="width: 100%" style="width: 100%"
multiple multiple
@remove-tag="removeTag" @remove-tag="removeTag"
@change="DeliveryType"
> >
<el-option <el-option
style="padding: 0" style="padding: 0"
@ -188,27 +189,31 @@
<div class="el_Commercial_ercial"> <div class="el_Commercial_ercial">
<span class="el_title_span">附加费计费</span> <span class="el_title_span">附加费计费</span>
<div class="el_fj"> <div class="el_fj">
<!-- 是否有分货费 -->
<div class="el_Storage"> <div class="el_Storage">
<span class="el_table_span">是否有分货费</span> <span class="el_table_span">是否附加费</span>
<el-radio-group v-model="form.dispatchIsSortFee" class="el_Cselect"> <el-radio-group
<el-radio v-for="item in Distributionfee" :key="item.label" :label="item.value">{{ v-model="form.dispatchIsAddFee"
class="el_Cselect"
@change="isdispatchIsAddFee"
>
<el-radio v-for="item in additionalfee" :key="item.label" :label="item.value">{{
item.label item.label
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<!-- 是否有操作/装卸费 -->
<div class="el_Storage"> <!-- 是否有分货费 -->
<span class="el_table_span">是否有操作/装卸费</span> <div class="el_Storage" v-if="form.dispatchIsAddFee">
<el-radio-group v-model="form.dispatchIsOperateFee" class="el_Cselect"> <span class="el_table_span">是否有分货费</span>
<el-radio v-for="item in Operatingfee" :key="item.label" :label="item.value">{{ <el-radio-group v-model="form.dispatchIsSortFee" class="el_Cselect">
<el-radio v-for="item in Distributionfee" :key="item.label" :label="item.value">{{
item.label item.label
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<!-- 是否有上楼费 --> <!-- 是否有上楼费 -->
<div class="el_Storage"> <div class="el_Storage" v-if="form.dispatchIsAddFee">
<div class="el_upstairs_a"> <div class="el_upstairs_a">
<span class="el_table_span">是否有上楼费</span> <span class="el_table_span">是否有上楼费</span>
<el-radio-group <el-radio-group
@ -222,7 +227,7 @@
</el-radio-group> </el-radio-group>
</div> </div>
</div> </div>
<div class="el_Storage"> <div class="el_Storage" v-if="form.dispatchIsAddFee">
<div class="el_upstairs_b" v-if="form.dispatchIsStairsCarryingCharge"> <div class="el_upstairs_b" v-if="form.dispatchIsStairsCarryingCharge">
<span class="el_table_span">是否配置免费层数</span> <span class="el_table_span">是否配置免费层数</span>
<el-radio-group v-model="form.dispatchIsFeeFloor" class="el_Cselect"> <el-radio-group v-model="form.dispatchIsFeeFloor" class="el_Cselect">
@ -235,7 +240,7 @@
</div> </div>
<div class="el_translation"> <div class="el_translation">
<!-- 是否有平移费 --> <!-- 是否有平移费 -->
<div class="el_Storage"> <div class="el_Storage" v-if="form.dispatchIsAddFee">
<span class="el_table_span">是否有平移费</span> <span class="el_table_span">是否有平移费</span>
<el-radio-group v-model="form.dispatchIsShiftingCharge" class="el_Cselect el_fx"> <el-radio-group v-model="form.dispatchIsShiftingCharge" class="el_Cselect el_fx">
<el-radio v-for="item in Translationfee" :key="item.label" :label="item.value">{{ <el-radio v-for="item in Translationfee" :key="item.label" :label="item.value">{{
@ -243,9 +248,18 @@
}}</el-radio> }}</el-radio>
</el-radio-group> </el-radio-group>
</div> </div>
<!-- 是否有操作/装卸费 -->
<div class="el_Storage" v-if="form.dispatchIsAddFee">
<span class="el_table_span">是否有操作/装卸费</span>
<el-radio-group v-model="form.dispatchIsOperateFee" class="el_Cselect el_fx">
<el-radio v-for="item in Operatingfee" :key="item.label" :label="item.value">{{
item.label
}}</el-radio>
</el-radio-group>
</div>
<!-- 附加费是否统一计费 --> <!-- 附加费是否统一计费 -->
<div class="el_Storage"> <div class="el_Storage" v-if="form.dispatchIsAddFee">
<span class="el_table_span">附加费是否按品类计费</span> <span class="el_table_span">附加费是否按品类计费</span>
<el-radio-group v-model="form.dispatchIsCategorySubjoin" class="el_Cselect el_fx"> <el-radio-group v-model="form.dispatchIsCategorySubjoin" class="el_Cselect el_fx">
<el-radio <el-radio
@ -386,9 +400,9 @@ const SelectData = ref({});
const formedit = ref({}); // const formedit = ref({}); //
const formCopy = ref(null); // const formCopy = ref(null); //
const form = ref({ const form = ref({
dispatchPieceCategoryState: true, // dispatchPieceCategoryState: false, //
dispatchWeightCategoryState: true, // dispatchWeightCategoryState: false, //
dispatchCubeCategoryState: true, // dispatchCubeCategoryState: false, //
dispatchServiceType: '', // dispatchServiceType: '', //
dispatchIsByCategory: 0, // dispatchIsByCategory: 0, //
dispatchIsLeaveBehind: 0, // dispatchIsLeaveBehind: 0, //
@ -398,6 +412,7 @@ const form = ref({
dispatchIsFeeFloor: null, // dispatchIsFeeFloor: null, //
dispatchIsShiftingCharge: 0, // dispatchIsShiftingCharge: 0, //
dispatchIsCategorySubjoin: 0, // dispatchIsCategorySubjoin: 0, //
dispatchIsAddFee: 0, //
dispatchIsMinCost: 0, // dispatchIsMinCost: 0, //
dispatchMinCostMode: null, // dispatchMinCostMode: null, //
dispatchMinCostType: 1, // dispatchMinCostType: 1, //
@ -500,6 +515,8 @@ const upstairs = ref([]);
const MinimumState = ref(false); const MinimumState = ref(false);
// //
const Distributionfee = ref([]); const Distributionfee = ref([]);
//
const additionalfee = ref([]);
// //
const Operatingfee = ref([]); const Operatingfee = ref([]);
const Deliveryloading = ref(false); const Deliveryloading = ref(false);
@ -544,7 +561,43 @@ const UpstairsChange = val => {
} }
}; };
// //
const categoryChange = val => {}; const categoryChange = val => {
form.value.dispatchPieceCategoryData = [
{
index: 1,
Warehousecategory: '',
options: [],
plus: true,
reduce: false,
StateName: 'storage', //
loading: false,
},
];
form.value.dispatchWeightCategoryData = [
{
index: 1,
Warehousecategory: '',
options: [],
plus: true,
reduce: false,
StateName: 'storage', //
loading: false,
},
];
form.value.dispatchCubeCategoryData = [
{
index: 1,
Warehousecategory: '',
options: [],
plus: true,
reduce: false,
StateName: 'storage', //
loading: false,
},
];
};
// //
const MinimumChange = val => { const MinimumChange = val => {
console.log(val); console.log(val);
@ -647,6 +700,7 @@ const isChecked = async item => {
}); });
} }
}; };
const DeliveryType = async value => {};
// //
const removeTag = value => { const removeTag = value => {
console.log(value, '点击移除value'); console.log(value, '点击移除value');
@ -806,6 +860,7 @@ async function updateDictionary(targetArray, dictionaryType) {
if (dictionaryType == 'price_yes_no') { if (dictionaryType == 'price_yes_no') {
Leftoverparts.value = { ...Distinguishcategories.value }; // Leftoverparts.value = { ...Distinguishcategories.value }; //
Distributionfee.value = { ...Distinguishcategories.value }; // Distributionfee.value = { ...Distinguishcategories.value }; //
additionalfee.value = { ...Distinguishcategories.value }; //
Operatingfee.value = { ...Distinguishcategories.value }; /// Operatingfee.value = { ...Distinguishcategories.value }; ///
upstairs.value = { ...Distinguishcategories.value }; // upstairs.value = { ...Distinguishcategories.value }; //
Numberlayers.value = { ...Distinguishcategories.value }; // Numberlayers.value = { ...Distinguishcategories.value }; //
@ -873,6 +928,16 @@ const search = val => {
} }
}; };
//
const isdispatchIsAddFee = value => {
(form.value.dispatchIsSortFee = 0), //
(form.value.dispatchIsStairsCarryingCharge = 0), //
(form.value.dispatchIsFeeFloor = null), //
(form.value.dispatchIsShiftingCharge = 0), //
(form.value.dispatchIsOperateFee = 0), //
(form.value.dispatchIsCategorySubjoin = 0); //
};
function updateOptions(allDropdowns) { function updateOptions(allDropdowns) {
// //
let dropdowns = [].concat(...allDropdowns); let dropdowns = [].concat(...allDropdowns);

47
src/views/financialsector/Financialse/FinancialWarehousing.vue

@ -110,7 +110,25 @@
<div class="el_Surcharge"> <div class="el_Surcharge">
<!-- 附加费计价单位 --> <!-- 附加费计价单位 -->
<div class="el_flex_row"> <div class="el_flex_row">
<div style="width: 100%">
<div class="el_Storage"> <div class="el_Storage">
<el-form-item label="是否附加费">
<el-radio-group
v-model="form.warehouseIsAddFee"
class="el_Cselect"
@change="iswarehouseIsAddFee"
>
<el-radio
v-for="item in warehouseIsAddFeeList"
:key="item.label"
:label="item.value"
>{{ item.label }}</el-radio
>
</el-radio-group>
</el-form-item>
</div>
</div>
<div class="el_Storage" v-if="form.warehouseIsAddFee">
<el-form-item label="附加费计价单位" prop="warehouseSubjoinFeeUnit"> <el-form-item label="附加费计价单位" prop="warehouseSubjoinFeeUnit">
<el-select <el-select
class="el_Cselect" class="el_Cselect"
@ -131,7 +149,7 @@
</div> </div>
<!-- 是否有管理费 --> <!-- 是否有管理费 -->
<div class="el_Storage"> <div class="el_Storage" v-if="form.warehouseIsAddFee">
<el-form-item label="是否有管理费"> <el-form-item label="是否有管理费">
<el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect"> <el-radio-group v-model="form.warehouseIsManageFee" class="el_Cselect">
<el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{ <el-radio v-for="item in Managementfees" :key="item.label" :label="item.value">{{
@ -142,7 +160,7 @@
</div> </div>
<!-- 是否有操作/装卸费 --> <!-- 是否有操作/装卸费 -->
<div class="el_Storage"> <div class="el_Storage" v-if="form.warehouseIsAddFee">
<el-form-item label="是否有操作/装卸费"> <el-form-item label="是否有操作/装卸费">
<el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect"> <el-radio-group v-model="form.warehouseIsOperateFee" class="el_Cselect">
<el-radio <el-radio
@ -157,7 +175,7 @@
<!-- 是否有分拣费用 --> <!-- 是否有分拣费用 -->
<div class="el_Storage"> <div class="el_Storage">
<el-form-item label="是否有分拣费用"> <el-form-item label="是否有分拣费用" v-if="form.warehouseIsAddFee">
<el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect"> <el-radio-group v-model="form.warehouseIsSortFee" class="el_Cselect">
<el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{ <el-radio v-for="item in Sortingfee" :key="item.label" :label="item.value">{{
item.label item.label
@ -166,8 +184,9 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<!-- 附加费用是否统一计费 --> <!-- 附加费用是否统一计费 -->
<div class="el_Storage"> <div class="el_Storage" v-if="form.warehouseIsAddFee">
<el-form-item label="附加费是否按品类计费"> <el-form-item label="附加费是否按品类计费">
<el-radio-group <el-radio-group
@change="AdditionalDisplayChange" @change="AdditionalDisplayChange"
@ -246,6 +265,7 @@ const ruleFormRef = ref();
const SelectData = ref({}); const SelectData = ref({});
const formedit = ref({}); // const formedit = ref({}); //
const form = ref({ const form = ref({
warehouseIsAddFee: 0, //
warehouseCalculationBasis: 1, // warehouseCalculationBasis: 1, //
warehouseIsByCategory: 0, // warehouseIsByCategory: 0, //
warehouseIsManageFee: 0, // warehouseIsManageFee: 0, //
@ -497,7 +517,8 @@ const Operatingunloading = ref([]);
const Sortingfee = ref([]); const Sortingfee = ref([]);
// //
const Additionalfeebilling = ref([]); const Additionalfeebilling = ref([]);
//
const warehouseIsAddFeeList = ref([]);
// //
function removeItemById(array, id) { function removeItemById(array, id) {
const index = array.findIndex(item => item.index === id); const index = array.findIndex(item => item.index === id);
@ -548,6 +569,15 @@ const categoriesduce = id => {
goriesloading.value = true; goriesloading.value = true;
removeItemById(form.value.AdditionalcategoriesData, id); removeItemById(form.value.AdditionalcategoriesData, id);
}; };
//
const iswarehouseIsAddFee = () => {
form.value.warehouseSubjoinFeeUnit = ''; //
form.value.warehouseIsManageFee = 0; //
form.value.warehouseIsOperateFee = 0; ///
form.value.warehouseIsSortFee = 0; //
form.value.warehouseIsCategorySubjoin = 0; //
};
async function updateDictionary(targetArray, dictionaryType) { async function updateDictionary(targetArray, dictionaryType) {
await getDictionaryBiz(dictionaryType) await getDictionaryBiz(dictionaryType)
.then(res => { .then(res => {
@ -568,6 +598,7 @@ async function updateDictionary(targetArray, dictionaryType) {
Operatingunloading.value = { ...Distinguishcategories.value }; /// Operatingunloading.value = { ...Distinguishcategories.value }; ///
Sortingfee.value = { ...Distinguishcategories.value }; // Sortingfee.value = { ...Distinguishcategories.value }; //
Additionalfeebilling.value = { ...Distinguishcategories.value }; // Additionalfeebilling.value = { ...Distinguishcategories.value }; //
warehouseIsAddFeeList.value = { ...Distinguishcategories.value };
} }
}) })
.catch(() => {}) .catch(() => {})
@ -613,7 +644,6 @@ const onLoad = async () => {
// //
form.value = await deepClone(request); form.value = await deepClone(request);
if (request.warehouseIsByCategory == 1) { if (request.warehouseIsByCategory == 1) {
form.value.StoragecategoryData = []; form.value.StoragecategoryData = [];
request.warehousePieceCategorys.forEach((res, index) => { request.warehousePieceCategorys.forEach((res, index) => {
@ -651,8 +681,7 @@ const onLoad = async () => {
}); });
}); });
} }
console.log(request.warehouseCalculationBasis,'request.warehouseCalculationBasis++++++===>>>'); form.value.warehouseCalculationBasis = request.warehouseCalculationBasis || 1; //
form.value.warehouseCalculationBasis= request.warehouseCalculationBasis|| 0;//
console.log(form.value, 'form.value.warehouseCalculationBasis'); console.log(form.value, 'form.value.warehouseCalculationBasis');
} }
@ -733,7 +762,6 @@ const Submit = () => {
} }
console.log(form.value, '要提交的参数'); console.log(form.value, '要提交的参数');
ElMessageBox.confirm('是否保存?', '提示', { ElMessageBox.confirm('是否保存?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -868,6 +896,7 @@ const AdditionalDisplayChange = val => {
.el_flex_row { .el_flex_row {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
flex-wrap: wrap;
.el-form-item { .el-form-item {
flex-direction: column; flex-direction: column;
margin-right: 0; margin-right: 0;

Loading…
Cancel
Save