jinhui.wang

手动配舱按钮状态修复

...@@ -282,7 +282,7 @@ ...@@ -282,7 +282,7 @@
282 size="mini" 282 size="mini"
283 v-hasPermi="['allocation:cargo:allocation']" 283 v-hasPermi="['allocation:cargo:allocation']"
284 @click="addFit" 284 @click="addFit"
285 - :disabled="tableSelection.length <= 0 || formData.accsPool!='OSPR'" 285 + :disabled="tableSelection.length <= 0"
286 >添加到航班</el-button 286 >添加到航班</el-button
287 > 287 >
288 <div class="tips"> 288 <div class="tips">
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-dialog 3 + <el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 - title="货物配舱" 4 + :append-to-body="true">
5 - width="80%"
6 - :visible.sync="dialogVisible"
7 - :close-on-click-modal="false"
8 - :append-to-body="true"
9 - >
10 <el-divider content-position="left">已选货物信息</el-divider> 5 <el-divider content-position="left">已选货物信息</el-divider>
11 - <el-table 6 + <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
12 - :data="tableData" 7 + style="width: 100%">
13 - size="mini"
14 - height="200"
15 - max-height="200"
16 - border
17 - stripe
18 - highlight-current-row
19 - style="width: 100%"
20 - >
21 <el-table-column type="index" label="序号" align="center"> 8 <el-table-column type="index" label="序号" align="center">
22 </el-table-column> 9 </el-table-column>
23 - <el-table-column 10 + <el-table-column v-for="(item, index) in cargoHeader" header-align="center" align="center" :prop="item.value"
24 - v-for="(item, index) in cargoHeader" 11 + :label="item.name" :key="index" :show-overflow-tooltip="true" :formatter="formatter">
25 - header-align="center"
26 - align="center"
27 - :prop="item.value"
28 - :label="item.name"
29 - :key="index"
30 - :show-overflow-tooltip="true"
31 - :formatter="formatter"
32 - >
33 </el-table-column> 12 </el-table-column>
34 </el-table> 13 </el-table>
35 - <el-form 14 + <el-form ref="form" label-position="right" label-width="auto" style="width: 400px; margin: 30px auto"
36 - ref="form" 15 + :model="formData" :rules="rules">
37 - label-position="right"
38 - label-width="auto"
39 - style="width: 400px; margin: 30px auto"
40 - >
41 <el-form-item label="航班号" prop="fltNo"> 16 <el-form-item label="航班号" prop="fltNo">
42 - <el-input 17 + <el-input v-model="fltNo" size="medium" placeholder="请输入航班号" maxlength="10" style="width: 350px"></el-input>
43 - v-model="fltNo"
44 - size="medium"
45 - placeholder="请输入航班号"
46 - style="width: 350px"
47 - ></el-input>
48 </el-form-item> 18 </el-form-item>
49 <el-form-item label="航班日期:" prop="fltDate"> 19 <el-form-item label="航班日期:" prop="fltDate">
50 - <el-date-picker 20 + <el-date-picker v-model="formData.fltDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
51 - v-model="formData.fltDate" 21 + size="medium" style="width: 350px">
52 - type="date"
53 - placeholder="选择日期"
54 - value-format="yyyy-MM-dd"
55 - size="medium"
56 - style="width: 350px"
57 - >
58 </el-date-picker> 22 </el-date-picker>
59 </el-form-item> 23 </el-form-item>
60 </el-form> 24 </el-form>
...@@ -116,11 +80,11 @@ export default { ...@@ -116,11 +80,11 @@ export default {
116 { 80 {
117 required: true, 81 required: true,
118 message: "航班日期不能为空", 82 message: "航班日期不能为空",
119 - trigger: "change", 83 + trigger: "blur",
120 }, 84 },
121 ], 85 ],
122 }, 86 },
123 - loading:false, 87 + loading: false,
124 }; 88 };
125 }, 89 },
126 methods: { 90 methods: {
...@@ -134,7 +98,7 @@ export default { ...@@ -134,7 +98,7 @@ export default {
134 }, 98 },
135 //确定配舱 99 //确定配舱
136 submit() { 100 submit() {
137 - this.loading= true; 101 + this.loading = true;
138 let arr = []; 102 let arr = [];
139 this.tableData.forEach((item) => { 103 this.tableData.forEach((item) => {
140 arr.push(item.id); 104 arr.push(item.id);
...@@ -173,7 +137,6 @@ export default { ...@@ -173,7 +137,6 @@ export default {
173 } 137 }
174 }); 138 });
175 this.cleaerForm(); 139 this.cleaerForm();
176 - this.loading = false;
177 this.$emit("dialogBeforeClose", { close: false, reload: true }); 140 this.$emit("dialogBeforeClose", { close: false, reload: true });
178 }) 141 })
179 .catch(() => { 142 .catch(() => {
...@@ -183,7 +146,6 @@ export default { ...@@ -183,7 +146,6 @@ export default {
183 type: "success", 146 type: "success",
184 }); 147 });
185 this.cleaerForm(); 148 this.cleaerForm();
186 - this.loading = false;
187 this.$emit("dialogBeforeClose", { 149 this.$emit("dialogBeforeClose", {
188 close: false, 150 close: false,
189 reload: true, 151 reload: true,
...@@ -196,7 +158,7 @@ export default { ...@@ -196,7 +158,7 @@ export default {
196 type: "warning", 158 type: "warning",
197 }); 159 });
198 } 160 }
199 - }).catch(()=>{ 161 + }).catch(() => {
200 this.loading = false; 162 this.loading = false;
201 }); 163 });
202 } else { 164 } else {
...@@ -209,13 +171,14 @@ export default { ...@@ -209,13 +171,14 @@ export default {
209 }, 171 },
210 dialogBeforeClose() { 172 dialogBeforeClose() {
211 this.cleaerForm(); 173 this.cleaerForm();
174 + this.$refs['form'].clearValidate();
212 this.$emit("dialogBeforeClose", { close: false, reload: true }); 175 this.$emit("dialogBeforeClose", { close: false, reload: true });
213 }, 176 },
214 - formatter(row, column, cellValue, index){ 177 + formatter(row, column, cellValue, index) {
215 - if(column.property == "cargoRulesStatus"){ 178 + if (column.property == "cargoRulesStatus") {
216 - if(cellValue == 1){ 179 + if (cellValue == 1) {
217 return "手动" 180 return "手动"
218 - }else{ 181 + } else {
219 return "自动" 182 return "自动"
220 } 183 }
221 } 184 }
......