From 0d952a00826a0fb7356ccb7f0233fcb232a8e894 Mon Sep 17 00:00:00 2001
From: zhaohengkun <zhaohengkun>
Date: Mon, 21 Oct 2024 10:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=9B=B8=E5=85=B3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/EventMarketing/giftBlock/index.vue    | 6 +++---
 .../src/views/EventMarketing/newCertificate/index.vue      | 7 +++----
 .../src/views/cashier/NewComponents/writeList.vue          | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 8117bcb4c..65ea057f3 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -108,7 +108,7 @@
               </el-button>
               <el-button
                 type="text"
-                v-if="scope.row.status == 0"
+                v-if="scope.row.status == 0 || scope.row.status == 1"
                 @click="uploadShow(scope.row)"
               >上传礼品卡数据
               </el-button>
@@ -295,8 +295,8 @@
         <el-form-item label="有效期" prop="value1">
           <el-date-picker
             v-model="ruleForm.value1"
-            type="datetimerange"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            type="daterange"
+            value-format="yyyy-MM-dd"
             range-separator="~"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index b559de96d..6da6e6b7e 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -123,7 +123,7 @@
                class="demo-ruleForm">
         <div class="d-s" style="justify-content: space-between">
           <el-form-item label="优惠券编号" required prop="number" style="width: 45%;">
-            <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号"></el-input>
+            <el-input v-model="ruleForm.number" placeholder="请输入优惠券编号" disabled></el-input>
           </el-form-item>
 
           <el-button type="primary" icon="el-icon-refresh" circle @click="refreshNumber()"
@@ -188,9 +188,8 @@
             </div>
           </el-form-item>
 
-          <el-form-item label="兑换内容" required style="width: 45%;" v-if="ruleForm.type=='2'" prop="exchangeContent"
-                        :disabled="disabledBol">
-            <el-input placeholder="" v-model="ruleForm.exchangeContent"></el-input>
+          <el-form-item label="兑换内容" required style="width: 45%;" v-if="ruleForm.type=='2'" prop="exchangeContent">
+            <el-input placeholder="" v-model="ruleForm.exchangeContent" :disabled="disabledBol"></el-input>
           </el-form-item>
 
           <el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'" prop="useType">
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
index 9913d23c6..5270aecd4 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
@@ -93,7 +93,7 @@ export default {
   name: "order_Goods",
   data() {
     return {
-      List:[],
+      list:[],
       beginTime:'',
       endTime:'',
       queryParams: {