From bb46e2d5e6164570853cd6be9bac876449e11cb7 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Wed, 12 Feb 2025 11:27:52 +0800
Subject: [PATCH] no message

---
 src/views/business-data/pick/index.vue        | 36 +++++++++++--------
 .../business-data/pickDetail/pickTask.vue     |  6 ++++
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index 9cd27b2..a92b9f7 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -142,6 +142,8 @@
             >
               <el-table-column prop="xh" label="序号" type="index" width="80"/>
               <el-table-column prop="item.code" label="物料编码" align="center"/>
+              <el-table-column prop="propC3" label="MES拆分物料" v-if="hasPropC3Value(props.row.pickDetails)"
+                               align="center"/>
               <el-table-column prop="item.name" label="物料名称" align="center"/>
               <el-table-column prop="orderQty" label="订单数量" align="center"/>
               <el-table-column prop="allocatedQty" label="分配数量" align="center"/>
@@ -226,16 +228,16 @@
 
 <script>
 import crudPick from '@/api/pick'
-import crudPickDetail, { findByAllPickDetail } from '@/api/pickDetail'
+import crudPickDetail, {findByAllPickDetail} from '@/api/pickDetail'
 import crudItem from '@/api/item'
 import crudBigItem from '@/api/bigItem'
-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'
 import pagination from '@crud/Pagination'
 
-import { none } from 'html-webpack-plugin/lib/chunksorter'
+import {none} from 'html-webpack-plugin/lib/chunksorter'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 
 const defaultForm = {
@@ -253,7 +255,7 @@ const defaultForm = {
 export default {
   name: 'Pick',
   dicts: ['pick_status', 'gd_type', 'return_status'],
-  components: { DateRangePicker, pagination, crudOperation, rrOperation, udOperation },
+  components: {DateRangePicker, pagination, crudOperation, rrOperation, udOperation},
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -264,7 +266,7 @@ export default {
       },
       idField: 'id',
       sort: ['createTime,asc', 'lineNo,asc'],
-      crudMethod: { ...crudPick },
+      crudMethod: {...crudPick},
       optShow: {
         add: false,
         edit: false,
@@ -289,19 +291,19 @@ export default {
       },
       rules: {
         gdCode: [
-          { required: true, message: '请选择工单编码', trigger: 'blur' }
+          {required: true, message: '请选择工单编码', trigger: 'blur'}
         ],
         lineNo: [
-          { required: true, message: '请输入顺序号', trigger: 'blur' }
+          {required: true, message: '请输入顺序号', trigger: 'blur'}
         ],
         status: [
-          { required: true, message: '请选择状态', trigger: 'blur' }
+          {required: true, message: '请选择状态', trigger: 'blur'}
         ],
         cpCodeOrDpCode: [
-          { required: true, message: '请选择成品代码/单品代码', trigger: 'blur' }
+          {required: true, message: '请选择成品代码/单品代码', trigger: 'blur'}
         ],
         station: [
-          { required: true, message: '请输入需求工位', trigger: 'blur' }
+          {required: true, message: '请输入需求工位', trigger: 'blur'}
         ]
       }
     }
@@ -317,17 +319,17 @@ export default {
       // 清空数组，防止重复添加
       this.itemAndBigItem = []
 
-      crudItem.queryItemAll({ enabled: true }).then(res => {
+      crudItem.queryItemAll({enabled: true}).then(res => {
         res.forEach(item => {
-          const cpCodeAndDpCode = { code: null }
+          const cpCodeAndDpCode = {code: null}
           cpCodeAndDpCode.code = item.code
           this.itemAndBigItem.push(cpCodeAndDpCode)
         })
       })
 
-      crudBigItem.queryBigItemAll({ enabled: true }).then(res => {
+      crudBigItem.queryBigItemAll({enabled: true}).then(res => {
         res.forEach(item => {
-          const cpCodeAndDpCode = { code: null }
+          const cpCodeAndDpCode = {code: null}
           cpCodeAndDpCode.code = item.code
           this.itemAndBigItem.push(cpCodeAndDpCode)
         })
@@ -339,7 +341,7 @@ export default {
       // 展开的时候expandedRows有值，收起的时候为空.
       this.loading = true
       if (expandedRows.length > 0) {
-        crudPickDetail.findByAllPickDetail({ pickId: row.id }).then(res => {
+        crudPickDetail.findByAllPickDetail({pickId: row.id}).then(res => {
           // 遍历当前页面表
           this.$set(row, 'pickDetails', res)
           setTimeout(() => {
@@ -430,6 +432,10 @@ export default {
         }
       })
 
+    },
+    hasPropC3Value(childData) {
+      // 检查子表数据中是否有 propC3 有值的数据项
+      return Array.isArray(childData) && childData.some(item => item.propC3);
     }
 
   }
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index 58e8e91..ebb7859 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -44,6 +44,12 @@
       <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
 
       <div>
+
+        <label class="el-form-item-label">出库单号</label>
+        <el-input v-model="query.pickCode" 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"