活动相关调整

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"
+            type="daterange"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd"
             range-separator="~"
             start-placeholder="开始日期"
             end-placeholder="结束日期">

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"
+          <el-form-item label="兑换内容" required style="width: 45%;" v-if="ruleForm.type=='2'" prop="exchangeContent">
-                        :disabled="disabledBol">
+            <el-input placeholder="" v-model="ruleForm.exchangeContent" :disabled="disabledBol"></el-input>
-            <el-input placeholder="" v-model="ruleForm.exchangeContent"></el-input>
           </el-form-item>
 
           <el-form-item label="优惠条件" required style="width: 45%;" v-if="ruleForm.type=='3'" prop="useType">

fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue

@@ -93,7 +93,7 @@ export default {
   name: "order_Goods",
   data() {
     return {
-      List:[],
+      list:[],
       beginTime:'',
       endTime:'',
       queryParams: {