From 44f9bc00d4f990741bf46715b4de51faf005a45b Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 15 Jul 2024 09:37:35 +0800
Subject: [PATCH] =?UTF-8?q?app=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionReport/components/dataItem.vue    | 17 ++++++++++++++---
 .../productionReport-detail.vue                 |  4 ++--
 .../components/detailPanel.vue                  |  4 ++--
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue b/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue
index 06eca669..087fcf44 100644
--- a/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue
+++ b/mes-ui/uni-app/src/pages/productionReport/components/dataItem.vue
@@ -105,10 +105,21 @@ const onRefresherrefresh = async () => {
   // 关闭动画
   isTriggered.value = false
 }
-const searchVal = ref('')
+const searchVal = ref()
 // const dataListDefault = ref([])
 const handleSearch = async () => {
+  queryParams.projectSubCodeOrName=undefined
   const code = searchVal.value
+
+  console.log('搜索',searchVal.value)
+  if (searchVal.value == '') {
+    searchVal.value = undefined
+  }else{
+    queryParams.projectSubCodeOrName = code
+  }
+  queryParams.pageNo = 1
+  queryParams.pageSize = 5
+  dataList.value = []
   queryParams.projectSubCodeOrName = code
   getListData()
 }
@@ -194,10 +205,10 @@ const handleOk = async () => {
 </script>
 <template>
   <view class="cont">
-    <view class="search" v-if="total > 5">
+    <!-- <view class="search">
       <input class="uni-input" v-model="searchVal" @change="handleSearch" placeholder="根据产品编码/名称搜索" />
       <uni-icons type="search" size="30" class="icons" @click="handleSearch"></uni-icons>
-    </view>
+    </view> -->
     <view class="selects" v-if="props.orderState == '0,1'">
       <!-- 多选-->
       <view style="display: flex" @click="flag = !flag">
diff --git a/mes-ui/uni-app/src/pages/productionReport/productionReport-detail.vue b/mes-ui/uni-app/src/pages/productionReport/productionReport-detail.vue
index 2f6244d4..97453edd 100644
--- a/mes-ui/uni-app/src/pages/productionReport/productionReport-detail.vue
+++ b/mes-ui/uni-app/src/pages/productionReport/productionReport-detail.vue
@@ -241,8 +241,8 @@ const handleStop = async () => {
           <view class="no-data" v-if="!historyList.length"> 无数据... </view>
           <template v-else>
             <view class="item" v-for="(item, index) in historyList" :key="item.id">
-              <view class="product-item">生产开始时间：{{ item.startTimeStr }}</view>
-              <view class="product-item">生产结束时间：{{ item.endTimeStr }}</view>
+              <!-- <view class="product-item">生产开始时间：{{ item.startTimeStr }}</view> -->
+              <view class="product-item">报工提交时间：{{ item.endTimeStr }}</view>
 
               <view class="product-row">
                 <view class="row-item">
diff --git a/mes-ui/uni-app/src/pages/unqualifiedNotification/components/detailPanel.vue b/mes-ui/uni-app/src/pages/unqualifiedNotification/components/detailPanel.vue
index 48b712e0..9495368d 100644
--- a/mes-ui/uni-app/src/pages/unqualifiedNotification/components/detailPanel.vue
+++ b/mes-ui/uni-app/src/pages/unqualifiedNotification/components/detailPanel.vue
@@ -62,7 +62,7 @@ const getProjectChildData = async (projectOrderId) => {
   const arr = []
   data.forEach((e) => {
     const obj = {
-      text: e.projectSubName,
+      text: e.projectSubName+' '+e.spec,
       value: e.id,
       spec: e.spec
     }
@@ -331,7 +331,7 @@ const deleteImage = (e: any) => {
         <uni-forms-item label="生产订单号" required name="projectId">
           <uni-data-select v-model="valiFormData.projectId" :localdata="projectData" @change="handleChangeProject"></uni-data-select>
         </uni-forms-item>
-        <uni-forms-item label="产品编码/名称" required name="projectSubId">
+        <uni-forms-item label="产品" required name="projectSubId">
           <uni-data-select v-model="valiFormData.projectSubId" :localdata="projectChildData" @change="handleChangeProjectChild"></uni-data-select>
         </uni-forms-item>
         <uni-forms-item label="规格/型号" name="">