Merge remote-tracking branch 'origin/main'

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

@@ -2,6 +2,10 @@
   <div class="app-container">
     <!--工具栏-->
     <div class="head-container">
+      <label class="el-form-item-label">任务号</label>
+      <el-input v-model="query.billCode" clearable placeholder="任务号" style="width: 170px;" class="filter-item"
+                @keyup.enter.native="crud.toQuery"/>
+
       <label class="el-form-item-label">物料编码</label>
       <el-select v-model="query.itemCode" placeholder="物料编码" filterable style="width: 170px;" class="filter-item">
         <el-option
@@ -41,22 +45,40 @@
       <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
 
       <div>
+        <label class="el-form-item-label">Mo票</label>
+        <el-input v-model="query.propC1" clearable placeholder="Mo票" style="width: 180px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
+        <label class="el-form-item-label">送货单号</label>
+        <el-input v-model="query.orderNumber" clearable placeholder="送货单号" style="width: 170px;" class="filter-item"
+                  @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">原点位</label>
         <el-input v-model="query.srcPointCode" clearable placeholder="原点位" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"/>
         <label class="el-form-item-label">目标点位</label>
-        <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 170px;"
+        <el-input v-model="query.dstPointCode" clearable placeholder="目标点位" style="width: 150px;"
                   class="filter-item" @keyup.enter.native="crud.toQuery"/>
         <rrOperation :crud="crud"/>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission" :tableKey="this.$options.name" />
+      <crudOperation :permission="permission" :tableKey="this.$options.name"/>
       <!--表单组件-->
 
       <!--表格渲染-->
-      <el-table ref="table"  height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-        <el-table-column type="selection" width="55" />
-        <el-table-column prop="xh" type="index" :index="indexMethod"  label="序号"/>
+      <el-table ref="table" height="66vh" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
+        <el-table-column type="selection" width="55"/>
+        <el-table-column prop="xh" type="index" :index="indexMethod" label="序号"/>
+        <el-table-column prop="billCode" label="任务号"/>
+        <el-table-column prop="orderNumber" label="送货单号">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.orderNumber }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="propC1" label="Mo票">
+          <template slot-scope="scope">
+            <div>{{ scope.row.itemKey.propC1 }}</div>
+          </template>
+        </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="物料编码">
           <template slot-scope="scope">
             <div>{{ scope.row.item.code }}</div>
@@ -67,18 +89,18 @@
             <div>{{ scope.row.item.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="srcStockCode" label="容器编码" />
-        <el-table-column prop="srcPointCode" label="原点位" />
-        <el-table-column prop="dstPointCode" label="目标点位" />
+        <el-table-column prop="srcStockCode" label="容器编码"/>
+        <el-table-column prop="srcPointCode" label="原点位"/>
+        <el-table-column prop="dstPointCode" label="目标点位"/>
         <el-table-column prop="agvStatus" label="任务状态">
           <template slot-scope="scope">
             {{ dict.label.task_status[scope.row.agvTask.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="planQty" label="计划数量" />
-        <el-table-column prop="moveQty" label="移位数量" />
-        <el-table-column prop="createBy" label="创建人" />
-        <el-table-column prop="createTime" label="创建时间" />
+        <el-table-column prop="planQty" label="计划数量"/>
+        <el-table-column prop="moveQty" label="移位数量"/>
+        <el-table-column prop="createBy" label="创建人"/>
+        <el-table-column prop="createTime" label="创建时间"/>
       </el-table>
       <!--分页组件-->
       <div style="float: right;">
@@ -90,7 +112,7 @@
 
 <script>
 import crudTask from '@/api/task'
-import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import CRUD, {presenter, header, form, crud} from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -98,14 +120,51 @@ import pagination from '@crud/Pagination'
 import DateRangePicker from "@/components/DateRangePicker/index.vue";
 import {getItemsList} from "@/api/item";
 
-const defaultForm = { id: null, itemId: null, itemKeyId: null, billCode: null, taskType: null, asnDetailId: null, moveDetailId: null, waveDetailId: null, pickDetailId: null, srcStockId: null, dstStockId: null, srcPointId: null, dstPointId: null, srcStockCode: null, dstStockCode: null, srcPointCode: null, dstPointCode: null, invStatus: null, taskStatus: null, beSkip: null, beBack: null, planQty: null, moveQty: null, putCode: null, invId: null, deptId: null, createBy: null, updateBy: null, createTime: null, updateTime: null }
+const defaultForm = {
+  id: null,
+  itemId: null,
+  itemKeyId: null,
+  billCode: null,
+  taskType: null,
+  asnDetailId: null,
+  moveDetailId: null,
+  waveDetailId: null,
+  pickDetailId: null,
+  srcStockId: null,
+  dstStockId: null,
+  srcPointId: null,
+  dstPointId: null,
+  srcStockCode: null,
+  dstStockCode: null,
+  srcPointCode: null,
+  dstPointCode: null,
+  invStatus: null,
+  taskStatus: null,
+  beSkip: null,
+  beBack: null,
+  planQty: null,
+  moveQty: null,
+  putCode: null,
+  invId: null,
+  deptId: null,
+  createBy: null,
+  updateBy: null,
+  createTime: null,
+  updateTime: null
+}
 export default {
   name: 'Task',
-  components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation },
+  components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   dicts: ['task_status'],
   cruds() {
-    return CRUD({ query:{taskType:['PICK']}, title: '出库任务', url: 'api/task', idField: 'id', sort: 'id,desc', crudMethod: { ...crudTask },
+    return CRUD({
+        query: {taskType: ['PICK']},
+        title: '出库任务',
+        url: 'api/task',
+        idField: 'id',
+        sort: 'id,desc',
+        crudMethod: {...crudTask},
         optShow: {
           add: false,
           edit: false,
@@ -124,14 +183,13 @@ export default {
         edit: ['admin', 'task:edit'],
         del: ['admin', 'task:del']
       },
-      rules: {
-      },
+      rules: {},
       queryTypeOptions: [
-        { key: 'itemCode', display_name: '物料代码' },
-        { key: 'itemName', display_name: '物料名称' },
-        { key: 'taskStatus', display_name: '任务状态' },
-        { key: 'srcPointCode', display_name: '源点位编码' },
-        { key: 'dstPointCode', display_name: '目标点位编码' }
+        {key: 'itemCode', display_name: '物料代码'},
+        {key: 'itemName', display_name: '物料名称'},
+        {key: 'taskStatus', display_name: '任务状态'},
+        {key: 'srcPointCode', display_name: '源点位编码'},
+        {key: 'dstPointCode', display_name: '目标点位编码'}
       ],
       itemListData: []
     }
@@ -146,7 +204,7 @@ export default {
       return true
     },
     indexMethod(index) {
-      return index * 1+1;
+      return index * 1 + 1;
     },
     //物料数据
     itemDataGet() {

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

@@ -39,7 +39,7 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" style="width: 100%;margin-top: -10px;">
       <el-table-column type="index" :index="indexMethod" label="序号"/>
-      <el-table-column :show-overflow-tooltip="true" prop="itemCode" label="任务号">
+      <el-table-column :show-overflow-tooltip="true" prop="po" label="任务号">
         <template slot-scope="scope">
           <div>{{ scope.row.pickDetail.po }}</div>
         </template>