Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/Statement/detaildialog.vue

@@ -18,12 +18,12 @@
                   sortable
                   prop="projectCode"
                   align="center"
-                  width="140"
+                  width="170"
                 />
                 <el-table-column label="归属部门 " prop="deptName" align="center" width="120" />
-                <el-table-column label="产品编码" prop="materialCode" align="center" width="120" />
-                <el-table-column label="产品名称" align="materialName" prop="name" min-width="120" />
-                <el-table-column label="规格/型号" align="center" prop="spec" min-width="120" />
+                <el-table-column label="产品编码" prop="materialCode" align="center" width="160" />
+                <el-table-column label="产品名称" align="center" prop="materialName" min-width="160" />
+                <el-table-column label="规格/型号" align="center" prop="spec" min-width="140" />
                 <el-table-column label="报工人" align="center" prop="ownerName" min-width="120" />
                 <el-table-column label="报工日期" align="center" prop="reportTime" min-width="220" >
                   <template #default="scope">

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">

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">

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="">