Merge branch 'jr_requirement_423' into debug_jr

src/views/customer/CompanyEdit.vue

@@ -168,7 +168,6 @@ function viewUserPermission(){
           :model="formState"
           :rules="formRules"
           label-width="100px"
-          :disabled="isView"
         >
         <div class="auth-box-label">
             <div class="text-icon"></div>
@@ -176,18 +175,19 @@ function viewUserPermission(){
           </div>
           <div class="flex form-tr-box">
             <el-form-item label="投资者名称" prop="CompanyName">
-              <el-input v-model="formState.CompanyName" placeholder="请输入机构投资者名称全称" />
+              <el-input v-model="formState.CompanyName" placeholder="请输入机构投资者名称全称" :disabled="isView"/>
             </el-form-item>
             <el-form-item label="社会信用码" prop="CreditCode">
               <el-input
                 v-model="formState.CreditCode"
                 placeholder="请输入社会信用码"
+                :disabled="isView"
               />
             </el-form-item>
           </div>
           <div class="flex form-tr-box">
             <el-form-item label="所属行业" prop="Industry">
-              <el-input v-model="formState.Industry" placeholder="请输入所属行业" />
+              <el-input v-model="formState.Industry" placeholder="请输入所属行业" :disabled="isView"/>
             </el-form-item>
             <el-form-item label="客户地址" prop="province">
               <div style="width: 100%">
@@ -195,6 +195,7 @@ function viewUserPermission(){
                   :provinceInfo="formState.province"
                   :cityInfo="formState.city"
                   @selected="selectRegion"
+                  :disabled="isView"
                 />
               </div>
             </el-form-item>
@@ -209,6 +210,7 @@ function viewUserPermission(){
                 onlySelectUser
                 v-model="formState.sellerId"
                 placeholder="请选择营业部"
+                :disabled="isView"
               />
             </el-form-item>
           </div>
@@ -220,6 +222,7 @@ function viewUserPermission(){
                 placeholder="请选择客户等级"
                 clearable
                 style="width: 100%;"
+                :disabled="isView"
               >
                 <el-option
                   v-for="item in userLevelList"
@@ -228,7 +231,7 @@ function viewUserPermission(){
                   :value="item.UserLevelId"
                 />
               </el-select>
-              <div style="width: 100%;text-align: right;">
+              <div style="width: 100%;text-align: right;" v-if="formState.UserLevelId">
                 <el-button type='primary' link @click="viewUserPermission" style="text-decoration: underline;">查看权限</el-button>
               </div>
             </el-form-item>

src/views/customer/UserEdit.vue

@@ -167,11 +167,10 @@ function viewUserPermission(){
         :model="formState"
         :rules="formRules"
         label-width="100px"
-        :disabled="isView"
       >
         <div class="flex form-tr-box">
           <el-form-item label="姓名" prop="realName">
-            <el-input v-model="formState.realName" placeholder="请输入姓名" />
+            <el-input v-model="formState.realName" placeholder="请输入姓名" :disabled="isView"/>
           </el-form-item>
         </div>
         <div class="flex form-tr-box">
@@ -180,6 +179,7 @@ function viewUserPermission(){
               v-model="formState.areaCode" 
               placeholder="请选择"
               style="width: 35%"
+              :disabled="isView"
             >
               <el-option
                 v-for="item in areaCodeOpts"
@@ -192,6 +192,7 @@ function viewUserPermission(){
               v-model="showPhoneVal"
               placeholder="输入手机号"
               style="width: 60%; margin-left: 5%"
+              :disabled="isView"
             />
           </el-form-item>
         </div>
@@ -205,6 +206,7 @@ function viewUserPermission(){
               onlySelectUser
               v-model="formState.sellerId"
               placeholder="请选择营业部"
+              :disabled="isView"
             />
             <!-- handleFilterList -->
             <!-- <el-select
@@ -224,6 +226,7 @@ function viewUserPermission(){
                 placeholder="请选择客户等级"
                 clearable
                 style="width: 100%;"
+                :disabled="isView"
               >
                 <el-option
                   v-for="item in userLevelList"
@@ -232,7 +235,7 @@ function viewUserPermission(){
                   :value="item.UserLevelId"
                 />
               </el-select>
-              <div style="width: 100%;text-align: right;">
+              <div style="width: 100%;text-align: right;" v-if="formState.UserLevelId">
                   <el-button type='primary' link  @click="viewUserPermission" style="text-decoration: underline;">查看权限</el-button>
               </div>
             </el-form-item>

src/views/customer/components/OperationRecord.vue

@@ -36,7 +36,7 @@ getRecord()
 .customer-operationRecord-wrap {
   margin-top: 20px;
   max-width: 350px;
-  max-height: 90vh;
+  max-height: 50vh;
   overflow-y: auto;
   padding: 20px;
   border: 1px solid #dcdfe6;