朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 14566ae6106c562973fe802c510abdf26e75dcaf 1 个父辈 6f8fbe3a

进出港预报查询页面新增消申报功能

内嵌 并排对比
正在显示 4 个修改的文件 包含 132 行增加 和 8 行删除
@@ -12,6 +12,10 @@ let baseUrlLongtimeplan = 'air-server-transport/transport/longtimeplan' @@ -12,6 +12,10 @@ let baseUrlLongtimeplan = 'air-server-transport/transport/longtimeplan'
12 let baseUrlBillperson = 'air-server-transport/transport/billperson' 12 let baseUrlBillperson = 'air-server-transport/transport/billperson'
13 let baseUrlResultMsg = 'air-server-transport/transport/returnmsg' 13 let baseUrlResultMsg = 'air-server-transport/transport/returnmsg'
14 let baseUrlDynamics = 'air-server-transport/transport/aircraftStaying' 14 let baseUrlDynamics = 'air-server-transport/transport/aircraftStaying'
  15 +let baseUrlCancel = 'air-server-transport/transport/prediction'
  16 +
  17 +//进港预报 取消申报原因
  18 +export const cancelPrediction = params => { return http.post(`${baseUrlCancel}/cancelPrediction`, params); };
15 19
16 20
17 //在港动态 21 //在港动态
@@ -162,7 +162,7 @@ @@ -162,7 +162,7 @@
162 ], 162 ],
163 stayid: [ 163 stayid: [
164 {required: true, message: '请选择', trigger: 'blur'}, 164 {required: true, message: '请选择', trigger: 'blur'},
165 - { pattern: /^[0-9]{6}$/, message: '请输入正确机坪号码', trigger: 'blur' } 165 + // { pattern: /^[0-9]{6}$/, message: '请输入正确机坪号码', trigger: 'blur' }
166 ], 166 ],
167 }, 167 },
168 tableData:[], 168 tableData:[],
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 fixed="right" 92 fixed="right"
93 prop="" 93 prop=""
94 label="报文操作" 94 label="报文操作"
95 - width="200"> 95 + width="280">
96 <template slot-scope="scope"> 96 <template slot-scope="scope">
97 <el-button 97 <el-button
98 size="mini" 98 size="mini"
@@ -100,6 +100,10 @@ @@ -100,6 +100,10 @@
100 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 100 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
101 <el-button 101 <el-button
102 size="mini" 102 size="mini"
  103 + type="warning"
  104 + @click="trans_cancle(scope.row)">取消申报</el-button>
  105 + <el-button
  106 + size="mini"
103 type="danger" 107 type="danger"
104 @click="handleDel(scope.$index, scope.row)">删除</el-button> 108 @click="handleDel(scope.$index, scope.row)">删除</el-button>
105 </template> 109 </template>
@@ -122,13 +126,30 @@ @@ -122,13 +126,30 @@
122 <!--查看回执弹框--> 126 <!--查看回执弹框-->
123 <el-dialog title="回执明细" :visible.sync="dialogTableVisible"> 127 <el-dialog title="回执明细" :visible.sync="dialogTableVisible">
124 <el-table :data="gridData"> 128 <el-table :data="gridData">
125 - <el-table-column property="sendtime" label="操作时间" ></el-table-column> 129 + <el-table-column property="sendtime" label="操作时间"></el-table-column>
126 <el-table-column property="createBy" label="操作人" ></el-table-column> 130 <el-table-column property="createBy" label="操作人" ></el-table-column>
127 <el-table-column property="flightNo" label="航班号"></el-table-column> 131 <el-table-column property="flightNo" label="航班号"></el-table-column>
128 - <el-table-column property="flightDate" label="航班日期" ></el-table-column>  
129 - <el-table-column property="receiptContent" label="回执内容" ></el-table-column> 132 + <el-table-column property="flightDate" label="航班日期"></el-table-column>
  133 + <el-table-column property="receiptContent" label="回执内容"></el-table-column>
130 </el-table> 134 </el-table>
131 </el-dialog> 135 </el-dialog>
  136 +<!-- 取消申报弹框-->
  137 + <el-dialog title="取消申报" :visible.sync="dialogFormVisible">
  138 + <el-form :model="form">
  139 + <el-form-item label="取消原因" prop="content" >
  140 + <el-input
  141 + v-model="form.content"
  142 + type="textarea"
  143 + :rows="2" required="required"
  144 + placeholder="取消原因必填"
  145 + />
  146 + </el-form-item>
  147 + </el-form>
  148 + <div slot="footer" class="dialog-footer">
  149 + <el-button @click="dialogFormVisible = false">取 消</el-button>
  150 + <el-button type="primary" @click="trans_add('form')">确 定</el-button>
  151 + </div>
  152 + </el-dialog>
132 </el-main> 153 </el-main>
133 </el-container> 154 </el-container>
134 </template> 155 </template>
@@ -151,7 +172,7 @@ @@ -151,7 +172,7 @@
151 172
152 </style> 173 </style>
153 <script> 174 <script>
154 - import {editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport"; 175 + import {addAircraftStaying, editPrediction, selectPrediction, selectReturnMsg, cancelPrediction} from "../../api/transport";
155 176
156 export default { 177 export default {
157 data(){ 178 data(){
@@ -169,6 +190,13 @@ @@ -169,6 +190,13 @@
169 tableloading:false, 190 tableloading:false,
170 gridData:[], 191 gridData:[],
171 dialogTableVisible: false, 192 dialogTableVisible: false,
  193 + form:{
  194 + content:''
  195 + },
  196 + dialogFormVisible: false,
  197 + textarea: '',
  198 + row2:undefined
  199 +
172 } 200 }
173 }, 201 },
174 methods: { 202 methods: {
@@ -183,6 +211,38 @@ @@ -183,6 +211,38 @@
183 this.gridData=response; 211 this.gridData=response;
184 }); 212 });
185 }, 213 },
  214 + //取消申报
  215 + trans_cancle(row){
  216 + this.dialogFormVisible=true;
  217 + this.row2=row;
  218 + },
  219 + trans_add(form) {
  220 + this.dialogFormVisible=true;
  221 + this.row2.content=this.form.content;
  222 + console.log(this.row2);
  223 + // 进行表单的预验证
  224 + // this.$refs.form.validate(valid => {
  225 + // // 未通过，表单预校验
  226 + // if (!valid) return
  227 +
  228 + cancelPrediction(this.row2).then((response) => {
  229 + const res = response.data
  230 + // 添加失败
  231 + if (res.code !== '200') {
  232 + // 关闭加载
  233 + return this.$message.error(res.msg)
  234 + }
  235 + // 添加，成功
  236 + this.$message.success(res.msg)
  237 + // 隐藏对话框
  238 + this.dialogFormVisible = false
  239 + // 刷新列表
  240 + this.submitForm()
  241 + }).catch(error => {
  242 + this.$message.error(error.toString())
  243 + })
  244 + // })
  245 + },
186 //分页 246 //分页
187 handleSizeChange(val) { 247 handleSizeChange(val) {
188 this.pageSize=val; 248 this.pageSize=val;
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <el-table-column 96 <el-table-column
97 prop="" 97 prop=""
98 label="报文操作" 98 label="报文操作"
99 - width="200"> 99 + width="280">
100 <template slot-scope="scope"> 100 <template slot-scope="scope">
101 <el-button 101 <el-button
102 size="mini" 102 size="mini"
@@ -104,6 +104,10 @@ @@ -104,6 +104,10 @@
104 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button> 104 @click="selectDetail(scope.$index,scope.row)">查看回执</el-button>
105 <el-button 105 <el-button
106 size="mini" 106 size="mini"
  107 + type="warning"
  108 + @click="trans_cancle(scope.row)">取消申报</el-button>
  109 + <el-button
  110 + size="mini"
107 type="danger" 111 type="danger"
108 @click="handleDel(scope.$index, scope.row)">删除</el-button> 112 @click="handleDel(scope.$index, scope.row)">删除</el-button>
109 </template> 113 </template>
@@ -133,6 +137,24 @@ @@ -133,6 +137,24 @@
133 <el-table-column property="receiptContent" label="回执内容" ></el-table-column> 137 <el-table-column property="receiptContent" label="回执内容" ></el-table-column>
134 </el-table> 138 </el-table>
135 </el-dialog> 139 </el-dialog>
  140 + <!-- 取消申报弹框-->
  141 + <el-dialog title="取消申报" :visible.sync="dialogFormVisible">
  142 + <el-form :model="form">
  143 + <el-form-item label="取消原因" prop="content" >
  144 + <el-input
  145 + v-model="form.content"
  146 + type="textarea"
  147 + :rows="2" required="required"
  148 + placeholder="取消原因必填"
  149 + />
  150 + </el-form-item>
  151 + </el-form>
  152 + <div slot="footer" class="dialog-footer">
  153 + <el-button @click="dialogFormVisible = false">取 消</el-button>
  154 + <el-button type="primary" @click="trans_add('form')">确 定</el-button>
  155 + </div>
  156 + </el-dialog>
  157 +
136 </el-main> 158 </el-main>
137 </el-container> 159 </el-container>
138 </template> 160 </template>
@@ -155,7 +177,7 @@ @@ -155,7 +177,7 @@
155 177
156 </style> 178 </style>
157 <script> 179 <script>
158 - import {editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport"; 180 + import {cancelPrediction, editPrediction, selectPrediction, selectReturnMsg} from "../../api/transport";
159 181
160 export default { 182 export default {
161 data(){ 183 data(){
@@ -172,6 +194,12 @@ @@ -172,6 +194,12 @@
172 tableloading:false, 194 tableloading:false,
173 gridData:[], 195 gridData:[],
174 dialogTableVisible: false, 196 dialogTableVisible: false,
  197 + form:{
  198 + content:''
  199 + },
  200 + dialogFormVisible: false,
  201 + textarea: '',
  202 + row2:undefined
175 } 203 }
176 }, 204 },
177 methods: { 205 methods: {
@@ -208,6 +236,38 @@ @@ -208,6 +236,38 @@
208 this.total = response.total; 236 this.total = response.total;
209 }); 237 });
210 }, 238 },
  239 + //取消申报
  240 + trans_cancle(row){
  241 + this.dialogFormVisible=true;
  242 + this.row2=row;
  243 + },
  244 + trans_add(form) {
  245 + this.dialogFormVisible=true;
  246 + this.row2.content=this.form.content;
  247 + console.log(this.row2);
  248 + // 进行表单的预验证
  249 + // this.$refs.form.validate(valid => {
  250 + // // 未通过，表单预校验
  251 + // if (!valid) return
  252 +
  253 + cancelPrediction(this.row2).then((response) => {
  254 + const res = response.data
  255 + // 添加失败
  256 + if (res.code !== '200') {
  257 + // 关闭加载
  258 + return this.$message.error(res.msg)
  259 + }
  260 + // 添加，成功
  261 + this.$message.success(res.msg)
  262 + // 隐藏对话框
  263 + this.dialogFormVisible = false
  264 + // 刷新列表
  265 + this.submitForm()
  266 + }).catch(error => {
  267 + this.$message.error(error.toString())
  268 + })
  269 + // })
  270 + },
211 //列表删除功能 271 //列表删除功能
212 handleDel(index, row) { 272 handleDel(index, row) {
213 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', { 273 this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {