Merge branch 'master' of http://git.keao.tech/SupplyChain/front

front-vue/src/views/system/company/certification.vue

@@ -412,7 +412,7 @@
             </div>
             <el-row :gutter="40" style="margin-top: 14px;">
               <template v-if="legalHandle">
-                <el-col :span="6" class="zap-personnel-information__item"
+                <el-col :span="8" class="zap-personnel-information__item"
                   >
                   <span class="zap-form__label">复核人员</span>
                   <el-input
@@ -431,7 +431,7 @@
                     <i class="el-icon-question" />
                   </el-tooltip>
                 </el-col>
-                <el-col :span="6" class="zap-personnel-information__item">
+                <el-col :span="8" class="zap-personnel-information__item">
                   <span class="zap-form__label">联系电话</span>
                   <el-input
                     v-model="form.phone"
@@ -451,7 +451,7 @@
                     <i class="el-icon-question" />
                   </el-tooltip>
                 </el-col>
-                <el-col :span="6" class="zap-personnel-information__item">
+                <el-col :span="8" class="zap-personnel-information__item">
                   <span class="zap-form__label">邮箱</span>
                   <el-input
                     v-model="form.email"
@@ -462,7 +462,7 @@
                 </el-col>
               </template>
               <template v-if="!legalHandle">
-                <el-col :span="6" class="zap-personnel-information__item">
+                <el-col :span="8" class="zap-personnel-information__item">
                   <span class="zap-form__label">复核人员</span>
                   <el-input
                     v-model="form.handler"
@@ -479,7 +479,7 @@
                     <i class="el-icon-question" />
                   </el-tooltip>
                 </el-col>
-                <el-col :span="6" class="zap-personnel-information__item"
+                <el-col :span="8" class="zap-personnel-information__item"
                   >
                   <span class="zap-form__label">联系电话</span>
                   <el-input
@@ -500,7 +500,7 @@
                     <i class="el-icon-question" />
                   </el-tooltip>
                 </el-col>
-                <el-col :span="6" class="zap-personnel-information__item">
+                <el-col :span="8" class="zap-personnel-information__item">
                   <span class="zap-form__label">邮箱</span>
                   <el-input
                     v-model="form.email"
@@ -511,7 +511,8 @@
                 </el-col>
               </template>
               <template>
-                <el-col :span="6" class="zap-personnel-information__item"
+                <el-col :span="8" class="zap-personnel-information__item"
+                style="padding:20px"
                   >
                   <span class="zap-form__label">业务操作员</span>
                   <el-input
@@ -521,7 +522,8 @@
                     clearable
                   ></el-input>
                 </el-col>
-                <el-col :span="6" class="zap-personnel-information__item"
+                <el-col :span="8" class="zap-personnel-information__item"
+                style="padding:20px"
                   >
                   <span class="zap-form__label">联系电话</span>
                   <el-input
@@ -1488,6 +1490,8 @@ export default {
                 response.data.scyEndTime == "永久"
               ) {
                 this.term = true;
+              }else{
+                this.term = false;
               }
               this.$set(this.form, "scyEndTime", response.data.scyEndTime);
             }
@@ -1820,6 +1824,7 @@ export default {
           if(this.term){
             console.log("长期");
             this.form.endTime = "长期";
+            this.form.scyEndTime = null;
           }else if(!this.form.scyEndTime&&!this.term){
             this.form.endTime = null;
             this.form.scyEndTime = null;