Merge branch 'M_2.5_1122' into test

src/views/entry/fillMainInf.vue

@@ -536,12 +536,13 @@
         getIdcardImgInfoData(data).then(res=> {
           if (res.code == 1 ) {
             // 身份证 有效 XXXXXXXX日 => xx-xx-xx
-            let endStr = res.data.words_result['失效日期'].words ? res.data.words_result['失效日期'].words : '';
+            if (res.data.words_result['签发日期'] && res.data.words_result['失效日期'] ) {
+              let beginStr = res.data.words_result['签发日期'].words;
+              let endStr = res.data.words_result['失效日期'].words;
               if (endStr == '长期') {
                 this.validityConcreteTime = [];
                 this.validityLongTermVal = true;
               }else {
-              let beginStr = res.data.words_result['签发日期'].words ? res.data.words_result['签发日期'].words : '';
                 let reg = /^(\d{4})(\d{2})(\d{2})$/;
                 let begin = beginStr.replace(reg, "$1-$2-$3");
                 let end = endStr.replace(reg, "$1-$2-$3");
@@ -562,6 +563,18 @@
                 }
               }, 1000)
             }
+          }else {
+            this.isReadFailVisible = true;
+            this.readTime = 5;
+            this.TIMER = setInterval(() => {
+              if (this.readTime && 0 < this.readTime <= 5 ) {
+                this.readTime--
+              } else {
+                this.readTime = 0;
+                this.isReadFailVisible = false;
+              }
+            }, 1000)
+          }
         });
       },
       handleBackPictureCardPreview2(file) {

src/views/system/shop/brand.vue

@@ -216,7 +216,7 @@
 
         <el-row>
           <el-col :span="16" :offset="3">
-            <el-form-item label="商标注册有效期：" prop="brand_auth_time" v-if="brandForm.brand_type === 2">
+            <el-form-item label="商标注册有效期：" prop="brand_auth_time">
               <el-date-picker type="date" placeholder="选择日期" v-model="validityConcreteTime"
                               style="width: 300px;" @change="validityConcreteChange"></el-date-picker>
               <el-checkbox v-model="validityLongTermVal" style="padding-left:15px;"
@@ -237,6 +237,7 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 value-format="yyyy-MM-dd"
+                :clearable = 'false'
               />
             </el-form-item>
           </el-col>
@@ -537,11 +538,9 @@
       addBrand() {
         if(this.total <= 20 ) {
           this.isOpen = true;
-          this.reset('brandForm')
           this.brandTitle = '新增品牌信息';
           this.indexBrandId = 0;
-          this.brandForm.brand_auth = '';
-          this.brandForm.brand_auth_time = '';
+          this.reset('brandForm')
         }else {
           this.$message({ type: 'warning', message: '目前暂时只支持维护20个品牌数据'});
         }
@@ -555,7 +554,6 @@
         getDetails(data).then(res => {
           if(res.code == 1) {
             this.isOpen = true;
-            this.reset('brandForm')
             this.brandTitle = '品牌信息详情';
             this.brandForm = res.data;
             // 品牌审核状态
@@ -605,9 +603,7 @@
             }
 
             // 品牌授权期限
-            this.brandForm.brandAuthRangeTime = []
-            this.brandForm.brandAuthRangeTime.push(this.timeFormatter(this.brandForm.brand_start_time))
-            this.brandForm.brandAuthRangeTime.push(this.timeFormatter(this.brandForm.brand_end_time))
+            this.$set(this.brandForm,'brandAuthRangeTime',[this.timeFormatter(this.brandForm.brand_start_time),this.timeFormatter(this.brandForm.brand_end_time)]);
 
             // 品牌厂商授权 图片
             let factoryArr = [];
@@ -789,8 +785,8 @@
       handleQuery() {
         this.queryParams.page = 1;
         this.getList();
-      },
 
+      },
       /** 商品注册有效期 具体时间 */
       validityConcreteChange() {
         if (this.validityConcreteTime) {
@@ -806,8 +802,15 @@
       // 通用方法
       /** 重置 编辑 表单*/
       reset(formName){
+        this.brandImgFileList= [];
+        this.certImgFileList= [];
+        this.factoryImgFileList= [];
+        this.shopImgFileList= [];
+
+        this.validityLongTermVal = false;
+        this.validityConcreteTime = ''
+        Object.assign(this.brandForm, this.$options.data().brandForm)
 
-        debugger
         if (this.$refs[formName]) {
           this.$refs[formName].resetFields();
         }else {
@@ -815,10 +818,8 @@
             this.$refs[formName].resetFields();
           })
         }
-        this.brandImgFileList= [];
-        this.certImgFileList= [];
-        this.factoryImgFileList= [];
-        this.shopImgFileList= [];
+
+        // console.log("brandForm:",this.brandForm);
       },
       /** 上传图片 数量限制 */
       limit1() {