区域、点位、任务管理基础功能；表数据结构更新；代码生成功能代码

mes/qd/src/views/wms/sch/task/index.vue

@@ -30,67 +30,22 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="起始点位">
+          <el-form-item label="点位编码">
             <el-input
-              v-model="query.start_point_code"
+              v-model="query.point_code"
               clearable
               style="width: 180px"
               placeholder="起点"
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="下一点位">
-            <el-input
-              v-model="query.next_point_code"
-              clearable
-              style="width: 180px"
-              placeholder="终点"
-              @keyup.enter.native="crud.toQuery"
-            />
-          </el-form-item>
           <el-form-item label="任务类型">
-            <el-select
-              filterable
+            <treeselect
               v-model="query.task_type"
+              :load-options="loadChildNodes"
+              :options="classes1"
               style="width: 180px"
-              placeholder="任务类型"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.SCH_TASK_TYPE"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="任务明细">
-            <el-select
-              filterable
-              v-model="query.taskdtl_type"
-              style="width: 180px"
-              placeholder="任务类型"
-              class="filter-item"
-              clearable
-              @change="hand"
-            >
-              <el-option
-                v-for="item in dict.SCH_TASK_TYPE_DTL"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
+              placeholder="请选择"
             />
           </el-form-item>
           <el-form-item label="完成方式">
@@ -112,6 +67,17 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="crud.toQuery"
+            />
+          </el-form-item>
 
           <el-form-item label="任务状态">
             <el-select
@@ -147,49 +113,68 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="50" />
-        <el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
-        <el-table-column prop="task_code" label="任务编码" />
+        <el-table-column v-if="true" prop="task_id" label="任务标识" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="true" prop="material_id" label="物料标识" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="task_code" label="任务编码" min-width="100" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_type" label="任务类型" />
-        <el-table-column prop="task_type_name" label="任务类型"  />
-        <el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
-        <el-table-column prop="taskdtl_type_name" label="任务明细" />
+        <el-table-column prop="acs_task_type" label="acs任务类型" min-width="120" show-overflow-tooltip >
+          <template slot-scope="scope">
+            {{ dict.label.acs_task_type[scope.row.acs_task_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip >
+          <template slot-scope="scope">
+            {{ dict.label.task_finished_type[scope.row.finished_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
+        <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
-        <!--
-                <el-table-column v-if="false" prop="finished_type" label="完成方式" />
-        -->
-        <!--        <el-table-column prop="finished_type_name" label="完成方式" :formatter="formatFinishTypeName"/>-->
-        <el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
-        <el-table-column prop="start_point_code" label="起点编码" width="85" />
-        <el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip/>
-        <el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
-        <el-table-column prop="next_point_code" label="下一点编码" width="85" />
-        <el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip/>
-        <el-table-column prop="vehicle_code" label="载具编码" />
-        <el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
-        <el-table-column prop="update_by" label="修改者" v-if="false"/>
+        <el-table-column prop="vehicle_type" label="载具类型" min-width="100" show-overflow-tooltip >
+          <template slot-scope="scope">
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="point_code1" label="起点" width="100" />
+        <el-table-column prop="point1_region_name" label="起点区域" width="120" />
+        <el-table-column prop="point_code2" label="终点" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point2_region_name" label="终点区域" min-width="120" show-overflow-tooltip />
+<!--        <el-table-column prop="point_code3" label="等待点" min-width="100" show-overflow-tooltip />-->
+<!--        <el-table-column prop="point3_region_name" label="等待点区域" min-width="120" show-overflow-tooltip />-->
+        <el-table-column prop="point_code3" label="点位3" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point3_region_name" label="点位3区域" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="point_code4" label="点位4" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="point4_region_name" label="点位4区域" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
         <el-table-column prop="create_time" label="创建时间" width="135" />
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="right"
           label="操作"
-          width="80px"
+          width="160px"
           align="center"
         >
           <template slot-scope="scope">
-            <el-dropdown trigger="click" @command="handleCommand">
-              <span class="el-dropdown-link">
-                <i class="el-icon-menu" />
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
-<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>-->
-                <!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">拉回</el-dropdown-item>-->
-<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'d')">重发</el-dropdown-item>-->
-<!--                <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'e')">详情</el-dropdown-item>-->
-              </el-dropdown-menu>
-            </el-dropdown>
+            <el-button
+              type="text"
+              icon="el-icon-upload"
+              @click="doOperate(scope.row, 'c')"
+            >下发</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-success"
+              @click="doOperate(scope.row, 'a')"
+            >完成</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-error"
+              @click="doOperate(scope.row, 'b')"
+            >取消</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -203,11 +188,11 @@
       width="30%"
     >
       <!--  组件-->
-      <component
-        :is="currentComponent"
-        :task-uuid="taskdtl_id"
-        :dialog-visible="viewDialogVisible"
-      />
+      <!--      <component-->
+      <!--        :is="currentComponent"-->
+      <!--        :task-uuid="task_id"-->
+      <!--        :dialog-visible="viewDialogVisible"-->
+      <!--      />-->
       <span slot="footer" class="dialog-footer">
         <el-button @click="viewDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
@@ -221,24 +206,34 @@ import crudTask from '@/api/wms/sch/task'
 import CRUD, { crud, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
+import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 
 export default {
   name: 'Task',
-  dicts: ['SCH_TASK_TYPE', 'SCH_TASK_TYPE_DTL'],
+  dicts: ['acs_task_type', 'vehicle_type', 'task_finished_type'],
   components: {
-    pagination, crudOperation, rrOperation
+    pagination, crudOperation, rrOperation, Treeselect, udOperation
   },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '任务',
       url: 'api/task',
-      idField: 'taskdtl_id',
-      sort: 'taskdtl_id,desc',
+      idField: 'task_id',
+      sort: 'task_id,desc',
       crudMethod: { ...crudTask },
       query: {
-        task_code:'',vehicle_code:'',start_point_code:'',next_point_code:'',task_type:'',taskdtl_type:'',finished_type:'',task_status:""
+        task_code: '',
+        vehicle_code: '',
+        start_point_code: '',
+        next_point_code: '',
+        task_type: '',
+        finished_type: '',
+        task_status: ''
       },
       optShow: {
         add: false,
@@ -253,7 +248,6 @@ export default {
     return {
       viewDialogVisible: false,
       fullscreen: false,
-      taskdtl_id: '',
       currentComponent: '',
       openParam: {},
       create_time: [],
@@ -263,26 +257,65 @@ export default {
       permission: {
 
       },
-      rules: {}
+      rules: {},
+      classes1: []
     }
   },
   created() {
+    this.initClass1()
     crudTask.getTaskStatus().then(data => {
       this.taskStatusList = data
     })
     crudTask.getFinishType().then(data => {
       this.finishTypeList = data
     })
-    this.crud.query.task_status = ['-1']
-    this.crud.toQuery()
+    // this.crud.query.task_status = ['-1']
+    // this.crud.toQuery()
   },
   methods: {
+    initClass1() {
+      const param = {
+        parent_class_code: 'task_type'
+      }
+      crudClassstandard.getClassType(param).then(res => {
+        const data = res.content
+        this.buildTree(data)
+        this.classes1 = data
+      })
+    },
+    buildTree(classes) {
+      classes.forEach(data => {
+        if (data.children) {
+          this.buildTree(data.children)
+        }
+        if (data.hasChildren && !data.children) {
+          data.children = null // 重点代码
+        }
+      })
+    },
+    // 获取子节点数据
+    loadChildNodes({ action, parentNode, callback }) {
+      if (action === LOAD_CHILDREN_OPTIONS) {
+        crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
+          parentNode.children = res.content.map(function(obj) {
+            if (obj.hasChildren) {
+              obj.children = null
+            }
+            return obj
+          })
+          setTimeout(() => {
+            callback()
+          }, 100)
+        })
+      }
+    },
     hand(value) {
       this.crud.toQuery()
     },
     handTaskStatus(value) {
+      this.crud.query.more_task_status = null
       if (value) {
-        this.query.task_status = this.task_status.toString()
+        this.crud.query.more_task_status = value.toString()
       }
       this.crud.toQuery()
     },
@@ -294,46 +327,28 @@ export default {
       }
       return ''
     },
-    formatFinishTypeName(row, column) {
-      for (const item of this.finishTypeList) {
-        if (item.code === row.finished_type) {
-          return item.name
-        }
-      }
-      return ''
-    },
-    beforeHandleCommand(index, row, command) {
-      return {
-        'index': index,
-        'row': row,
-        'command': command
-      }
-    },
-    handleCommand(command) {
+    doOperate(row, command) {
       let method_name = ''
-      switch (command.command) {
+      switch (command) {
         case 'a':// 完成
           method_name = 'forceFinish'
           break
         case 'b':// 取消
           method_name = 'cancel'
           break
-        case 'c':// 拉回
-          method_name = 'pullBack'
+        case 'c':// 下发
+          method_name = 'immediateNotifyAcs'
           break
-        case 'd':// 重发
-          method_name = 'renotifyAcs'
-          break
-        case 'e':// 详情
+        case 'd':// 详情
           method_name = 'view'
           break
       }
       if (method_name === 'view') {
-        this.view(command.row)
+        this.view(row)
         return
       }
       const data = {
-        taskdtl_id: command.row.taskdtl_id,
+        task_id: row.task_id,
         method_name: method_name
       }
       crudTask.operation(data).then(res => {
@@ -344,7 +359,7 @@ export default {
       })
     },
     view(row) {
-      this.taskdtl_id = row.taskdtl_id
+      this.task_id = row.task_id
       switch (row.task_type) {
         case '01':// 入库
           this.fullscreen = true