From 5d2d9b4da9bdbe3439d1e402211b196c6a41064a Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Mon, 14 Mar 2022 16:34:26 +0800
Subject: [PATCH] =?UTF-8?q?dam-7=20feat=20=E6=8B=A3=E9=85=8D=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E5=8F=AF=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=EF=BC=8C=E4=B8=8D=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/aggregating/index.vue | 34 ++++++++++----------
 src/pages/raw/handover/picking/index.vue     | 34 ++++++++++----------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/pages/raw/handover/aggregating/index.vue b/src/pages/raw/handover/aggregating/index.vue
index 39675d9..86195a5 100644
--- a/src/pages/raw/handover/aggregating/index.vue
+++ b/src/pages/raw/handover/aggregating/index.vue
@@ -41,7 +41,7 @@
         <!-- 时间 -->
         <u-col :span="12">
           <view style="display: flex">
-            <u-field style="background: white; border-radius: 10rpx; padding-left: 0" v-model="form.requestTime" disabled :placeholder="$t('message.SelectTime')" :label="$t('message.NowTime')"> </u-field>
+            <u-field style="background: white; border-radius: 10rpx; padding-left: 0" v-model="form.requestTime" :placeholder="$t('message.SelectTime')" :label="$t('message.NowTime')"> </u-field>
             <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker>
             <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
           </view>
@@ -183,23 +183,23 @@ export default class Aggregating extends BasePage {
     this.$form.setRules(this.rules);
     model.clearProOrderList();
     this.form.sapFactoryCode = session.factoryCode;
-    this.form.requestTime = this.getNowFormatDate();
-  }
-  getNowFormatDate() {
-    var date = new Date();
-    var seperator1 = '-';
-    var year = date.getFullYear();
-    var month: any = date.getMonth() + 1;
-    var strDate: any = date.getDate();
-    if (month >= 1 && month <= 9) {
-      month = '0' + month;
-    }
-    if (strDate >= 0 && strDate <= 9) {
-      strDate = '0' + strDate;
-    }
-    var currentdate = year + seperator1 + month + seperator1 + strDate;
-    return currentdate;
+    //this.form.requestTime = this.getNowFormatDate();
   }
+  // getNowFormatDate() {
+  //   var date = new Date();
+  //   var seperator1 = '-';
+  //   var year = date.getFullYear();
+  //   var month: any = date.getMonth() + 1;
+  //   var strDate: any = date.getDate();
+  //   if (month >= 1 && month <= 9) {
+  //     month = '0' + month;
+  //   }
+  //   if (strDate >= 0 && strDate <= 9) {
+  //     strDate = '0' + strDate;
+  //   }
+  //   var currentdate = year + seperator1 + month + seperator1 + strDate;
+  //   return currentdate;
+  // }
   startConfirm(startParams: any) {
     this.form.requestTime = startParams.year + '-' + startParams.month + '-' + startParams.day;
   }
diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue
index 82fc772..4650dd2 100644
--- a/src/pages/raw/handover/picking/index.vue
+++ b/src/pages/raw/handover/picking/index.vue
@@ -28,7 +28,7 @@
           </u-form-item>
           <!-- 时间 -->
           <view style="display: flex">
-            <u-field style="background: white; border-radius: 10rpx; padding-left: 0" v-model="form.requireDateRegion" disabled :placeholder="$t('message.SelectTime')" :label="$t('message.NowTime')"> </u-field>
+            <u-field style="background: white; border-radius: 10rpx; padding-left: 0" v-model="form.requireDateRegion" :placeholder="$t('message.SelectTime')" :label="$t('message.NowTime')"> </u-field>
             <u-picker :confirm-text="$t('message.product_Confirm')" :cancel-text="$t('message.product_Cancel')" v-model="startShow" :params="startParams" mode="time" @confirm="startConfirm"></u-picker>
             <u-button @click="startShow = true" type="primary">{{ $t('message.workArea_Selelct') }}</u-button>
           </view>
@@ -177,23 +177,23 @@ export default class pickingDom extends BasePage {
     this.$form.setRules(this.rules);
     model.clearProOrderList();
     this.form.sapFactoryCode = session.factoryCode;
-    this.form.requireDateRegion = this.getNowFormatDate();
-  }
-  getNowFormatDate() {
-    var date = new Date();
-    var seperator1 = '-';
-    var year = date.getFullYear();
-    var month: any = date.getMonth() + 1;
-    var strDate: any = date.getDate();
-    if (month >= 1 && month <= 9) {
-      month = '0' + month;
-    }
-    if (strDate >= 0 && strDate <= 9) {
-      strDate = '0' + strDate;
-    }
-    var currentdate = year + seperator1 + month + seperator1 + strDate;
-    return currentdate;
+    //this.form.requireDateRegion = this.getNowFormatDate();
   }
+  // getNowFormatDate() {
+  //   var date = new Date();
+  //   var seperator1 = '-';
+  //   var year = date.getFullYear();
+  //   var month: any = date.getMonth() + 1;
+  //   var strDate: any = date.getDate();
+  //   if (month >= 1 && month <= 9) {
+  //     month = '0' + month;
+  //   }
+  //   if (strDate >= 0 && strDate <= 9) {
+  //     strDate = '0' + strDate;
+  //   }
+  //   var currentdate = year + seperator1 + month + seperator1 + strDate;
+  //   return currentdate;
+  // }
   startConfirm(startParams: any) {
     this.form.requireDateRegion = startParams.year + '-' + startParams.month + '-' + startParams.day;
   }