Merge remote-tracking branch 'origin/master'

src/views/system/agency/data.js

@@ -1,5 +1,4 @@
 import { IsPermission } from "@/router/routerUtil";
-let formLabelWidth = '150px';
 // 表单数据配置（改为函数形式，接收route参数）
 export const getZxqdFindConfig = (route) => ({
     tabSize: "small", //Table 的尺寸 large / default /small (默认default)
@@ -35,10 +34,10 @@ export const getZxqdFindConfig = (route) => ({
     operateShow: true, //是否为表格添加操作栏(默认true)
     operateTitle: "操作", //操作栏标题(默认为"")
     operateFixed: true, //操作栏是否固定(默认false)
-    operateWidth: "200", //操作栏宽度
+    operateWidth: "150", //操作栏宽度
     operate: {
         edit: IsPermission(route, 'EDIT_LIST'), //是否编辑(默认true)
-        info: IsPermission(route, 'INFO_LIST'), //是否编辑(默认true)
+        info: false,
         delete: true, //是否删除(默认true) IsPermission(route, 'DEL_LIST')
         announcement: false, // 公告
         remark: false, // 详情
@@ -53,7 +52,7 @@ export const getZxqdFindConfig = (route) => ({
         {
             label: "序号",
             type: "index", //类型:selection,index,expand
-            width: "80px", //表头宽度
+            width: "50px", //表头宽度
         },
     ],
     field: [
@@ -62,7 +61,7 @@ export const getZxqdFindConfig = (route) => ({
             label: "中心渠道编号",
             form: {
                 hideEdit: true,
-                formLabelWidth: formLabelWidth,
+                formLabelWidth: '120px',
                 type: 'input',
                 required: true,
             }
@@ -71,7 +70,7 @@ export const getZxqdFindConfig = (route) => ({
             prop: "centerAgencyName",
             label: "中心渠道名称",
             form: {
-                formLabelWidth: formLabelWidth,
+                formLabelWidth: '200px',
                 type: 'input',
                 required: true,
                 disabled: false

src/views/system/agency/index.vue

@@ -313,19 +313,19 @@ const field = ref({
         {
             label: "序号",
             type: "index", //类型:selection,index,expand
-            width: "80px", //表头宽度
+            width: "50px", //表头宽度
         },
     ],
     field: [
         {
             prop: "issuerId",
             label: "发行方编号",
-            width: "120px"
+            width: "80px"
         },
         {
             prop: "name",
             label: "渠道名称",
-            width: "120px",
+            width: "200px",
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -336,7 +336,7 @@ const field = ref({
         {
             prop: "agencyId",
             label: "渠道编号",
-            width: "120px",
+            width: "100px",
             form: {
                 width: '45%',
                 formLabelWidth: formLabelWidth,
@@ -361,7 +361,7 @@ const field = ref({
         {
             prop: "type",
             label: "合作机构类别",
-            width: "120px",
+            width: "100px",
             listData: AGENCY_TYPE,
             form: {
                 width: '45%',
@@ -504,9 +504,9 @@ const field = ref({
             }
         },
         {
-            prop: "createTime",
+            prop: "insertTime",
             label: "创建时间",
-            width: "170px",
+            width: "150px",
             funRuleStarts: true,
             funRule: (val: any) => {
                 if (val) {

src/views/system/updatePassword/index.vue

@@ -8,7 +8,7 @@
                     <el-tab-pane name="oldPassword" label="通过旧密码修改">
                         <el-form-item prop="mobile" label="手机号">
                             <el-input maxlength="60" v-trim clearable v-model="dataForm.mobile" type="text"
-                                placeholder="请输入手机号"></el-input>
+                                placeholder="请输入手机号" :disabled="true"></el-input>
                         </el-form-item>
                         <el-form-item prop="password" label="旧密码">
                             <el-input maxlength="60" v-trim clearable v-model="dataForm.password" type="password"
@@ -33,18 +33,13 @@
                                 type="password" placeholder="请确认密码"></el-input>
                         </el-form-item>
                         <el-form-item prop="mobile" label="手机号">
-                            <el-input maxlength="60" v-trim clearable size="large" v-model="dataForm.mobile"
-                                placeholder="请输入手机号">
-                            </el-input>
+                            <el-input maxlength="60" v-trim clearable v-model="dataForm.mobile" placeholder="请输入手机号" :disabled="true"/>
                         </el-form-item>
                         <el-form-item prop="code" label="验证码">
                             <div class="code-wrap">
-                                <el-input maxlength="60" v-trim clearable size="large" v-model="dataForm.code"
-                                    placeholder="请输入验证码"></el-input>
-                                <el-button type="primary" class="code-btn" @click="codeHandle" :disabled="disabled">{{
-            disabled
-                ?
-                `获取验证码${count}` : '获取验证码' }}</el-button>
+                                <el-input maxlength="60" v-trim clearable v-model="dataForm.code" placeholder="请输入验证码"/>
+                                <el-button type="primary" class="code-btn" @click="codeHandle" :disabled="disabled" size="small">
+                                    {{ disabled ? `获取验证码${count}` : '获取验证码' }}</el-button>
                             </div>
                         </el-form-item>
                     </el-tab-pane>
@@ -196,15 +191,19 @@
     const dataFormSubmitHandle = useDebounce(submit);
     function cancelHandle() {
         dialogVisible.value = false;
-        dataForm.value = {
-            mobile: "",
-            password: "",
-            newPassword: "",
-            affirmNewPassword: "",
-            code: ""
-        }
+        // dataForm.value = {
+        //     mobile: "",
+        //     password: "",
+        //     newPassword: "",
+        //     affirmNewPassword: "",
+        //     code: ""
+        // }
     }
-    function init() {
+    function init() {        
+        //从localstare中读取个人信息
+        let cacheAccessToken = getCache( 'cacheAccessToken',{ isSessionStorage: false },{})
+
+        dataForm.value.mobile = cacheAccessToken.staffId;
         dialogVisible.value = true;
     }
     // 获取验证码