颜色高亮

易文鹏
1 parent 5da34a89
Showing 7 changed files with 95 additions and 5 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -98,6 +98,11 @@
             {{ status_dictText }}
           </a-tag>
         </span>
+        <span slot="taskType_dictText" slot-scope="taskType_dictText">
+            <a-tag :key="taskType_dictText" :color="getStatusColor(taskType_dictText)">
+              {{ taskType_dictText }}
+            </a-tag>
+        </span>
  
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -121,8 +126,8 @@
         <span slot="action" slot-scope="text, record">
 <!--          <a v-if="record.status == 0 && record.taskType == 200" @click="selectFillPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
 <!--          <a v-else-if="record.status == 0" @click="selectContainerStatus(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
-          <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'">生成任务<a-divider type="vertical"/></a>
-          <a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'">生成任务<a-divider type="vertical"/></a>
+          <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
+          <a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
           <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
             <a><a-button type="danger">取消配盘</a-button> <a-divider type="vertical"/></a>
           </a-popconfirm>
@@ -192,6 +197,7 @@ export default {
           title: '任务类型',
           align: "center",
           dataIndex: 'taskType_dictText',
+          scopedSlots: {customRender: 'taskType_dictText'}
         },
         {
           title: '状态',
@@ -284,6 +290,9 @@ export default {
         '新建': 'green',
         '生成任务': 'blue',
         '上架完成': 'gray',
+
+        '整盘入库': 'blue',
+        '补充入库': 'green',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -100,13 +100,23 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
         :customRow="clickThenSelect"
         @change="handleTableChange">
+        <span slot="taskType_dictText" slot-scope="taskType_dictText">
+            <a-tag :key="taskType_dictText" :color="getStatusColor(taskType_dictText)">
+              {{ taskType_dictText }}
+            </a-tag>
+        </span>
+        <span slot="status_dictText" slot-scope="status_dictText">
+            <a-tag :key="status_dictText" :color="getStatusColor(status_dictText)">
+              {{ status_dictText }}
+            </a-tag>
+        </span>
  
         <span slot="action" slot-scope="text, record">
-          <a v-if="record.status == 0" @click="selectPort(record)">生成任务<a-divider type="vertical"/></a>
+          <a v-if="record.status == 0" @click="selectPort(record)"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
           <a-popconfirm v-if="record.status == 0" v-has="'shipmentContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
-            <a>取消配盘<a-divider type="vertical"/></a>
+             <a><a-button type="danger">取消配盘</a-button> <a-divider type="vertical"/></a>
           </a-popconfirm>
-          <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
+           <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)"><a-button type="default">编辑</a-button></a>
         </span>
       </a-table>
     </div>
@@ -159,11 +169,13 @@ export default {
           title: '任务类型',
           align: "center",
           dataIndex: 'taskType_dictText',
+          scopedSlots: {customRender: 'taskType_dictText'}
         },
         {
           title: '状态',
           align: "center",
           dataIndex: 'status_dictText',
+          scopedSlots: {customRender: 'status_dictText'}
         },
         {
           title: '起始库位',
@@ -245,6 +257,18 @@ export default {
     }
   },
   methods: {
+    getStatusColor(status) {
+      const colors = {
+        '新建': 'green',
+        '生成任务': 'blue',
+        '下架完成': 'gray',
+
+        '整出任务': 'blue',
+        '分拣任务': 'green',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
+    },
     initDictConfig() {
     },
     clickThenSelect(record) {
@@ -129,6 +129,12 @@
           </a-tag>
         </span>
  
+        <span slot="taskType_dictText" slot-scope="taskType_dictText">
+            <a-tag :key="taskType_dictText" :color="getStatusColor(taskType_dictText)">
+              {{ taskType_dictText }}
+            </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -222,6 +228,7 @@ export default {
           align: "center",
           dataIndex: 'taskType_dictText',
           customFilterDropdown: true,
+          scopedSlots: {customRender: 'taskType_dictText'}
         },
         {
           title: '容器编码',
@@ -355,6 +362,9 @@ export default {
         '下发任务': 'blue',
         '到达拣选站台': 'orange',
         '任务完成': 'grey',
+
+        '盘点': 'blue',
+        '出库查看': 'green',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -116,6 +116,13 @@
             </a-tag>
         </span>
  
+
+        <span slot="taskType_dictText" slot-scope="taskType_dictText">
+            <a-tag :key="taskType_dictText" :color="getStatusColor(taskType_dictText)">
+              {{ taskType_dictText }}
+            </a-tag>
+        </span>
+
         <span slot="zoneCode" slot-scope="zoneCode">
           <a-tag :key="zoneCode" color=blue>
             {{ solutionZoneCode(zoneCode) }}
@@ -216,6 +223,7 @@ export default {
           title: '任务类型',
           align: "center",
           dataIndex: 'taskType_dictText',
+          scopedSlots: {customRender: 'taskType_dictText'}
         },
         {
           title: '容器编码',
@@ -351,6 +359,9 @@ export default {
         '下发任务': 'blue',
         '到达拣选站台': 'orange',
         '任务完成': 'grey',
+
+        '整盘入库': 'blue',
+        '补充入库': 'green',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -122,6 +122,12 @@
           </a-tag>
         </span>
  
+        <span slot="taskType_dictText" slot-scope="taskType_dictText">
+            <a-tag :key="taskType_dictText" :color="getStatusColor(taskType_dictText)">
+              {{ taskType_dictText }}
+            </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -217,6 +223,7 @@ export default {
           title: '任务类型',
           align: "center",
           dataIndex: 'taskType_dictText',
+          scopedSlots: {customRender: 'taskType_dictText'}
         },
         {
           title: '容器编码',
@@ -351,6 +358,9 @@ export default {
         '下发任务': 'blue',
         '到达拣选站台': 'orange',
         '任务完成': 'grey',
+
+        '整盘出库': 'blue',
+        '分拣出库': 'green',
         default: 'blue'
       };
       return colors[status] || colors.default;
@@ -51,6 +51,12 @@
           </a-tag>
         </span>
  
+        <span slot="inventoryStatus_dictText" slot-scope="inventoryStatus_dictText">
+          <a-tag :key="inventoryStatus_dictText" :color="getStatusColor(inventoryStatus_dictText)">
+            {{ inventoryStatus_dictText }}
+          </a-tag>
+        </span>
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
         </template>
@@ -172,6 +178,7 @@ export default {
           title: '库存状态',
           align: "center",
           dataIndex: 'inventoryStatus_dictText',
+          scopedSlots: {customRender: 'inventoryStatus_dictText'}
         },
         {
           title: '创建人',
@@ -226,6 +233,16 @@ export default {
     }
   },
   methods: {
+    getStatusColor(status) {
+      const colors = {
+        '良品': 'green',
+        '报废品': 'purple',
+        '待确认	': 'grey',
+        '次品': 'red',
+        default: 'blue'
+      };
+      return colors[status] || colors.default;
+    },
     loadFrom() {
       getCompanyList().then((res) => {
         if (res.success) {
@@ -122,6 +122,12 @@
             </a-tag>
         </span>
  
+        <span slot="taskType_dictText" slot-scope="taskType_dictText">
+            <a-tag :key="taskType_dictText" :color="getStatusColor(taskType_dictText)">
+              {{ taskType_dictText }}
+            </a-tag>
+        </span>
+
         <span slot="zoneCode" slot-scope="zoneCode">
           <a-tag :key="zoneCode" color=blue>
             {{ solutionZoneCode(zoneCode) }}
@@ -220,6 +226,7 @@ export default {
           title: '任务类型',
           align: "center",
           dataIndex: 'taskType_dictText',
+          scopedSlots: {customRender: 'taskType_dictText'}
         },
         {
           title: '容器编码',
@@ -358,6 +365,8 @@ export default {
         '下发任务': 'blue',
         '到达拣选站台': 'orange',
         '任务完成': 'grey',
+
+        '移库': 'blue',
         default: 'blue'
       };
       return colors[status] || colors.default;