修改bug

修改bug

src/utils/baseUrl.js

@@ -1,15 +1,15 @@
 const URL = {
   //baseUrl: 'http://183.131.25.186:9501',//测试环境
-  baseUrl: 'http://116.131.8.26:9501',//pre环境
+  //baseUrl: 'http://116.131.8.26:9501',//pre环境
   //baseUrl: 'http://103.105.201.2:9501',//正式环境-ip
-  //baseUrl: 'https://flzxw.bjzxtw.org.cn',//正式环境-域名
+  baseUrl: 'https://flzxw.bjzxtw.org.cn',//正式环境-域名
   //baseUrl: 'http://192.168.1.201:9501',//刘佳伟本地环境
   //baseUrl:'http://192.168.1.115:9501',//冯蕊的本地环境
   //baseUrl: 'http://192.168.1.127:9501',//刘剑的本地环境
   //WebsocketUrl: 'ws://192.168.1.201:9506',//刘佳伟websocket地址
   //WebsocketUrl: 'ws://192.168.1.127:9506'//刘剑websocket地址
   //WebsocketUrl: 'ws://183.131.25.186:9506',//测试环境websocket地址
-  WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
+  //WebsocketUrl: 'ws://116.131.8.26:9506'//pre环境websocket地址
   //WebsocketUrl: 'ws://103.105.201.2:9506'//正式环境websocket地址
 }
 

src/views/role/components/userDefault.vue

@@ -118,11 +118,10 @@
           <el-form-item label="手机号：" :label-width="formLabelWidth" prop="mobile" class="custom-align-right">
             <el-input v-model="form.mobile" autocomplete="off" placeholder="请输入手机号.."></el-input>
           </el-form-item>
-          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right" v-if="form.long_time==false">
+          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right" v-if="form.long_time==0">
             <el-date-picker
               v-model="timeList"
               type="daterange"
-              :disabled="form.long_time === 1"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
@@ -133,7 +132,6 @@
           <div class="timeBox" v-else>
             <div class="timeTitle"><span>*</span>有效期：</div>
             <el-date-picker
-              v-model="timeList"
               type="daterange"
               :disabled="form.long_time === 1"
               range-separator="至"

src/views/role/components/userEnterprise.vue

@@ -96,7 +96,7 @@
           <el-form-item label="法人身份证：" :label-width="formLabelWidth" prop="legal_person_id_card" class="custom-align-right">
             <el-input v-model="form.legal_person_id_card" autocomplete="off" placeholder="请输入法人身份证号.."></el-input>
           </el-form-item>
-          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
+          <!-- <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
             <el-date-picker
               v-model="timeList"
               type="daterange"
@@ -107,7 +107,30 @@
               :picker-options="pickerOptions">
             </el-date-picker>
             <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+          </el-form-item> -->
+          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right" v-if="form.long_time==0">
+            <el-date-picker
+              v-model="timeList"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
+          <div class="timeBox" v-else>
+            <div class="timeTitle"><span>*</span>有效期：</div>
+            <el-date-picker
+              type="daterange"
+              :disabled="form.long_time === 1"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+          </div>
           <el-form-item label="传真：" :label-width="formLabelWidth" prop="fax" class="custom-align-right">
             <el-input v-model="form.fax" autocomplete="off" placeholder="请输入传真号码.."></el-input>
           </el-form-item>
@@ -601,6 +624,26 @@ export default {
       margin-left: 10px;
     }
   }
+  .timeBox {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    margin-bottom: 22px;
+    .timeTitle {
+      width: 110px;
+      text-align: right;
+      font-size: 14px;
+      color: #606266;
+      font-weight: bold;
+      height: 36px;
+      line-height: 36px;
+      margin-right: 10px;
+      span {
+        color: red;
+        margin-right: 5px;
+      }
+    }
+  }
   .longTimeCheckbox {
     margin-left: 10px;
   }

src/views/role/components/userInvestigate.vue

@@ -127,7 +127,7 @@
             <el-cascader :options="options" :show-all-levels="false" disabled v-else></el-cascader>
             <el-checkbox v-model="isNational" :true-label="1" :false-label="0" class="longTimeCheckbox">全国</el-checkbox>
           </el-form-item>
-          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
+          <!-- <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right">
             <el-date-picker
               v-model="timeList"
               type="daterange"
@@ -138,7 +138,30 @@
               :picker-options="pickerOptions">
             </el-date-picker>
             <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+          </el-form-item> -->
+          <el-form-item label="有效期：" :label-width="formLabelWidth" prop="timeList" class="custom-align-right" v-if="form.long_time==0">
+            <el-date-picker
+              v-model="timeList"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
           </el-form-item>
+          <div class="timeBox" v-else>
+            <div class="timeTitle"><span>*</span>有效期：</div>
+            <el-date-picker
+              type="daterange"
+              :disabled="form.long_time === 1"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :picker-options="pickerOptions">
+            </el-date-picker>
+            <el-checkbox v-model="form.long_time" :true-label="1" :false-label="0" class="longTimeCheckbox">无限期</el-checkbox>
+          </div>
           <el-form-item label="籍贯：" :label-width="formLabelWidth" prop="" class="custom-align-right">
             <CityCascader v-model="form.native_place_arr_id" @update-city-id="update_native_place_arr_id"></CityCascader>
           </el-form-item>
@@ -738,6 +761,26 @@ export default {
       margin-left: 10px;
     }
   }
+  .timeBox {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    margin-bottom: 22px;
+    .timeTitle {
+      width: 110px;
+      text-align: right;
+      font-size: 14px;
+      color: #606266;
+      font-weight: bold;
+      height: 36px;
+      line-height: 36px;
+      margin-right: 10px;
+      span {
+        color: red;
+        margin-right: 5px;
+      }
+    }
+  }
   .longTimeCheckbox {
     margin-left: 10px;
   }