rev 修改

wcs/nladmin-ui/src/views/acs/instruction/index.vue

@@ -22,18 +22,6 @@
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
-        <el-select
-          v-model="query.material_type"
-          clearable
-          filterable
-          size="small"
-          placeholder="物料类型"
-          class="filter-item"
-          style="width: 190px"
-          @change="crud.toQuery"
-        >
-          <el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
-        </el-select>
         <el-select
           v-model="query.status"
           clearable
@@ -44,7 +32,7 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value"/>
         </el-select>
         <el-input
           v-model="query.point_code"
@@ -65,9 +53,9 @@
           style="width: 190px"
           @change="crud.toQuery"
         >
-          <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value"/>
         </el-select>
-        <rrOperation />
+        <rrOperation/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
@@ -92,16 +80,16 @@
       >
         <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
           <el-form-item label="起点">
-            <el-input v-model="form.start_point_code" style="width: 370px;" />
+            <el-input v-model="form.start_point_code" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="终点">
-            <el-input v-model="form.next_point_code" style="width: 370px;" />
+            <el-input v-model="form.next_point_code" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="载具号">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
+            <el-input v-model="form.vehicle_code" style="width: 370px;"/>
           </el-form-item>
           <el-form-item label="描述信息" prop="description">
-            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" />
+            <el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea"/>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -118,47 +106,54 @@
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
-        <el-table-column prop="instruction_code" label="指令编号" />
-        <el-table-column prop="instruction_type" label="指令类型">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column v-if="false" prop="instruction_id" label="指令标识"/>
+        <el-table-column prop="task_code" label="任务号" show-overflow-tooltip width="100"/>
+        <el-table-column prop="instruction_code" label="指令编号" show-overflow-tooltip width="100"/>
+        <el-table-column prop="instruction_type" label="指令类型" show-overflow-tooltip width="100">
           <template slot-scope="scope">
             {{ dict.label.task_type[scope.row.instruction_type] }}
           </template>
         </el-table-column>
-        <!--        <el-table-column prop="link_num" label="关联编号" />-->
-        <el-table-column prop="task_code" label="任务号" />
-        <el-table-column prop="vehicle_code" label="载具号" />
-        <el-table-column prop="instruction_status" label="指令状态">
+        <el-table-column prop="instruction_status" label="指令状态" show-overflow-tooltip width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.instruction_status=='0' ">就绪</span>
-            <span v-if="scope.row.instruction_status=='1' ">执行中</span>
-            <span v-if="scope.row.instruction_status=='2' ">完成</span>
+            {{ dict.label.task_status[scope.row.instruction_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="send_status" label="下发状态">
+        <el-table-column prop="link_num" label="关联编号" show-overflow-tooltip width="100"/>
+        <el-table-column prop="priority" label="优先级" show-overflow-tooltip width="100"/>
+        <el-table-column prop="send_status" label="下发状态" show-overflow-tooltip width="100">
           <template slot-scope="scope">
-            <span v-if="scope.row.send_status=='0' ">未下发</span>
-            <span v-if="scope.row.send_status=='1' ">成功</span>
-            <span v-if="scope.row.send_status=='2' ">失败</span>
+            {{ dict.label.send_status[scope.row.send_status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="取货点1" />
-        <el-table-column prop="next_point_code" label="放货点1" />
-        <el-table-column prop="start_point_code2" label="取货点2" />
-        <el-table-column prop="next_point_code2" label="放货点2" />
-        <el-table-column prop="put_point_code" label="中转点" />
-        <el-table-column prop="execute_device_code" label="当前执行设备" />
-        <el-table-column prop="carno" label="车号" />
-        <el-table-column prop="weight" label="重量" />
-        <el-table-column prop="agv_jobno" label="AGV任务号" />
-        <el-table-column prop="agv_inst_type" label="AGV任务类型" />
-        <el-table-column prop="agv_system_type" label="AGV系统类型" >
+        <el-table-column prop="start_point_code" label="取货点" show-overflow-tooltip width="100"/>
+        <el-table-column prop="next_point_code" label="放货点" show-overflow-tooltip width="100"/>
+        <el-table-column prop="put_point_code" label="中转点" show-overflow-tooltip width="100"/>
+        <el-table-column prop="execute_status" label="执行状态" show-overflow-tooltip width="100">
+          <template slot-scope="scope">
+            {{ dict.label.execute_status[scope.row.execute_status] }}
+          </template>
         </el-table-column>
-        <el-table-column prop="remark" label="描述" />
-        <el-table-column prop="create_by" label="创建者" />
-        <el-table-column prop="create_time" label="创建时间" width="135" />
-
+        <el-table-column prop="execute_device_code" label="当前执行设备" show-overflow-tooltip width="130"/>
+        <el-table-column prop="vehicle_code" label="载具号" show-overflow-tooltip width="100"/>
+        <el-table-column prop="quantity" label="物料数量" show-overflow-tooltip width="100"/>
+        <el-table-column prop="weight" label="物料重量" show-overflow-tooltip width="100"/>
+        <el-table-column prop="carno" label="车号" show-overflow-tooltip width="100"/>
+        <el-table-column prop="agv_jobno" label="AGV任务号" show-overflow-tooltip width="120"/>
+        <el-table-column prop="agv_system_type" label="AGV系统类型" show-overflow-tooltip width="130">
+          <template slot-scope="scope">
+            {{ dict.label.agv_system_type[scope.row.agv_system_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="agv_inst_type" label="AGV任务类型" show-overflow-tooltip width="130">
+          <template slot-scope="scope">
+            {{ dict.label.agv_inst_type[scope.row.agv_inst_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="描述" show-overflow-tooltip width="100"/>
+        <el-table-column prop="create_by" label="创建者" show-overflow-tooltip width="100"/>
+        <el-table-column prop="create_time" label="创建时间" show-overflow-tooltip width="150"/>
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
@@ -169,7 +164,7 @@
           <template slot-scope="scope">
             <el-dropdown trigger="click" @command="handleCommand">
               <span class="el-dropdown-link">
-                <i class="el-icon-menu" />
+                <i class="el-icon-menu"/>
               </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
@@ -182,7 +177,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination />
+      <pagination/>
     </div>
   </div>
 </template>
@@ -193,6 +188,7 @@ import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import { getDicts } from '@/api/system/dict'
 import pagination from '@crud/Pagination'
+import rrOperation from '@crud/RR.operation'
 
 const defaultForm = {
   instruction_id: null,
@@ -231,9 +227,9 @@ const defaultForm = {
   update_time: null
 }
 export default {
-  dicts: ['task_status', 'task_type'],
+  dicts: ['task_status', 'task_type', 'send_status', 'execute_status', 'agv_system_type', 'agv_inst_type'],
   name: 'Instruction',
-  components: { crudOperation, pagination },
+  components: { crudOperation, pagination, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({