Просмотр исходного кода

总所报销详情页展示功能修改

user5 2 лет назад
Родитель
Сommit
a020f0a319

+ 5 - 0
src/views/modules/reimbursementSys/accountant/reimbursementList.vue

@@ -334,6 +334,11 @@ export default {
     },
     resetSearch () {
       this.$refs.searchForm.resetFields()
+      this.searchForm.beginIncome = ''
+      this.searchForm.endIncome = ''
+      this.searchForm.beginDate = ''
+      this.searchForm.endDate = ''
+      this.searchDates = ''
       this.refreshList()
     },
     uploadSuccess (res, file) {

+ 1 - 0
src/views/modules/reimbursementSys/accountant/user/reimbursementUserForm.vue

@@ -182,6 +182,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = '2'
             this.reimbursementUser.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

+ 2 - 6
src/views/modules/reimbursementSys/accountant/user/reimbursementUserList.vue

@@ -47,12 +47,12 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top">
-      <vxe-toolbar  :refresh="{query: refreshList}" import export  print resizable custom>
+      <vxe-toolbar  :refresh="{query: refreshList}" export  print resizable custom>
         <template #buttons>
           <el-row>
             <el-button v-if="hasPermission('accountant:reimbursementUser:add')" type="primary" icon="el-icon-plus" size="small" @click="add()">新增</el-button>
             <el-button v-if="hasPermission('accountant:reimbursementUser:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.reimbursementUserTable && $refs.reimbursementUserTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-            <el-button v-if="hasPermission('accountant:reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>
+            <!--<el-button v-if="hasPermission('accountant:reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>-->
             <el-button v-if="hasPermission('accountant:reimbursementUser:add')" type="success" icon="el-icon-success" size="small" @click="initialize()">初始化</el-button>
           </el-row>
         </template>
@@ -71,10 +71,6 @@
           highlight-hover-row
           :menu-config="{}"
           :print-config="{}"
-          :import-config="{
-                    importMethod: importMethod,
-                    types: ['xls', 'xlsx'],
-                    remote: true}"
           :export-config="{
                     remote: true,
                     filename: `兴光会计报销人员信息数据${moment(new Date()).format('YYYY-MM-DD')}`,

+ 5 - 0
src/views/modules/reimbursementSys/assess/reimbursementList.vue

@@ -334,6 +334,11 @@ export default {
     },
     resetSearch () {
       this.$refs.searchForm.resetFields()
+      this.searchForm.beginIncome = ''
+      this.searchForm.endIncome = ''
+      this.searchForm.beginDate = ''
+      this.searchForm.endDate = ''
+      this.searchDates = ''
       this.refreshList()
     },
     uploadSuccess (res, file) {

+ 1 - 0
src/views/modules/reimbursementSys/assess/user/reimbursementUserForm.vue

@@ -182,6 +182,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = '4'
             this.reimbursementUser.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

+ 2 - 6
src/views/modules/reimbursementSys/assess/user/reimbursementUserList.vue

@@ -47,12 +47,12 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top">
-      <vxe-toolbar  :refresh="{query: refreshList}" import export  print resizable custom>
+      <vxe-toolbar  :refresh="{query: refreshList}" export  print resizable custom>
         <template #buttons>
           <el-row>
             <el-button v-if="hasPermission('assess:reimbursementUser:add')" type="primary" icon="el-icon-plus" size="small" @click="add()">新增</el-button>
             <el-button v-if="hasPermission('assess:reimbursementUser:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.reimbursementUserTable && $refs.reimbursementUserTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-            <el-button v-if="hasPermission('assess:reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>
+            <!--<el-button v-if="hasPermission('assess:reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>-->
             <el-button v-if="hasPermission('assess:reimbursementUser:add')" type="success" icon="el-icon-success" size="small" @click="initialize()">初始化</el-button>
           </el-row>
         </template>
@@ -71,10 +71,6 @@
           highlight-hover-row
           :menu-config="{}"
           :print-config="{}"
-          :import-config="{
-                    importMethod: importMethod,
-                    types: ['xls', 'xlsx'],
-                    remote: true}"
           :export-config="{
                     remote: true,
                     filename: `兴光评估报销人员信息数据${moment(new Date()).format('YYYY-MM-DD')}`,

+ 5 - 0
src/views/modules/reimbursementSys/project/reimbursementList.vue

@@ -334,6 +334,11 @@ export default {
     },
     resetSearch () {
       this.$refs.searchForm.resetFields()
+      this.searchForm.beginIncome = ''
+      this.searchForm.endIncome = ''
+      this.searchForm.beginDate = ''
+      this.searchForm.endDate = ''
+      this.searchDates = ''
       this.refreshList()
     },
     uploadSuccess (res, file) {

+ 1 - 0
src/views/modules/reimbursementSys/project/user/reimbursementUserForm.vue

@@ -182,6 +182,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = '3'
             this.reimbursementUser.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

+ 2 - 6
src/views/modules/reimbursementSys/project/user/reimbursementUserList.vue

@@ -47,12 +47,12 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top">
-      <vxe-toolbar  :refresh="{query: refreshList}" import export  print resizable custom>
+      <vxe-toolbar  :refresh="{query: refreshList}" export  print resizable custom>
         <template #buttons>
           <el-row>
             <el-button v-if="hasPermission('project:reimbursementUser:add')" type="primary" icon="el-icon-plus" size="small" @click="add()">新增</el-button>
             <el-button v-if="hasPermission('project:reimbursementUser:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.reimbursementUserTable && $refs.reimbursementUserTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-            <el-button v-if="hasPermission('project:reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>
+            <!--<el-button v-if="hasPermission('project:reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>-->
             <el-button v-if="hasPermission('project:reimbursementUser:add')" type="success" icon="el-icon-success" size="small" @click="initialize()">初始化</el-button>
           </el-row>
         </template>
@@ -71,10 +71,6 @@
           highlight-hover-row
           :menu-config="{}"
           :print-config="{}"
-          :import-config="{
-                    importMethod: importMethod,
-                    types: ['xls', 'xlsx'],
-                    remote: true}"
           :export-config="{
                     remote: true,
                     filename: `兴光项目报销人员信息数据${moment(new Date()).format('YYYY-MM-DD')}`,

+ 5 - 0
src/views/modules/reimbursementSys/reimbursementList.vue

@@ -332,6 +332,11 @@ export default {
     },
     resetSearch () {
       this.$refs.searchForm.resetFields()
+      this.searchForm.beginIncome = ''
+      this.searchForm.endIncome = ''
+      this.searchForm.beginDate = ''
+      this.searchForm.endDate = ''
+      this.searchDates = ''
       this.refreshList()
     },
     uploadSuccess (res, file) {

+ 1 - 0
src/views/modules/reimbursementSys/user/reimbursementUserForm.vue

@@ -182,6 +182,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = '1'
             this.reimbursementUser.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

+ 2 - 6
src/views/modules/reimbursementSys/user/reimbursementUserList.vue

@@ -59,12 +59,12 @@
       </el-form-item>
     </el-form>
     <div class="bg-white top">
-      <vxe-toolbar  :refresh="{query: refreshList}" import export  print resizable custom>
+      <vxe-toolbar  :refresh="{query: refreshList}" export  print resizable custom>
         <template #buttons>
           <el-row>
             <el-button v-if="hasPermission('reimbursementUser:add')" type="primary" icon="el-icon-plus" size="small" @click="add()">新增</el-button>
             <el-button v-if="hasPermission('reimbursementUser:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.reimbursementUserTable && $refs.reimbursementUserTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-            <el-button v-if="hasPermission('reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>
+            <!--<el-button v-if="hasPermission('reimbursementUser:import')"  type="default" @click="downloadTpl()" size="small">下载模板</el-button>-->
             <el-button v-if="hasPermission('reimbursementUser:add')" type="success" icon="el-icon-success" size="small" @click="initialize()">初始化</el-button>
           </el-row>
         </template>
@@ -83,10 +83,6 @@
           highlight-hover-row
           :menu-config="{}"
           :print-config="{}"
-          :import-config="{
-                    importMethod: importMethod,
-                    types: ['xls', 'xlsx'],
-                    remote: true}"
           :export-config="{
                     remote: true,
                     filename: `中审众环报销人员信息数据${moment(new Date()).format('YYYY-MM-DD')}`,

+ 12 - 0
src/views/modules/reimbursementSys/wuHanReimbursementBusinessForm.vue

@@ -50,6 +50,17 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12"  v-if="method !== 'read'">
+          <el-form-item label="实发类型" prop="reimbursementFsalary"
+                        :rules="[
+                  {required: true, message:'请选择实发类型', trigger:'blur'}
+                 ]">
+            <el-radio-group v-model="inputForm.reimbursementFsalary">
+              <el-radio v-for="item in $dictUtils.getDictList('reimbursement_fsalary')" :label="item.value" :key="item.id">{{item.label}}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="12" v-if="this.show">
           <el-form-item label="报销天数" prop="reimbursementDay" :rules="[{required: true, max: 10, message:'报销天数不能为空且只可为整数', trigger:'blur'}]">
             <el-input v-model="inputForm.reimbursementDay" class="bg-grey" size="small" placeholder="报销天数" style="width: 100%;" @keyup.native="inputForm.reimbursementDay = checkInputs(inputForm.reimbursementDay)"></el-input>
@@ -135,6 +146,7 @@
           userId: '', // 人员id
           year: '', // 年份
           reimbursementType: '', // 报销类型
+          reimbursementFsalary: '', // 实发类型
           reimbursementQuota: '', // 年报销额度
           reimbursementAmount: '', // 报销金额
           reimbursementQuotaDay: '', // 日报销额度

+ 5 - 0
src/views/modules/reimbursementSys/wuHanReimbursementBusinessList.vue

@@ -41,6 +41,11 @@
             >
             </el-table-column>
             <el-table-column
+              prop="reimbursementFsalary"
+              label="实发类型"
+            >
+            </el-table-column>
+            <el-table-column
               prop="reimbursementDay"
               label="报销天数"
             >

+ 5 - 0
src/views/modules/reimbursementSys/wuHanReimbursementList.vue

@@ -331,6 +331,11 @@ export default {
     },
     resetSearch () {
       this.$refs.searchForm.resetFields()
+      this.searchForm.beginIncome = ''
+      this.searchForm.endIncome = ''
+      this.searchForm.beginDate = ''
+      this.searchForm.endDate = ''
+      this.searchDates = ''
       this.refreshList()
     },
     uploadSuccess (res, file) {