This commit is contained in:
linfso 2024-06-06 16:36:55 +08:00
parent 692f2b35f0
commit 567d719a32
4 changed files with 15 additions and 33 deletions

View File

@ -74,25 +74,6 @@
</el-col>
</el-row>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="10">
<el-form-item label="查询时间范围" prop="dateTimeRange">
<div slot="label">
<el-radio-group class="query-label" v-model="queryOrderDateType">
<el-radio :key="1" label="1">发货时间</el-radio>
</el-radio-group>
</div>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
<el-form-item label="" prop="queryExpireNotSign">
<el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
<el-form-item label="寄件人" prop="sendName">

View File

@ -30,7 +30,6 @@
</el-form-item>
</el-col>
<!-- 运单录入 end -->
<!-- 运单修改 -->
@ -171,7 +170,7 @@
</el-checkbox-group>
</div>
<div style="margin-left:10px">
<TanexPrinterPanel ref="tanexPrinter" v-model="printerStatus" @onPrint="handleBatchPrint" @onPrintComplete="onComplete"></TanexPrinterPanel>
<TanexPrinterPanel ref="tanexPrinter" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false" @onPrintComplete="onComplete"></TanexPrinterPanel>
</div>
</div>
</el-form-item>
@ -1071,7 +1070,7 @@ methods: {
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
showCancelButton: false,
showClose: false
}).then(() => {
this.billCode=null;
@ -1136,7 +1135,7 @@ methods: {
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
showCancelButton: false,
showClose: false
}).then(() => {
this.billCode=null;
@ -1152,7 +1151,7 @@ methods: {
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
showCancelButton: false,
showClose: false
}).then(() => {
this.billCode=null;
@ -1233,6 +1232,7 @@ methods: {
},
initData() {
this.reset();
this.form.productTypeSelArr=null;
if(this.billCode && this.billCode!=undefined) {
this.loading = true;
@ -1250,7 +1250,7 @@ methods: {
}
if(this.form.lockFlag=="T"){
this.$confirm('已锁单,不允许修改!', '提示', {
this.$confirm(this.lockReason, '提示', {
confirmButtonText: '确认',
cancelButtonText: '返回',
type: 'warning'
@ -1402,6 +1402,7 @@ methods: {
blSpecialQuote:null,
blSensitive:null,
lockFlag:null,
lockMessage:null,
};
this.resetForm("form");
},
@ -1534,7 +1535,7 @@ methods: {
this.form.sender.country=value.country;
this.form.sender.province=value.province;
this.form.sender.city=value.city;
this.form.sender.county=value.district;
this.form.sender.county=value.county;
// this.form.receiveTown=value.town;
this.form.sender.address=value.address;
this.form.sender.company=value.company;
@ -1545,7 +1546,7 @@ methods: {
this.form.reciever.country=value.country;
this.form.reciever.province=value.province;
this.form.reciever.city=value.city;
this.form.reciever.county=value.district;
this.form.reciever.county=value.county;
// this.form.receiveTown=value.town;
this.form.reciever.address=value.address;
this.form.reciever.company=value.company;

View File

@ -30,7 +30,6 @@
</el-form-item>
</el-col>
<!-- 运单录入 end -->
<!-- 运单修改 -->
@ -1071,7 +1070,7 @@ methods: {
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
showCancelButton: false,
showClose: false
}).then(() => {
this.billCode=null;
@ -1136,7 +1135,7 @@ methods: {
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
showCancelButton: false,
showClose: false
}).then(() => {
this.billCode=null;
@ -1152,7 +1151,7 @@ methods: {
type: "warning",
distinguishCancelAndClose: true,
closeOnClickModal: false,
showCancelButton: false,
showCancelButton: false,
showClose: false
}).then(() => {
this.billCode=null;
@ -1251,7 +1250,7 @@ methods: {
}
if(this.form.lockFlag=="T"){
this.$confirm('已锁单,不允许修改!', '提示', {
this.$confirm(this.lockReason, '提示', {
confirmButtonText: '确认',
cancelButtonText: '返回',
type: 'warning'
@ -1403,6 +1402,7 @@ methods: {
blSpecialQuote:null,
blSensitive:null,
lockFlag:null,
lockMessage:null,
};
this.resetForm("form");
},

View File

@ -701,4 +701,4 @@ export default {
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style>
</style>