Merge branch '12.31外协分选发出' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue into 12.31外协分选发出

src/views/business/report/index.vue

@@ -6,20 +6,20 @@
             <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true"
                 style="margin-right: 0px">
                 <el-form-item class="section-title" label="报工日报" />
-                <el-form-item label="批次号：">
-                    <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable
-                        style="width: 130px" />
-                </el-form-item>
                 <el-form-item label="产品描述：">
-                    <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription" @keydown.enter.prevent
+                    <el-input placeholder="请输入产品描述" v-model.trim="queryParams.productDescription" @keydown.enter.prevent @blur="handleTrimQuarms"
                         clearable style="width: 130px" />
                 </el-form-item>
+                <el-form-item label="批次号：">
+                    <el-input placeholder="请输入批次号" v-model.trim="queryParams.lotCode" @keydown.enter.prevent clearable @blur="handleTrimQuarms"
+                        style="width: 130px" />
+                </el-form-item>
                 <el-form-item label="员工姓名：">
-                    <el-input placeholder="请输入姓名" v-model.trim="queryParams.nickName" @keydown.enter.prevent clearable
+                    <el-input placeholder="请输入姓名" v-model.trim="queryParams.nickName" @keydown.enter.prevent clearable @blur="handleTrimQuarms"
                         style="width: 96px" />
                 </el-form-item>
                 <el-form-item label="箱号：">
-                    <el-input placeholder="请输入箱号" v-model.trim="queryParams.originalCarrier" @keydown.enter.prevent
+                    <el-input placeholder="请输入箱号" v-model.trim="queryParams.originalCarrier" @keydown.enter.prevent @blur="handleTrimQuarms"
                         clearable style="width: 96px" />
                 </el-form-item>
                 <el-form-item class="section-title" label="请选择当前工段：">
@@ -29,7 +29,7 @@
                 <el-form-item label="时间：">
                     <el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
-                    <span>~</span>
+                    <span>到</span>
                     <el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD"
                         :editable="false" clearable placeholder="请选择" style="width: 136px" @change="handleDateChange" />
                 </el-form-item>
@@ -182,7 +182,12 @@ function handleDateChange() {
     console.log(queryParams.value.startTime);
     console.log(queryParams.value.endTime);
 }
-
+function handleTrimQuarms(){
+  queryParams.value.lotCode = queryParams.value.lotCode !=null&&queryParams.value.lotCode !=""?queryParams.value.lotCode.trim():null;
+  queryParams.value.productDescription = queryParams.value.productDescription !=null&&queryParams.value.productDescription !=""?queryParams.value.productDescription.trim():null;
+  queryParams.value.nickName = queryParams.value.nickName !=null&&queryParams.value.nickName !=""?queryParams.value.nickName.trim():null;
+  queryParams.value.originalCarrier = queryParams.value.originalCarrier !=null&&queryParams.value.originalCarrier !=""?queryParams.value.originalCarrier.trim():null;
+}
 
 /**切换工序 */
 function handleProcessChange() {

src/views/business/reportPlan/index.vue

@@ -4,12 +4,12 @@
       <!-- 搜索区 -->
       <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
         <el-form-item class="section-title" label="生产计划" />
-        <el-form-item label="生产计划单号：">
-          <el-input placeholder="请输入生产计划单号" v-model.trim="queryParams.productionPlanNo"
+        <el-form-item label="产品描述：">
+          <el-input placeholder="请输入产品描述" v-model="queryParams.keywords" @blur="handleTrimQuarms"
             @keyup.enter="handleQueryProductionPlanDetail" @keydown.enter.prevent clearable style="width: 200px" />
         </el-form-item>
-        <el-form-item label="产品描述：">
-          <el-input placeholder="请输入产品描述" v-model.trim="queryParams.keywords"
+        <el-form-item label="生产计划单号：">
+          <el-input placeholder="请输入生产计划单号" v-model="queryParams.productionPlanNo" @blur="handleTrimQuarms"
             @keyup.enter="handleQueryProductionPlanDetail" @keydown.enter.prevent clearable style="width: 200px" />
         </el-form-item>
         <el-form-item class="section-title" label="请选择当前工段：">
@@ -128,6 +128,10 @@ function handleExport() {
     ...queryParams.value
   }, `报工日报${new Date().getTime()}.xlsx`)
 }
+function handleTrimQuarms(){
+  queryParams.value.productionPlanNo = queryParams.value.productionPlanNo !=null&&queryParams.value.productionPlanNo !=""?queryParams.value.productionPlanNo.trim():null;
+  queryParams.value.keywords = queryParams.value.keywords !=null&&queryParams.value.keywords !=""?queryParams.value.keywords.trim():null;
+}
 
 onMounted(() => {
   getList();

src/views/business/reviseBath/index.vue

@@ -4,7 +4,7 @@
     <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="计划单号：">
         <el-input placeholder="请输入计划单号" @keydown.enter.prevent @keyup.enter="handleQuery" clearable
-          v-model.trim="queryParams.productionPlanNo" style="width: 160px" />
+          v-model="queryParams.productionPlanNo"  @blur="handleTrimQuarms" style="width: 160px" />
       </el-form-item>
       <el-form-item label="批号状态：" label-width="100px">
         <el-select v-model="queryParams.lotCodeStatusCode" clearable placeholder="请选择批号状态" style="width: 150px">
@@ -136,6 +136,10 @@ function handleFresh() {
   console.log(queryParams.value)
   getList();
 }
+function handleTrimQuarms(){
+  queryParams.value.productionPlanNo = queryParams.value.productionPlanNo !=null&&queryParams.value.productionPlanNo !=""?queryParams.value.productionPlanNo.trim():null;
+
+}
 
 /** 搜索按钮操作 */
 function handleQuery() {