订单搜索修改

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/draftOrder/index.vue

@@ -2,13 +2,10 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -181,12 +178,9 @@
 	import TenantEdit from "./components/Edit"
 	import TenantView from "./components/View"
 	// 【订单管理】-API
-	import
-    orderMgrApi from "@/api/runManageCenter/orderMgr"
+	import orderMgrApi from "@/api/runManageCenter/orderMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
-  import planMgrApi from "@/api/runManageCenter/planMgr";
+	import { downloadFile,  initQueryParams } from '@/utils/commons'
   import FileImport from "@/components/zuihou/Import";
 	export default {
 	  name: "DraftOrder",
@@ -496,6 +490,12 @@
 	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
+
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数-草稿：orderstatus = 1 and source = 1

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/failAuditOrder/index.vue

@@ -2,13 +2,23 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+<!--    	<span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--    	<span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--      &lt;!&ndash; 零件名称 &ndash;&gt;-->
+<!--      <span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -220,8 +230,7 @@
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -472,6 +481,11 @@
 	        this.queryParams.model.deliveryTime_st = this.queryParams.timeRange[0] + " 00:00:00"
 	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
 
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/finishedOrder/index.vue

@@ -2,13 +2,23 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
+<!--    	<span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--    	<span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 零件名称 -->
+      <span>
     		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -24,6 +34,22 @@
 		      align="right">
 		    </el-date-picker>
     	</span>
+    </div>
+    <div>
+      <span>
+    		<span>{{$t("runCenter.searchForm.deliveryTime2")}}：</span>
+    		<el-date-picker
+          v-model="queryParams.timeRange1"
+          type="daterange"
+          :picker-options="pickerOptions"
+          :range-separator='$t("common.separator")'
+          :start-placeholder='$t("common.startTime")'
+          :end-placeholder='$t("common.endTime")'
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          align="right">
+		    </el-date-picker>
+    	</span>
       <span style="margin-left: 15px;">
 	      <el-button plain type="primary" icon="el-icon-search" size="medium" @click="search">
 	        {{ $t("table.search") }}

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/outNewOrder/index.vue

@@ -2,13 +2,18 @@
   <div class="app-container">
 		<!-- 搜索模块 -->
     <div class="filter-container">
-    	<span>
-    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>
-    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
-    	</span>
-    	<span style="margin-left: 15px;">
-    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>
-    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
+<!--    	<span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+<!--    	<span style="margin-left: 15px;">-->
+<!--    		<span>{{$t("runCenter.searchForm.orderNo")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.orderNo" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 订单名称 -->
+      <span style="margin-left: 15px;">
+    		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
+    		<el-input v-model="queryParams.model.orderName" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>
     	</span>
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.deliveryTime")}}：</span>
@@ -220,8 +225,7 @@
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -467,6 +471,12 @@
 	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
+
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数-新增外部：orderstatus  = 1 and source = 2

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/reviewedOrder/index.vue

@@ -5,6 +5,11 @@
 <!--    	<span>-->
 <!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
 <!--    		<el-input v-model="queryParams.model.custDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
+<!--    	</span>-->
+      <!-- 零件名称 -->
+<!--      <span>-->
+<!--    		<span>{{$t("runCenter.searchForm.bomName")}}：</span>-->
+<!--    		<el-input v-model="queryParams.model.bomDesc" :placeholder='$t("common.pleaseEnter")' style="width: 120px;" size="medium"/>-->
 <!--    	</span>-->
     	<span style="margin-left: 15px;">
     		<span>{{$t("runCenter.searchForm.orderName")}}：</span>
@@ -213,9 +218,10 @@
 	import TenantView from "./components/View"
 	// 【订单管理】-API
 	import orderMgrApi from "@/api/runManageCenter/orderMgr"
+  // 【计划管理】-API
+  import planMgrApi from "@/api/runManageCenter/planMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },
@@ -497,6 +503,12 @@
 	        this.queryParams.model.deliveryTime_ed = this.queryParams.timeRange[1] + " 23:59:59"
 	      }
 
+        // 如果【零件交货日期】有值
+        if (this.queryParams.timeRange1) {
+          this.queryParams.model.pdeliveryTimeStart = this.queryParams.timeRange1[0] + " 00:00:00"
+          this.queryParams.model.pdeliveryTimeEnd = this.queryParams.timeRange1[1] + " 23:59:59"
+        }
+
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
 	      // 查询必须参数

imcs-ui/src/views/zuihou/runManageCenter/orderMgr/components/runningOrder/index.vue

@@ -373,8 +373,7 @@
 	// 【计划管理】-API
 	import planMgrApi from "@/api/runManageCenter/planMgr"
 	import elDragDialog from '@/directive/el-drag-dialog'
-	import { downloadFile, initEnums, initDicts, initQueryParams } from '@/utils/commons'
-	import axios from 'axios'
+	import { initQueryParams } from '@/utils/commons'
 	export default {
 	  name: "DraftOrder",
 	  directives: { elDragDialog },