Browse Source

页面优化、人员导出模板功能修改

user5 2 years ago
parent
commit
b8332d3aa5

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

@@ -111,6 +111,7 @@
               <span v-else></span>
             </template>
           </vxe-column>
+          <vxe-column  width="100px" title="所属年份" field="year" align="center" visible></vxe-column>
           <vxe-column  width="100px" title="发票代码" field="invoiceCode" align="center" visible></vxe-column>
           <vxe-column  width="100px" title="发票号码" field="invoiceNumber" align="center">
             <template slot-scope="scope">

+ 2 - 2
src/views/modules/reimbursementSys/accountant/treeReimbursementBuinessUserSelect.vue

@@ -180,11 +180,11 @@ export default {
         return
       }
       if (node['disabled'] || node['typeFlag']) {
-        this.$message.warning('节点(' + node[this.props.label] + ')被禁止选择,请重新选择。')
+        // this.$message.warning('节点(' + node[this.props.label] + ')被禁止选择,请重新选择。')
         return
       }
       if (this.isOnlySelectLeaf && node.children.length > 0) {
-        this.$message.warning('不能选择根节点(' + node[this.props.label] + ')请重新选择。')
+        // this.$message.warning('不能选择根节点(' + node[this.props.label] + ')请重新选择。')
         return
       }
       this.valueTitle = node[this.props.label]

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

@@ -37,7 +37,7 @@
           <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('sys:user: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-row>
         </template>
       </vxe-toolbar>
@@ -181,6 +181,7 @@ export default {
       formBody.append('file', file)
       this.reimbursementUser.importExcel(formBody).then(result => {
         this.$message.success(result.data)
+        this.refreshList()
       })
     },
     // 下载模板

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

@@ -107,6 +107,7 @@
               <span v-else></span>
             </template>
           </vxe-column>
+          <vxe-column  width="100px" title="所属年份" field="year" align="center" visible></vxe-column>
           <vxe-column  width="100px" title="发票代码" field="invoiceCode" align="center" visible></vxe-column>
           <vxe-column  width="100px" title="发票号码" field="invoiceNumber" align="center">
             <template slot-scope="scope">

+ 2 - 2
src/views/modules/reimbursementSys/treeReimbursementBuinessUserSelect.vue

@@ -180,11 +180,11 @@ export default {
         return
       }
       if (node['disabled'] || node['typeFlag']) {
-        this.$message.warning('节点(' + node[this.props.label] + ')被禁止选择,请重新选择。')
+        // this.$message.warning('节点(' + node[this.props.label] + ')被禁止选择,请重新选择。')
         return
       }
       if (this.isOnlySelectLeaf && node.children.length > 0) {
-        this.$message.warning('不能选择根节点(' + node[this.props.label] + ')请重新选择。')
+        // this.$message.warning('不能选择根节点(' + node[this.props.label] + ')请重新选择。')
         return
       }
       this.valueTitle = node[this.props.label]

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

@@ -37,7 +37,7 @@
           <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('sys:user: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-row>
         </template>
       </vxe-toolbar>
@@ -181,6 +181,7 @@ export default {
       formBody.append('file', file)
       this.reimbursementUser.importExcel(formBody).then(result => {
         this.$message.success(result.data)
+        this.refreshList()
       })
     },
     // 下载模板

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

@@ -107,6 +107,7 @@
               <span v-else></span>
             </template>
           </vxe-column>
+          <vxe-column  width="100px" title="所属年份" field="year" align="center" visible></vxe-column>
           <vxe-column  width="100px" title="发票代码" field="invoiceCode" align="center" visible></vxe-column>
           <vxe-column  width="100px" title="发票号码" field="invoiceNumber" align="center">
             <template slot-scope="scope">