aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

Browse Source
This commit is contained in:
linfso 2024-08-01 07:26:03 +08:00
commit f2417bd7cc
4 changed files with 141 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
View File

@ -145,17 +145,32 @@
<el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag> <el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('航空提单号')" align="center" prop="airBilllNo" min-width="170" /> <!-- <el-table-column :label="$t('运输方式')" align="center" prop="airBilllNo" min-width="170" /> -->
<el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
</template>
</el-table-column>
<el-table-column :label="$t('单号')" align="center" prop="" min-width="170">
<template slot-scope="scope">
<span v-if="scope.row.transType==2">{{scope.row.airBilllNo}}</span>
<span v-else-if="scope.row.transType==4">{{scope.row.shipNo}}</span>
<span v-else>{{scope.row.carNo}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('时间')" align="center" prop="etd" min-width="170" />
<el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170"> <el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.remark }}</span> <span class="ellipsis">{{ scope.row.remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100"> <!-- <el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.sendCountryName }}</span> <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('起始网点')" align="center" prop="startSiteName" min-width="150" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="150" />
<el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100"> <el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.destCountryName }}</span> <span class="ellipsis">{{ scope.row.destCountryName }}</span>
@ -223,7 +238,7 @@
<span slot="label"> <span slot="label">
<span style="color: red">{{ $t('下一网点') }}</span> <span style="color: red">{{ $t('下一网点') }}</span>
</span> </span>
<EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker> <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onNextSiteSelect" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -1085,6 +1100,15 @@ export default {
this.coData.startSiteCode=item && item.siteCode; this.coData.startSiteCode=item && item.siteCode;
this.coData.startSiteName=item && item.siteName; this.coData.startSiteName=item && item.siteName;
}, },
onNextSiteSelect(item){
if(!item){
this.coData.nextSiteCode = null;
this.coData.nextSiteName = null;
return;
}
this.coData.nextSiteCode=item && item.siteCode;
this.coData.nextSiteName=item && item.siteName;
},
onDateSelect(value){ onDateSelect(value){
console.log("date picker---->", value) console.log("date picker---->", value)
this.dateTimeRange=value; this.dateTimeRange=value;
@ -1131,6 +1155,7 @@ export default {
startSiteCode: this.coData.startSiteCode || null, startSiteCode: this.coData.startSiteCode || null,
startSiteName: this.coData.startSiteName || null, startSiteName: this.coData.startSiteName || null,
nextSiteCode: this.coData.nextSiteCode || null, nextSiteCode: this.coData.nextSiteCode || null,
nextSiteName: this.coData.nextSiteName || null,
airBilllNo: this.coData.airBilllNo || null, airBilllNo: this.coData.airBilllNo || null,
carNo: this.coData.carNo || null, carNo: this.coData.carNo || null,
shipNo: this.coData.shipNo || null, shipNo: this.coData.shipNo || null,
@ -1229,6 +1254,7 @@ export default {
this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode; this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null; this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo; this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
this.tempCoPackInfo.etd = this.coData.etd; this.tempCoPackInfo.etd = this.coData.etd;
this.tempCoPackInfo.carNo = this.coData.carNo; this.tempCoPackInfo.carNo = this.coData.carNo;
@ -1359,8 +1385,41 @@ export default {
} }
let bcList=this.formBatchBillList.trim().split(/[；\;\,\，\n]/)||[]; let bcList=this.formBatchBillList.trim().split(/[；\;\,\，\n]/)||[];
bcList.forEach(async (billcode) => { // bcList.forEach(async (billcode) => {
billcode = billcode.trim(); // billcode = billcode.trim();
// if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
// let billRes = await listEmisWaybill({billCode:billcode});
// if(!billRes || billRes.code != 200){
// this.$modal.msgError(billRes && billRes.msg)
// return;
// }else if(!billRes.rows || billRes.rows.length < 1){
// this.$modal.msgError(('无此运单数据') + ": " + billcode)
// return;
// }
// let item = billRes.rows[0];
// this.emisCoPackDetail.push(item);
// if(this.coPackType=="edit"){
// let packDetail = {
// batchNo: this.coData.batchNo,
// billCode: item.billCode,
// scanDate: item.scanDate,
// scanStatus: item.scanStatus,
// groupStatus: "1",//已组批次
// scanMan: item.scanMan,
// scanSite: item.scanSite,
// createBy: this.$store.getters.empCode,
// createTime: parseTime(new Date())
// };
// let response = await addEmisTmsSiteBatchDtl(packDetail);
// if(!response || response.code != 200){
// this.$modal.msgError(response && response.msg || '组批次明细新增失败')
// return;
// }
// }
// }
// })
for(let i = 0; i < bcList.length; i++){
let billcode = bcList[i].trim();
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){ if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode}); let billRes = await listEmisWaybill({billCode:billcode});
if(!billRes || billRes.code != 200){ if(!billRes || billRes.code != 200){
@ -1391,7 +1450,7 @@ export default {
} }
} }
} }
}) }
this.titleBatch=""; this.titleBatch="";
this.openBatch=false; this.openBatch=false;
this.formBatchBillList = ""; this.formBatchBillList = "";
@ -1412,6 +1471,7 @@ export default {
this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode; this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null; this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo; this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
this.tempCoPackInfo.etd = this.coData.etd; this.tempCoPackInfo.etd = this.coData.etd;
this.tempCoPackInfo.carNo = this.coData.carNo; this.tempCoPackInfo.carNo = this.coData.carNo;
@ -1472,6 +1532,7 @@ export default {
this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode; this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null; this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo; this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
this.tempCoPackInfo.etd = this.coData.etd; this.tempCoPackInfo.etd = this.coData.etd;
this.tempCoPackInfo.carNo = this.coData.carNo; this.tempCoPackInfo.carNo = this.coData.carNo;
@ -1554,8 +1615,10 @@ export default {
this.computeTotal(); this.computeTotal();
// 更新主表 // 更新主表
this.tempCoPackInfo.destCountry = this.coData.destCountry; this.tempCoPackInfo.destCountry = this.coData.destCountry;
this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode; // this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
// this.tempCoPackInfo.sendStiteName = this.coData.sendStiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.blUnpack = this.blUnpack; this.tempCoPackInfo.blUnpack = this.blUnpack;
this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty; this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty; this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
@ -1616,8 +1679,10 @@ export default {
item.destCountry = this.coData.destCountry; item.destCountry = this.coData.destCountry;
// item.sendSiteCode = this.coData.sendSiteCode; // item.sendSiteCode = this.coData.sendSiteCode;
item.startSiteCode = this.coData.startSiteCode; item.startSiteCode = this.coData.startSiteCode;
item.startSiteName = this.coData.startSiteName;
// item.nextSiteCode = this.coData.nextSiteCode; // item.nextSiteCode = this.coData.nextSiteCode;
item.nextSiteCode = this.coData.nextSiteCode; item.nextSiteCode = this.coData.nextSiteCode;
item.nextSiteName = this.coData.nextSiteName;
item.blUnpack = this.blUnpack; item.blUnpack = this.blUnpack;
}) })
this.coData.totalWaybillQty=this.emisCoPackDetail.length; this.coData.totalWaybillQty=this.emisCoPackDetail.length;
@ -1671,6 +1736,7 @@ export default {
this.coData.destCountryName = null; this.coData.destCountryName = null;
// this.coData.sendSiteCode = null; // this.coData.sendSiteCode = null;
this.coData.nextSiteCode = null; this.coData.nextSiteCode = null;
this.coData.nextSiteName = null;
this.coData.nextStation = null; this.coData.nextStation = null;
// this.blUnpack = "1"; // this.blUnpack = "1";

48
src/views/emis/emisTmsSiteBatch/panel/ExpressPanel.vue
View File

@ -143,17 +143,31 @@
<el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag> <el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('航空提单号')" align="center" prop="airBilllNo" min-width="170" /> <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_biz_shipping_method" :value="scope.row.transType"/>
</template>
</el-table-column>
<el-table-column :label="$t('单号')" align="center" prop="" min-width="170">
<template slot-scope="scope">
<span v-if="scope.row.transType==2">{{scope.row.airBilllNo}}</span>
<span v-else-if="scope.row.transType==4">{{scope.row.shipNo}}</span>
<span v-else>{{scope.row.carNo}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('时间')" align="center" prop="etd" min-width="170" />
<el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170"> <el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.remark }}</span> <span class="ellipsis">{{ scope.row.remark }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100"> <!-- <el-table-column :label="$t('发件国家')" align="center" prop="sendCountryName" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.sendCountryName }}</span> <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column :label="$t('起始网点')" align="center" prop="startSiteName" min-width="150" />
<el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="150" />
<el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100"> <el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="ellipsis">{{ scope.row.destCountryName }}</span> <span class="ellipsis">{{ scope.row.destCountryName }}</span>
@ -213,7 +227,7 @@
<span slot="label"> <span slot="label">
<span style="color: red">{{ $t('下一网点') }}</span> <span style="color: red">{{ $t('下一网点') }}</span>
</span> </span>
<EmisSiteSimplePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker> <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onNextSiteSelect" v-model="coData.nextSiteCode" ></EmisSiteSimplePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -1031,6 +1045,15 @@ export default {
this.coData.startSiteCode=item && item.siteCode; this.coData.startSiteCode=item && item.siteCode;
this.coData.startSiteName=item && item.siteName; this.coData.startSiteName=item && item.siteName;
}, },
onNextSiteSelect(item){
if(!item){
this.coData.nextSiteCode = null;
this.coData.nextSiteName = null;
return;
}
this.coData.nextSiteCode=item && item.siteCode;
this.coData.nextSiteName=item && item.siteName;
},
onDateSelect(value){ onDateSelect(value){
console.log("date picker---->", value) console.log("date picker---->", value)
this.dateTimeRange=value; this.dateTimeRange=value;
@ -1077,6 +1100,7 @@ export default {
startSiteCode: this.coData.startSiteCode || null, startSiteCode: this.coData.startSiteCode || null,
startSiteName: this.coData.startSiteName || null, startSiteName: this.coData.startSiteName || null,
nextSiteCode: this.coData.nextSiteCode || null, nextSiteCode: this.coData.nextSiteCode || null,
nextSiteName: this.coData.nextSiteName || null,
airBilllNo: this.coData.airBilllNo || null, airBilllNo: this.coData.airBilllNo || null,
carNo: this.coData.carNo || null, carNo: this.coData.carNo || null,
shipNo: this.coData.shipNo || null, shipNo: this.coData.shipNo || null,
@ -1175,6 +1199,7 @@ export default {
this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode; this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null; this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo; this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
this.tempCoPackInfo.etd = this.coData.etd; this.tempCoPackInfo.etd = this.coData.etd;
this.tempCoPackInfo.carNo = this.coData.carNo; this.tempCoPackInfo.carNo = this.coData.carNo;
@ -1305,8 +1330,9 @@ export default {
} }
let bcList=this.formBatchBillList.trim().split(/[；\;\,\，\n]/)||[]; let bcList=this.formBatchBillList.trim().split(/[；\;\,\，\n]/)||[];
bcList.forEach(async (billcode) => { // bcList.forEach(async (billcode) => {
billcode = billcode.trim(); for(let i = 0; i < bcList.length; i++){
let billcode = bcList[i].trim();
if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){ if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
let billRes = await listEmisWaybill({billCode:billcode}); let billRes = await listEmisWaybill({billCode:billcode});
if(!billRes || billRes.code != 200){ if(!billRes || billRes.code != 200){
@ -1337,7 +1363,7 @@ export default {
} }
} }
} }
}) }
this.titleBatch=""; this.titleBatch="";
this.openBatch=false; this.openBatch=false;
this.formBatchBillList = ""; this.formBatchBillList = "";
@ -1358,6 +1384,7 @@ export default {
this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode; this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null; this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo; this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
this.tempCoPackInfo.etd = this.coData.etd; this.tempCoPackInfo.etd = this.coData.etd;
this.tempCoPackInfo.carNo = this.coData.carNo; this.tempCoPackInfo.carNo = this.coData.carNo;
@ -1418,6 +1445,7 @@ export default {
this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode; this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null; this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo; this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
this.tempCoPackInfo.etd = this.coData.etd; this.tempCoPackInfo.etd = this.coData.etd;
this.tempCoPackInfo.carNo = this.coData.carNo; this.tempCoPackInfo.carNo = this.coData.carNo;
@ -1500,8 +1528,9 @@ export default {
this.computeTotal(); this.computeTotal();
// 更新主表 // 更新主表
this.tempCoPackInfo.destCountry = this.coData.destCountry; this.tempCoPackInfo.destCountry = this.coData.destCountry;
this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode; // this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode; this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
this.tempCoPackInfo.blUnpack = this.blUnpack; this.tempCoPackInfo.blUnpack = this.blUnpack;
this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty; this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty; this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
@ -1562,8 +1591,10 @@ export default {
item.destCountry = this.coData.destCountry; item.destCountry = this.coData.destCountry;
// item.sendSiteCode = this.coData.sendSiteCode; // item.sendSiteCode = this.coData.sendSiteCode;
item.startSiteCode = this.coData.startSiteCode; item.startSiteCode = this.coData.startSiteCode;
item.startSiteName = this.coData.startSiteName;
// item.nextSiteCode = this.coData.nextSiteCode; // item.nextSiteCode = this.coData.nextSiteCode;
item.nextSiteCode = this.coData.nextSiteCode; item.nextSiteCode = this.coData.nextSiteCode;
item.nextSiteName = this.coData.nextSiteName;
item.blUnpack = this.blUnpack; item.blUnpack = this.blUnpack;
}) })
this.coData.totalWaybillQty=this.emisCoPackDetail.length; this.coData.totalWaybillQty=this.emisCoPackDetail.length;
@ -1617,6 +1648,7 @@ export default {
this.coData.destCountryName = null; this.coData.destCountryName = null;
// this.coData.sendSiteCode = null; // this.coData.sendSiteCode = null;
this.coData.nextSiteCode = null; this.coData.nextSiteCode = null;
this.coData.nextSiteName = null;
this.coData.nextStation = null; this.coData.nextStation = null;
// this.blUnpack = "1"; // this.blUnpack = "1";

1
src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
View File

@ -563,6 +563,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = []; this.ids = [];
debugger;
for(let i = 0; i< selection.length; i++){ for(let i = 0; i< selection.length; i++){
if(selection[i].blReversion != "1"){ if(selection[i].blReversion != "1"){
this.ids.push(selection[i].id) this.ids.push(selection[i].id)

45
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -134,7 +134,12 @@
</div> </div>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" /> <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
<el-table-column :label="$t('状态')" align="center" prop="currentStatus" min-width="100" /> <!-- <el-table-column :label="$t('状态')" align="center" prop="currentStatus" min-width="100" /> -->
<el-table-column :label="$t('状态')" align="center" prop="waybillStatus" width="100" >
<template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
</template>
</el-table-column>
<el-table-column :label="$t('通知网点')" align="center" prop="notifySiteName" min-width="170" /> <el-table-column :label="$t('通知网点')" align="center" prop="notifySiteName" min-width="170" />
<el-table-column :label="$t('登记网点')" align="center" prop="scanSite" min-width="170" /> <el-table-column :label="$t('登记网点')" align="center" prop="scanSite" min-width="170" />
<el-table-column :label="$t('登记日期')" align="center" prop="scanDate" min-width="170"> <el-table-column :label="$t('登记日期')" align="center" prop="scanDate" min-width="170">
@ -155,8 +160,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" /> <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
<el-table-column :label="$t('所属业务员')" align="center" prop="marketMan" min-width="170" /> <el-table-column :label="$t('所属业务员')" align="center" prop="registerManName" min-width="170" />
<el-table-column :label="$t('业务员编号')" align="center" prop="marketManCode" min-width="100" /> <el-table-column :label="$t('业务员编号')" align="center" prop="registerManCode" min-width="100" />
</xd-table> </xd-table>
<!-- 添加或修改问题件对话框 --> <!-- 添加或修改问题件对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag :close-on-click-modal="false" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" v-dialogDrag :close-on-click-modal="false" append-to-body>
@ -196,7 +201,7 @@
<script> <script>
import { addEmisWaybillProblemInfo,listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo"; import { addEmisWaybillProblemInfo,listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
import { doScan } from "@/api/emis/emisTmsScanRecord"; import { doScan } from "@/api/emis/emisTmsScanRecord";
import { listEmisWaybill } from "@/api/emis/emisWaybill"; // import { listEmisWaybill } from "@/api/emis/emisWaybill";
import { getWaybillDetail} from "@/api/emis/emisWaybill"; import { getWaybillDetail} from "@/api/emis/emisWaybill";
// import { getWaybillDetail } from "@/api/emis/emisWaybill"; // import { getWaybillDetail } from "@/api/emis/emisWaybill";
@ -207,7 +212,7 @@ import { parseTime } from "@/utils/custom";
export default { export default {
name: "ProblemEntry", name: "ProblemEntry",
components: { EmisSiteSimplePicker, ProblemTypePicker }, components: { EmisSiteSimplePicker, ProblemTypePicker },
dicts: ['emis_question_type'], dicts: ['emis_question_type', 'emis_waybill_status'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -651,7 +656,7 @@ export default {
this.emisWaybillList = newList; this.emisWaybillList = newList;
this.open = false; this.open = false;
}, },
async submitFormBatch(){ submitFormBatch(){
if(this.formBatch.billCode==null || this.formBatch.billCode==''){ if(this.formBatch.billCode==null || this.formBatch.billCode==''){
this.$message.error("输入单号后回车"); this.$message.error("输入单号后回车");
return; return;
@ -674,29 +679,31 @@ export default {
this.$message.error("单号："+ bcList[bc].trim() + ", 已存在"); this.$message.error("单号："+ bcList[bc].trim() + ", 已存在");
continue; continue;
}else{ }else{
await this.addToList(bcList[bc].trim()); this.addToList(bcList[bc].trim());
} }
} }
this.loading = false; this.loading = false;
this.openBatch=false; this.openBatch=false;
}, },
async addToList(billCode){ async addToList(billCode){
let response = await listEmisWaybill({billCode:billCode}) debugger;
if(!response || response.code != 200){ if(!billCode){
this.$message.error(response && response.msg || '未知错误');
}
let scanDate = new Date();
if(response.code != 200){
this.$message.error(response.msg);
return; return;
} }
let rows = response.rows; let response = await getWaybillDetail(billCode);
if(!rows || rows.length == 0){ if(!response || response.code != 200){
this.$message.error((response && response.msg || '未知错误') + ": " + billCode);
return;
}
let scanDate = new Date();
let data = response.data;
if(!data || data.billCode == ""){
this.$message.error("未查到单号: " + billCode); this.$message.error("未查到单号: " + billCode);
return; return;
} }
for (let index = 0; index < rows.length; index++) { // for (let index = 0; index < rows.length; index++) {
let rsItem = rows[index]; let rsItem = data;//rows[index];
console.log(rsItem); console.log(rsItem);
let record =Object.assign({}, rsItem) let record =Object.assign({}, rsItem)
// record.notifySiteCode = record.sendSiteCode; // record.notifySiteCode = record.sendSiteCode;
@ -723,7 +730,7 @@ export default {
record.dataFrom="PC"; record.dataFrom="PC";
this.emisWaybillList.push(record); this.emisWaybillList.push(record);
this.dataMap[this.form.billCode]=record; this.dataMap[this.form.billCode]=record;
} // }
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {