safecheck-client 4.0.1-4 → 4.0.1-40

package/src/filiale/meihekou/android/SafecheckOrderV.vue

@@ -115,13 +115,7 @@
                     v-on:change="daychange" style="width: 60%"></v-select>
         </div>
         <div class="row" style="margin-top: 10px">
-          <label class="font_normal_body">截止时间</label>
-          <datepicker placeholder="请选择截至时间"
-                      :value.sync="selectData.f_finish_date"
-                      v-model="selectData.f_finish_date"
-                      :format="'yyyy-MM-dd HH:mm:ss'"
-                      style="width: 60%"
-                      :disabled="true"></datepicker>
+          <label class="font_normal_body">截止时间&nbsp;&nbsp;&nbsp;&nbsp;{{selectData.f_finish_date}}</label>
         </div>
         <div class="row" style="margin-top: 10px">
           <label  class="font_normal_body" >备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注</label>
@@ -348,36 +342,39 @@ export default {
   },
   methods: {
     getDays(val){
+      if (!val){
+        return
+      }
       console.log(val)
       this.days = this.$appdata.getParam(val+'截止天数')
       this.selectData.day = this.$appdata.getSingleValue(val+'默认截止天数') || 1
     },
     daychange(val) {
+      if (!val){
+        return
+      }
       this.selectData.day = val
       if (val == '其他') {
         this.flag = false
       } else {
         if(val){
           this.flag = true
-          this.selectData.f_finish_date = this.getSecondDay(val)
+          this.$set('selectData.f_finish_date',this.getSecondDay(val))
         }else {
-          this.selectData.f_finish_date = this.getSecondDay(1)
+          this.$set('selectData.f_finish_date',this.getSecondDay(1))
         }
-
       }
     },
-    getSecondDay(val){
-      let t = new Date();
-      let t1 = t.getTime()
-      val = val * 1000
-      t.setTime(t1 + val * 60 * 60 * 24);
-      let Y = t.getFullYear() + '-'
-      let M = (t.getMonth() + 1 < 10 ? '0' + (t.getMonth() + 1) : t.getMonth() + 1) + '-'
-      let D = (t.getDate() < 10 ? '0' + t.getDate() : t.getDate()) + ' '
-      let h = (t.getHours() < 10 ? '0' + t.getHours() : t.getHours()) + ':'
-      let m = (t.getMinutes() < 10 ? '0' + t.getMinutes() : t.getMinutes()) + ':'
-      let s = t.getSeconds() < 10 ? '0' + t.getSeconds() : t.getSeconds()
-      return Y + M + D + h + m + s
+    getSecondDay(val) {
+      const addMs = val * 1000 * 86400; // 86400 = 60*60*24
+      const targetDate = new Date(Date.now() + addMs);
+      const year = targetDate.getFullYear();
+      const month = String(targetDate.getMonth() + 1).padStart(2, '0');
+      const day = String(targetDate.getDate()).padStart(2, '0');
+      const hours = String(targetDate.getHours()).padStart(2, '0');
+      const minutes = String(targetDate.getMinutes()).padStart(2, '0');
+      const seconds = String(targetDate.getSeconds()).padStart(2, '0');
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
     },
     showmod(){
       // this.saveNoclick()
@@ -419,6 +416,7 @@ export default {
         f_meetunit:f_meetunit,
         f_outlets:f_meetunit,
       }
+      this.getDays(f_repairtype)
     },
     cancel1(){
       this.showModal2=false
@@ -1409,7 +1407,8 @@ export default {
                         let param = {}
                         param = res.data[0]
                         param.f_new_tablebase = _this.data.f_new_tablebase
-                        param.tabname="在线抄表"
+                        param.tabname="在线抄表",
+                        param.f_result_state="安检回量"
                         var pardate = {
                           _this:this,
                           tittle:'抄表单信息',