wms / wms4_zhongputaicang · Commits

Commit 7807abcfcb6ee7126ff1cc6be6d8120e6367c2b6

Authored by 易文鹏
1 parent 059c12ea
develop

状态高亮

Inline Side-by-side
Showing 12 changed files with 334 additions and 83 deletions
ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
  View file @7807abc
... ... @@ -23,7 +23,7 @@
23 23 v-model="queryParam.containerTypeCode"
24 24 >
25 25 <a-select-option v-for="item in containerTypeList" :key="item.name" :value="item.code"
26   - >{{ item.name }}
  26 + >{{ item.name }}
27 27 </a-select-option>
28 28 </a-select>
29 29 </a-form-item>
... ... @@ -54,7 +54,7 @@
54 54 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
55 55 <a @click="handleToggleSearch" style="margin-left: 8px">
56 56 {{ toggleSearchStatus ? '收起' : '展开' }}
57   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
  57 + <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
58 58 </a>
59 59 </span>
60 60 </a-col>
... ... @@ -83,13 +83,13 @@
83 83 <a-dropdown v-if="selectedRowKeys.length > 0">
84 84 <a-menu slot="overlay" v-has="'container:deleteBatch'">
85 85 <a-menu-item key="1" @click="batchDel">
86   - <a-icon type="delete" />
  86 + <a-icon type="delete"/>
87 87 删除
88 88 </a-menu-item>
89 89 </a-menu>
90 90 <a-button style="margin-left: 8px">
91 91 批量操作
92   - <a-icon type="down" />
  92 + <a-icon type="down"/>
93 93 </a-button>
94 94 </a-dropdown>
95 95 </div>
... ... @@ -116,6 +116,19 @@
116 116 class="j-table-force-nowrap"
117 117 @change="handleTableChange"
118 118 >
  119 +
  120 + <span slot="status_dictText" slot-scope="status_dictText">
  121 + <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
  122 + {{ status_dictText }}
  123 + </a-tag>
  124 + </span>
  125 +
  126 + <span slot="fillStatus_dictText" slot-scope="fillStatus_dictText">
  127 + <a-tag :key="fillStatus_dictText" :color="getStatusColor(fillStatus_dictText)">
  128 + {{ fillStatus_dictText }}
  129 + </a-tag>
  130 + </span>
  131 +
119 132 <span slot="zoneCode" slot-scope="zoneCode">
120 133 <a-tag :key="zoneCode" color="blue">
121 134 {{ solutionZoneCode(zoneCode) }}
... ... @@ -175,12 +188,12 @@
175 188  
176 189 <script>
177 190 import '@/assets/less/TableExpand.less'
178   -import { mixinDevice } from '@/utils/mixin'
179   -import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  191 +import {mixinDevice} from '@/utils/mixin'
  192 +import {JeecgListMixin} from '@/mixins/JeecgListMixin'
180 193 import ContainerModal from './modules/ContainerModal'
181   -import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
182   -import { getZoneList } from '@/api/api'
183   -import { getContainerTypeList } from '@/api/api'
  194 +import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
  195 +import {getZoneList} from '@/api/api'
  196 +import {getContainerTypeList} from '@/api/api'
184 197 import ContainerEditModal from './modules/ContainerEditModal'
185 198 import ContainerPrintModal from './modules/ContainerPrintModal'
186 199  
... ... @@ -205,7 +218,7 @@ export default {
205 218 key: 'rowIndex',
206 219 width: 60,
207 220 align: 'center',
208   - customRender: function(t, r, index) {
  221 + customRender: function (t, r, index) {
209 222 return parseInt(index) + 1
210 223 }
211 224 },
... ... @@ -224,17 +237,19 @@ export default {
224 237 align: 'center',
225 238 dataIndex: 'containerTypeCode',
226 239 key: 'containerTypeCode',
227   - scopedSlots: { customRender: 'containerTypeCode' }
  240 + scopedSlots: {customRender: 'containerTypeCode'}
228 241 },
229 242 {
230 243 title: '容器状态',
231 244 align: 'center',
232   - dataIndex: 'status_dictText'
  245 + dataIndex: 'status_dictText',
  246 + scopedSlots: {customRender: 'status_dictText'}
233 247 },
234 248 {
235 249 title: '容器填充状态',
236 250 align: 'center',
237   - dataIndex: 'fillStatus_dictText'
  251 + dataIndex: 'fillStatus_dictText',
  252 + scopedSlots: {customRender: 'fillStatus_dictText'}
238 253 },
239 254 {
240 255 title: '创建人',
... ... @@ -262,7 +277,7 @@ export default {
262 277 align: 'center',
263 278 fixed: 'right',
264 279 width: 147,
265   - scopedSlots: { customRender: 'action' }
  280 + scopedSlots: {customRender: 'action'}
266 281 }
267 282 ],
268 283 url: {
... ... @@ -281,25 +296,38 @@ export default {
281 296 this.loadFrom()
282 297 },
283 298 computed: {
284   - importExcelUrl: function() {
  299 + importExcelUrl: function () {
285 300 return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
286 301 }
287 302 },
288 303 methods: {
289   - initDictConfig() {},
  304 + getStatusColor(status) {
  305 + const colors = {
  306 + '空闲': 'green',
  307 + '锁定': 'blue',
  308 +
  309 + '空盘': 'lightgray',
  310 + '有货': 'purple',
  311 + '满盘': 'red',
  312 + default: 'default'
  313 + };
  314 + return colors[status] || colors.default;
  315 + },
  316 + initDictConfig() {
  317 + },
290 318 getSuperFieldList() {
291 319 let fieldList = []
292   - fieldList.push({ type: 'string', value: 'code', text: '容器编码', dictCode: '' })
293   - fieldList.push({ type: 'string', value: 'companyCode', text: '货主', dictCode: '' })
294   - fieldList.push({ type: 'string', value: 'locationCode', text: '库位编码', dictCode: '' })
  320 + fieldList.push({type: 'string', value: 'code', text: '容器编码', dictCode: ''})
  321 + fieldList.push({type: 'string', value: 'companyCode', text: '货主', dictCode: ''})
  322 + fieldList.push({type: 'string', value: 'locationCode', text: '库位编码', dictCode: ''})
295 323 // fieldList.push({type:'string',value:'zoneCode',text:'库区编码',dictCode:''})
296   - fieldList.push({ type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: '' })
297   - fieldList.push({ type: 'string', value: 'status', text: '容器状态', dictCode: 'container_status' })
298   - fieldList.push({ type: 'string', value: 'fillStatus', text: '容器填充状态', dictCode: 'fill_status' })
299   - fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
300   - fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
301   - fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
302   - fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
  324 + fieldList.push({type: 'string', value: 'containerTypeCode', text: '容器类型', dictCode: ''})
  325 + fieldList.push({type: 'string', value: 'status', text: '容器状态', dictCode: 'container_status'})
  326 + fieldList.push({type: 'string', value: 'fillStatus', text: '容器填充状态', dictCode: 'fill_status'})
  327 + fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
  328 + fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
  329 + fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
  330 + fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
303 331 this.superFieldList = fieldList
304 332 },
305 333 editForm(record) {
... ...
ant-design-vue-jeecg/src/views/system/config/LocationList.vue
  View file @7807abc
... ... @@ -16,7 +16,7 @@
16 16 </a-col>
17 17 <a-col :xl="6" :lg="7" :md="8" :sm="24">
18 18 <a-form-item label="状态">
19   - <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status" />
  19 + <j-dict-select-tag placeholder="请选择状态" v-model="queryParam.status" dictCode="location_status"/>
20 20 </a-form-item>
21 21 </a-col>
22 22 <template v-if="toggleSearchStatus">
... ... @@ -70,17 +70,17 @@
70 70 </a-col>
71 71 <a-col :xl="6" :lg="7" :md="8" :sm="24">
72 72 <a-form-item label="高低位">
73   - <j-dict-select-tag placeholder="请输入高低位" v-model="queryParam.high" dictCode="high_status" />
  73 + <j-dict-select-tag placeholder="请输入高低位" v-model="queryParam.high" dictCode="high_status"/>
74 74 </a-form-item>
75 75 </a-col>
76 76 <a-col :xl="6" :lg="7" :md="8" :sm="24">
77 77 <a-form-item label="内外侧">
78   - <j-dict-select-tag placeholder="请选择内外侧" v-model="queryParam.rowFlag" dictCode="row_type" />
  78 + <j-dict-select-tag placeholder="请选择内外侧" v-model="queryParam.rowFlag" dictCode="row_type"/>
79 79 </a-form-item>
80 80 </a-col>
81 81 <a-col :xl="6" :lg="7" :md="8" :sm="24">
82 82 <a-form-item label="是否可用">
83   - <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status" />
  83 + <j-dict-select-tag placeholder="请选择是否可用" v-model="queryParam.enable" dictCode="enable_status"/>
84 84 </a-form-item>
85 85 </a-col>
86 86 </template>
... ... @@ -90,7 +90,7 @@
90 90 <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
91 91 <a @click="handleToggleSearch" style="margin-left: 8px">
92 92 {{ toggleSearchStatus ? '收起' : '展开' }}
93   - <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
  93 + <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
94 94 </a>
95 95 </span>
96 96 </a-col>
... ... @@ -121,13 +121,13 @@
121 121 <a-dropdown v-if="selectedRowKeys.length > 0">
122 122 <a-menu slot="overlay" v-has="'location:deleteBatch'">
123 123 <a-menu-item key="1" @click="batchDel">
124   - <a-icon type="delete" />
  124 + <a-icon type="delete"/>
125 125 删除
126 126 </a-menu-item>
127 127 </a-menu>
128 128 <a-button style="margin-left: 8px">
129 129 批量操作
130   - <a-icon type="down" />
  130 + <a-icon type="down"/>
131 131 </a-button>
132 132 </a-dropdown>
133 133 </div>
... ... @@ -154,6 +154,25 @@
154 154 class="j-table-force-nowrap"
155 155 @change="handleTableChange"
156 156 >
  157 +
  158 + <span slot="rowFlag_dictText" slot-scope="rowFlag_dictText">
  159 + <a-tag :key="rowFlag_dictText" :color="getStatusColor(rowFlag_dictText)">
  160 + {{ rowFlag_dictText }}
  161 + </a-tag>
  162 + </span>
  163 +
  164 + <span slot="high_dictText" slot-scope="high_dictText">
  165 + <a-tag :key="high_dictText" :color="getStatusColor(high_dictText)">
  166 + {{ high_dictText }}
  167 + </a-tag>
  168 + </span>
  169 +
  170 + <span slot="status_dictText" slot-scope="status_dictText">
  171 + <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
  172 + {{ status_dictText }}
  173 + </a-tag>
  174 + </span>
  175 +
157 176 <span slot="locationTypeCode" slot-scope="locationTypeCode">
158 177 <a-tag :key="locationTypeCode" color="pink">
159 178 {{ solutionLocationType(locationTypeCode) }}
... ... @@ -213,12 +232,12 @@
213 232  
214 233 <script>
215 234 import '@/assets/less/TableExpand.less'
216   -import { mixinDevice } from '@/utils/mixin'
217   -import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  235 +import {mixinDevice} from '@/utils/mixin'
  236 +import {JeecgListMixin} from '@/mixins/JeecgListMixin'
218 237 import LocationModal from './modules/LocationModal'
219   -import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
220   -import { getLocationTypeList } from '@/api/api'
221   -import { getZoneList } from '@/api/api'
  238 +import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
  239 +import {getLocationTypeList} from '@/api/api'
  240 +import {getZoneList} from '@/api/api'
222 241 import LocationBatchAddModal from './modules/LocationBatchAddModal'
223 242 import LocationPrintModal from './modules/LocationPrintModal'
224 243  
... ... @@ -255,21 +274,22 @@ export default {
255 274 {
256 275 title: '状态',
257 276 align: 'center',
258   - dataIndex: 'status_dictText'
  277 + dataIndex: 'status_dictText',
  278 + scopedSlots: {customRender: 'status_dictText'}
259 279 },
260 280 {
261 281 title: '库区',
262 282 align: 'center',
263 283 dataIndex: 'zoneCode',
264 284 key: 'zoneCode',
265   - scopedSlots: { customRender: 'zoneCode' }
  285 + scopedSlots: {customRender: 'zoneCode'}
266 286 },
267 287 {
268 288 title: '库位类型',
269 289 align: 'center',
270 290 dataIndex: 'locationTypeCode',
271 291 key: 'locationTypeCode',
272   - scopedSlots: { customRender: 'locationTypeCode' }
  292 + scopedSlots: {customRender: 'locationTypeCode'}
273 293 },
274 294 {
275 295 title: '巷道',
... ... @@ -294,12 +314,14 @@ export default {
294 314 {
295 315 title: '高低位',
296 316 align: 'center',
297   - dataIndex: 'high_dictText'
  317 + dataIndex: 'high_dictText',
  318 + scopedSlots: {customRender: 'high_dictText'}
298 319 },
299 320 {
300 321 title: '内外侧',
301 322 align: 'center',
302   - dataIndex: 'rowFlag_dictText'
  323 + dataIndex: 'rowFlag_dictText',
  324 + scopedSlots: {customRender: 'rowFlag_dictText'}
303 325 },
304 326 {
305 327 title: '物料分区存放',
... ... @@ -337,7 +359,7 @@ export default {
337 359 align: 'center',
338 360 fixed: 'right',
339 361 width: 147,
340   - scopedSlots: { customRender: 'action' }
  362 + scopedSlots: {customRender: 'action'}
341 363 }
342 364 ],
343 365 url: {
... ... @@ -368,32 +390,47 @@ export default {
368 390 this.loadFrom()
369 391 },
370 392 computed: {
371   - importExcelUrl: function() {
  393 + importExcelUrl: function () {
372 394 return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
373 395 }
374 396 },
375 397 methods: {
376   - initDictConfig() {},
  398 + getStatusColor(status) {
  399 + const colors = {
  400 + '空闲': 'green',
  401 + '锁定': 'blue',
  402 +
  403 + '外侧': 'gray',
  404 + '内侧': 'purple',
  405 +
  406 + '高库位': 'red',
  407 + '低库位': 'green',
  408 + default: 'default'
  409 + };
  410 + return colors[status] || colors.default;
  411 + },
  412 + initDictConfig() {
  413 + },
377 414 getSuperFieldList() {
378 415 let fieldList = []
379   - fieldList.push({ type: 'string', value: 'code', text: '库位编码', dictCode: '' })
380   - fieldList.push({ type: 'string', value: 'zoneCode', text: '库区编码', dictCode: '' })
381   - fieldList.push({ type: 'string', value: 'locationTypeCode', text: '库位类型', dictCode: '' })
382   - fieldList.push({ type: 'string', value: 'containerCode', text: '容器编码', dictCode: '' })
383   - fieldList.push({ type: 'string', value: 'status', text: '状态', dictCode: 'location_status' })
384   - fieldList.push({ type: 'int', value: 'roadWay', text: '巷道', dictCode: '' })
385   - fieldList.push({ type: 'int', value: 'row', text: '行', dictCode: '' })
386   - fieldList.push({ type: 'int', value: 'icolumn', text: '列', dictCode: '' })
387   - fieldList.push({ type: 'int', value: 'layer', text: '层', dictCode: '' })
388   - fieldList.push({ type: 'int', value: 'grid', text: '格', dictCode: '' })
389   - fieldList.push({ type: 'int', value: 'high', text: '高低位', dictCode: '' })
390   - fieldList.push({ type: 'int', value: 'rowFlag', text: '内外侧', dictCode: 'row_type' })
391   - fieldList.push({ type: 'string', value: 'materialAreaCode', text: '物料分区存放', dictCode: '' })
392   - fieldList.push({ type: 'int', value: 'enable', text: '是否可用', dictCode: 'enable_status' })
393   - fieldList.push({ type: 'string', value: 'createBy', text: '创建人', dictCode: '' })
394   - fieldList.push({ type: 'datetime', value: 'createTime', text: '创建日期' })
395   - fieldList.push({ type: 'string', value: 'updateBy', text: '更新人', dictCode: '' })
396   - fieldList.push({ type: 'datetime', value: 'updateTime', text: '更新日期' })
  416 + fieldList.push({type: 'string', value: 'code', text: '库位编码', dictCode: ''})
  417 + fieldList.push({type: 'string', value: 'zoneCode', text: '库区编码', dictCode: ''})
  418 + fieldList.push({type: 'string', value: 'locationTypeCode', text: '库位类型', dictCode: ''})
  419 + fieldList.push({type: 'string', value: 'containerCode', text: '容器编码', dictCode: ''})
  420 + fieldList.push({type: 'string', value: 'status', text: '状态', dictCode: 'location_status'})
  421 + fieldList.push({type: 'int', value: 'roadWay', text: '巷道', dictCode: ''})
  422 + fieldList.push({type: 'int', value: 'row', text: '行', dictCode: ''})
  423 + fieldList.push({type: 'int', value: 'icolumn', text: '列', dictCode: ''})
  424 + fieldList.push({type: 'int', value: 'layer', text: '层', dictCode: ''})
  425 + fieldList.push({type: 'int', value: 'grid', text: '格', dictCode: ''})
  426 + fieldList.push({type: 'int', value: 'high', text: '高低位', dictCode: ''})
  427 + fieldList.push({type: 'int', value: 'rowFlag', text: '内外侧', dictCode: 'row_type'})
  428 + fieldList.push({type: 'string', value: 'materialAreaCode', text: '物料分区存放', dictCode: ''})
  429 + fieldList.push({type: 'int', value: 'enable', text: '是否可用', dictCode: 'enable_status'})
  430 + fieldList.push({type: 'string', value: 'createBy', text: '创建人', dictCode: ''})
  431 + fieldList.push({type: 'datetime', value: 'createTime', text: '创建日期'})
  432 + fieldList.push({type: 'string', value: 'updateBy', text: '更新人', dictCode: ''})
  433 + fieldList.push({type: 'datetime', value: 'updateTime', text: '更新日期'})
397 434 this.superFieldList = fieldList
398 435 },
399 436 loadFrom() {
... ...
ant-design-vue-jeecg/src/views/system/config/PortList.vue
  View file @7807abc
... ... @@ -40,7 +40,8 @@
40 40 <div class="table-operator">
41 41 <a-button v-has="'port:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
42 42 <a-button v-has="'port:export'" type="primary" icon="download" @click="handleExportXls('出入口')">导出</a-button>
43   - <a-upload v-has="'port:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
  43 + <a-upload v-has="'port:import'" name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
  44 + :action="importExcelUrl"
44 45 @change="handleImportExcel">
45 46 <a-button type="primary" icon="import">导入</a-button>
46 47 </a-upload>
... ... @@ -79,7 +80,13 @@
79 80 class="j-table-force-nowrap"
80 81 @change="handleTableChange">
81 82  
82   - <span slot="zoneCode" slot-scope="zoneCode">
  83 + <span slot="type_dictText" slot-scope="type_dictText">
  84 + <a-tag :key="type_dictText" :color="getStatusColor(type_dictText)">
  85 + {{ type_dictText }}
  86 + </a-tag>
  87 + </span>
  88 +
  89 + <span slot="zoneCode" slot-scope="zoneCode">
83 90 <a-tag :key="zoneCode" color=blue>
84 91 {{ solutionZoneCode(zoneCode) }}
85 92 </a-tag>
... ... @@ -183,7 +190,8 @@ export default {
183 190 {
184 191 title: '类型',
185 192 align: "center",
186   - dataIndex: 'type_dictText'
  193 + dataIndex: 'type_dictText',
  194 + scopedSlots: {customRender: 'type_dictText'}
187 195 },
188 196 {
189 197 title: '创建人',
... ... @@ -236,6 +244,15 @@ export default {
236 244 },
237 245 },
238 246 methods: {
  247 + getStatusColor(status) {
  248 + const colors = {
  249 + '入库口': 'green',
  250 + '出库口': 'purple',
  251 + '出入口': 'red',
  252 + default: 'default'
  253 + };
  254 + return colors[status] || colors.default;
  255 + },
239 256 initDictConfig() {
240 257 },
241 258 getSuperFieldList() {
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @7807abc
... ... @@ -86,6 +86,12 @@
86 86 :customRow="clickThenSelect"
87 87 @change="handleTableChange">
88 88  
  89 + <span slot="status_dictText" slot-scope="status_dictText">
  90 + <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
  91 + {{ status_dictText }}
  92 + </a-tag>
  93 + </span>
  94 +
89 95 <template slot="htmlSlot" slot-scope="text">
90 96 <div v-html="text"></div>
91 97 </template>
... ... @@ -183,6 +189,7 @@ export default {
183 189 title: '状态',
184 190 align: "center",
185 191 dataIndex: 'status_dictText',
  192 + scopedSlots: {customRender: 'status_dictText'}
186 193 },
187 194 {
188 195 title: '起始库位',
... ... @@ -264,6 +271,15 @@ export default {
264 271 }
265 272 },
266 273 methods: {
  274 + getStatusColor(status) {
  275 + const colors = {
  276 + '新建': 'green',
  277 + '生成任务': 'purple',
  278 + '上架完成': 'gray',
  279 + default: 'default'
  280 + };
  281 + return colors[status] || colors.default;
  282 + },
267 283 initDictConfig() {
268 284 },
269 285 clickThenSelect(record) {
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
  View file @7807abc
... ... @@ -121,6 +121,18 @@
121 121 :customRow='clickThenSelect'
122 122 @change='handleTableChange'>
123 123  
  124 + <span slot="firstStatus_dictText" slot-scope="firstStatus_dictText">
  125 + <a-tag :key="firstStatus_dictText" :color="getStatusColor(firstStatus_dictText)">
  126 + {{ firstStatus_dictText }}
  127 + </a-tag>
  128 + </span>
  129 +
  130 + <span slot="lastStatus_dictText" slot-scope="lastStatus_dictText">
  131 + <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
  132 + {{ lastStatus_dictText }}
  133 + </a-tag>
  134 + </span>
  135 +
124 136 <span slot="companyCode" slot-scope="companyCode">
125 137 <a-tag :key="companyCode" color=blue>
126 138 {{ solutionCompany(companyCode) }}
... ... @@ -228,11 +240,15 @@ export default {
228 240 title: '头状态',
229 241 align: "center",
230 242 dataIndex: 'firstStatus_dictText',
  243 + key: 'firstStatus_dictText',
  244 + scopedSlots: {customRender: 'firstStatus_dictText'}
231 245 },
232 246 {
233 247 title: '尾状态',
234 248 align: "center",
235 249 dataIndex: 'lastStatus_dictText',
  250 + key: 'lastStatus_dictText',
  251 + scopedSlots: {customRender: 'lastStatus_dictText'}
236 252 },
237 253 {
238 254 title: '上游单号',
... ... @@ -325,6 +341,19 @@ export default {
325 341 }
326 342 },
327 343 methods: {
  344 + getStatusColor(status) {
  345 + const colors = {
  346 + '新建': 'green',
  347 + '收货': 'yellow',
  348 + '等待上架': 'blue',
  349 + '上架': 'orange',
  350 + '过账': 'purple',
  351 + '回传': 'grey',
  352 + '回传失败': 'red',
  353 + default: 'default'
  354 + };
  355 + return colors[status] || colors.default;
  356 + },
328 357 initDictConfig() {
329 358 },
330 359 clickThenSelect(record) {
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
  View file @7807abc
... ... @@ -124,6 +124,19 @@
124 124 :customRow="clickThenSelect"
125 125 @change="handleTableChange">
126 126  
  127 +
  128 + <span slot="firstStatus_dictText" slot-scope="firstStatus_dictText">
  129 + <a-tag :key="firstStatus_dictText" :color="getStatusColor(firstStatus_dictText)">
  130 + {{ firstStatus_dictText }}
  131 + </a-tag>
  132 + </span>
  133 +
  134 + <span slot="lastStatus_dictText" slot-scope="lastStatus_dictText">
  135 + <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
  136 + {{ lastStatus_dictText }}
  137 + </a-tag>
  138 + </span>
  139 +
127 140 <span slot="companyCode" slot-scope="companyCode">
128 141 <a-tag :key="companyCode" color=blue>
129 142 {{ solutionCompany(companyCode) }}
... ... @@ -257,11 +270,15 @@ export default {
257 270 title: '头状态',
258 271 align: "center",
259 272 dataIndex: 'firstStatus_dictText',
  273 + key: 'firstStatus_dictText',
  274 + scopedSlots: {customRender: 'firstStatus_dictText'}
260 275 },
261 276 {
262 277 title: '尾状态',
263 278 align: "center",
264 279 dataIndex: 'lastStatus_dictText',
  280 + key: 'lastStatus_dictText',
  281 + scopedSlots: {customRender: 'lastStatus_dictText'}
265 282 },
266 283 {
267 284 title: '上游单号',
... ... @@ -356,6 +373,19 @@ export default {
356 373 }
357 374 },
358 375 methods: {
  376 + getStatusColor(status) {
  377 + const colors = {
  378 + '新建': 'green',
  379 + '收货': 'yellow',
  380 + '等待上架': 'blue',
  381 + '上架': 'orange',
  382 + '过账': 'purple',
  383 + '回传': 'grey',
  384 + '回传失败': 'red',
  385 + default: 'default'
  386 + };
  387 + return colors[status] || colors.default;
  388 + },
359 389 initDictConfig() {
360 390 },
361 391 receive(record) {
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @7807abc
... ... @@ -99,6 +99,12 @@
99 99 :customRow="clickThenSelect"
100 100 @change="handleTableChange">
101 101  
  102 + <span slot="status_dictText" slot-scope="status_dictText">
  103 + <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
  104 + {{ status_dictText }}
  105 + </a-tag>
  106 + </span>
  107 +
102 108 <template slot="htmlSlot" slot-scope="text">
103 109 <div v-html="text"></div>
104 110 </template>
... ... @@ -181,6 +187,7 @@ export default {
181 187 title: '状态',
182 188 align: "center",
183 189 dataIndex: 'status_dictText',
  190 + scopedSlots: {customRender: 'status_dictText'}
184 191 },
185 192 {
186 193 title: '起始库位',
... ... @@ -262,6 +269,15 @@ export default {
262 269 }
263 270 },
264 271 methods: {
  272 + getStatusColor(status) {
  273 + const colors = {
  274 + '新建': 'green',
  275 + '生成任务': 'purple',
  276 + '下架完成': 'gray',
  277 + default: 'default'
  278 + };
  279 + return colors[status] || colors.default;
  280 + },
265 281 initDictConfig() {
266 282 },
267 283 clickThenSelect(record) {
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
  View file @7807abc
... ... @@ -131,6 +131,18 @@
131 131 :customRow="clickThenSelect"
132 132 @change="handleTableChange">
133 133  
  134 + <span slot="firstStatus_dictText" slot-scope="firstStatus_dictText">
  135 + <a-tag :key="firstStatus_dictText" :color="getStatusColor(firstStatus_dictText)">
  136 + {{ firstStatus_dictText }}
  137 + </a-tag>
  138 + </span>
  139 +
  140 + <span slot="lastStatus_dictText" slot-scope="lastStatus_dictText">
  141 + <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
  142 + {{ lastStatus_dictText }}
  143 + </a-tag>
  144 + </span>
  145 +
134 146 <span slot="companyCode" slot-scope="companyCode">
135 147 <a-tag :key="companyCode" color=blue>
136 148 {{ solutionCompany(companyCode) }}
... ... @@ -252,11 +264,15 @@ export default {
252 264 title: '头状态',
253 265 align: "center",
254 266 dataIndex: 'firstStatus_dictText',
  267 + key: 'firstStatus_dictText',
  268 + scopedSlots: {customRender: 'firstStatus_dictText'}
255 269 },
256 270 {
257 271 title: '尾状态',
258 272 align: "center",
259 273 dataIndex: 'lastStatus_dictText',
  274 + key: 'lastStatus_dictText',
  275 + scopedSlots: {customRender: 'lastStatus_dictText'}
260 276 },
261 277 {
262 278 title: '上游单号',
... ... @@ -354,6 +370,19 @@ export default {
354 370 }
355 371 },
356 372 methods: {
  373 + getStatusColor(status) {
  374 + const colors = {
  375 + '新建': 'green',
  376 + '出库组盘': 'yellow',
  377 + '等待下架': 'blue',
  378 + '下架': 'orange',
  379 + '过账': 'purple',
  380 + '回传': 'grey',
  381 + '回传失败': 'red',
  382 + default: 'default'
  383 + };
  384 + return colors[status] || colors.default;
  385 + },
357 386 initDictConfig() {
358 387 },
359 388 clickThenSelect(record) {
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @7807abc
... ... @@ -139,6 +139,18 @@
139 139 :customRow="clickThenSelect"
140 140 @change="handleTableChange">
141 141  
  142 + <span slot="firstStatus_dictText" slot-scope="firstStatus_dictText">
  143 + <a-tag :key="firstStatus_dictText" :color="getStatusColor(firstStatus_dictText)">
  144 + {{ firstStatus_dictText }}
  145 + </a-tag>
  146 + </span>
  147 +
  148 + <span slot="lastStatus_dictText" slot-scope="lastStatus_dictText">
  149 + <a-tag :key="lastStatus_dictText" :color="getStatusColor(lastStatus_dictText)">
  150 + {{ lastStatus_dictText }}
  151 + </a-tag>
  152 + </span>
  153 +
142 154 <span slot="companyCode" slot-scope="companyCode">
143 155 <a-tag :key="companyCode" color=blue>
144 156 {{ solutionCompany(companyCode) }}
... ... @@ -266,11 +278,15 @@ export default {
266 278 title: '头状态',
267 279 align: "center",
268 280 dataIndex: 'firstStatus_dictText',
  281 + key: 'firstStatus_dictText',
  282 + scopedSlots: {customRender: 'firstStatus_dictText'}
269 283 },
270 284 {
271 285 title: '尾状态',
272 286 align: "center",
273 287 dataIndex: 'lastStatus_dictText',
  288 + key: 'lastStatus_dictText',
  289 + scopedSlots: {customRender: 'lastStatus_dictText'}
274 290 },
275 291 {
276 292 title: '上游单号',
... ... @@ -365,6 +381,19 @@ export default {
365 381 }
366 382 },
367 383 methods: {
  384 + getStatusColor(status) {
  385 + const colors = {
  386 + '新建': 'green',
  387 + '出库组盘': 'yellow',
  388 + '等待下架': 'blue',
  389 + '下架': 'orange',
  390 + '过账': 'purple',
  391 + '回传': 'grey',
  392 + '回传失败': 'red',
  393 + default: 'default'
  394 + };
  395 + return colors[status] || colors.default;
  396 + },
368 397 initDictConfig() {
369 398 },
370 399 clickThenSelect(record) {
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @7807abc
... ... @@ -107,6 +107,12 @@
107 107 :customRow="clickThenSelect"
108 108 @change="handleTableChange">
109 109  
  110 + <span slot="status_dictText" slot-scope="status_dictText">
  111 + <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
  112 + {{ status_dictText }}
  113 + </a-tag>
  114 + </span>
  115 +
110 116 <span slot="zoneCode" slot-scope="zoneCode">
111 117 <a-tag :key="zoneCode" color=blue>
112 118 {{ solutionZoneCode(zoneCode) }}
... ... @@ -238,6 +244,8 @@ export default {
238 244 title: '任务状态',
239 245 align: "center",
240 246 dataIndex: 'status_dictText',
  247 + key: 'status_dictText',
  248 + scopedSlots: {customRender: 'status_dictText'}
241 249 },
242 250 {
243 251 title: '异常信息',
... ... @@ -313,6 +321,16 @@ export default {
313 321 }
314 322 },
315 323 methods: {
  324 + getStatusColor(status) {
  325 + const colors = {
  326 + '生成任务': 'green',
  327 + '下发任务': 'blue',
  328 + '到达拣选站台': 'orange',
  329 + '任务完成': 'grey',
  330 + default: 'default'
  331 + };
  332 + return colors[status] || colors.default;
  333 + },
316 334 initDictConfig() {
317 335 },
318 336 clickThenSelect(record) {
... ...
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @7807abc
... ... @@ -107,6 +107,12 @@
107 107 :customRow="clickThenSelect"
108 108 @change="handleTableChange">
109 109  
  110 + <span slot="status_dictText" slot-scope="status_dictText">
  111 + <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
  112 + {{ status_dictText }}
  113 + </a-tag>
  114 + </span>
  115 +
110 116 <span slot="zoneCode" slot-scope="zoneCode">
111 117 <a-tag :key="zoneCode" color=blue>
112 118 {{ solutionZoneCode(zoneCode) }}
... ... @@ -238,6 +244,8 @@ export default {
238 244 title: '任务状态',
239 245 align: "center",
240 246 dataIndex: 'status_dictText',
  247 + key: 'status_dictText',
  248 + scopedSlots: {customRender: 'status_dictText'}
241 249 },
242 250 {
243 251 title: '异常信息',
... ... @@ -312,6 +320,16 @@ export default {
312 320 }
313 321 },
314 322 methods: {
  323 + getStatusColor(status) {
  324 + const colors = {
  325 + '生成任务': 'green',
  326 + '下发任务': 'blue',
  327 + '到达拣选站台': 'orange',
  328 + '任务完成': 'grey',
  329 + default: 'default'
  330 + };
  331 + return colors[status] || colors.default;
  332 + },
315 333 initDictConfig() {
316 334 },
317 335 clickThenSelect(record) {
... ...
huaheng-wms-core/src/main/resources/rebel.xml deleted
View file @059c12e
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -
3   -<!--
4   - This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
5   - Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
6   --->
7   -<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
8   -
9   - <id>huaheng-wms-core</id>
10   -
11   - <classpath>
12   - <dir name="/Users/yiwenpeng/Desktop/code/huaheng/西安比亚迪/wms4_biyadi/huaheng-wms-core/target/classes">
13   - </dir>
14   - </classpath>
15   -
16   -</application>