diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls
index 89332cbf..9478f8cc 100644
Binary files a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls and b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/mdpb.xls differ
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java
index dd0f7e92..474c775b 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/service/impl/WastecchangeServiceImpl.java
@@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Maps;
 import lombok.RequiredArgsConstructor;
 import org.apache.poi.util.StringUtil;
 import org.nl.exception.BadRequestException;
@@ -21,6 +22,7 @@ import org.springframework.data.domain.Pageable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
@@ -51,12 +53,23 @@ public class WastecchangeServiceImpl implements WastecchangeService {
         HashMap<String, String> map = new HashMap<>();
         map.put("flag", "1");
         map.put("tech_type", tech_type);
-        if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code", "%" + material_code + "%");
+        if (ObjectUtil.isNotEmpty(material_code)) {
+            map.put("material_code", "%" + material_code + "%");
+        }
         map.put("class_ids", MaterOptTypeEnum.THW.getClass_idStr());
 
-        JSONObject json = WQL.getWO("PDM_WASTECCHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "material_code ASC");
-
-        return json;
+        JSONObject allmaterialIds = WQL.getWO("PDM_WASTECCHANGE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mater.material_code");
+        JSONArray array = allmaterialIds.getJSONArray("content");
+        JSONArray array2 = new JSONArray();
+        if (ObjectUtil.isNotEmpty(array)){
+           for(int i=0;i<array.size();i++){
+               JSONObject jo = array.getJSONObject(i);
+               jo.put("tech_type",tech_type);
+               array2.add(jo);
+           }
+            allmaterialIds.put("content",array2);
+        }
+        return allmaterialIds;
     }
 
     @Override
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/wal/PDM_WASTECCHANGE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/wal/PDM_WASTECCHANGE.wql
index d5301238..9d17cca5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/wal/PDM_WASTECCHANGE.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/pdm/wal/PDM_WASTECCHANGE.wql
@@ -19,6 +19,7 @@
 	输入.material_id					    TYPEAS s_string
 	输入.code					        TYPEAS s_string
 	输入.tech_type					    TYPEAS s_string
+	输入.materialIds			            TYPEAS f_string
 
 
 [临时表]
@@ -44,53 +45,49 @@
 	##########################################
 
 	IF 输入.flag = "1"
-		PAGEQUERY
-			SELECT
-            	mater.material_code,
-            	mater.material_id,
-            	mater.material_name,
-            	mater.material_model,
-            	chan.change_id,
-            	chan.cf_qty,
-            	chan.yz_qty,
-            	chan.cx_qty,
-            	chan.yc_qty,
-            	chan.jy_qty,
-            	chan.lt_qty,
-            	chan.sj_qty,
-            	chan.ys_qty,
-            	chan.ds_qty,
-            	chan.cqx_qty,
-            	chan.xqx_qty,
-            	chan.qx_qty,
-            	chan.jcf_qty,
-            	chan.tb_qty,
-            	chan.ycr_qty,
-            	chan.gz_qty,
-            	chan.create_id,
-            	chan.create_name,
-            	chan.create_time,
-            	 输入.tech_type AS tech_type
-            FROM
-            	md_me_materialbase mater
-            	LEFT JOIN PDM_BI_WasteCChange chan ON mater.material_id = chan.material_id and chan.tech_type = 输入.tech_type
-            WHERE
-                mater.is_delete = '0'
-                AND mater.is_used = '1'
-
-                OPTION 输入.class_ids <> ""
-                    mater.material_type_id = 输入.class_ids
-                ENDOPTION
-
-                OPTION 输入.material_code <> ""
-                    (mater.material_code like 输入.material_code or
-                     mater.material_name like 输入.material_code)
-                ENDOPTION
-
-
-			ENDSELECT
-		ENDPAGEQUERY
-	ENDIF
+    		PAGEQUERY
+    			SELECT
+                	mater.material_code,
+                	mater.material_id,
+                	mater.material_name,
+                	mater.material_model,
+                	chan.change_id,
+                	chan.cf_qty,
+                	chan.yz_qty,
+                	chan.cx_qty,
+                	chan.yc_qty,
+                	chan.jy_qty,
+                	chan.lt_qty,
+                	chan.sj_qty,
+                	chan.ys_qty,
+                	chan.ds_qty,
+                	chan.cqx_qty,
+                	chan.xqx_qty,
+                	chan.qx_qty,
+                	chan.jcf_qty,
+                	chan.tb_qty,
+                	chan.ycr_qty,
+                	chan.gz_qty,
+                	chan.create_id,
+                	chan.create_name,
+                	chan.create_time
+                FROM
+                	md_me_materialbase mater
+                	LEFT JOIN PDM_BI_WasteCChange chan ON mater.material_id = chan.material_id
+                WHERE
+                    mater.is_delete = '0'
+                    AND mater.is_used = '1'
+                    and mater.material_type_id='1503644361664106496'
+                     OPTION 输入.material_code <> ""
+                         (mater.material_code like 输入.material_code or
+                          mater.material_name like 输入.material_code)
+                     ENDOPTION
+                    OPTION 输入.tech_type <> ""
+                             chan.tech_type = 输入.tech_type
+                    ENDOPTION
+    			ENDSELECT
+    		ENDPAGEQUERY
+    	ENDIF
 
 	IF 输入.flag = "2"
 		QUERY
@@ -158,4 +155,4 @@
 
 			ENDSELECT
 		ENDQUERY
-	ENDIF
\ No newline at end of file
+	ENDIF
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
index 27ac3a4c..c5f6973e 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/ProductmaterialsetServiceImpl.java
@@ -91,7 +91,6 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
         String nickName = SecurityUtils.getNickName();
         String now = DateUtil.now();
 
-
         WQLObject wo = WQLObject.getWQLObject("md_pd_productmaterialset");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(whereJon));
         wo.insert(json);
@@ -100,6 +99,9 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(Map whereJon) {
+        Long currentUserId = SecurityUtils.getCurrentUserId();
+        String nickName = SecurityUtils.getNickName();
+        String now = DateUtil.now();
         WQLObject setTab = WQLObject.getWQLObject("MD_PD_ProductMaterialSet");
         JSONArray jsonArr = JSONObject.parseArray(JSON.toJSONString(whereJon.get("tableData")));
         //查询此产品是否有对应关系
@@ -118,6 +120,9 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
                 setJson.put("set_prior_level", (String) json.getString("set_prior_level"));
                 setJson.put("is_calculate_forming", json.getString("is_calculate_forming"));
                 setJson.put("add_rate", json.getString("add_rate"));
+                setJson.put("set_optid",currentUserId + "");
+                setJson.put("set_optname", nickName);
+                setJson.put("set_time", now);
                 setTab.insert(setJson);
             }
         } else {
@@ -143,6 +148,9 @@ public class ProductmaterialsetServiceImpl implements ProductmaterialsetService
                 setJson.put("set_prior_level", (String) json.getString("set_prior_level"));
                 setJson.put("is_calculate_forming", json.getString("is_calculate_forming"));
                 setJson.put("add_rate", json.getString("add_rate"));
+                setJson.put("set_optid",currentUserId + "");
+                setJson.put("set_optname", nickName);
+                setJson.put("set_time", now);
                 setTab.insert(setJson);
             }
         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
index 3946cdce..d1a4b9a4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/wql/QPD_PD_PRODUCTMATERIALSET01.wql
@@ -46,32 +46,35 @@
 	IF 输入.flag = "1"
 		PAGEQUERY
 			SELECT
-			    mater.material_id,
-			    mater.material_code,
-			    mater.material_name,
-			    mater.update_optname,
-			    mater.update_time,
-			    mset.set_type,
-			    mset.num,
-			    d.label AS set_type_name,
-			    ext.old_mark
+                mater.material_id,
+                mater.material_code,
+                mater.material_name,
+                mater.update_optname,
+                mater.update_time,
+                mset.set_type,
+                mset.num,
+                    mset.set_optname,
+                    mset.set_time,
+                d.label AS set_type_name,
+                ext.old_mark
             FROM
-            	MD_ME_MaterialBase mater
-            		LEFT JOIN
-            		(
-            		  SELECT
+                MD_ME_MaterialBase mater
+                    LEFT JOIN
+                    (
+                      SELECT
                           ms.material_id,
                           set_type,
+                        set_optname,
+                        set_time,
                           COUNT( ms.product_material_id ) AS num
-            		  FROM md_pd_productmaterialset ms
-            		      GROUP BY material_id,set_type
-            		)
-            		 mset ON mset.material_id = mater.material_id
-            		 LEFT JOIN sys_dict_detail d ON  mset.set_type = d.value and d.name = 'PD_SET_TYPE'
-            		 LEFT JOIN MD_ME_ProducMaterialExt ext ON  mater.material_id = ext.material_id
+                      FROM md_pd_productmaterialset ms
+                          GROUP BY material_id,set_type,set_optname,set_time
+                    )
+                     mset ON mset.material_id = mater.material_id
+                     LEFT JOIN sys_dict_detail d ON  mset.set_type = d.value and d.name = 'PD_SET_TYPE'
+                     LEFT JOIN MD_ME_ProducMaterialExt ext ON  mater.material_id = ext.material_id
             WHERE
                 mater.is_delete = '0'
-                AND mater.is_used = '1'
 
                 OPTION 输入.material_code <> ""
                         (mater.material_code like 输入.material_code or
diff --git a/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue b/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue
index cb592694..813c06e0 100644
--- a/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue
+++ b/mes/qd/src/views/wms/basedata/pdm/wastecchange/index.vue
@@ -44,7 +44,7 @@
         <el-table-column prop="cf_qty" label="CF" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].cf_qty"
+              v-model="scope.row.cf_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -57,7 +57,7 @@
         <el-table-column prop="yz_qty" label="YZ" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].yz_qty"
+              v-model="scope.row.yz_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -70,7 +70,7 @@
         <el-table-column prop="cx_qty" label="CX" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].cx_qty"
+              v-model="scope.row.cx_qty"
               size="small"
               :controls="false"
               style="width: 95px"
@@ -83,7 +83,7 @@
         <el-table-column prop="yc_qty" label="YC" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].yc_qty"
+              v-model="scope.row.yc_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -96,7 +96,7 @@
         <el-table-column prop="jy_qty" label="JY" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].jy_qty"
+              v-model="scope.row.jy_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -109,7 +109,7 @@
         <el-table-column prop="lt_qty" label="LT" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].lt_qty"
+              v-model="scope.row.lt_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -122,7 +122,7 @@
         <el-table-column prop="sj_qty" label="SJ" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].sj_qty"
+              v-model="scope.row.sj_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -135,7 +135,7 @@
         <el-table-column prop="ys_qty" label="YS" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].ys_qty"
+              v-model="scope.row.ys_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -148,7 +148,7 @@
         <el-table-column prop="ds_qty" label="DS" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].ds_qty"
+              v-model="scope.row.ds_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -161,7 +161,7 @@
         <el-table-column prop="cqx_qty" label="CQX" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].cqx_qty"
+              v-model="scope.row.cqx_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -174,7 +174,7 @@
         <el-table-column prop="xqx_qty" label="XQX" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].xqx_qty"
+              v-model="scope.row.xqx_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -187,7 +187,7 @@
         <el-table-column prop="qx_qty" label="QX" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].qx_qty"
+              v-model="scope.row.qx_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -200,7 +200,7 @@
         <el-table-column prop="jcf_qty" label="JCF" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].jcf_qty"
+              v-model="scope.row.jcf_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -213,7 +213,7 @@
         <el-table-column prop="tb_qty" label="TB" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].tb_qty"
+              v-model="scope.row.tb_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -226,7 +226,7 @@
         <el-table-column prop="ycr_qty" label="YCR" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].ycr_qty"
+              v-model="scope.row.ycr_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -239,7 +239,7 @@
         <el-table-column prop="gz_qty" label="GZ" width="120">
           <template slot-scope="scope">
             <el-input-number
-              v-model="crud.data[scope.$index].gz_qty"
+              v-model="scope.row.gz_qty"
               size="small"
               style="width: 95px"
               :controls="false"
@@ -268,13 +268,12 @@ import crudWastecchange from '@/api/wms/basedata/pdm/wastecchange'
 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'
 
 const defaultForm = { change_id: null, material_id: null, tech_type: null, cf_qty: null, yz_qty: null, cx_qty: null, yc_qty: null, jy_qty: null, lt_qty: null, sj_qty: null, ys_qty: null, ds_qty: null, cqx_qty: null, xqx_qty: null, qx_qty: null, jcf_qty: null, tb_qty: null, ycr_qty: null, gz_qty: null, create_id: null, create_name: null, create_time: null }
 export default {
   name: 'Wastecchange',
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -318,7 +317,6 @@ export default {
       }
     },
     confirm(row) {
-      // row.tech_type = this.form.tech_type
       this.confirm_flg = true
       crudWastecchange.confirm(row).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
diff --git a/mes/qd/src/views/wms/pf/productmaterialset/index.vue b/mes/qd/src/views/wms/pf/productmaterialset/index.vue
index 94a0bf4b..2a750d90 100644
--- a/mes/qd/src/views/wms/pf/productmaterialset/index.vue
+++ b/mes/qd/src/views/wms/pf/productmaterialset/index.vue
@@ -57,8 +57,8 @@
         <el-table-column prop="material_name" label="产品名称" />
         <el-table-column prop="set_type_name" label="模式" />
         <el-table-column prop="num" label="对应PG粉数" />
-        <el-table-column prop="update_optname" label="设置人" />
-        <el-table-column prop="update_time" label="设置时间" />
+        <el-table-column prop="set_optname" label="设置人" />
+        <el-table-column prop="set_time" label="设置时间" />
         <el-table-column v-permission="[]" label="操作" fixed="right" width="80px" align="center">
           <template slot-scope="scope">
             <el-button
diff --git a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue
index aa6d0a4b..f63e9124 100644
--- a/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicegridcheck/index.vue
@@ -64,7 +64,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="计划维修日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="单据状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
index b78738b2..1642ed12 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -55,7 +55,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="计划维修日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="单据状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
index 2ab7ac73..d33c2933 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
@@ -55,7 +55,14 @@
             />
           </el-form-item>
           <el-form-item label="计划维修日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="是否启用">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
index 608654a5..2a9174c3 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
@@ -55,7 +55,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="计划维修日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="单据状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
index 85568d03..5c893f80 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
@@ -55,7 +55,14 @@
             </el-select>
           </el-form-item>
           <el-form-item label="计划维修日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="单据状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
index 4a6e1f2a..a169655d 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
@@ -55,7 +55,14 @@
             />
           </el-form-item>
           <el-form-item label="日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
index 9cffcbcc..eb505f9c 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
@@ -55,7 +55,14 @@
             />
           </el-form-item>
           <el-form-item label="日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue
index 76848b03..5bce38a8 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancegrid/index.vue
@@ -64,7 +64,14 @@
             />
           </el-form-item>
           <el-form-item label="日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
index f5b4bd84..2933295c 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
@@ -55,7 +55,14 @@
             />
           </el-form-item>
           <el-form-item label="日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
index dac84c7b..92bc6c39 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepagrid/index.vue
@@ -64,7 +64,14 @@
             />
           </el-form-item>
           <el-form-item label="日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="状态">
             <el-select
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
index 3e3c2316..f3b1259c 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
@@ -55,7 +55,14 @@
             />
           </el-form-item>
           <el-form-item label="计划开始日期">
-            <date-range-picker v-model="query.createTime" class="date-item" />
+            <el-date-picker
+              v-model="query.createTime"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              @change="hand"
+            />
           </el-form-item>
           <el-form-item label="是否启用">
             <el-select