朱兆平 / vue_cli · 提交

转到一个项目

作者 zhangFan
提交 8c142fd116b111be60974dc40c838dddfdc705e9 1 个父辈 1f021514

新增和修改页面

内嵌 并排对比
正在显示 1 个修改的文件 包含 16 行增加 和 11 行删除
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </el-table-column> 34 </el-table-column>
35 <el-table-column label="航班号" width="90px" align="center"> 35 <el-table-column label="航班号" width="90px" align="center">
36 <template slot-scope="scope"> 36 <template slot-scope="scope">
37 - <span>{{ scope.row.carrier +scope.row.flightno }}</span> 37 + <span>{{ scope.row.flightno }}</span>
38 </template> 38 </template>
39 </el-table-column> 39 </el-table-column>
40 <el-table-column label="航班日期" width="120px" align="center" sortable> 40 <el-table-column label="航班日期" width="120px" align="center" sortable>
@@ -115,7 +115,7 @@ @@ -115,7 +115,7 @@
115 <el-col :span="10"> 115 <el-col :span="10">
116 <el-form-item label="航班号" prop="flightno"> 116 <el-form-item label="航班号" prop="flightno">
117 <div v-if="dialogStatus === 'update'"> 117 <div v-if="dialogStatus === 'update'">
118 - <el-input disabled="" v-model="temp.carrier + temp.flightno"/> 118 + <el-input disabled="" v-model="flightno"/>
119 </div> 119 </div>
120 <div v-else> 120 <div v-else>
121 <el-input v-model="flightno"/> 121 <el-input v-model="flightno"/>
@@ -128,11 +128,12 @@ @@ -128,11 +128,12 @@
128 <div v-if="dialogStatus === 'update'"> 128 <div v-if="dialogStatus === 'update'">
129 <el-date-picker disabled="" :picker-options="pickerOptions" 129 <el-date-picker disabled="" :picker-options="pickerOptions"
130 v-model="temp.flightdate" align="right" 130 v-model="temp.flightdate" align="right"
  131 + value-format="yyyy-MM-dd"
131 type="date" placeholder="请输入航班日期" style="width: 87%"/> 132 type="date" placeholder="请输入航班日期" style="width: 87%"/>
132 </div> 133 </div>
133 <div v-else> 134 <div v-else>
134 <el-date-picker :picker-options="pickerOptions" v-model="temp.flightdate" 135 <el-date-picker :picker-options="pickerOptions" v-model="temp.flightdate"
135 - align="right" 136 + align="right" value-format="yyyy-MM-dd"
136 type="date" placeholder="请输入航班日期" style="width: 87%"/> 137 type="date" placeholder="请输入航班日期" style="width: 87%"/>
137 </div> 138 </div>
138 </el-form-item> 139 </el-form-item>
@@ -367,7 +368,7 @@ @@ -367,7 +368,7 @@
367 <el-option 368 <el-option
368 v-for="item in countryOption" 369 v-for="item in countryOption"
369 :key="item.value" 370 :key="item.value"
370 - :label="item.label" 371 + :label="item.value"
371 :value="item.value"> 372 :value="item.value">
372 <span style="float: left">{{ item.label }}</span> 373 <span style="float: left">{{ item.label }}</span>
373 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span> 374 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -442,7 +443,7 @@ @@ -442,7 +443,7 @@
442 <el-option 443 <el-option
443 v-for="item in countryOption" 444 v-for="item in countryOption"
444 :key="item.value" 445 :key="item.value"
445 - :label="item.label" 446 + :label="item.value"
446 :value="item.value"> 447 :value="item.value">
447 <span style="float: left">{{ item.label }}</span> 448 <span style="float: left">{{ item.label }}</span>
448 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span> 449 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -569,7 +570,6 @@ @@ -569,7 +570,6 @@
569 awba: undefined, 570 awba: undefined,
570 awbh: undefined, 571 awbh: undefined,
571 customcode: undefined, 572 customcode: undefined,
572 - carrier: undefined,  
573 flightno: undefined, 573 flightno: undefined,
574 flightdate: undefined, 574 flightdate: undefined,
575 originstation: undefined, 575 originstation: undefined,
@@ -909,7 +909,7 @@ @@ -909,7 +909,7 @@
909 if (newValue != null && newValue!='') { 909 if (newValue != null && newValue!='') {
910 this.selectCountry.countryCode = newValue 910 this.selectCountry.countryCode = newValue
911 getByCountryCode(this.selectCountry).then(res => { 911 getByCountryCode(this.selectCountry).then(res => {
912 - this.temp.awbinfo.cnscomidno = res.data.dataList[0].enterpriseCode 912 + this.temp.awbinfo.cnscomidpre = res.data.dataList[0].enterpriseCode
913 }) 913 })
914 } 914 }
915 }, 915 },
@@ -917,7 +917,7 @@ @@ -917,7 +917,7 @@
917 if (newValue != null && newValue!='') { 917 if (newValue != null && newValue!='') {
918 this.selectCountry.countryCode = newValue 918 this.selectCountry.countryCode = newValue
919 getByCountryCode(this.selectCountry).then(res => { 919 getByCountryCode(this.selectCountry).then(res => {
920 - this.temp.awbinfo.shpcomidpno = res.data.dataList[0].enterpriseCode 920 + this.temp.awbinfo.shpcomidpre = res.data.dataList[0].enterpriseCode
921 }) 921 })
922 } 922 }
923 } 923 }
@@ -1046,8 +1046,8 @@ @@ -1046,8 +1046,8 @@
1046 }) 1046 })
1047 }, 200) 1047 }, 200)
1048 if (query.length > 1) { 1048 if (query.length > 1) {
1049 - this.selectCountry.countryNameCn = query  
1050 - getByCountryCodeForName(this.selectCountry).then(res => { 1049 + this.selectCountry.countryCode = query
  1050 + getByCountryCode(this.selectCountry).then(res => {
1051 this.shpCompnyList = res.data.dataList 1051 this.shpCompnyList = res.data.dataList
1052 this.shpCompnyTypeOption = this.shpCompnyList.map(item => { 1052 this.shpCompnyTypeOption = this.shpCompnyList.map(item => {
1053 return {value: item.enterpriseCode, label: item.enterpriseCode} 1053 return {value: item.enterpriseCode, label: item.enterpriseCode}
@@ -1082,11 +1082,16 @@ @@ -1082,11 +1082,16 @@
1082 }) 1082 })
1083 }, 1083 },
1084 updateData() { 1084 updateData() {
1085 - console.log(this.temp)  
1086 this.$refs.formData.validate(valid => { 1085 this.$refs.formData.validate(valid => {
1087 if (valid) { 1086 if (valid) {
1088 updateMT1201(this.temp).then(res => { 1087 updateMT1201(this.temp).then(res => {
  1088 + if(res.data.count>0){
  1089 + this.dialogFormVisible = false
  1090 + this.getList()
1089 Message.success(res.data.respMessage) 1091 Message.success(res.data.respMessage)
  1092 + }else {
  1093 + Message.success("数据异常清稍后重试")
  1094 + }
1090 }) 1095 })
1091 } 1096 }
1092 }) 1097 })