更新

acs/nladmin-ui/src/views/acs/device/driver/magang_conveyor_control.vue

@@ -92,6 +92,11 @@
               <el-switch v-model="form.manual_create_task" />
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="是否输入物料" label-width="150px">
+              <el-switch v-model="form.input_material" />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -112,6 +117,23 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="任务类型" label-width="150px">
+              <el-select
+                v-model="form.taskType"
+                filterable
+                clearable
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in dict.task_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="关联三色灯" prop="device_code" label-width="100px">
               <el-select
@@ -129,11 +151,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否输入物料" label-width="150px">
-              <el-switch v-model="form.input_material" />
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
     </el-card>
@@ -266,6 +283,7 @@ import deviceCrud from '@/api/acs/device/device'
 
 export default {
   name: 'StandardConveyorControl',
+  dicts: ['task_type'],
   mixins: [crud],
   props: {
     parentForm: {
@@ -297,7 +315,8 @@ export default {
         manual_create_task: true,
         is_pickup: true,
         is_release: true,
-        link_device_code: []
+        link_device_code: [],
+        taskType: ''
       },
       rules: {}
     }

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

@@ -109,10 +109,14 @@
         <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 prop="link_num" label="关联编号" />
+        <el-table-column prop="instruction_type" label="指令类型">
+          <template slot-scope="scope">
+            {{ dict.label.instruction_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="指令状态">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">就绪</span>
@@ -130,6 +134,7 @@
         <el-table-column prop="start_point_code" label="取货点" />
         <el-table-column prop="put_point_code" label="倒料点" />
         <el-table-column prop="next_point_code" label="放货点" />
+        <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="carno" label="车号" />
         <el-table-column prop="compound_inst" label="复合指令">
           <template slot-scope="scope">
@@ -213,7 +218,7 @@ const defaultForm = {
   update_time: null
 }
 export default {
-  dicts: ['task_status'],
+  dicts: ['task_status', 'instruction_type'],
   name: 'Instruction',
   components: { crudOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],

acs/nladmin-ui/src/views/acs/task/index.vue

@@ -251,9 +251,11 @@
         <el-table-column type="selection" width="25" />
         <el-table-column v-if="false" prop="task_id" label="任务标识" />
         <el-table-column prop="task_code" label="任务号" />
-        <el-table-column prop="task_type" label="任务类型" />
-        <el-table-column prop="link_num" label="关联编号" />
-        <el-table-column prop="vehicle_code" label="载具号" />
+        <el-table-column prop="task_type" label="任务类型">
+          <template slot-scope="scope">
+            {{ dict.label.task_type[scope.row.task_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="task_status" label="任务状态">
           <template slot-scope="scope">
             <span v-if="scope.row.task_status==='0' ">就绪</span>
@@ -261,15 +263,12 @@
             <span v-if="scope.row.task_status==='2' ">完成</span>
           </template>
         </el-table-column>
-        <!--<el-table-column prop="task_type" label="任务类型">
-          <template slot-scope="scope">
-            {{ dict.label.task_type[scope.row.task_type] }}
-          </template>
-        </el-table-column>-->
         <el-table-column prop="priority" label="任务优先级" />
         <el-table-column prop="start_point_code" label="取货点" width="120px" />
         <el-table-column prop="put_point_code" label="倒料点" />
         <el-table-column prop="next_point_code" label="放货点" width="120px" />
+        <el-table-column prop="link_num" label="关联编号" />
+        <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="compound_task" label="复合任务">
           <template slot-scope="scope">
             <span v-if="scope.row.compound_task==='0' ">否</span>