From 979230afada4f3247aa4b41c44570aaa427d5e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Thu, 13 Jun 2024 16:02:46 +0800
Subject: [PATCH] no message

---
 src/views/business-data/gdDetail/index.vue   |  4 +++-
 src/views/business-data/pick/index.vue       | 10 +++++-----
 src/views/business-data/pickDetail/index.vue |  7 ++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/views/business-data/gdDetail/index.vue b/src/views/business-data/gdDetail/index.vue
index 99df056..78ff688 100644
--- a/src/views/business-data/gdDetail/index.vue
+++ b/src/views/business-data/gdDetail/index.vue
@@ -45,9 +45,11 @@
         <el-table-column prop="updateBy" label="修改人" />
         <el-table-column prop="createTime" label="创建时间" />
         <el-table-column prop="updateTime" label="修改时间" />
+        <el-table-column prop="gd.name" label="任务编号" />
         <el-table-column prop="lineNo" label="行号" />
         <el-table-column prop="item.code" label="关联物料" />
         <el-table-column prop="itemQty" label="单品数量" />
+        <el-table-column prop="orderQty" label="未拆分数量" />
         <el-table-column prop="bigItem.code" label="总成代码" />
         <el-table-column prop="bigItemQty" label="总成套数" />
         <el-table-column prop="orderType" label="单据类型" />
@@ -74,7 +76,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { id: null, createBy: null, updateBy: null, createTime: null, updateTime: null, lineNo: null, item: null, itemQty: null, bigItem: null, bigItemQty: null, orderType: null }
+const defaultForm = { id: null, createBy: null, updateBy: null, createTime: null, updateTime: null, lineNo: null, item: null, itemQty: null, bigItem: null, bigItemQty: null, orderType: null, gd: null }
 export default {
   name: 'GdDetail',
   components: { pagination, crudOperation, rrOperation, udOperation },
diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index 4a9d22c..fa6f23e 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -6,8 +6,8 @@
         <!-- 搜索 -->
         <label class="el-form-item-label">出库单头</label>
         <el-input v-model="query.code" 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.gdDetaiId" 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.gdDetaiId" clearable placeholder="工单明细" style="width: 185px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
         <rrOperation :crud="crud" />
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -28,7 +28,7 @@
             未设置字典，请手动设置 Select
           </el-form-item>
           <el-form-item label="关联工单明细">
-            <el-input v-model="form.gdDetaiId" style="width: 370px;" />
+            <el-input v-model="form.gdDetail" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -45,7 +45,7 @@
         <el-table-column prop="code" label="出库单头" />
         <el-table-column prop="lineNo" label="序号" />
         <el-table-column prop="status" label="状态" />
-        <el-table-column prop="gdDetaiId" label="关联工单明细" />
+        <el-table-column prop="gdDetail.id" label="关联工单明细" />
         <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" width="150px" align="center">
           <template slot-scope="scope">
             <udOperation
@@ -69,7 +69,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 
-const defaultForm = { id: null, createBy: null, updateBy: null, createTime: null, updateTime: null, deptId: null, code: null, lineNo: null, status: null, gdDetaiId: null }
+const defaultForm = { id: null, createBy: null, updateBy: null, createTime: null, updateTime: null, deptId: null, code: null, lineNo: null, status: null, gdDetail: null }
 export default {
   name: 'Pick',
   components: { pagination, crudOperation, rrOperation, udOperation },
diff --git a/src/views/business-data/pickDetail/index.vue b/src/views/business-data/pickDetail/index.vue
index 0ce4650..008cd45 100644
--- a/src/views/business-data/pickDetail/index.vue
+++ b/src/views/business-data/pickDetail/index.vue
@@ -123,7 +123,11 @@
         />
 
 
-        <el-table-column prop="po" width="120" label="任务号"/>
+        <el-table-column prop="pickCode" width="120" label="任务号">
+          <template slot-scope="scope">
+            <div>{{ scope.row.pick.code }}</div>
+          </template>
+        </el-table-column>
         <el-table-column :show-overflow-tooltip="true" prop="itemName" label="物料编码">
           <template slot-scope="scope">
             <div>{{ scope.row.item.code }}</div>
@@ -139,6 +143,7 @@
             {{ dict.label.pick_status[scope.row.status] }}
           </template>
         </el-table-column>
+        <el-table-column prop="lineNo" label="封包系数"/>
         <el-table-column prop="orderQty" label="订单数量"/>
         <el-table-column prop="allocatedQty" label="分配数量"/>
         <el-table-column prop="pickedQty" label="拣货数量"/>