From bdea6f89251e2e11a92d38e41a64edf53b2cb95d Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 16:22:25 +0800
Subject: [PATCH] feat: 1、物品分发使用人修改，使用记录

---
 admin-web/src/components/mySearch/SearchItem.vue |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/admin-web/src/components/mySearch/SearchItem.vue b/admin-web/src/components/mySearch/SearchItem.vue
index 7e2bdf4..0dbda42 100644
--- a/admin-web/src/components/mySearch/SearchItem.vue
+++ b/admin-web/src/components/mySearch/SearchItem.vue
@@ -4,7 +4,7 @@
     <el-input
       :type="item.inputType || 'text'"
       v-if="item.type === 'text'"
-      :placeholder="item.placeholder || ''"
+      :placeholder="item.placeholder || '璇疯緭鍏�'"
       @change="(e) => inputChange(e)"
       :clearable="true"
       v-model="val"
@@ -15,10 +15,12 @@
     <el-cascader
       v-model="val"
       v-if="item.type === 'cascader'"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       :options="item.options"
       :props="item.optionsConfig.props||{ checkStrictly: true,emitPath: false,value: 'id' }"
       :show-all-levels="false"
       filterable
+      clearable
       style="width: 150px"
       @change="(v) => this.$emit('change', v)"
     >
@@ -26,7 +28,7 @@
     <!-- 涓嬫媺-->
     <el-select
       v-if="item.type === 'select'"
-      :placeholder="item.placeholder || ''"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       v-model="val"
       filterable
       :multiple="item.multiple || false"
@@ -54,7 +56,7 @@
     <!--鏃堕棿-->
     <el-time-select
       v-if="item.type === 'time-picker'"
-      :placeholder="item.placeholder || ''"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       v-model="val"
       :clearable="true"
       style="width: 150px"
@@ -66,7 +68,9 @@
       v-model="val"
       type="year"
       :clearable="true"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       style="width: 150px"
+      :value-format="item.format?item.format:'yyyy'"
       @change="(v) => panelChange(v, 'yyyy')"
     />
     <!--鏈堥�夋嫨鍣�-->
@@ -75,7 +79,9 @@
       v-model="val"
       type="month"
       :clearable="true"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       style="width: 150px"
+      :value-format="item.format?item.format:'yyyyMM'"
       @change="(v) => panelChange(v, 'yyyy-MM')"
     />
     <!--鏃ラ�夋嫨鍣�-->
@@ -84,7 +90,9 @@
       v-model="val"
       type="date"
       :clearable="true"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       style="width: 150px"
+      :value-format="item.format?item.format:'yyyyMMdd'"
       @change="(v) => panelChange(v, 'yyyy-MM-dd')"
     />
     <!--鏃ユ湡甯︽椂闂撮�夋嫨鍣�-->
@@ -93,6 +101,7 @@
       v-model="val"
       type="datetime"
       :clearable="true"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       style="width: 150px"
       format="yyyy-MM-dd HH:mm:ss"
       value-format="yyyy-MM-dd HH:mm:ss"
@@ -103,7 +112,7 @@
       v-if="item.type === 'datetimerange-picker'"
       v-model="val"
       style="width: 378px"
-      :placeholder="item.placeholder || ''"
+      :placeholder="item.placeholder || '璇烽�夋嫨'"
       type="datetimerange"
       :pickerOptions='pickerOptions'
       :disabled="item.disabled"
@@ -243,14 +252,7 @@
       }
     },
     panelChange(v, type) {
-      var info = null
-      if (v && this.item.type !== 'date-time-picker') {
-        info = formatDates(v, type)
-      } else {
-        info = v
-      }
-      this.val = info
-      this.$emit('change', info)
+      this.$emit('change', v)
     },
     filterOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;

--
Gitblit v1.9.1