Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
6a627421 1 parent aa72e5fc

数据状态修正，文本修正

Inline Side-by-side
Showing 5 changed files with 25 additions and 9 deletions
...@@ -201,6 +201,7 @@ export default { ...@@ -201,6 +201,7 @@ export default {
201 //日期选择变化 201 //日期选择变化
202 dateChange(val) { 202 dateChange(val) {
203 this.routeList = [] 203 this.routeList = []
204 + this.formData.route = null
204 if (this.formData.fltNo && this.formData.fltNo != null && this.formData.fltNo != '') { 205 if (this.formData.fltNo && this.formData.fltNo != null && this.formData.fltNo != '') {
205 if (this.formData.fltDate && this.formData.fltDate != null && this.formData.fltDate != '') { 206 if (this.formData.fltDate && this.formData.fltDate != null && this.formData.fltDate != '') {
206 let obj = { 207 let obj = {
......
...@@ -775,6 +775,7 @@ export default { ...@@ -775,6 +775,7 @@ export default {
775 // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false; 775 // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false;
776 //是否预审 776 //是否预审
777 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false; 777 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
778 + this.ishighPriceWeightPercent = this.form.highLowPriceFlg === 1 ? false : true
778 // 计算高低价可配 779 // 计算高低价可配
779 // this.LowHighAvailable(); 780 // this.LowHighAvailable();
780 } else { 781 } else {
......
...@@ -140,11 +140,17 @@ export default { ...@@ -140,11 +140,17 @@ export default {
140 }, 140 },
141 //提交 141 //提交
142 submit() { 142 submit() {
143 - let obj = {} 143 + let obj = {
144 + goodsList: []
145 + }
144 obj.goodsStation = this.formData.goodsStation 146 obj.goodsStation = this.formData.goodsStation
145 this.formData.goodsList = this.formData.goodsList.replace(/；/g, ";") 147 this.formData.goodsList = this.formData.goodsList.replace(/；/g, ";")
146 if (this.formData.goodsList != null && this.formData.goodsList != '') { 148 if (this.formData.goodsList != null && this.formData.goodsList != '') {
147 - obj.goodsList = this.formData.goodsList.split(';') 149 + this.formData.goodsList.split(';').forEach(item => {
150 + if (item != null && item != '') {
151 + obj.goodsList.push(item)
152 + }
153 + })
148 } 154 }
149 this.$refs['addForm'].validate(val => { 155 this.$refs['addForm'].validate(val => {
150 if (val) { 156 if (val) {
......
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item label="航班号" prop="flightList"> 11 <el-form-item label="航班号" prop="flightList">
12 - <el-input type="textarea" v-model="flightList" rows="4" maxlength="125" placeholder="请输入航班号，多个用“;”隔开"> 12 + <el-input type="textarea" v-model="flightList" rows="4" maxlength="125"
13 + placeholder="请输入航班号，多个用“;”隔开">
13 </el-input> 14 </el-input>
14 </el-form-item> 15 </el-form-item>
15 </el-form> 16 </el-form>
...@@ -62,11 +63,17 @@ export default { ...@@ -62,11 +63,17 @@ export default {
62 methods: { 63 methods: {
63 //提交 64 //提交
64 submit() { 65 submit() {
65 - let obj = {} 66 + let obj = {
67 + flightList: []
68 + }
66 obj.goodsStation = this.formData.goodsStation 69 obj.goodsStation = this.formData.goodsStation
67 if (this.formData.flightList != null && this.formData.flightList != '') { 70 if (this.formData.flightList != null && this.formData.flightList != '') {
68 this.formData.flightList = this.formData.flightList.toUpperCase() 71 this.formData.flightList = this.formData.flightList.toUpperCase()
69 - obj.flightList = this.formData.flightList.split(';') 72 + this.formData.flightList.split(';').forEach(item => {
73 + if (item != null && item != '') {
74 + obj.flightList.push(item)
75 + }
76 + })
70 } 77 }
71 this.$refs['addForm'].validate(val => { 78 this.$refs['addForm'].validate(val => {
72 if (val) { 79 if (val) {
......
...@@ -65,13 +65,13 @@ export default { ...@@ -65,13 +65,13 @@ export default {
65 ids: [], 65 ids: [],
66 fltNo: undefined, 66 fltNo: undefined,
67 fltDate: undefined, 67 fltDate: undefined,
68 - route: undefined, 68 + route: null,
69 overweight: false, 69 overweight: false,
70 }, 70 },
71 cargoHeader: [ 71 cargoHeader: [
72 { name: "口岸代码", value: "portName", width: "" }, 72 { name: "口岸代码", value: "portName", width: "" },
73 { name: "运单号", value: "waybillNo", width: "" }, 73 { name: "运单号", value: "waybillNo", width: "" },
74 - { name: "货物状态", value: "statusName" , width: ""}, 74 + { name: "货物状态", value: "statusName", width: "" },
75 { name: "站点", value: "siteName", width: "" }, 75 { name: "站点", value: "siteName", width: "" },
76 { name: "申报类型", value: "typeName", width: "" }, 76 { name: "申报类型", value: "typeName", width: "" },
77 { name: "URSA", value: "ursa", width: "" }, 77 { name: "URSA", value: "ursa", width: "" },
...@@ -79,8 +79,8 @@ export default { ...@@ -79,8 +79,8 @@ export default {
79 { name: "件数", value: "qty", width: "" }, 79 { name: "件数", value: "qty", width: "" },
80 { name: "ACCS原航班号", value: "fltNoAccs", width: "120" }, 80 { name: "ACCS原航班号", value: "fltNoAccs", width: "120" },
81 { name: "ACCS原航班日期", value: "fltDateAccs", width: "130" }, 81 { name: "ACCS原航班日期", value: "fltDateAccs", width: "130" },
82 - { name: "品名描述", value: "nameDescription" , width: ""}, 82 + { name: "品名描述", value: "nameDescription", width: "" },
83 - { name: "是否自动", value: "cargoRulesStatus" , width: ""}, 83 + { name: "是否自动", value: "cargoRulesStatus", width: "" },
84 { name: "创建人", value: "createUserName", width: "" }, 84 { name: "创建人", value: "createUserName", width: "" },
85 { name: "创建时间", value: "createTime", width: "" }, 85 { name: "创建时间", value: "createTime", width: "" },
86 ], 86 ],
...@@ -201,6 +201,7 @@ export default { ...@@ -201,6 +201,7 @@ export default {
201 //日期选择变化 201 //日期选择变化
202 dateChange(val) { 202 dateChange(val) {
203 this.routeList = [] 203 this.routeList = []
204 + this.formData.route = null
204 if (this.formData.fltNo && this.formData.fltNo != null && this.formData.fltNo != '') { 205 if (this.formData.fltNo && this.formData.fltNo != null && this.formData.fltNo != '') {
205 if (this.formData.fltDate && this.formData.fltDate != null && this.formData.fltDate != '') { 206 if (this.formData.fltDate && this.formData.fltDate != null && this.formData.fltDate != '') {
206 let obj = { 207 let obj = {
......