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

md

Browse Source
This commit is contained in:
linfso 2024-06-28 10:24:48 +08:00
parent 2ed4995371
commit 5f5ad8eee9
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -13,13 +13,13 @@
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;"> <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- 运单录入 --> <!-- 运单录入 -->
<el-col :span="6" v-if="action=='add'"> <el-col :span="6" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('发货时间')" prop="sendDate"> <el-form-item :label="$t('发货时间')" prop="sendDate">
<el-input v-model="sendDate" placeholder="" disabled /> <el-input v-model="sendDate" placeholder="" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="18" v-if="action=='add'"> <el-col :span="18" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('运单号')" prop="billCode" > <el-form-item :label="$t('运单号')" prop="billCode" >
<div style="display:inline-flex"> <div style="display:inline-flex">
<div> <div>
@ -158,7 +158,7 @@
</el-row> </el-row>
<div v-if="action=='add'" style="position: absolute;right: 80px;top: 60px;z-index: 100;"> <div v-if="action=='add' || action=='preAdd'" style="position: absolute;right: 80px;top: 60px;z-index: 100;">
<div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;"> <div v-if="totalAvailablePag.mainHasCnt>0" style="display:inline-flex;font-size: 15px;font-weight: 700;">
<div style="width:230px"> <div style="width:230px">
@ -674,7 +674,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="action=='add'"> <el-col :span="24" v-if="action=='add' || action=='preAdd' ">
<el-form-item :label="$t('打印选项')" prop="printTypeCheckList"> <el-form-item :label="$t('打印选项')" prop="printTypeCheckList">
<el-checkbox-group v-model="form.printTypeCheckList"> <el-checkbox-group v-model="form.printTypeCheckList">
<el-checkbox :key="0" :label="0" > <el-checkbox :key="0" :label="0" >
@ -689,7 +689,7 @@
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" v-if="action=='add'"> <el-col :span="24" v-if="action=='add' || action=='preAdd'">
<el-form-item :label="$t('打印组件')" prop="printTypeCheckList"> <el-form-item :label="$t('打印组件')" prop="printTypeCheckList">
<TanexPrinterPanel ref="tanexPrinter" :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false" @onPrintComplete="onComplete"></TanexPrinterPanel> <TanexPrinterPanel ref="tanexPrinter" :isShowPinters="true" v-model="printerStatus" @onPrint="handleBatchPrint" :isInitA4="false" @onPrintComplete="onComplete"></TanexPrinterPanel>
</el-form-item> </el-form-item>
@ -771,8 +771,8 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
import { deepClone } from '@/utils/index' import { deepClone } from '@/utils/index'
export default { export default {
// name: "WaybillRecord", name: "WaybillRecord",
name: "WaybillModify", // name: "WaybillModify",
components: { components: {
SalemanPicker, SalemanPicker,
PayeePicker, PayeePicker,
@ -853,7 +853,7 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] } { required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
], ],
province: [ province: [
{ required: true, message: "省不能为空", trigger: ["blur",'change'] } { required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
], ],
company: [ company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] } { required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
@ -1524,7 +1524,7 @@ methods: {
}); });
}, },
startTimer(){ startTimer(){
if(this.action=='add'){ if(this.action=='add' || action=='preAdd'){
this.sendDate=parseTime(new Date()); this.sendDate=parseTime(new Date());
this.timer = setTimeout(this.startTimer, 1000); this.timer = setTimeout(this.startTimer, 1000);
} }
@ -1642,7 +1642,10 @@ methods: {
}, },
calcDestSite(){ calcDestSite(){
let queryParams = { let queryParams = {
province:this.form.reciever.province country:this.form.reciever.country,
province:this.form.reciever.province,
city:this.form.reciever.city,
address:this.form.reciever.address
}; };
if(this.form.reciever.province){ if(this.form.reciever.province){

7
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -853,7 +853,7 @@ data() {
{ required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] } { required: true, message: "收货人国家不能为空", trigger: ["blur",'change'] }
], ],
province: [ province: [
{ required: true, message: "省不能为空", trigger: ["blur",'change'] } { required: true, message: "收货省不能为空", trigger: ["blur",'change'] }
], ],
company: [ company: [
{ required: true, message: "发件公司不能为空", trigger: ["blur",'change'] } { required: true, message: "发件公司不能为空", trigger: ["blur",'change'] }
@ -1642,7 +1642,10 @@ methods: {
}, },
calcDestSite(){ calcDestSite(){
let queryParams = { let queryParams = {
province:this.form.reciever.province country:this.form.reciever.country,
province:this.form.reciever.province,
city:this.form.reciever.city,
address:this.form.reciever.address
}; };
if(this.form.reciever.province){ if(this.form.reciever.province){