Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front

src/views/mes/machineProduction/index.vue

@@ -11,8 +11,8 @@
       <el-form-item label="生产时间" prop="productDateArray">
         <el-date-picker
           v-model="queryParams.productDateArray"
-          format="yyyy-MM-dd HH:mm:ss"
-          type="datetimerange"
+          format="yyyy-MM-dd"
+          type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -168,7 +168,7 @@ export default {
       var y = dd.getFullYear();
       var m = dd.getMonth() + 1; //获取当前月份的日期
       var d = dd.getDate();
-      return y + "-" + m + "-" + d ;
+      return y + "-" + m + "-" + d + " 00:00:00";
     },
 
     /** 查询设备小时产量列表 */

src/views/quality/qcWarehousing/index.vue

@@ -671,7 +671,7 @@ export default {
 		},
 		//工单选择确认
 		onSelectWorkOrder(obj) {
-           this.form.orderNo = obj.orderNo;
+           this.form.orderNo = obj.workorderCode;
 		   this.form.materialName = obj.materialName;
 		   this.form.materialCode = obj.materialCode;
            this.form.quality = obj.quality;