Ver código fonte

回款,付款,资产编号隐藏;注册增加勾选协议;默认头像替换

sunlupeng 1 ano atrás
pai
commit
16dbca2ea4

BIN
src/assets/images/profile.png


+ 1 - 1
src/store/modules/user.js

@@ -171,7 +171,7 @@ const user = {
 
           res = res.data; // 读取 data 数据
           const user = res.user
-          const avatar = (user.avatar === "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
+          const avatar = (user.avatar === "" || user.avatar == null) ? require("@/assets/images/profile.png") : user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

+ 3 - 3
src/views/finance/asset/index.vue

@@ -6,10 +6,10 @@
                 <el-input v-model="queryParams.name" placeholder="请输入资产名称" clearable style="width: 250px"
                     @keyup.enter.native="handleQuery" />
             </el-form-item>
-            <el-form-item label="资产编号" prop="assetInfoUuid">
+            <!-- <el-form-item label="资产编号" prop="assetInfoUuid">
                 <el-input v-model="queryParams.assetInfoUuid" placeholder="请输入资产编号" clearable style="width: 250px"
                     @keyup.enter.native="handleQuery" />
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="资产型号" prop="typeNumber">
                 <el-input v-model="queryParams.typeNumber" placeholder="请输入资产型号" clearable style="width: 250px"
                     @keyup.enter.native="handleQuery" />
@@ -82,7 +82,7 @@
             <el-table-column type="selection" align="center" width="55" />
             <el-table-column label="序号" type="index" width="50"align="center"/>
             <el-table-column label="资产名称" align="center" prop="name" min-width="150" />
-            <el-table-column label="资产编号" align="center" prop="assetInfoUuid" min-width="350" />
+            <!-- <el-table-column label="资产编号" align="center" prop="assetInfoUuid" min-width="350" /> -->
             <el-table-column label="资产型号" align="center" prop="typeNumber" min-width="150" />
             <el-table-column label="资产序列号" align="center" prop="serialNumber" min-width="150" />
             <el-table-column label="购买日期" align="center" prop="purchaseDate" min-width="100" />

+ 3 - 3
src/views/finance/cash/paymentInfo.vue

@@ -5,10 +5,10 @@
           <el-input v-model="queryParams.paymentTitle" placeholder="请输入付款标题" clearable style="width: 250px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="付款编号" prop="paymentInfoUuid">
+        <!-- <el-form-item label="付款编号" prop="paymentInfoUuid">
           <el-input v-model="queryParams.paymentInfoUuid" placeholder="请输入付款编号" clearable style="width: 250px"
             @keyup.enter.native="handleQuery" />
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="创建人" prop="creatorName">
           <el-input v-model="queryParams.creatorName" placeholder="创建人" clearable style="width: 250px"
             @keyup.enter.native="handleQuery" />
@@ -39,7 +39,7 @@
       <el-table v-loading="loading" :data="dataList">
         <el-table-column label="序号" type="index" width="50"align="center"/>
         <el-table-column label="付款标题" align="center" prop="paymentTitle" min-width="150" />
-        <el-table-column label="付款编号" align="center" prop="paymentInfoUuid" min-width="250" />
+        <!-- <el-table-column label="付款编号" align="center" prop="paymentInfoUuid" min-width="250" /> -->
         <el-table-column label="付款日期" align="center" prop="paymentDate" min-width="100" />
         <el-table-column label="付款金额(元)" align="center" prop="paymentMoney" min-width="100" />
         <el-table-column label="创建人" align="center" prop="creatorName" min-width="80" />

+ 3 - 3
src/views/finance/cash/refundInfo.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="回款编号" prop="refundInfoUuid">
+        <!-- <el-form-item label="回款编号" prop="refundInfoUuid">
         <el-input v-model="queryParams.refundInfoUuid" placeholder="请输入回款编号" clearable style="width: 250px"
           @keyup.enter.native="handleQuery" />
-      </el-form-item>
+      </el-form-item> -->
         <el-form-item label="回款标题" prop="refundTitle">
           <el-input v-model="queryParams.refundTitle" placeholder="请输入回款标题" clearable style="width: 250px"
             @keyup.enter.native="handleQuery" />
@@ -49,7 +49,7 @@
 
       <el-table v-loading="loading" :data="dataList">
         <el-table-column label="序号" type="index" width="50"align="center"/>
-        <el-table-column label="回款编号" align="center" prop="refundInfoUuid" min-width="350" />
+        <!-- <el-table-column label="回款编号" align="center" prop="refundInfoUuid" min-width="350" /> -->
         <el-table-column label="回款标题" align="center" prop="refundTitle" min-width="150" />
         <el-table-column label="客户名称" align="center" prop="customerName" min-width="200" />
         <el-table-column label="合同名称" align="center" prop="contractName" min-width="100" />

+ 1 - 1
src/views/mp/components/wx-msg/main.vue

@@ -141,7 +141,7 @@ export default {
       },
       user: { // 由于微信不再提供昵称,直接使用“用户”展示
         nickname: '用户',
-        avatar: require("@/assets/images/profile.jpg"),
+        avatar: require("@/assets/images/profile.png"),
         accountId: 0, // 公众号账号编号
       },
       mp: {

+ 4 - 2
src/views/register.vue

@@ -37,14 +37,15 @@
                 </el-input>
               </el-form-item>
               <div class="service-laws">
-                点击注册表明你已阅读并同意
+                <el-checkbox v-model="isAgree" style="font-size: 15px;"></el-checkbox>
+                请阅读并同意
                 <span class="terms" @click="getAgreement(1)">《服务条款》</span>
                 <span class="terms" @click="getAgreement(2)">《隐私声明》</span>
               </div>
               <!-- 下方的下一步按钮 -->
               <el-form-item style="width:100%;">
-                <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
+                <el-button :disabled="!isAgree" :loading="loading" size="medium" type="primary" style="width:100%;"
                   @click.native.prevent="handleRegister()">
                   <span v-if="!loading">注 册</span>
                   <span v-else>操 作 中...</span>
@@ -79,6 +80,7 @@ import {setTenantId} from "@/utils/auth";
 export default {
   data() {
     return {
+      isAgree: false,
       title:'',
       agreementData:'',
       dialogVisible: false,