Merge remote-tracking branch 'origin/master'

src/views/modules/reimbursementSys/accountant/reimbursementForm.vue

@@ -82,7 +82,7 @@
               this.loading = false
             })
           }
-          if (method === 'editInvoiceBusiness' || method === 'view') { // 修改或者查看
+          if (method === 'editInvoiceBusiness') { // 修改或者查看
             this.loading = true
             this.reimbursementSys.queryBusinessByInvoiceId(this.inputForm.id).then(({data}) => {
               this.inputForm = this.recover(this.inputForm, data)

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">

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]

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()
       })
     },
     // 下载模板

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">

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]

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

@@ -62,6 +62,13 @@
               width="200px"
             >
             </el-table-column>
+            <el-table-column
+              prop="reimbursementAddress"
+              label="报销来源"
+              width="200px"
+              :formatter="addressType"
+            >
+            </el-table-column>
           </el-table>
         </el-col>
       </el-row>
@@ -71,6 +78,7 @@
 
 <script>
   import ReimbursementUser from '@/api/reimbursementSys/user/reimbursementUserService'
+
   export default {
     data () {
       return {
@@ -128,6 +136,15 @@
       goBack () {
         this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
         this.$router.push('/reimbursementSys/user/reimbursementUserList')
+      },
+      addressType (row, column) {
+        // eslint-disable-next-line eqeqeq
+        if (row.reimbursementAddress == 0) {
+          return ''
+          // eslint-disable-next-line eqeqeq
+        } else if (row.reimbursementAddress == 1) {
+          return '武汉'
+        }
       }
     }
   }

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()
       })
     },
     // 下载模板

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">
@@ -342,7 +343,7 @@ export default {
     addBusinessInfo (id, businessCode) {
       this.$refs.reimbursementBusinessForm.init('addBusinessInfo', {id: '', businessCodeId: id, businessCode: businessCode, parent: {id: '', name: ''}})
     },
-    // 查看业务报销详情
+    // 查看业务报销详情/reimbursementSys/reimbursementBusinessList
     viewBusinessInfo (id) {
       this.$router.push({path: `/reimbursementSys/wuHanReimbursementBusinessList`, query: {id: id, title: '业务报销详情'}})
     },