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

解决一键装车状态问题

master
马远东 1 year ago
parent
48f46dfa7a
commit
496a4590b5
3 changed files with 86 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/views/aftersales/aftersalesWorkOrder.vue
  2. 141
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 8
      src/views/distribution/deliverylist/distributionDeliveryListedt.vue

4
src/views/aftersales/aftersalesWorkOrder.vue
Unescape View File

@ -1927,8 +1927,8 @@ const tabChenge = val => {
} else if (val == 3) { } else if (val == 3) {
console.log(UserPermissions.value, '当前身份'); console.log(UserPermissions.value, '当前身份');
if (UserPermissions.value == '仓库客服') { if (UserPermissions.value == '仓库客服') {
data.workOrderStatus = 10; data.workOrderStatus = '';
details.query.workOrderStatus = 10; details.query.workOrderStatus = '';
ArbitrationStatus.value = true; //可以申请仲裁 ArbitrationStatus.value = true; //可以申请仲裁
Tableheaderswitching(columnList); Tableheaderswitching(columnList);
empty(); empty();

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

@ -42,55 +42,60 @@
</el-form-item> </el-form-item>
<el-form-item label="异常工单号"> <el-form-item label="异常工单号">
<el-input v-model="Indexform.workOrderNumber" disabled placeholder="异常工单号(自动生成)" clearable /> <el-input
v-model="Indexform.workOrderNumber"
disabled
placeholder="异常工单号(自动生成)"
clearable
/>
</el-form-item> </el-form-item>
<el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'"> <el-tabs type="border-card" class="PackageInformation" v-show="identifying != '2'">
<el-tab-pane label="包件信息"> <el-tab-pane label="包件信息">
<div class="ResponsibilityBoxS"> <div class="ResponsibilityBoxS">
<div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></div> <div><el-button type="primary" @click="AddPackage"> 添加信息 </el-button></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
v-model="item.packageCode" v-model="item.packageCode"
placeholder="请输入包条码" placeholder="请输入包条码"
clearable clearable
:rows="2" :rows="2"
@change="ChangePackageInfo(item.packageCode, index)" @change="ChangePackageInfo(item.packageCode, index)"
/> />
</div> </div>
<div class="maxBox"> <div class="maxBox">
<span class="title">订单自编码:</span> <span class="title">订单自编码:</span>
<el-input v-model="item.orderCode" placeholder="请输入订单自编号" clearable /> <el-input v-model="item.orderCode" placeholder="请输入订单自编号" clearable />
</div> </div>
<div class="maxBox"> <div class="maxBox">
<span class="title">运单号:</span> <span class="title">运单号:</span>
<el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable /> <el-input v-model="item.waybillNumber" placeholder="请输入运单号" clearable />
</div>
<div class="maxBox">
<span class="title">品牌:</span>
<el-input v-model="item.brandName" placeholder="请输入品牌" clearable />
</div>
</div> </div>
<div class="maxBox"> <div class="el-btn">
<span class="title">品牌:</span> <el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
<el-input v-model="item.brandName" placeholder="请输入品牌" clearable /> 查看历史包件
</el-button>
<el-button type="primary" @click="PackagRemoval(index)"> 移除 </el-button>
</div> </div>
</div> </div>
<div class="NumTotal">
<div class="el-btn"> <span>总件数:{{ NumberPackages }}</span>
<el-button v-if="item.state" type="primary" @click="historicalPackages(index)">
查看历史包件
</el-button>
<el-button type="primary" @click="PackagRemoval(index)"> 移除 </el-button>
</div> </div>
</div> </div>
<div class="NumTotal"> </el-tab-pane>
<span>总件数:{{ NumberPackages }}</span> </el-tabs>
</div>
</div>
</el-tab-pane>
</el-tabs>
<!-- 必填(提货环节可以不填写运单号) --> <!-- 必填(提货环节可以不填写运单号) -->
<!-- <el-form-item label="运单号" v-if="groundlineType != 1"> <!-- <el-form-item label="运单号" v-if="groundlineType != 1">
@ -137,7 +142,6 @@
<el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable /> <el-input v-model="Indexform.orderCode" placeholder="请输入订单自编号" clearable />
</el-form-item> --> </el-form-item> -->
<!-- 必填 --> <!-- 必填 -->
<el-form-item <el-form-item
@ -176,15 +180,15 @@
<el-date-picker <el-date-picker
v-model="Indexform.deliveryTime" v-model="Indexform.deliveryTime"
type="datetime" type="datetime"
format="YYYY-MM-DD" format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择配送时间" placeholder="请选择配送时间"
/> />
</el-form-item> </el-form-item>
<!-- 必填 --> <!-- 必填 -->
<el-form-item <el-form-item
label="配送司机" label="配送司机"
v-if=" v-if="
groundlineSet || groundlineSet ||
@ -213,7 +217,6 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3"> <el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
<el-input v-model="Indexform.vehicleRoute" placeholder="请输入车辆路线车次号" clearable /> <el-input v-model="Indexform.vehicleRoute" placeholder="请输入车辆路线车次号" clearable />
</el-form-item> </el-form-item>
@ -404,7 +407,6 @@
</el-select> </el-select>
<el-input v-else v-model="item.personResponsibleName" placeholder="请输入责任人" /> <el-input v-else v-model="item.personResponsibleName" placeholder="请输入责任人" />
</div> </div>
<div class="maxBox el_zb"> <div class="maxBox el_zb">
<span class="title">占比:</span> <span class="title">占比:</span>
@ -417,9 +419,9 @@
/> />
<span>%</span> <span>%</span>
</div> </div>
<div class="maxBox "> <div class="maxBox">
<span class="title">三方责任人:</span> <span class="title">三方责任人:</span>
<el-input v-model="item.tripartite" placeholder="请输入三方责任人" /> <el-input v-model="item.tripartite" placeholder="请输入三方责任人" />
</div> </div>
<div class="maxBox"> <div class="maxBox">
@ -612,7 +614,13 @@ const PackageInfo = ref([
]); ]);
// 责任方列表 // 责任方列表
const FangAddList = ref([ const FangAddList = ref([
{ businessName: '', personResponsibleName: '', responsibilityRatio: '', description: '',tripartite:'' }, {
businessName: '',
personResponsibleName: '',
responsibilityRatio: '',
description: '',
tripartite: '',
},
]); ]);
// 提货责任方 // 提货责任方
const responsible = ref([ const responsible = ref([
@ -750,13 +758,13 @@ const DiscoveringNodesChange = val => {
// 车次号自动带出时间司机 // 车次号自动带出时间司机
function DeliveryTrainnumber() { function DeliveryTrainnumber() {
if(!Indexform.value.trainNumber){ if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
Indexform.value.deliveryTime='' Indexform.value.deliveryTime = null;
Indexform.value.deliveryDriver='' Indexform.value.deliveryDriver = '';
DeliveryDriver.value =[] DeliveryDriver.value = [];
} }
if(!Indexform.value.trainNumber){ if (!Indexform.value.trainNumber && !Indexform.value.deliveryTime) {
return return;
} }
let data = { let data = {
trainNumber: Indexform.value.trainNumber, trainNumber: Indexform.value.trainNumber,
@ -799,7 +807,7 @@ const responsibleParty = () => {
FangAddList.value.push({ FangAddList.value.push({
businessName: '', businessName: '',
personResponsibleName: '', personResponsibleName: '',
tripartite:'', tripartite: '',
responsibilityRatio: '', responsibilityRatio: '',
description: '', description: '',
}); });
@ -975,7 +983,7 @@ const ConfirmForm = () => {
personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name || personResponsibleList.value.find(obj => obj.id == item.personResponsibleName)?.name ||
null, //责任人名称 null, //责任人名称
responsibilityRatio: item.responsibilityRatio, //责任比例 responsibilityRatio: item.responsibilityRatio, //责任比例
tripartite:item.tripartite,//三方责任人 tripartite: item.tripartite, //三方责任人
}); });
}); });
} }
@ -991,7 +999,7 @@ const ConfirmForm = () => {
personResponsibleId: '', personResponsibleId: '',
personResponsibleName: item.personResponsibleName, //责任人名称 personResponsibleName: item.personResponsibleName, //责任人名称
responsibilityRatio: item.responsibilityRatio, //责任比例 responsibilityRatio: item.responsibilityRatio, //责任比例
tripartite:item.tripartite,//三方责任人 tripartite: item.tripartite, //三方责任人
}); });
}); });
} }
@ -1179,28 +1187,33 @@ const ChangePackageInfo = (val, index) => {
console.log(res.data.data, '包件信息'); console.log(res.data.data, '包件信息');
if (res.data.data.length) { if (res.data.data.length) {
const packageData = res.data.data[0]; const packageData = res.data.data[0];
console.log(packageData,'获取的第一个参数');
PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码 PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码
PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号 PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号
PackageInfo.value[index].orderId = packageData.orderId; //运单号 PackageInfo.value[index].orderId = packageData.orderId; //运单号
PackageInfo.value[index].brandName = packageData.brandName; //品牌 PackageInfo.value[index].brandName = packageData.brandName; //品牌
PackageInfo.value[index].state = false; //状态 PackageInfo.value[index].state = false; //状态
Indexform.value.first=packageData.first;//一级品
Indexform.value.secondary=packageData.secondary;//二级品 console.log(packageData, '处理的包件参数');
console.log(packageData,'处理的包件参数'); console.log(Indexform.value.firsts, '一级品');
console.log(Indexform.value.firsts,'一级品'); console.log(Indexform.value.second, '二 级品');
console.log(Indexform.value.second,'二 级品');
res.data.data.find(item => { res.data.data.find(item => {
if (item.workOrderId && item.workOrderNumber) { if (item.workOrderId && item.workOrderNumber) {
HistoricalPackageList.value = res.data.data; HistoricalPackageList.value = res.data.data;
PackageInfo.value[index].state = true; //状态 PackageInfo.value[index].state = true; //状态
} }
}); });
Indexform.value.first = packageData.firsts; //一级品
Indexform.value.secondary = packageData.second; //二级品
Indexform.value.waybillMall = packageData.mallName;//客户名称（运单商场）
} }
// packageCode; //包件码 // packageCode; //包件码
// //订单自编码 // //订单自编码
// orderCode: orderId; //运单号 // orderCode: orderId; //运单号
// workOrderId; //工单id // workOrderId; //工单id
// workOrderNumber; //工单名称 // workOrderNumber; //工单名称
console.log(PackageInfo.value, '处理好的参数'); console.log(PackageInfo.value, '处理好的参数');
}); });
}; };
@ -1458,7 +1471,7 @@ const ViewPackageDetails = val => {
margin-bottom: 10px; margin-bottom: 10px;
width: 97%; width: 97%;
border-left: none; border-left: none;
.el-tabs__header{ .el-tabs__header {
} }
} }
.NumTotal { .NumTotal {

8
src/views/distribution/deliverylist/distributionDeliveryListedt.vue
Unescape View File

@ -182,12 +182,12 @@
text text
icon="el-icon-view" icon="el-icon-view"
@click="handleSignone(slotProps.scope.row)" @click="handleSignone(slotProps.scope.row)"
v-if="
>一键签收
<!-- v-if="
slotProps.scope.row.signingStatus == '待审核' && slotProps.scope.row.signingStatus == '待审核' &&
slotProps.scope.row.driverSigning == '未签收' slotProps.scope.row.driverSigning == '未签收'
" --> "
>一键签收
</el-text> </el-text>
</template> </template>
</tablecmt> </tablecmt>

Write Preview
Loading…
Cancel
Save