页面样式修改

src/views/modules/reimbursementSys/reimbursementBusinessList.vue

@@ -7,12 +7,18 @@
           </el-form>
         </el-col>
         <el-col :span="24">
-          <el-col :span="12"><h3>业务报销详情</h3></el-col>
+          <el-col :span="12"><h3>业务报销详情</h3>
+            <div style="margin-bottom: 5px;">
+              <span class="color: red">可报销额度：{{columnForm.reimbursementQuota}}</span>
+              <span class="color: red">；  已报销额度：{{columnForm.alreadyReimbursementAmount}}</span>
+              <span class="color: red">；  剩余报销额度：{{columnForm.surplusReimbursementAmount}}</span>
+            </div>
+          </el-col>
           <el-col :span="12" style="text-align:right">
             <el-button type="info" size="small" @click="goBack">返回</el-button>
           </el-col>
           <el-table
-            :data="columnList"
+            :data="columnForm.columnList"
             style="width: 100%">
             <el-table-column
               prop="userName"
@@ -64,7 +70,12 @@
           name: '',
           sqlCmd: ''
         },
-        columnList: []
+        columnForm: {
+          reimbursementQuota: '',  // 报销额度
+          alreadyReimbursementAmount: '',  // 已报销额度
+          surplusReimbursementAmount: '',  // 剩余报销额度
+          columnList: []
+        }
       }
     },
     reimbursementBusiness: null,
@@ -73,11 +84,14 @@
     },
     activated () {
       this.$refs['inputForm'].resetFields()
-      this.columnList = []
+      this.columnForm.columnList = []
       this.inputForm.id = this.$route.query.id
       if (this.inputForm.id) {
         this.reimbursementBusiness.findListByBusinessCodeId(this.inputForm.id).then(({data}) => {
-          this.columnList = data
+          this.columnForm.columnList = data.list
+          this.columnForm.reimbursementQuota = data.reimbursementQuota
+          this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
+          this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
         })
       }
     },

src/views/modules/reimbursementSys/reimbursementList.vue

@@ -63,11 +63,16 @@
             </template>
           </vxe-column>
           <vxe-column  width="100px" title="发票代码" field="invoiceCode" align="center" ></vxe-column>
-          <vxe-column  width="100px" title="发票号码" field="invoiceNumber" align="center"></vxe-column>
+          <vxe-column  width="100px" title="发票号码" field="invoiceNumber" align="center">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursement:view') && scope.row.parentId !== '0'" @click="viewInvoice(scope.row.id)">{{scope.row.invoiceNumber}}</el-link>
+              <span v-else></span>
+            </template>
+          </vxe-column>
           <vxe-column  width="100px" title="金额" field="money" align="center"></vxe-column>
           <vxe-column  width="100px" title="税额" field="tax" align="center"></vxe-column>
           <vxe-column  width="100px" title="收入" field="income" align="center"></vxe-column>
-          <vxe-column  width="100px" title="报销比例" field="reimbursementRatio" align="center"></vxe-column>
+          <vxe-column  width="100px" title="报销比例%" field="reimbursementRatio" align="center"></vxe-column>
           <vxe-column  width="200px" title="购方企业名称" field="firmName" align="center"></vxe-column>
           <vxe-column  width="100px" title="开票日期" field="makeTime" align="center"></vxe-column>
           <vxe-column  width="150px" title="商品名称" field="name" align="center"></vxe-column>
@@ -80,12 +85,12 @@
 
           <vxe-column title="操作" width="300px" fixed="right" align="center">
             <template slot-scope="scope">
-              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode==='' && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusiness(scope.row.id)">修改业务编码</el-button>
-              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode !== '' && !scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusinessRatio(scope.row.id)">编辑报销比例</el-button>
+              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode==='' && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusiness(scope.row.id)">新增业务编码</el-button>
+              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.businessCode !== '' && !scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-edit" size="small" @click="editBusinessRatio(scope.row.id)">报销比例</el-button>
               <el-button v-if="hasPermission('reimbursementBusiness:add') && scope.row.businessCode !== '' && scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-plus" size="small" @click="addBusinessInfo(scope.row.id, scope.row.businessCode)">业务报销</el-button>
               <el-button v-if="hasPermission('reimbursementBusiness:view') && scope.row.businessCode !== '' && scope.row.reimbursementRatio && scope.row.parentId === '0'" type="text" icon="el-icon-view" size="small" @click="viewBusinessInfo(scope.row.id)">业务报销详情</el-button>
-              <el-button v-if="hasPermission('reimbursement:view') && scope.row.parentId !== '0'" type="text" icon="el-icon-view" size="small" @click="viewInvoice(scope.row.id)">查看发票详情</el-button>
-              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.parentId !== '0' && !scope.row.gatheringTime" type="text" icon="el-icon-edit" size="small" @click="editInvoice(scope.row.id)">发票收款</el-button>
+
+              <el-button v-if="hasPermission('reimbursement:edit') && scope.row.parentId !== '0' && !scope.row.gatheringTime" type="text" icon="el-icon-edit" size="small" @click="editInvoice(scope.row.id)">收款</el-button>
               <el-button v-if="hasPermission('reimbursement:del') && scope.row.parentId === '0'" type="text" icon="el-icon-delete" size="small" @click="delBusiness(scope.row.id)">删除</el-button>
               <el-button v-if="hasPermission('reimbursement:del') && scope.row.parentId !== '0'" type="text" icon="el-icon-delete" size="small" @click="delInvoice(scope.row.id)">删除</el-button>
             </template>

src/views/modules/reimbursementSys/reimbursementRatioForm.vue

@@ -14,8 +14,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="报销比例" prop="reimbursementRatio":rules="[{required: true, max: 10, message:'报销比例不能为空', trigger:'blur'}]">
-            <el-input v-model="inputForm.reimbursementRatio" class="bg-grey" size="small" placeholder="报销比例" style="width: 100%;" @keyup.native="inputForm.reimbursementRatio = checkInputs(inputForm.reimbursementRatio)">
+          <el-form-item label="报销比例(%)" prop="reimbursementRatio":rules="[{required: true, max: 10, message:'报销比例不能为空', trigger:'blur'}]">
+            <el-input v-model="inputForm.reimbursementRatio" class="bg-grey" size="small" placeholder="报销比例(%)" style="width: 100%;" @keyup.native="inputForm.reimbursementRatio = checkInputs(inputForm.reimbursementRatio)">
                 </el-input>
           </el-form-item>
         </el-col>

src/views/modules/reimbursementSys/user/reimbursementUserBusinessList.vue

@@ -7,7 +7,18 @@
           </el-form>
         </el-col>
         <el-col :span="24">
-          <el-col :span="12"><h3>人员报销详情</h3></el-col>
+          <el-col :span="12"><h3>人员报销详情</h3>
+            <div style="margin-bottom: 5px;">
+              <span class="color: red">可报销额度：{{columnForm.reimbursementQuota}}</span>
+              <span class="color: red">；  已报销额度：{{columnForm.alreadyReimbursementAmount}}</span>
+              <span class="color: red">；  剩余报销额度：{{columnForm.surplusReimbursementAmount}}</span>
+            </div>
+            <div style="margin-bottom: 5px;">
+              <span class="color: red">可报销天数：{{columnForm.reimbursementDay}}</span>
+              <span class="color: red">；  已报销天数：{{columnForm.alreadyReimbursementDay}}</span>
+              <span class="color: red">；  剩余报销天数：{{columnForm.surplusReimbursementDay}}</span>
+            </div>
+          </el-col>
           <el-col :span="12" style="text-align:right">
             <el-button type="info" size="small" @click="goBack">返回</el-button>
           </el-col>
@@ -53,6 +64,7 @@
       return {
         title: '',
         method: '',
+        count: '10',
         loading: false,
         previewVisible: false,
         isIndeterminate: false,
@@ -65,7 +77,12 @@
           sqlCmd: ''
         },
         columnForm: {
-          isNeedAll: true,
+          reimbursementDay: '',  // 报销天数
+          alreadyReimbursementDay: '',  // 已报销天数
+          surplusReimbursementDay: '',  // 剩余报销天数
+          reimbursementQuota: '',  // 报销额度
+          alreadyReimbursementAmount: '',  // 已报销额度
+          surplusReimbursementAmount: '',  // 剩余报销额度
           columnList: []
         }
       }
@@ -80,7 +97,13 @@
       this.inputForm.id = this.$route.query.id
       if (this.inputForm.id) {
         this.reimbursementUser.findListByUserId(this.inputForm.id).then(({data}) => {
-          this.columnForm.columnList = data
+          this.columnForm.columnList = data.list
+          this.columnForm.reimbursementDay = data.reimbursementDay
+          this.columnForm.alreadyReimbursementDay = data.alreadyReimbursementDay
+          this.columnForm.surplusReimbursementDay = data.surplusReimbursementDay
+          this.columnForm.reimbursementQuota = data.reimbursementQuota
+          this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
+          this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
         })
       }
     },

src/views/modules/reimbursementSys/user/reimbursementUserList.vue

@@ -63,7 +63,7 @@
           <vxe-column type="checkbox" width="40px"> </vxe-column>
           <vxe-column  title="人员" field="user.name">
             <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursementUser:edit')" @click="edit(scope.row.id)">{{scope.row.user.name}}</el-link>
+              <el-link  type="primary" :underline="false" v-if="hasPermission('reimbursementUser:edit')" @click="view(scope.row.id)">{{scope.row.user.name}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('reimbursementUser:view')"  @click="view(scope.row.id,)">{{scope.row.user.name}}</el-link>
               <span v-else>{{scope.row.user.name}}</span>
             </template>
@@ -72,10 +72,14 @@
           <vxe-column  title="报销年份" field="year"></vxe-column>
           <vxe-column  title="日报销额度" field="reimbursementQuotaDay"></vxe-column>
           <vxe-column  title="年报销额度" field="reimbursementQuota"></vxe-column>
+
+          <vxe-column  title="已报额度" field="alreadyReimbursementAmount"></vxe-column>
+          <vxe-column  title="剩余额度" field="surplusReimbursementAmount"></vxe-column>
+          <vxe-column  title="已报天数" field="alreadyReimbursementDay"></vxe-column>
+          <vxe-column  title="剩余天数" field="surplusReimbursementDay"></vxe-column>
           <vxe-column title="操作" width="300px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('reimbursementUser:view')" type="text" icon="el-icon-view" size="small" @click="view(scope.row.id)">查看</el-button>
-              <el-button v-if="hasPermission('reimbursementUser:view')" type="text" icon="el-icon-view" size="small" @click="viewBusinessInfo(scope.row.id)">查看报销详情</el-button>
+              <el-button v-if="hasPermission('reimbursementUser:view')" type="text" icon="el-icon-view" size="small" @click="viewBusinessInfo(scope.row.id)">报销详情</el-button>
               <el-button v-if="hasPermission('reimbursementUser:edit')" type="text" icon="el-icon-edit" size="small" @click="edit(scope.row.id)">修改</el-button>
               <el-button v-if="hasPermission('reimbursementUser:del')" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
             </template>
@@ -200,8 +204,8 @@ export default {
             type: 'success',
             duration: 1500
           })
-          this.refreshList()
         })
+        this.refreshList()
       })
     }
   }