no message

src/views/base-data/point/index.vue

@@ -160,11 +160,22 @@
             {{ dict.label.point_type[scope.row.type] }}
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="status" label="状态">
+
+        <el-table-column
+          prop="status"
+          label="状态"
+          width="100"
+          :filters="[{ text: '空闲', value: 'FREE' }, { text: '占用', value: 'USED' }]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end">
           <template slot-scope="scope">
-            {{ dict.label.use_status[scope.row.status] }}
+            <el-tag
+              :type="dict.label.use_status[scope.row.status] === '空闲' ? 'success' : 'danger'"
+              disable-transitions> {{ dict.label.use_status[scope.row.status] }}
+            </el-tag>
           </template>
         </el-table-column>
+
         <el-table-column :show-overflow-tooltip="true" prop="areaName" label="库区">
           <template slot-scope="scope">
             <div>{{ scope.row.area.name }}</div>
@@ -364,6 +375,9 @@ export default {
       crudArea.queryAreaAll({}).then(res => {
         this.areas = res
       })
+    },
+    filterTag(value, row) {
+      return row.status === value
     }
   }
 }

src/views/base-data/stock/index.vue

@@ -160,11 +160,22 @@
             <div>{{ scope.row.stockType }}</div>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="area" label="状态">
+
+        <el-table-column
+          prop="status"
+          label="状态"
+          width="100"
+          :filters="[{ text: '空闲', value: 'FREE' }, { text: '占用', value: 'USED' }]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end">
           <template slot-scope="scope">
-            {{ dict.label.use_status[scope.row.status] }}
+            <el-tag
+              :type="dict.label.use_status[scope.row.status] === '空闲' ? 'success' : 'danger'"
+              disable-transitions> {{ dict.label.use_status[scope.row.status] }}
+            </el-tag>
           </template>
         </el-table-column>
+
         <el-table-column label="启用" align="center" prop="enabled">
           <template slot-scope="scope">
             <el-switch
@@ -335,6 +346,9 @@ export default {
       crudPoint.queryPointAll({enabled: true}).then(res => {
         this.points = res
       })
+    },
+    filterTag(value, row) {
+      return row.status === value
     }
   }
 }

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

@@ -4,7 +4,6 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle" type="flex">
         <!-- 搜索 -->
-        <div>
           <label class="el-form-item-label">创建日期</label>
           <date-range-picker v-model="query.createTime" style="width: 250px;" class="filter-item"/>
 
@@ -26,7 +25,6 @@
                     class="filter-item" @keyup.enter.native="crud.toQuery"
           />
 
-        </div>
 
 
         <div>
@@ -372,8 +370,7 @@ export default {
     },
     resetQuery() {
       this.radio3 = '执行中';
-      this.query = { status: 'ATCALL', createTime: '', stockCode: '', startSlotCode: '', endSlotCode: '', type: '' };
+      this.crud.resetQuery()
-      this.crud.toQuery();
     },
     clickChange(lab) {
       if (lab === '全部') {

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

@@ -3,7 +3,8 @@
     <!--工具栏-->
     <div class="head-container">
       <label class="el-form-item-label">物料编码</label>
-      <el-select v-model="query.itemCode" placeholder="物料编码" filterable clearable style="width: 170px;" class="filter-item">
+      <el-select v-model="query.itemCode" placeholder="物料编码" filterable clearable style="width: 170px;"
+                 class="filter-item">
         <el-option
           @keyup.enter.native="crud.toQuery"
           v-for="item in this.items"
@@ -78,9 +79,29 @@
         <el-table-column prop="itemKey.orderNumber" label="箱号"/>
         <el-table-column prop="srcPointCode" label="原点位"/>
         <el-table-column prop="dstPointCode" label="目标点位"/>
-        <el-table-column prop="taskStatus" label="任务状态">
+
+        <el-table-column
+          prop="taskStatus"
+          label="任务状态"
+          width="100"
+          :filters="[
+          { text: '待执行', value: 'OPEN' },
+          { text: '执行中', value: 'ATCALL' },
+          { text: '顶升', value: 'UP_CONTAINER' },
+          { text: '已到站', value: 'ARRIVED' },
+          { text: '已完成', value: 'FINISH' },
+          { text: '任务取消', value: 'CANCEL' }
+          ]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end"
+        >
           <template slot-scope="scope">
+            <el-tag
+              :type="getStatusType(scope.row.taskStatus)"
+              disable-transitions
+            >
               {{ dict.label.task_status[scope.row.taskStatus] }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="planQty" label="计划数量"/>
@@ -198,6 +219,26 @@ export default {
       }).catch(e => {
         this.crud.notify('物料加载失败', CRUD.NOTIFICATION_TYPE.ERROR)
       })
+    },
+    getStatusType(status) {
+      switch (this.dict.label.task_status[status]) {
+        case '待执行':
+          return 'info'
+        case '执行中':
+          return 'warning'
+        case '顶升':
+          return 'primary'
+        case '已完成':
+        case '已到站':
+          return 'success'
+        case '任务取消':
+          return 'danger'
+        default:
+          return ''
+      }
+    },
+    filterTag(value, row) {
+      return row.taskStatus === value
     }
   }
 }

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

@@ -2,9 +2,11 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <div v-if="crud.props.searchToggle" type="flex">
         <label class="el-form-item-label" v-show="false">物料编码</label>
         <el-select v-show="false" v-model="query.itemCode" @focus="getItem" value-key="id" filterable multiple
-                 placeholder="请选择物料" style="width: 150px;" class="filter-item" @keyup.enter.native="crud.toQuery">
+                   placeholder="请选择物料" style="width: 150px;" class="filter-item"
+                   @keyup.enter.native="crud.toQuery">
           <el-option
             v-for="item in items"
             :key="item.id"
@@ -12,9 +14,7 @@
             :value="item.code"
           />
         </el-select>
-      <!--
+
-            <el-input v-model="query.itemCode" clearable placeholder="请输入物料编码" style="width: 140px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-      -->
         <label class="el-form-item-label">物料编码</label>
         <el-input v-model="query.itemCodeOne" clearable placeholder="请输入物料编码" style="width: 150px;"
                   class="filter-item" @keyup.enter.native="crud.toQuery"/>
@@ -27,13 +27,27 @@
                   @keyup.enter.native="crud.toQuery"/>
 
         <label class="el-form-item-label">容器号</label>
-      <el-input v-model="query.stockName" clearable placeholder="请输入容器号" style="width: 150px;" class="filter-item"
+        <el-input v-model="query.stockName" clearable placeholder="请输入容器号" style="width: 150px;"
+                  class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
 
         <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置
         </el-button>
 
+        <div class="statusButton" style="border-bottom: solid lightgray 1px;">
+          <el-radio-group v-model="radio3" @change="clickChange" size="small">
+            <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>
+
+
+        </div>
+      </div>
+
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
@@ -203,6 +217,7 @@ export default {
   },
   data() {
     return {
+      radio3: '小件',
       points: [],
       stocks: [],
       items: [],
@@ -241,6 +256,7 @@ export default {
       this.crud.toQuery();
     },
     resetQuery() {
+      this.radio3 = '小件';
       this.crud.resetQuery()
     },
     getSummaries(param) {
@@ -269,6 +285,24 @@ export default {
       });
 
       return sums;
+    },
+    clickChange(lab) {
+      if (lab === '全部') {
+        this.query.status = ''
+        this.crud.toQuery()
+      } else if (lab === '小件') {
+        this.query.areaName = '小件存储区'
+        this.crud.toQuery()
+      } else if (lab === '大件') {
+        this.query.areaName = '大件存储区'
+        this.crud.toQuery()
+      } else if (lab === '翻包') {
+        this.query.areaName = ['小件翻包区', '大件翻包区']
+        this.crud.toQuery()
+      } else if (lab === '叫料') {
+        this.query.areaName = ['小件翻包存储区', '小件翻包存储区']
+        this.crud.toQuery()
+      }
     }
   }
 

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

@@ -10,7 +10,8 @@
         />
 
         <label class="el-form-item-label">工单状态</label>
-        <el-select v-model="query.status" filterable clearable placeholder="请选择" class="filter-item" style="width: 180px;">
+        <el-select v-model="query.status" filterable clearable placeholder="请选择" class="filter-item"
+                   style="width: 180px;">
           <el-option
             v-for="item in dict.pick_status"
             :key="item.id"
@@ -130,9 +131,29 @@
         <el-table-column prop="code" label="出库单编码" width="180" v-element-table-tooltip/>
         <el-table-column prop="gdCode" label="工单编码" v-element-table-tooltip/>
         <el-table-column prop="lineNo" label="顺序号"/>
-        <el-table-column prop="status" label="状态">
+        <el-table-column
+          prop="status"
+          label="状态"
+          width="100"
+          :filters="[
+          { text: '打开', value: 'OPEN' },
+          { text: '部分分配', value: 'ASSIGN' },
+          { text: '已分配', value: 'ALLOCATE' },
+          { text: '拣货中', value: 'PICKUP' },
+          { text: '拣货完成', value: 'PICK_ALL' },
+          { text: '叫料中', value: 'SHIP_PART' },
+          { 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.pick_status[scope.row.status] }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="cpCodeOrDpCode" label="成品代码/单品代码"/>
@@ -290,6 +311,28 @@ export default {
          this.$refs.table.toggleRowExpansion(row)
        }
        */
+    },
+    getStatusType(status) {
+      switch (this.dict.label.pick_status[status]) {
+        case '打开':
+          return 'info'
+        case '部分分配':
+        case '已分配':
+          return 'warning'
+        case '拣货中':
+        case '拣货完成':
+          return 'primary'
+        case '叫料中':
+        case '已关闭':
+          return 'success'
+        case '已取消':
+          return 'danger'
+        default:
+          return ''
+      }
+    },
+    filterTag(value, row) {
+      return row.status === value
     }
 
   }

src/views/business-data/pickDetail/pickTask.vue

@@ -3,7 +3,8 @@
     <!--工具栏-->
     <div class="head-container">
       <label class="el-form-item-label">物料编码</label>
-      <el-select v-model="query.itemCode" placeholder="物料编码" filterable clearable style="width: 170px;" class="filter-item">
+      <el-select v-model="query.itemCode" placeholder="物料编码" filterable clearable style="width: 170px;"
+                 class="filter-item">
         <el-option
           @keyup.enter.native="crud.toQuery"
           v-for="item in this.items"
@@ -78,10 +79,28 @@
             <div>{{ scope.row.item.name }}</div>
           </template>
         </el-table-column>
-
+        <el-table-column
-        <el-table-column prop="taskStatus" label="任务状态">
+          prop="taskStatus"
+          label="任务状态"
+          width="100"
+          :filters="[
+          { text: '待执行', value: 'OPEN' },
+          { text: '执行中', value: 'ATCALL' },
+          { text: '顶升', value: 'UP_CONTAINER' },
+          { text: '已到站', value: 'ARRIVED' },
+          { text: '已完成', value: 'FINISH' },
+          { text: '任务取消', value: 'CANCEL' }
+          ]"
+          :filter-method="filterTag"
+          filter-placement="bottom-end"
+        >
           <template slot-scope="scope">
+            <el-tag
+              :type="getStatusType(scope.row.taskStatus)"
+              disable-transitions
+            >
               {{ dict.label.task_status[scope.row.taskStatus] }}
+            </el-tag>
           </template>
         </el-table-column>
         <el-table-column prop="srcPointCode" label="原点位"/>
@@ -194,6 +213,26 @@ export default {
       }).catch(e => {
         this.crud.notify('物料加载失败', CRUD.NOTIFICATION_TYPE.ERROR)
       })
+    },
+    getStatusType(status) {
+      switch (this.dict.label.task_status[status]) {
+        case '待执行':
+          return 'info'
+        case '执行中':
+          return 'warning'
+        case '顶升':
+          return 'primary'
+        case '已完成':
+        case '已到站':
+          return 'success'
+        case '任务取消':
+          return 'danger'
+        default:
+          return ''
+      }
+    },
+    filterTag(value, row) {
+      return row.taskStatus === value
     }
   }
 }