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

md

Browse Source
This commit is contained in:
linfso 2025-01-09 11:18:37 +08:00
parent 33df9c4a5f
commit 6617962863
2 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/views/oms/emisWaybill/OrderRecord.vue
View File

@ -14,8 +14,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('发货时间:')" prop="sendDate" label-width="80px">
{{form.sendDate}}
<el-form-item :label="$t('下单时间:')" prop="orderDate" label-width="80px">
{{form.orderDate}}
</el-form-item>
</el-col>
@ -105,8 +105,6 @@
</el-form-item>
</el-col> -->
</el-row>
</el-col>
@ -527,14 +525,13 @@
</el-row>
</div>
</el-collapse-item>
<!-- v-if="needDeclare==1" -->
<el-collapse-item title="" name="3" v-if="this.transType==1">
<el-collapse-item title="" name="3" v-if="this.form.carryType==1">
<template slot="title">
<div class="form-group-title">
<span class="title" v-if="this.transType==1">{{ $t('快递货物申报信息') }}</span>
<!-- <span class="title" v-else-if="this.transType==2">{{ $t('空运货物申报信息') }}</span> -->
<!-- <span class="title" v-else-if="this.transType==3">{{ $t('陆运货物申报信息') }}</span> -->
<!-- <span class="title" v-else-if="this.transType==4">{{ $t('海运货物申报信息') }}</span> -->
<span class="title" v-if="this.form.carryType==1">{{ $t('快递货物申报信息') }}</span>
<!-- <span class="title" v-else-if="this.form.carryType==2">{{ $t('空运货物申报信息') }}</span> -->
<!-- <span class="title" v-else-if="this.form.carryType==3">{{ $t('陆运货物申报信息') }}</span> -->
<!-- <span class="title" v-else-if="this.form.carryType==4">{{ $t('海运货物申报信息') }}</span> -->
<!-- <span class="title" v-else>{{ $t('货物申报信息') }}</span> -->
</div>
</template>
@ -624,28 +621,28 @@
<el-input v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
</template>
</el-table-column> -->
<!-- <el-table-column v-if="this.transType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<!-- <el-table-column v-if="this.form.carryType==1" prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
</template>
</el-table-column> -->
<el-table-column v-if="this.transType==1" prop="goodsName" label="品牌" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column v-if="this.form.carryType==1" prop="goodsName" label="品牌" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.brand" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column v-if="this.transType==1" prop="material" label="材质" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column v-if="this.form.carryType==1" prop="material" label="材质" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.material" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column v-if="this.transType==1" prop="purpose" label="用途" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column v-if="this.form.carryType==1" prop="purpose" label="用途" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.purpose" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column v-if="this.transType==1" prop="ingredients" label="成分" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column v-if="this.form.carryType==1" prop="ingredients" label="成分" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
</template>
@ -661,7 +658,7 @@
</template>
</el-table-column> -->
<el-table-column v-if="this.transType==1" prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<el-table-column v-if="this.form.carryType==1" prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-input v-model="scope.row.hscode" size="mini" placeholder=""></el-input>
</template>
@ -708,7 +705,7 @@
</el-row>
</el-collapse-item>
<el-collapse-item title="" name="4" v-if="this.transType!=1">
<el-collapse-item title="" name="4" v-if="this.form.carryType!=1">
<template slot="title">
<div class="form-group-title"><span class="title">{{ $t('上传单证文件') }}</span>
</div>
@ -1106,8 +1103,6 @@ watch: {
// next()
// },
created() {
if(this.$route.query.action=="copyOrder"){
this.action=this.$route.query.action;
this.billCode=this.$route.query.billCode;
@ -1141,7 +1136,6 @@ created() {
console.log("==preOrderByProd=>",postForm);
this.form.sendDate =parseTime(new Date());
this.form.transLine=postForm.transLine;
this.form.billWeight=postForm.billWeight;
@ -1177,7 +1171,7 @@ methods: {
initData() {
this.reset();
this.form.productTypeSelArr=null;
this.form.sendDate =parseTime(new Date());
if(this.billCode && this.billCode!=undefined) {
this.loading = true;
@ -1367,7 +1361,7 @@ methods: {
this.preCalcFee();
},
onTransLineChange(item){
this.transType=item.transType;
this.form.carryType=item.transType;
this.preCalcFee()
},
openCollapse(index){
@ -1478,6 +1472,7 @@ methods: {
blMessage: null,
blAcceptMessage: null,
meterType:null,
carryType:null,
blGenSubbill:null,
billCodeSub:null,
blSpecialQuote:null,
@ -1569,21 +1564,21 @@ methods: {
};
this.form.attachmentList.push(item);
// 不影响原表单提交,clone 一份数据
let postForm=deepClone(this.form)
// 调整包装类型为多选
if(this.form.packType&&this.form.packType.length>0){
postForm.packType=this.form.packType.join(",");
}
this.form.orderDate =parseTime(new Date());
// 不影响原表单提交,clone 一份数据
let postForm=deepClone(this.form)
// 调整包装类型为多选
if(this.form.packType&&this.form.packType.length>0){
postForm.packType=this.form.packType.join(",");
}
realSubmitOrder(postForm).then(res => {
realSubmitOrder(postForm).then(res => {
console.log("===>realSubmitOrder==>",res)
this.billCode=res.data.billCode;
this.$modal.msgSuccess("下单成功");
this.onComplete();
});
});
},
// 弹出地址簿选择
handleSelectCustomerAddress(addressType){

32
src/views/oms/emisWaybill/SendOrderbillList.vue
View File

@ -388,7 +388,6 @@
<el-table-column :label="$t('仓库地址')" align="center" prop="intoWarehouseAddress" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('预发货时间')" align="center" prop="pickStartDate" min-width="170" :show-overflow-tooltip="true"/>
<!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
@ -404,7 +403,11 @@
<span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.waybillStatus!=0">{{ parseTime(scope.row.sendDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column :label="$t('收件员')" align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
@ -549,8 +552,6 @@
<OrderDetailReadOnly :key="currentTraceBillCode" :billCode="currentTraceBillCode" ></OrderDetailReadOnly>
</el-dialog>
<div>
<el-image-viewer
v-if="showViewer"
@ -560,12 +561,9 @@
</div>
<el-dialog title="查看揽收底单图片" :visible.sync="openShowGotPic" width="30%" :close-on-click-modal="false" v-dialogDrag append-to-body>
<div>
<!-- <el-image :src="billPicSendRmk" style="width: 200px"></el-image> -->
<ImagePreview height="300px" :key="billPicSendRmk" :src="billPicSendRmk" >
</ImagePreview>
<el-image
<ImagePreview height="300px" :key="billPicSendRmk" :src="billPicSendRmk" ></ImagePreview>
<!-- <el-image
:src="`${realSrc}`"
fit="cover"
:style="`width:${realWidth};height:${realHeight};`"
@ -574,7 +572,7 @@
<div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div>
</el-image>
</el-image> -->
</div>
</el-dialog>
@ -1061,16 +1059,12 @@ export default {
},
// 多选框选中数据
handleSelectionChange(selection) {
console.log("====>selection==>",selection)
if(selection!=null){
this.currentSelectBill = selection[0];
this.billCode=selection[0].billCode;
this.billPicSendRmk=selection[0].billPicSendRmk;
}
console.log("====>billCode==>",this.billCode)
this.selectionList=selection;
if(this.selectionList&&this.selectionList.length>0){
this.currentSelectBill = this.selectionList[0];
this.billCode=this.selectionList[0].billCode;
this.billPicSendRmk=this.selectionList[0].billPicSendRmk;
}
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length