bug

src/views/ecw/coupon/index.vue

@@ -3,9 +3,9 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="标题" prop="titleZh">
+      <!-- <el-form-item label="标题" prop="titleZh">
         <el-input v-model="queryParams.titleZh" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="标题" prop="titleEn">
         <el-input v-model="queryParams.titleEn" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
@@ -16,6 +16,12 @@
         </el-select> -->
         <dict-selector :type='DICT_TYPE.ECW_COUPON_TYPE' v-model="queryParams.type" />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
+      </el-form-item>
+      <el-form-item label="关键字" prop="conditionCurrencyId">
+        <el-input v-model="queryParams.searchKey" placeholder="请输入关键字" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <!-- <el-form-item label="使用条件(优惠卷专用)" prop="cashCondition">
         <el-input v-model="queryParams.cashCondition" placeholder="请输入使用条件(优惠卷专用)" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -25,26 +31,26 @@
       <el-form-item label="条件货币ID" prop="conditionCurrencyId">
         <el-input v-model="queryParams.conditionCurrencyId" placeholder="请输入条件货币ID" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="开始时间">
+      <!-- <el-form-item label="开始时间">
         <el-date-picker v-model="dateRangeStartTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="减免货币ID" prop="reduceCurrencyId">
         <el-input v-model="queryParams.reduceCurrencyId" placeholder="请输入减免货币ID" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="结束时间">
+      <!-- <el-form-item label="结束时间">
         <el-date-picker v-model="dateRangeEndTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="领券后X天起生效" prop="afterReceiveDays">
         <el-input v-model="queryParams.afterReceiveDays" placeholder="请输入领券后X天起生效" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="有效天数" prop="validDays">
         <el-input v-model="queryParams.validDays" placeholder="请输入有效天数" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="费用类型" prop="costType">
+      <!-- <el-form-item label="费用类型" prop="costType">
         <dict-selector :type="DICT_TYPE.ECW_COUPON_COST_TYPE" v-model="queryParams.costType"/>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="优惠清单" prop="discountDetailed">
         <el-input v-model="queryParams.discountDetailed" placeholder="请输入优惠清单" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -74,12 +80,12 @@
       <el-form-item label="每个用户领券上限，如不填则默认为1" prop="limitNum">
         <el-input v-model="queryParams.limitNum" placeholder="请输入每个用户领券上限，如不填则默认为1" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="过期状态" prop="overdueStatus">
+      <!-- <el-form-item label="过期状态" prop="overdueStatus">
         <dict-selector :type="DICT_TYPE.ECW_COUPON_OVERDUE_STATUS" v-model="queryParams.overdueStatus"/>
-      </el-form-item>
-      <el-form-item label="投放状态" prop="putonStatus">
+      </el-form-item> -->
+      <!-- <el-form-item label="投放状态" prop="putonStatus">
         <dict-selector :type="DICT_TYPE.ECW_COUPON_PUTON_STATUS" v-model="queryParams.putonStatus"/>
-      </el-form-item>
+      </el-form-item> -->
       <!-- <el-form-item label="获取方式 0=客户领取 1=平台发放" prop="getWay">
         <el-input v-model="queryParams.getWay" placeholder="请输入获取方式 0=客户领取 1=平台发放" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
@@ -97,9 +103,7 @@
       <el-form-item label="单证报关(可多选) 1 我司全代 2自单代报 3混合报关" prop="documentDeclaration">
         <el-input v-model="queryParams.documentDeclaration" placeholder="请输入单证报关(可多选) 1 我司全代 2自单代报 3混合报关" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item> -->
-      <el-form-item label="状态" prop="status">
-        <dict-selector :type="DICT_TYPE.ECW_COUPON_STATUS" v-model="queryParams.status"/>
-      </el-form-item>
+      
       <!-- <el-form-item label="创建时间">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
@@ -132,23 +136,29 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="titleZh" />
+      <el-table-column label="描述" align="center" prop="type">
+        <template slot-scope="{row}">
+          {{$l(row, 'content')}}
+        </template>
+      </el-table-column>
       <el-table-column label="发布人/发布时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
           <div>{{ scope.row.creatorName }}</div>
-          <div>{{ parseTime(scope.row.createTime) }}</div>
+          <div>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</div>
         </template>
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime) }}</span>
+          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="结束时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime) }}</span>
+        <template slot-scope="{row}">
+          <div :style="{red: row.overdueStatus ==0 ? 'red' : null}">{{ parseTime(row.endTime, '{y}-{m}-{d}') }}</div>
+          <div v-if="row.overdueStatus == 0" style="color: red">已过期</div>
         </template>
       </el-table-column>
-      
+      <!-- 
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -158,7 +168,7 @@
         <template slot-scope="{row}">
           <dict-tag :type="DICT_TYPE.ECW_IS_DRAFT" :value="row.status" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row, true)"

src/views/ecw/productPrice/edit.vue

@@ -154,10 +154,10 @@
               :prop="`specialList.${specialIndex}`.allPrice"
               :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"
               >
-                  <selector v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
+                  <selector disabled v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
                   <inputor default2="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
                   <span class="mr-10">/</span>
-                  <selector v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
+                  <selector disabled v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
             </el-form-item>
           </template>
           <template v-else v-for="(special, specialIndex) in this.form.specialList">
@@ -167,10 +167,10 @@
               :prop="`specialList.${specialIndex}.transportPrice`"
               :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"
               >
-              <selector v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
+              <selector disabled v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
               <inputor default2="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
               <span class="mr-10">/</span>
-              <selector v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
+              <selector disabled v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
             </el-form-item>
             <el-form-item
               :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')"
@@ -178,10 +178,10 @@
               :prop="`specialList.${specialIndex}.clearancePrice`"
               :rules="{validator: priceValidator, trigger: 'blur',   message: '价格错误'}"
               >
-              <selector v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
+              <selector disabled v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
               <inputor default2="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
               <span class="mr-10">/</span>
-              <selector v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
+              <selector disabled v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
             </el-form-item>
           </template>
         </template>
@@ -233,7 +233,7 @@
       <el-button @click="showLogsDialog=true" type="primary" v-if="readonly">{{$t('查看价格日志')}}</el-button>
     </div>
 
-    <el-dialog title="查看价格日志" :visible="showLogsDialog" :before-close="closeLogsDialog" width="1000px">
+    <el-dialog :title="$t('查看价格日志')" :visible="showLogsDialog" :before-close="closeLogsDialog" width="1000px">
       <el-table :data="logs">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="修改人" prop="creatorName"></el-table-column>