Explorar o código

去掉搜索下箭头,修改input样式,增加申请页面

david %!s(int64=2) %!d(string=hai) anos
pai
achega
eca0f76e74

+ 18 - 0
src/api/finance.js

@@ -44,6 +44,24 @@ export function multPoint(query) {
     })
 }
 
+//change-balance
+export function changeBalance(query) {
+  return request({
+    url: '/v1/finance/change-balance',
+    method: 'post',
+    data: query
+  })
+}
+
+//full-info
+export function userFullInfo(query) {
+  return request({
+    url: '/v1/user/full-info',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 删除角色
 export function deleteRole(id) {

+ 4 - 1
src/components/FilterUser.vue

@@ -84,7 +84,7 @@
       <el-button class="filter-item" icon="el-icon-plus" @click="handleOptionPlus" />
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="handleFilterUser">{{ filterBtnName }}</el-button>
       <el-button class="filter-item" type="" @click="handleFilterClear">{{ $t('common.reset') }}</el-button>
-      <el-button class="down-button" type="text"><i class="el-icon-arrow-down" /></el-button>
+      <!-- <el-button class="down-button" type="text"><i class="el-icon-arrow-down" /></el-button> -->
     </div>
     <div v-show="filterSelected.length > 0" class="filter-selected">
       <el-tag
@@ -617,4 +617,7 @@ export default {
     .selected-tag {
       margin-left: 10px;
     }
+    /deep/ .el-input__inner {
+        width:203px;
+    }
   </style>

+ 4 - 0
src/lang/en.js

@@ -347,6 +347,7 @@ export default {
     modifyEcoinChangeInfo:'Modify member Ecoin change information',
     memberCode:'Member code',
     memberName:'Member name',
+    memberLevel:'Member level',
     accountType:'Account type',
     pleaseSelectAccountType:'Please select account type',
     adjustmentAmount:'Adjustment amount',
@@ -362,6 +363,9 @@ export default {
     handleAuditPassNotice:'Are you sure to pass the approval (negative number is allowed for member account) ? Note:',
     okDelData:"OK to delete the selected data?",
     exportNotice:"Are you sure you want to export the current data?",
+    manuallyAdd:'Manually add',
+    adjustAmount:'Adjust amount',
+    ecoinInsufficientNotice:'Ecoin of member is insufficient, whether to continue to submit.',
   },
 
   // 管理员管理

+ 4 - 0
src/lang/zh.js

@@ -350,6 +350,7 @@ export default {
     modifyEcoinChangeInfo:'修改会员余额变动信息',
     memberCode:'会员编号',
     memberName:'会员姓名',
+    memberLevel:'会员级别',
     accountType:'账户类型',
     pleaseSelectAccountType:'请选择账户类型',
     adjustmentAmount:'调整金额',
@@ -365,6 +366,9 @@ export default {
     handleAuditPassNotice:'确定要通过审核(会员账户允许为负数)?备注',
     okDelData:"确定删除选定的数据?",
     exportNotice:"确定要导出当前数据吗?",
+    manuallyAdd:'手动添加',
+    adjustAmount:'调整金额',
+    ecoinInsufficientNotice:'会员账户余额不足,是否继续提交',
   },
 
   // 管理员管理

+ 67 - 53
src/views/finance/change-balance-opt.vue

@@ -2,15 +2,15 @@
     <div v-loading="loading">
       <div class="white-box">
         <el-tabs v-model="tabActiveName">
-          <el-tab-pane label="Manually add" name="first" v-if="permission.hasPermission(`finance/change-balance`)"><!--手动添加-->
-            <el-form ref="form" :model="form" label-width="250px" class="form-page">
-              <el-form-item label="Member code"><!--会员编号-->
+          <el-tab-pane :label="$t('financial.manuallyAdd')" name="first" v-if="permission.hasPermission(`finance/change-balance`)"><!--手动添加-->
+            <el-form ref="form" :model="form" label-width="250px" class="bkele-form-page">
+              <el-form-item :label="$t('financial.memberCode')"><!--会员编号-->
                 <el-input v-model="form.userName" @change="handleChange"></el-input>
               </el-form-item>
-              <el-form-item label="Member name" v-show="userInfo.REAL_NAME!==null"><!--会员姓名-->
+              <el-form-item :label="$t('financial.memberName')" v-show="userInfo.REAL_NAME!==null"><!--会员姓名-->
                 <el-input :value="userInfo.REAL_NAME" :disabled="true"></el-input>
               </el-form-item>
-              <el-form-item label="Member level" v-show="userInfo.REAL_NAME!==null"><!--会员级别-->
+              <el-form-item :label="$t('financial.memberLevel')" v-show="userInfo.REAL_NAME!==null"><!--会员级别-->
                 <el-input :value="userInfo.LEVEL_NAME" :disabled="true"></el-input>
               </el-form-item>
               <!--<el-form-item label="报单中心级别" v-show="userInfo.DEC_ROLE_NAME!=='无'">-->
@@ -20,30 +20,30 @@
               <el-form-item :label="item.label" v-show="userInfo.REAL_NAME!==null" v-for="(item,key) in type" :key="key">
                 <el-input :value="userInfo[item.name.toUpperCase()]" :disabled="true"></el-input>
               </el-form-item>
-  
-              <el-form-item label="Account type"><!--账户类型-->
-                <el-select v-model="form.type" placeholder="select account type"><!--请选择账户类型-->
+              
+              <el-form-item :label="$t('financial.accountType')"><!--账户类型-->
+                <el-select v-model="form.type" :placeholder="$t('financial.pleaseSelectAccountType')"><!--请选择账户类型-->
                   <el-option v-for="(item,key) in type" :label="item.label" :value="key" :key="key"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="Adjust amount"><!--调整金额-->
+              <el-form-item :label="$t('financial.adjustAmount')"><!--调整金额-->
                 <el-input v-model="form.amount"></el-input>
               </el-form-item>
-              <el-form-item label="Transaction type"><!--交易类型-->
-                <el-select v-model="form.dealType" placeholder="select transaction type"><!--请选择交易类型-->
+              <el-form-item :label="$t('financial.transactionType')"><!--交易类型-->
+                <el-select v-model="form.dealType" :placeholder="$t('financial.pleaseSelectTranserType')"><!--请选择交易类型-->
                   <el-option v-for="(item,key) in dealTypes" :label="item.TYPE_NAME" :value="item.ID"
                              :key="item.ID"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="Remark"><!--备注-->
+              <el-form-item :label="$t('common.note')"><!--备注-->
                 <el-input v-model="form.remark"></el-input>
               </el-form-item>
-              <el-form-item label="Note on display"><!--备注前台显示-->
+              <el-form-item :label="$t('financial.forgeDisplayRemark')"><!--备注前台显示-->
                 <el-switch v-model="form.isShow" active-value="1" inactive-value="0">
                 </el-switch>
               </el-form-item>
               <el-form-item>
-                <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">Confirm<!-- 提交 --></el-button>
+                <el-button type="primary" :loading="submitButtonStat" :disabled="getCodeStat" @click="onSubmit">{{ $t('common.confirm') }}<!-- 提交 --></el-button>
               </el-form-item>
             </el-form>
           </el-tab-pane>
@@ -78,13 +78,12 @@
   <script>
     import tool from '@/utils/tool'
     import baseInfo from '@/utils/baseInfo'
-    import { getChangeBalanceType, multPoint, balanceAuditListExport, balanceAuditDelete } from '@/api/finance'
+    import { getChangeBalanceType, multPoint, changeBalance, userFullInfo } from '@/api/finance'
     // import {CDN_BASE_URL} from '@/utils/config'
     import permission from '@/utils/permission'
   
     export default {
       name: 'finance_change-balance-opt',
-   
       mounted() {
         getChangeBalanceType().then(response => {
           this.type = response.data.type
@@ -100,25 +99,10 @@
             console.log(err)
             this.loading = false
         })
-        // network.getData('finance/change-balance-type').then(response => {
-        //   this.type = response.type
-        //   this.dealTypes = response.dealTypes
-        //   this.loading = false
-        //   if (permission.hasPermission(`finance/import-change-balance-to-excel-table`) && permission.hasPermission(`finance/import-change-balance`)) {
-        //     this.tabActiveName = 'second'
-        //   }
-        //   if (permission.hasPermission(`finance/change-balance`)) {
-        //     this.tabActiveName = 'first'
-        //   }
-        // })
         multPoint({opType: 1}).then(response => {
             this.form.balanceCode = response.data.balanceCode
             this.getCodeStat = false
         })
-        // network.postData('finance/mult-point', {opType: 1}).then(response => {
-        //     this.form.balanceCode = response.balanceCode
-        //     this.getCodeStat = false
-        // })
       },
       data() {
         return {
@@ -155,20 +139,24 @@
       },
       methods: {
         handleChange() {
-        //   this.loading = true
-        //   network.getData('user/full-info', {userName: this.form.userName}).then(response => {
-        //     this.userInfo = response
-        //     this.loading = false
-        //   }).catch(response => {
-        //     this.loading = false
-        //   })
+          this.loading = true
+          userFullInfo({userName: this.form.userName}).then(response => {
+            this.userInfo = response.data
+            this.loading = false
+          }).catch(err => {
+            this.loading = false
+            this.$message({
+              message: err,
+              type: 'error'
+            })
+          })
         },
         onSubmit() {
               if (this.form.type === 'bonus') {
                 if ((Number.parseFloat(this.userInfo['BONUS']) + Number.parseFloat(this.form.amount)) < 0) {
-                  this.$confirm(`Ecoin of member is insufficient, whether to continue to submit.`, 'Hint', {// 会员账户余额不足,是否继续提交
-                    confirmButtonText: 'confirm', // 确定
-                    cancelButtonText: 'cancel', // 取消
+                  this.$confirm(this.$t('financial.ecoinInsufficientNotice'), this.$t('common.hint'), {// 会员账户余额不足,是否继续提交
+                    confirmButtonText: this.$t('common.confirm'), // 确定
+                    cancelButtonText: this.$t('common.cancel'), // 取消
                     type: 'warning'
                   }).then(() => {
                     this._handleSubmit()
@@ -185,17 +173,20 @@
         },
         _handleSubmit() {
           this.submitButtonStat = true
-          let path = 'finance/change-balance'
-        //   network.postData(path, this.form).then(response => {
-        //     this.submitButtonStat = false
-        //     this.$message({
-        //       message: response,
-        //       type: 'success'
-        //     })
-        //     this.$router.go(-1)
-        //   }).catch(response => {
-        //     this.submitButtonStat = false
-        //   })
+          changeBalance(this.form).then(response => {
+            this.submitButtonStat = false
+            this.$message({
+              message: response.data,
+              type: 'success'
+            })
+            this.$router.go(-1)
+          }).catch(err => {
+            this.submitButtonStat = false
+            this.$message({
+              message: err,
+              type: 'error'
+            })
+          })
         },
         handleExcel() {
         //   window.open(CDN_BASE_URL + `/files/bonus_change_balance.xlsx`)
@@ -205,6 +196,29 @@
   </script>
   
   <style scoped>
-  
+  @media (min-width: 761px) {
+    /deep/ .el-input__inner {
+      width: 500px;
+    }
+  }
+  @media (max-width:760px) {
+    /deep/ .white-box {
+    padding: 0px 0px;
+    }
+    /deep/ .el-form-item__content {
+      margin-left:150px !important;
+    }
+    /deep/ .el-form-item__label {
+      width:150px !important;
+    }
+    /deep/ .el-input__inner { 
+      width: 150px;
+    }
+    /* .el-input {
+      width: 90%;
+    } */
+
+  }
+
   </style>
   

+ 1 - 1
vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
     },
     proxy: {
       [process.env.VUE_APP_BASE_API]:{
-        target:"http://172.24.124.135:9970",
+        target:"http://172.25.252.101:9970",
         changeOrigin:true,
         pathRewrite:{
           ["^" + process.env.VUE_APP_BASE_API] : ""