no message

src/views/business-data/businessTask/agvTask.vue

@@ -56,8 +56,8 @@
           <el-radio-button label="全部"> 全部</el-radio-button>
           <el-radio-button label="待执行">待执行</el-radio-button>
           <el-radio-button label="执行中">执行中</el-radio-button>
-          <el-radio-button label="顶升">顶升</el-radio-button>
+          <el-radio-button label="已顶升">已顶升</el-radio-button>
-          <el-radio-button label="到达">到达</el-radio-button>
+          <el-radio-button label="已到达">已到达</el-radio-button>
           <el-radio-button label="已完成">已完成</el-radio-button>
           <el-radio-button label="任务取消">任务取消</el-radio-button>
         </el-radio-group>
@@ -144,8 +144,8 @@
           :filters="[
           { text: '待执行', value: 'OPEN' },
           { text: '执行中', value: 'ATCALL' },
-          { text: '顶升', value: 'UP_CONTAINER' },
+          { text: '已顶升', value: 'UP_CONTAINER' },
-          { text: '到达', value: 'ARRIVED' },
+          { text: '已到达', value: 'ARRIVED' },
           { text: '已完成', value: 'FINISH' },
           { text: '任务取消', value: 'CANCEL' }
           ]"
@@ -431,10 +431,10 @@ export default {
       } else if (lab === '执行中') {
         this.query.status = 'ATCALL'
         this.crud.toQuery()
-      } else if (lab === '顶升') {
+      } else if (lab === '已顶升') {
         this.query.status = 'UP_CONTAINER'
         this.crud.toQuery()
-      } else if (lab === '到达') {
+      } else if (lab === '已到达') {
         this.query.status = 'ARRIVED'
         this.crud.toQuery()
       } else if (lab === '已完成') {
@@ -450,9 +450,9 @@ export default {
         case '待执行':
           return 'info'
         case '执行中':
-        case '顶升':
+        case '已顶升':
           return 'warning'
-        case '到达':
+        case '已到达':
           return 'primary'
         case '已完成':
           return 'success'

src/views/business-data/les/index.vue

@@ -5,10 +5,12 @@
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
         <label class="el-form-item-label">任务号</label>
-        <el-input v-model="query.taskCode" clearable placeholder="任务号" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.taskCode" clearable placeholder="任务号" style="width: 185px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">物料号</label>
-        <el-input v-model="query.materialCode" clearable placeholder="物料号" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.materialCode" clearable placeholder="物料号" style="width: 185px;" class="filter-item"
-        <rrOperation :crud="crud" />
+                  @keyup.enter.native="crud.toQuery"/>
+        <rrOperation :crud="crud"/>
       </div>
 
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -25,13 +27,34 @@
       <el-table-column prop="xh" type="index" :index="indexMethod" label="序号"/>
       <el-table-column prop="taskCode" label="任务号"/>
       <el-table-column prop="onlineNo" label="上线单号"/>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="100"
+        :filters="[
+          { text: '已创建', value: 'OPEN' },
+          { text: '已到站', value: 'ARRIVED' },
+          { text: '已完成', value: 'CLOSE' },
+          ]"
+        :filter-method="filterTag"
+        filter-placement="bottom-end"
+      >
+        <template slot-scope="scope">
+          <el-tag
+            :type="getStatusType(scope.row.status)"
+            disable-transitions
+          >
+            {{ dict.label.asn_status[scope.row.status] }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="caseNum" label="数量"/>
       <el-table-column prop="materialCode" label="物料号"/>
       <el-table-column prop="boxNo" label="料箱号"/>
       <el-table-column prop="routeCode" label="编组/线路"/>
       <el-table-column prop="srcPositionCode" label="起点"/>
-      <el-table-column prop="dstPositionCode" label="终点"/>
+      <el-table-column prop="dstPositionCode" label="目标库位"/>
-      <el-table-column prop="taskType" label="任务类型"/>
+      <el-table-column prop="repMessage" label="返回报文"/>
-      <el-table-column prop="createBy" label="创建人"/>
       <el-table-column prop="createTime" label="日期"/>
     </el-table>
     <!--分页组件-->
@@ -45,7 +68,7 @@
 
 <script>
 import crudLes from '@/api/les'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -53,7 +76,7 @@ import pagination from '@crud/Pagination'
 import Treeselect from '@riophae/vue-treeselect'
 import Search from '@/views/monitor/log/search.vue'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
-import { getToken } from '@/utils/auth'
+import {getToken} from '@/utils/auth'
 
 const defaultForm = {
   id: null,
@@ -72,11 +95,12 @@ const defaultForm = {
 }
 export default {
   name: 'LES',
-  components: { DateRangePicker, Search, Treeselect, pagination, crudOperation, rrOperation, udOperation },
+  components: {DateRangePicker, Search, Treeselect, pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['asn_status'],
   cruds() {
     return CRUD({
-      title: 'les任务', url: 'api/les', idField: 'id', sort: 'id,desc', crudMethod: { ...crudLes },
+      title: 'les任务', url: 'api/les', idField: 'id', sort: 'id,desc', crudMethod: {...crudLes},
       optShow: {
         add: false,
         edit: false,
@@ -115,6 +139,19 @@ export default {
     },
     resetQuery() {
       this.crud.resetQuery()
+    },
+    getStatusType(status) {
+      switch (this.dict.label.asn_status[status]) {
+        case '已创建':
+          return 'warning'
+        case '已到站':
+          return 'primary'
+        case '已关闭':
+          return 'success'
+      }
+    },
+    filterTag(value, row) {
+      return row.status === value
     }
   }
 }