朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 8bbac6b1b341b6e3dbd29c1f05b0a29f5ef01062 1 个父辈 a248716d

解决一傻逼 提出的无理要求

内嵌 并排对比
正在显示 3 个修改的文件 包含 68 行增加 和 11 行删除
@@ -11,6 +11,8 @@ export const aisleList = params => {return http.get(`${base}/businesstype/aisleL @@ -11,6 +11,8 @@ export const aisleList = params => {return http.get(`${base}/businesstype/aisleL
11 11
12 export const barCodeDel = params => {return http.get(`${base}/businesstype/barCodeDel`, params);}; 12 export const barCodeDel = params => {return http.get(`${base}/businesstype/barCodeDel`, params);};
13 13
  14 +export const forwarderBarCodeDel = params => {return http.get(`${base}/businesstype/forwarderBarCodeDel`, params);};
  15 +
14 export const remove = params => {return http.get(`${base}/businesstype/remove`, params);}; 16 export const remove = params => {return http.get(`${base}/businesstype/remove`, params);};
15 17
16 export const save = params => {return axios.post(`${base}/businesstype/save`, params);}; 18 export const save = params => {return axios.post(`${base}/businesstype/save`, params);};
@@ -60,11 +60,11 @@ @@ -60,11 +60,11 @@
60 </el-table-column> 60 </el-table-column>
61 <el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效"> 61 <el-table-column prop="isvalid" :formatter="isvalidFormatter" label="是否失效">
62 </el-table-column> 62 </el-table-column>
63 - <el-table-column prop="trailerFrameNo" label="车牌号" width="100"> 63 + <el-table-column prop="trailerFrameNo" label="车牌号" width="90">
64 </el-table-column> 64 </el-table-column>
65 <el-table-column prop="agentname" label="挂靠单位"> 65 <el-table-column prop="agentname" label="挂靠单位">
66 </el-table-column> 66 </el-table-column>
67 - <el-table-column prop="endstation" :formatter="endstationName" label="目的场站" width="100"> 67 + <el-table-column prop="endstation" :formatter="endstationName" label="目的场站" width="90">
68 </el-table-column> 68 </el-table-column>
69 <el-table-column prop="aisle" :formatter="aisleName" label="卡口" width="100"> 69 <el-table-column prop="aisle" :formatter="aisleName" label="卡口" width="100">
70 </el-table-column> 70 </el-table-column>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </el-table-column> 80 </el-table-column>
81 <el-table-column prop="cocode" label="货物类型"> 81 <el-table-column prop="cocode" label="货物类型">
82 </el-table-column> 82 </el-table-column>
83 - <el-table-column prop="barcode" label="二维码编号" width="110"> 83 + <el-table-column prop="barcode" label="二维码编号" width="100">
84 </el-table-column> 84 </el-table-column>
85 <el-table-column prop="turnoverflag" :formatter="turnoverflagFormatter" label="进出场站"> 85 <el-table-column prop="turnoverflag" :formatter="turnoverflagFormatter" label="进出场站">
86 </el-table-column> 86 </el-table-column>
@@ -88,12 +88,13 @@ @@ -88,12 +88,13 @@
88 </el-table-column> 88 </el-table-column>
89 <el-table-column prop="updateDate" label="更新时间" width="155"> 89 <el-table-column prop="updateDate" label="更新时间" width="155">
90 </el-table-column> 90 </el-table-column>
91 - <el-table-column fixed="right" label="操作" width="150"> 91 + <el-table-column fixed="right" label="操作" width="245">
92 <template slot-scope="scope"> 92 <template slot-scope="scope">
93 <el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button> 93 <el-button type="success" @click="opneEdit(scope.$index, scope.row)" size="mini">修改</el-button>
94 <!-- <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>--> 94 <!-- <el-button type="danger" @click="deleteClick(scope.$index, scope.row)" size="mini">删除</el-button>-->
95 <!-- <el-button type="warning" disabled size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>--> 95 <!-- <el-button type="warning" disabled size="mini" style="margin-top: 2px;margin-left: 0px">审核</el-button>-->
96 <el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button> 96 <el-button type="info" @click="barCodeDelete(scope.$index, scope.row)" size="mini">异常</el-button>
  97 + <el-button type="info" @click="forwarderDelete(scope.$index, scope.row)" size="mini">取消申请</el-button>
97 </template> 98 </template>
98 </el-table-column> 99 </el-table-column>
99 </el-table> 100 </el-table>
@@ -360,7 +361,7 @@ @@ -360,7 +361,7 @@
360 </section> 361 </section>
361 </template> 362 </template>
362 <script> 363 <script>
363 - import {list, aisleList, barCodeDel, remove, edit} from '../../api/remote_interface/byont_import'; 364 + import {list, aisleList, barCodeDel, remove, edit, forwarderBarCodeDel} from '../../api/remote_interface/byont_import';
364 import {getYardList as yartList} from "../../api/station_dispatch"; 365 import {getYardList as yartList} from "../../api/station_dispatch";
365 export default { 366 export default {
366 filters: { 367 filters: {
@@ -596,6 +597,44 @@ @@ -596,6 +597,44 @@
596 597
597 }); 598 });
598 }, 599 },
  600 + // 取消申请
  601 + forwarderDelete(index, row) {
  602 + this.$confirm('确认取消吗？', '提示', {}).then(() => {
  603 + let para = {
  604 + trailerFrameNo: row.trailerFrameNo,
  605 + barCode: row.barcode
  606 + }
  607 + forwarderBarCodeDel(para).then((res) =>{
  608 + if (res.data.code == 200){
  609 + this.$message({
  610 + message: res.data.msg,
  611 + type: 'success'
  612 + });
  613 + this.getList();
  614 + }else if (res.data.code == 201){
  615 + this.$message({
  616 + message: res.data.msg,
  617 + type: 'error'
  618 +
  619 + });
  620 + }else if (res.data.code == 202){
  621 + this.$message({
  622 + message: res.data.msg,
  623 + type: 'error'
  624 +
  625 + });
  626 + }
  627 + }).catch((error)=>{
  628 + this.$message({
  629 + message: error,
  630 + type: 'error'
  631 + });
  632 + });
  633 +
  634 + }).catch(() =>{
  635 +
  636 + });
  637 + },
599 // 删除 638 // 删除
600 deleteClick(index, row){ 639 deleteClick(index, row){
601 this.$confirm('确认删除吗？', '提示', {}).then(() => { 640 this.$confirm('确认删除吗？', '提示', {}).then(() => {
@@ -68,7 +68,6 @@ @@ -68,7 +68,6 @@
68 <el-input 68 <el-input
69 type="text" 69 type="text"
70 v-model="addForm.remark3" 70 v-model="addForm.remark3"
71 - maxlength="10"  
72 show-word-limit 71 show-word-limit
73 size="small" style="width: 180px"> 72 size="small" style="width: 180px">
74 </el-input> 73 </el-input>
@@ -93,7 +92,7 @@ @@ -93,7 +92,7 @@
93 </el-row> 92 </el-row>
94 <el-row> 93 <el-row>
95 <el-form-item label="场站选择：" prop="endstationList"> 94 <el-form-item label="场站选择：" prop="endstationList">
96 - <el-select v-model="addForm.endstationList" multiple placeholder="请选择"> 95 + <el-select v-model="addForm.endstationList" multiple placeholder="请选择">
97 <el-option 96 <el-option
98 v-for="item in options" 97 v-for="item in options"
99 :key="item.stationId" 98 :key="item.stationId"
@@ -446,11 +445,28 @@ @@ -446,11 +445,28 @@
446 let _this = this; 445 let _this = this;
447 this.$refs.addForm.validate((valid) => { 446 this.$refs.addForm.validate((valid) => {
448 if (valid) { 447 if (valid) {
449 - this.$confirm('确认提交吗？', '提示', {}).then(() => {  
450 - _this.addsubmit();  
451 - }).catch(() =>{ 448 + // 调拨分拨 最少选择两个场站
  449 + if (this.addForm.businesstype == '分拨业务' || this.addForm.businesstype =='调拨业务'){
  450 + if (this.addForm.endstationList.length > 1){
  451 + console.log("222222")
  452 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  453 + _this.addsubmit();
  454 + }).catch(() =>{
452 455
453 - }); 456 + });
  457 + }else {
  458 + this.$message({
  459 + message: '场站最少选择两个',
  460 + type: "error"
  461 + })
  462 + }
  463 + }else {
  464 + this.$confirm('确认提交吗？', '提示', {}).then(() => {
  465 + _this.addsubmit();
  466 + }).catch(() =>{
  467 +
  468 + });
  469 + }
454 } else { 470 } else {
455 console.log('error submit!!'); 471 console.log('error submit!!');
456 return false; 472 return false;