Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
5e61f4aa 1 parent f5f837e0

按钮图标增加，顺位查看维度跳转逻辑修改，bug修复

Inline Side-by-side
Showing 11 changed files with 76 additions and 26 deletions
...@@ -11,7 +11,8 @@ export function findSourceFlightRulesApi(data) { ...@@ -11,7 +11,8 @@ export function findSourceFlightRulesApi(data) {
11 // 目标航班查询 11 // 目标航班查询
12 export function findSourceFlightAndFlightDateApi(data) { 12 export function findSourceFlightAndFlightDateApi(data) {
13 return request({ 13 return request({
14 - url: '/sourceFlight/findSourceFlightAndFlightDate', 14 + // url: '/sourceFlight/findSourceFlightAndFlightDate',
15 + url: '/sourceFlight/findActualAllocateFlightList',
15 method: 'post', 16 method: 'post',
16 data: data 17 data: data
17 }) 18 })
......
...@@ -19,7 +19,8 @@ let ductLabels = { ...@@ -19,7 +19,8 @@ let ductLabels = {
19 "7": "预审导出", 19 "7": "预审导出",
20 "8": "预审导入", 20 "8": "预审导入",
21 "9": "航班不推送修改为待推送", 21 "9": "航班不推送修改为待推送",
22 - "10": "回推ACCS" 22 + "10": "回推ACCS",
23 + "11": "航班迁转"
23 } 24 }
24 }, 25 },
25 "menu": {//菜单设置 26 "menu": {//菜单设置
...@@ -62,6 +63,11 @@ let ductLabels = { ...@@ -62,6 +63,11 @@ let ductLabels = {
62 "1": "是", 63 "1": "是",
63 "2": "否", 64 "2": "否",
64 }, 65 },
66 + // "whiteListSwitch": {
67 + // "1": "开启",
68 + // "0": "关闭",
69 + // null: '关闭'
70 + // }
65 }, 71 },
66 "flightRand": {//航班顺位设置 72 "flightRand": {//航班顺位设置
67 "status": { 73 "status": {
...@@ -123,7 +129,8 @@ let ductLabels = { ...@@ -123,7 +129,8 @@ let ductLabels = {
123 "1": "pre-MD cutoff", 129 "1": "pre-MD cutoff",
124 "2": "航班迁转手动释放", 130 "2": "航班迁转手动释放",
125 "3": "预审不通过定时任务", 131 "3": "预审不通过定时任务",
126 - "4": "自动配舱" 132 + "4": "自动配舱",
133 + "5": "航班迁转"
127 }, 134 },
128 "weightMark": { 135 "weightMark": {
129 "1": "增加", 136 "1": "增加",
...@@ -135,6 +142,27 @@ let ductLabels = { ...@@ -135,6 +142,27 @@ let ductLabels = {
135 "0": "关闭", 142 "0": "关闭",
136 "1": "开启" 143 "1": "开启"
137 } 144 }
145 + },
146 + "preMdeSelect": {
147 + "manualRde": {
148 +
149 + },
150 + },
151 + 'goodsLogStation': {
152 + "status": {
153 + "0": "未处理",
154 + "1": "处理中",
155 + "2": "处理成功",
156 + "3": "处理失败"
157 + }
158 + },
159 + "archiveDataTables": {
160 + "status": {
161 + "0": "未处理",
162 + "1": "处理成功",
163 + "2": "处理失败",
164 + "3": "处理中"
165 + }
138 } 166 }
139 } 167 }
140 168
......
...@@ -176,17 +176,17 @@ ...@@ -176,17 +176,17 @@
176 <div style="margin: 0 0 0 10px"> 176 <div style="margin: 0 0 0 10px">
177 <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button> 177 <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
178 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" 178 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
179 - v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading" 179 + v-hasPermi="['allocation:cargo:export']" icon="el-icon-download" @click="xlsx(0)"
180 - :disabled="tableData.length <= 0">{{ 180 + :loading="downLoadingTip.downloading" :disabled="tableData.length <= 0">{{
181 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果" 181 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
182 }}</el-button> 182 }}</el-button>
183 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini" 183 <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
184 - v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading" 184 + v-hasPermi="['allocation:cargo:export']" icon="el-icon-download" @click="xlsx(1)"
185 - :disabled="tableData.length <= 0">{{ 185 + :loading="downLoadingTip.downloading" :disabled="tableData.length <= 0">{{
186 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 186 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
187 }}</el-button> 187 }}</el-button>
188 - <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit" 188 + <el-button type="primary" size="mini" icon="el-icon-plus" v-hasPermi="['allocation:cargo:allocation']"
189 - :disabled="tableSelection.length <= 0">添加到航班</el-button> 189 + @click="addFit" :disabled="tableSelection.length <= 0">添加到航班</el-button>
190 <div class="tips"> 190 <div class="tips">
191 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 191 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
192 <span>总件数:{{ allQty }}</span> 192 <span>总件数:{{ allQty }}</span>
......
...@@ -774,7 +774,10 @@ export default { ...@@ -774,7 +774,10 @@ export default {
774 }) 774 })
775 } else { 775 } else {
776 //航线为空，提示未找到维度数据 776 //航线为空，提示未找到维度数据
777 - if (this.routeSatus == 'flightInformationMaintenancePurple Tail') { 777 + if (this.routeSatus == 'flightInformationMaintenancePurple Tail' || this.routeSatus == 'FlightRandConfig') {
778 + if (this.routeSatus == 'FlightRandConfig') {
779 + this.infoForm.fltDate = ''
780 + }
778 findDestinationFltRuleByFlightNo({ 781 findDestinationFltRuleByFlightNo({
779 purposeOfFlightNo: this.infoForm.fltNo, 782 purposeOfFlightNo: this.infoForm.fltNo,
780 flightRoute: this.infoForm.route, 783 flightRoute: this.infoForm.route,
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150"> 67 <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
68 <template slot-scope="scope"> 68 <template slot-scope="scope">
69 <el-button size="mini" type="text" icon="el-icon-edit" 69 <el-button size="mini" type="text" icon="el-icon-edit"
70 - @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, scope.row.route)">查看配置维度 70 + @click="handleClick(scope.row.actualFlight, 'detail', scope.row.flightDate, ' ', ' ')">查看配置维度
71 </el-button> 71 </el-button>
72 </template> 72 </template>
73 </el-table-column> 73 </el-table-column>
......
...@@ -5,11 +5,12 @@ ...@@ -5,11 +5,12 @@
5 <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel" 5 <el-upload action="/caPreReviewImport/importFlight" name="file" :http-request="uploadExcel"
6 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx" 6 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
7 class="upload-demo" v-hasPermi="['base:caImport:import']"> 7 class="upload-demo" v-hasPermi="['base:caImport:import']">
8 - <el-button type="primary">点击上传</el-button> 8 + <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
9 </el-upload> 9 </el-upload>
10 </el-form-item> 10 </el-form-item>
11 <el-form-item> 11 <el-form-item>
12 - <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:caImport:download']">下载模板</el-button> 12 + <el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
13 + v-hasPermi="['base:caImport:download']">下载模板</el-button>
13 </el-form-item> 14 </el-form-item>
14 </el-form> 15 </el-form>
15 <div style="font-size: 12px; font-weight: 700"> 16 <div style="font-size: 12px; font-weight: 700">
......
...@@ -12,11 +12,12 @@ ...@@ -12,11 +12,12 @@
12 <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel" 12 <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel"
13 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx" 13 :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
14 class="upload-demo" v-hasPermi="['base:flightImport:importFlight']"> 14 class="upload-demo" v-hasPermi="['base:flightImport:importFlight']">
15 - <el-button type="primary">点击上传</el-button> 15 + <el-button icon="el-icon-upload2" type="primary">点击上传</el-button>
16 </el-upload> 16 </el-upload>
17 </el-form-item> 17 </el-form-item>
18 <el-form-item> 18 <el-form-item>
19 - <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']">下载模板 19 + <el-button type="primary" icon="el-icon-download" @click="downloadTempleate"
20 + v-hasPermi="['base:flightImport:exportExcel']">下载模板
20 </el-button> 21 </el-button>
21 </el-form-item> 22 </el-form-item>
22 </el-form> 23 </el-form>
......
...@@ -777,6 +777,7 @@ export default { ...@@ -777,6 +777,7 @@ export default {
777 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false; 777 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
778 // 计算高低价可配 778 // 计算高低价可配
779 // this.LowHighAvailable(); 779 // this.LowHighAvailable();
780 + this.ishighPriceWeightPercent = this.form.highLowPriceFlg === 1 ? false : true
780 } else { 781 } else {
781 this.msgError(response.msg); 782 this.msgError(response.msg);
782 } 783 }
......
...@@ -104,11 +104,17 @@ export default { ...@@ -104,11 +104,17 @@ export default {
104 }, 104 },
105 //提交 105 //提交
106 submit() { 106 submit() {
107 - let obj = {} 107 + let obj = {
108 + goodsList: []
109 + }
108 obj.goodsStation = this.formData.goodsStation 110 obj.goodsStation = this.formData.goodsStation
109 this.formData.goodsList = this.formData.goodsList.replace(/；/g, ";") 111 this.formData.goodsList = this.formData.goodsList.replace(/；/g, ";")
110 if (this.formData.goodsList != null && this.formData.goodsList != '') { 112 if (this.formData.goodsList != null && this.formData.goodsList != '') {
111 - obj.goodsList = this.formData.goodsList.split(';') 113 + this.formData.goodsList.split(';').forEach(item => {
114 + if (item != null && item != '') {
115 + obj.goodsList.push(item)
116 + }
117 + })
112 } 118 }
113 this.$refs['addForm'].validate(val => { 119 this.$refs['addForm'].validate(val => {
114 if (val) { 120 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) {
......
...@@ -153,16 +153,18 @@ ...@@ -153,16 +153,18 @@
153 <div class="pl10 mt20"> 153 <div class="pl10 mt20">
154 <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询 154 <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
155 </el-button> 155 </el-button>
156 - <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'" 156 + <el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
157 - size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{ 157 + :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(0)"
158 + :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
158 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果" 159 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
159 }}</el-button> 160 }}</el-button>
160 - <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'" 161 + <el-button v-hasPermi="['base:cargo:export']" icon="el-icon-download"
161 - size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{ 162 + :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="small" @click="xlse(1)"
163 + :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
162 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 164 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
163 }}</el-button> 165 }}</el-button>
164 - <el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:release']" 166 + <el-button type="primary" size="small" icon="el-icon-s-flag" :disabled="selectTable.length == 0"
165 - @click="release">释放舱位</el-button> 167 + v-hasPermi="['base:cargo:release']" @click="release">释放舱位</el-button>
166 <span class="ml20" style="color: #ffba00">全部导出上限80000条数据</span> 168 <span class="ml20" style="color: #ffba00">全部导出上限80000条数据</span>
167 <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" 169 <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
168 :status="progress == 100 ? 'success' : 'warning'"></el-progress> 170 :status="progress == 100 ? 'success' : 'warning'"></el-progress>
......