Merge remote-tracking branch 'origin/dev1.6' into dev1.6

src/views/ecw/coupon/index.vue

@@ -188,7 +188,7 @@
                      v-hasPermi="['ecw:coupon:update']">{{ $t('编辑') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)"
                      v-hasPermi="['ecw:coupon:create']">{{ $t('复制') }}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="updateEndtimeItem = scope.row" v-if="scope.row.endTime"
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="updateEndtimeItem = scope.row" v-if="scope.row.endTime && scope.row.status"
                      v-hasPermi="['ecw:coupon:update']">{{ $t('延期') }}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                      v-hasPermi="['ecw:coupon:delete']">{{ $t('删除') }}</el-button>

src/views/ecw/customer/query.vue

@@ -35,7 +35,7 @@
               {{ getDictDatas2(DICT_TYPE.CUSTOMER_TYPE, (customer.type||'').split(',')).map(e => isChinese ? e.label : e.labelEn).join(', ')}}
             </el-descriptions-item>
 <!--            <el-descriptions-item :label="$t('联系方式')">{{ customer }}</el-descriptions-item>-->
-            <el-descriptions-item :label="$t('推介人')">{{ promoter  }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('推介人')">{{ customer.promoterName }}</el-descriptions-item>
             <el-descriptions-item :label="$t('客户经理')">{{customerService }}</el-descriptions-item>
             <el-descriptions-item :label="$t('公司名称')">{{ customer.company }}</el-descriptions-item>
             <el-descriptions-item :label="$t('联系地址')">{{ customer.address }}</el-descriptions-item>
@@ -47,6 +47,8 @@
               <el-image v-show="!!customer.picture" :src="customer.picture" style="width: 100px;height: 100px"></el-image>
             </el-descriptions-item>
             <el-descriptions-item :label="$t('备注')">{{ customer.remarks }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('身份证号码')">{{ customer.carName }}</el-descriptions-item>
 <!--            <el-descriptions-item :label="$t('信用等级')">{{ customer }}</el-descriptions-item>-->
           </el-descriptions>
         </el-card>
@@ -493,7 +495,7 @@ export default {
       this.productTypeList = r.data
     })
 
-    getCustomerSelect().then(r => {
+    getCustomerSelect({pageSize:1000,pageNo:1}).then(r => {
       this.customerSelect = r.data.list
     })