rev:task

2024-05-24 10:32:35 +08:00
parent 000341f6d1
commit c2c4369c14
14 changed files with 516 additions and 92 deletions
--- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
+++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
@@ -10,6 +10,7 @@
          label-width="80px"
          label-suffix=":"
        >
+<<<<<<< Updated upstream
          <el-form-item label="生产车间">
            <el-select
              v-model="query.product_area"
@@ -27,12 +28,18 @@
              />
            </el-select>
          </el-form-item>
+=======
+>>>>>>> Stashed changes
          <el-form-item label="任务号">
            <label slot="label">任&nbsp;&nbsp;务&nbsp;号:</label>
            <el-input
              v-model="query.task_code"
              clearable
+<<<<<<< Updated upstream
              style="width: 180px"
+=======
+              style="width: 240px"
+>>>>>>> Stashed changes
              placeholder="任务号"
              @keyup.enter.native="crud.toQuery"
            />
@@ -42,7 +49,11 @@
            <el-input
              v-model="query.vehicle_code"
              clearable
+<<<<<<< Updated upstream
              style="width: 180px"
+=======
+              style="width: 240px"
+>>>>>>> Stashed changes
              placeholder="载具号"
              @keyup.enter.native="crud.toQuery"
            />
@@ -51,11 +62,16 @@
            <el-input
              v-model="query.point_code"
              clearable
+<<<<<<< Updated upstream
              style="width: 180px"
+=======
+              style="width: 240px"
+>>>>>>> Stashed changes
              placeholder="起点"
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
+<<<<<<< Updated upstream
          <el-form-item label="任务类型">
            <el-select
              v-model="query.task_type"
@@ -110,23 +126,47 @@
              v-model="task_status"
              multiple
              style="width: 200px"
+=======
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="query.createTime"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="crud.toQuery">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="任务状态">
+            <el-select
+              v-model="query.task_status"
+              multiple
+              style="width: 360px"
+>>>>>>> Stashed changes
              placeholder="任务状态"
              class="filter-item"
              clearable
              @change="handTaskStatus"
            >
              <el-option
+<<<<<<< Updated upstream
                label="调度中任务"
                value="-1"
              />
              <el-option
                v-for="item in taskStatusList"
                :key="item.code"
+=======
+                v-for="item in taskStatusList"
+                :key="item.value"
+>>>>>>> Stashed changes
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
+<<<<<<< Updated upstream
          <rrOperation />
        </el-form>
      </div>
@@ -208,15 +248,114 @@
              icon="el-icon-success"
              @click="doOperate(scope.row, 'a')"
            >完成</el-button>
+=======
+          <rrOperation/>
+        </el-form>
+      </div>
+      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
+      <crudOperation :permission="permission"/>
+      <!--表单组件-->
+      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
+                 :title="crud.status.title" width="800px">
+        <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
+                 :model="form" :rules="rules" size="mini" label-width="115px" label-suffix=":">
+          <el-form-item label="任务编码">
+            <el-input v-model="form.task_code" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="任务状态">
+            <el-input v-model="form.task_status" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="点位1">
+            <el-input v-model="form.point_code1" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="点位2">
+            <el-input v-model="form.point_code2" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="点位3">
+            <el-input v-model="form.point_code3" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="点位4">
+            <el-input v-model="form.point_code4" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="载具类型">
+            <el-input v-model="form.vehicle_type" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="载具编码">
+            <el-input v-model="form.vehicle_code" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="优先级">
+            <el-input v-model="form.priority" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item v-if="false" label="处理类">
+            <el-input v-model="form.handle_class" style="width: 240px;"/>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="form.remark" style="width: 240px;"/>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="crud.cancelCU">取消</el-button>
+          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+        </div>
+      </el-dialog>
+      <!--表格渲染-->
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="product_area" show-overflow-tooltip show-tooltip-when-overflow label="生产区域"/>
+        <el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码"/>
+        <el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型"/>
+        <el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型"/>
+        <el-table-column prop="task_status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
+          <template slot-scope="scope">
+            {{ getStatusName(scope.row.task_status) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤"/>
+        <el-table-column prop="group_code" show-overflow-tooltip show-tooltip-when-overflow label="任务组"/>
+        <el-table-column prop="point_code1" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点1"/>
+        <el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点1"/>
+        <el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点2"/>
+        <el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点2"/>
+        <el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow label="载具编码">
+          <template slot-scope="scope">
+            {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow label="优先级"/>
+        <el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" label="处理类"/>
+        <el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow label="立即下发"/>
+        <el-table-column prop="remark" show-overflow-tooltip show-tooltip-when-overflow label="备注"/>
+        <el-table-column prop="form_data" show-overflow-tooltip show-tooltip-when-overflow width="130" label="自定义参数"/>
+        <el-table-column prop="create_time" show-overflow-tooltip show-tooltip-when-overflow label="创建时间"/>
+        <el-table-column prop="update_name" show-overflow-tooltip show-tooltip-when-overflow label="修改人"/>
+        <el-table-column prop="update_time" show-overflow-tooltip show-tooltip-when-overflow label="修改时间"/>
+        <el-table-column v-permission="[]" label="操作" width="160px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              icon="el-icon-success"
+              @click="doOperate(scope.row, 'a')"
+              :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
+            >完成
+            </el-button>
+>>>>>>> Stashed changes
            <el-button
              type="text"
              icon="el-icon-error"
              @click="doOperate(scope.row, 'b')"
+<<<<<<< Updated upstream
            >取消</el-button>
+=======
+              :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
+            >取消
+            </el-button>
+>>>>>>> Stashed changes
          </template>
        </el-table-column>
      </el-table>
      <!--分页组件-->
+<<<<<<< Updated upstream
      <pagination />
    </div>
    <el-dialog
@@ -236,16 +375,27 @@
        <el-button type="primary" @click="viewDialogVisible = false">确 定</el-button>
      </span>
    </el-dialog>
+=======
+      <pagination/>
+    </div>
+>>>>>>> Stashed changes
  </div>
 </template>

 <script>
+<<<<<<< Updated upstream
 import crudTask from '@/views/wms/dispatch_manage/task/task'
 import CRUD, { crud, header, presenter } from '@crud/crud'
+=======
+import crudSchBaseTask from './schBaseTask'
+// import crudSchBaseTaskconfig from './config/schBaseTaskconfig'
+import CRUD, {crud, form, header, presenter} from '@crud/crud'
+>>>>>>> Stashed changes
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+<<<<<<< Updated upstream
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'

@@ -273,17 +423,62 @@ export default {
        product_area: 'A1',
        task_status: '-1'
      },
+=======
+import crudDict from '@/views/system/dict/dict'
+
+
+const defaultForm = {
+  id: null,
+  product_area: null,
+  task_code: null,
+  task_type: null,
+  acs_type: null,
+  task_status: null,
+  task_step: null,
+  group_code: null,
+  point_code1: null,
+  point_code2: null,
+  point_code3: null,
+  point_code4: null,
+  vehicle_code: null,
+  priority: null,
+  handle_class: null,
+  is_send: null,
+  create_time: null,
+  update_time: null,
+  update_name: null,
+  remark: null,
+  form_data: null,
+  is_delete: false
+}
+export default {
+  name: 'Task',
+  components: {pagination, crudOperation, rrOperation, udOperation},
+  mixins: [presenter(), header(), form(defaultForm), crud()],
+  cruds() {
+    return CRUD({
+      title: '任务管理',
+      url: 'api/schBaseTask',
+      idField: 'task_id',
+      sort: 'task_code,desc',
+>>>>>>> Stashed changes
      optShow: {
        add: false,
        edit: false,
        del: false,
        download: false,
        reset: true
+<<<<<<< Updated upstream
      }
+=======
+      },
+      crudMethod: {...crudSchBaseTask}
+>>>>>>> Stashed changes
    })
  },
  data() {
    return {
+<<<<<<< Updated upstream
      viewDialogVisible: false,
      fullscreen: false,
      currentComponent: '',
@@ -347,11 +542,26 @@ export default {
          data.children = null // 重点代码
        }
      })
+=======
+      permission: {},
+      rules: {},
+      taskStatusList: [],
+    }
+  },
+  created() {
+    this.getTaskStatusList()
+  },
+  methods: {
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeRefresh]() {
+      return true
+>>>>>>> Stashed changes
    },
    hand(value) {
      this.crud.toQuery()
    },
    handTaskStatus(value) {
+<<<<<<< Updated upstream
      this.crud.query.task_status = value.toString()
      this.crud.toQuery()
    },
@@ -370,6 +580,22 @@ export default {
        }
      }
      return ''
+=======
+      this.crud.query.more_task_status = null
+      if (value) {
+        this.crud.query.more_task_status = value.toString()
+      }
+      this.crud.toQuery()
+    },
+    getTaskStatusList() {
+      crudDict.getStatusEnum("FORM_STATUS").then(res => {
+        this.taskStatusList = res
+      })
+    },
+    getStatusName(code) {
+      const status = this.taskStatusList.find(item => item.code === code)
+      return status ? status.name : '-'
+>>>>>>> Stashed changes
    },
    doOperate(row, command) {
      let method_name = ''
@@ -388,6 +614,7 @@ export default {
          break
      }
      if (method_name === 'view') {
+<<<<<<< Updated upstream
        this.view(row)
        return
      }
@@ -396,11 +623,23 @@ export default {
        method_name: method_name
      }
      crudTask.operation(data).then(res => {
+=======
+        // this.view(row)
+        return
+      }
+      const data = {
+        task_code: row.task_code,
+        method_name: method_name,
+        config_code: row.config_code
+      }
+      crudSchBaseTask.operation(data).then(res => {
+>>>>>>> Stashed changes
        this.crud.toQuery()
        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
      }).catch(err => {
        console.log(err.response.data.message)
      })
+<<<<<<< Updated upstream
    },
    view(row) {
      this.task_id = row.task_id
@@ -433,6 +672,10 @@ export default {

  }

+=======
+    }
+  }
+>>>>>>> Stashed changes
 }
 </script>

--- a/wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js
+++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/schBaseTask.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/schBaseTask',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/schBaseTask/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/schBaseTask',
+    method: 'put',
+    data
+  })
+}
+
+export function getTaskStatusList() {
+  return request({
+    url: 'api/schBaseTask/taskStatusList',
+    method: 'get'
+  })
+}
+
+export function operation(data) {
+  return request({
+    url: 'api/schBaseTask/operation',
+    method: 'put',
+    data
+  })
+}
+
+export default { add, edit, del, getTaskStatusList, operation}