From 6caecd26f75979777956dc96e14d6f3b39ce6688 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 15 七月 2022 17:23:42 +0800
Subject: [PATCH] 1.修改bug

---
 src/views/scgl/scdd.vue |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 1d7193e..30151be 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -13,6 +13,7 @@
             <el-form-item label="璁㈠崟鐘舵��" style=" display: flex;">
               <el-select
                 v-model="form.erporderstus"
+                filterable
                 :popper-append-to-body="false"
                 style="width: 200px"
                 placeholder="璇烽�夋嫨"
@@ -56,25 +57,26 @@
               <el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
             </el-form-item>
             <el-form-item label="鍒涘缓鏃堕棿" style=" display: flex;">
-              <!--              <el-date-picker-->
-              <!--                v-model="form.createdate"-->
-              <!--                type="daterange"-->
-              <!--                :clearable="false"-->
-              <!--                range-separator="~"-->
-              <!--                start-placeholder="寮�濮嬫棩鏈�"-->
-              <!--                end-placeholder="缁撴潫鏃ユ湡"-->
-              <!--                size="mini"-->
-              <!--              />-->
-              <!--              :picker-options="expireTimeOption"-->
               <el-date-picker
                 v-model="form.createdate"
-                type="date"
-                size="mini"
+                type="daterange"
                 :clearable="false"
-                style="width: 200px;"
-                format="yyyy-MM-dd"
-                placeholder="閫夋嫨鏃ユ湡"
+                range-separator="~"
+                start-placeholder="寮�濮嬫棩鏈�"
+                style="width: 240px"
+                end-placeholder="缁撴潫鏃ユ湡"
+                size="mini"
               />
+              <!--              :picker-options="expireTimeOption"-->
+              <!--              <el-date-picker-->
+              <!--                v-model="form.createdate"-->
+              <!--                type="date"-->
+              <!--                size="mini"-->
+              <!--                :clearable="false"-->
+              <!--                style="width: 200px;"-->
+              <!--                format="yyyy-MM-dd"-->
+              <!--                placeholder="閫夋嫨鏃ユ湡"-->
+              <!--              />-->
             </el-form-item>
           </div>
           <div style="min-height: 100px">
@@ -128,14 +130,12 @@
           @click="orderClose"
         >鍏抽棴璁㈠崟
         </el-button>
-        <!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>-->
-        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
       </div>
       <el-divider />
       <div class="elTableDiv">
         <el-table
           :data="tableData"
-          :height="tableHeight"
+          :height="tableHeight+'px'"
           border
           stripe
           :style="{width: 100+'%',height:tableHeight+'px',}"
@@ -459,10 +459,10 @@
         tempDate2 = handleDatetime(tempDate2[0]) + '~' + handleDatetime(tempDate2[1])
       }
 
-      // let tempDate = this.form.createdate
-      // if (tempDate.length > 0) {
-      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
-      // }
+      let tempDate = this.form.createdate
+      if (tempDate.length > 0) {
+        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
+      }
 
       const data = {
         erporderstus: this.form.erporderstus, // 璁㈠崟鐘舵�佺爜
@@ -472,8 +472,8 @@
         partspec: this.form.partspec, // 浜у搧瑙勬牸
         paydate: tempDate2, // 浜や粯鏃堕棿
         creatuser: this.form.creatuser, // 鍒涘缓浜哄憳
-        createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
-        // createdate: tempDate,
+        // createdate: this.form.createdate.toString().length > 0 ? handleDatetime(this.form.createdate) : '', // 鍒涘缓鏃堕棿
+        createdate: tempDate,
         prop: this.form.prop, // 鎺掑簭瀛楁
         order: this.form.order, // 鎺掑簭瀛楁
         page: this.form.page, // 绗嚑椤�

--
Gitblit v1.9.3