无票报销登记和展示功能

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

@@ -17,7 +17,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-              :url="`/sys/user/treeUserDataByOfficeName?type=2&officeName=兴光会计`"
+              :url="`/sys/user/treeUserDataAllOffice?type=2`"
               :value="inputForm.userId"
               :clearable="true"
               :accordion="true"
@@ -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>
@@ -121,6 +132,7 @@
           userId: '', // 人员id
           year: '', // 年份
           reimbursementType: '', // 报销类型
+          reimbursementFsalary: '', // 实发类型
           reimbursementQuota: '', // 年报销额度
           reimbursementAmount: '', // 报销金额
           reimbursementQuotaDay: '', // 日报销额度
@@ -295,6 +307,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = 2
             this.reimbursementBusiness.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

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

@@ -12,7 +12,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-          :url="`/sys/user/treeUserDataByOfficeName?type=2&officeName=兴光会计`"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
           :value="searchForm.userId"
           :clearable="true"
           :accordion="true"
@@ -81,6 +81,7 @@
           :checkbox-config="{}">
           <vxe-column type="checkbox" width="40px"></vxe-column>
           <vxe-column width="172px" title="报销人" field="userName" align="center" visible></vxe-column>
+          <vxe-column width="172px" title="报销人部门" field="userOfficeName" align="center" visible></vxe-column>
           <vxe-column width="172px" title="报销年份" field="year" align="center"></vxe-column>
           <vxe-column width="172px" title="报销类型" field="reimbursementType" align="center">
             <template slot-scope="scope">
@@ -88,6 +89,12 @@
               <el-tag v-if="scope.row.reimbursementType === '2'"> 补差</el-tag>
             </template>
           </vxe-column>
+          <vxe-column width="172px" title="实发类型" field="reimbursementFsalary" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.reimbursementFsalary === '1'"> 登记不实发</el-tag>
+              <el-tag v-if="scope.row.reimbursementFsalary === '2'"> 登记并实发</el-tag>
+            </template>
+          </vxe-column>
           <vxe-column width="172px" title="报销天数" field="reimbursementDay" align="center"></vxe-column>
           <vxe-column width="172px" title="报销额度" field="reimbursementAmount" align="center"></vxe-column>
           <vxe-column title="操作" width="300px" fixed="right" align="center">
@@ -177,7 +184,8 @@
         dataList: [],
         searchForm: {
           year: '',
-          userId: ''
+          userId: '',
+          officeType: '2'
         },
         tablePage: {
           total: 0,

src/views/modules/reimbursementSys/assess/reimbursementIsNoTicketForm.vue

@@ -17,7 +17,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-              :url="`/sys/user/treeUserDataByOfficeName?type=2&officeName=兴光评估`"
+              :url="`/sys/user/treeUserDataAllOffice?type=2`"
               :value="inputForm.userId"
               :clearable="true"
               :accordion="true"
@@ -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>
@@ -121,6 +132,7 @@
           userId: '', // 人员id
           year: '', // 年份
           reimbursementType: '', // 报销类型
+          reimbursementFsalary: '', // 实发类型
           reimbursementQuota: '', // 年报销额度
           reimbursementAmount: '', // 报销金额
           reimbursementQuotaDay: '', // 日报销额度
@@ -295,6 +307,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = 4
             this.reimbursementBusiness.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

src/views/modules/reimbursementSys/assess/reimbursementIsNoTicketList.vue

@@ -12,7 +12,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-          :url="`/sys/user/treeUserDataByOfficeName?type=2&officeName=兴光评估`"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
           :value="searchForm.userId"
           :clearable="true"
           :accordion="true"
@@ -81,6 +81,7 @@
           :checkbox-config="{}">
           <vxe-column type="checkbox" width="40px"></vxe-column>
           <vxe-column width="172px" title="报销人" field="userName" align="center" visible></vxe-column>
+          <vxe-column width="172px" title="报销人部门" field="userOfficeName" align="center" visible></vxe-column>
           <vxe-column width="172px" title="报销年份" field="year" align="center"></vxe-column>
           <vxe-column width="172px" title="报销类型" field="reimbursementType" align="center">
             <template slot-scope="scope">
@@ -88,6 +89,12 @@
               <el-tag v-if="scope.row.reimbursementType === '2'"> 补差</el-tag>
             </template>
           </vxe-column>
+          <vxe-column width="172px" title="实发类型" field="reimbursementFsalary" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.reimbursementFsalary === '1'"> 登记不实发</el-tag>
+              <el-tag v-if="scope.row.reimbursementFsalary === '2'"> 登记并实发</el-tag>
+            </template>
+          </vxe-column>
           <vxe-column width="172px" title="报销天数" field="reimbursementDay" align="center"></vxe-column>
           <vxe-column width="172px" title="报销额度" field="reimbursementAmount" align="center"></vxe-column>
           <vxe-column title="操作" width="300px" fixed="right" align="center">
@@ -177,7 +184,8 @@
         dataList: [],
         searchForm: {
           year: '',
-          userId: ''
+          userId: '',
+          officeType: '4'
         },
         tablePage: {
           total: 0,

src/views/modules/reimbursementSys/project/reimbursementIsNoTicketForm.vue

@@ -17,7 +17,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-              :url="`/sys/user/treeUserDataByOfficeName?type=2&officeName=兴光项目`"
+              :url="`/sys/user/treeUserDataAllOffice?type=2`"
               :value="inputForm.userId"
               :clearable="true"
               :accordion="true"
@@ -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>
@@ -121,6 +132,7 @@
           userId: '', // 人员id
           year: '', // 年份
           reimbursementType: '', // 报销类型
+          reimbursementFsalary: '', // 实发类型
           reimbursementQuota: '', // 年报销额度
           reimbursementAmount: '', // 报销金额
           reimbursementQuotaDay: '', // 日报销额度
@@ -295,6 +307,7 @@
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
             this.loading = true
+            this.inputForm.officeType = 3
             this.reimbursementBusiness.save(this.inputForm).then(({data}) => {
               this.loading = false
               this.visible = false

src/views/modules/reimbursementSys/project/reimbursementIsNoTicketList.vue

@@ -12,7 +12,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-          :url="`/sys/user/treeUserDataByOfficeName?type=2&officeName=兴光项目`"
+          :url="`/sys/user/treeUserDataAllOffice?type=2`"
           :value="searchForm.userId"
           :clearable="true"
           :accordion="true"
@@ -81,6 +81,7 @@
           :checkbox-config="{}">
           <vxe-column type="checkbox" width="40px"></vxe-column>
           <vxe-column width="172px" title="报销人" field="userName" align="center" visible></vxe-column>
+          <vxe-column width="172px" title="报销人部门" field="userOfficeName" align="center" visible></vxe-column>
           <vxe-column width="172px" title="报销年份" field="year" align="center"></vxe-column>
           <vxe-column width="172px" title="报销类型" field="reimbursementType" align="center">
             <template slot-scope="scope">
@@ -88,6 +89,12 @@
               <el-tag v-if="scope.row.reimbursementType === '2'"> 补差</el-tag>
             </template>
           </vxe-column>
+          <vxe-column width="172px" title="实发类型" field="reimbursementFsalary" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.reimbursementFsalary === '1'"> 登记不实发</el-tag>
+              <el-tag v-if="scope.row.reimbursementFsalary === '2'"> 登记并实发</el-tag>
+            </template>
+          </vxe-column>
           <vxe-column width="172px" title="报销天数" field="reimbursementDay" align="center"></vxe-column>
           <vxe-column width="172px" title="报销额度" field="reimbursementAmount" align="center"></vxe-column>
           <vxe-column title="操作" width="300px" fixed="right" align="center">
@@ -177,7 +184,8 @@
         dataList: [],
         searchForm: {
           year: '',
-          userId: ''
+          userId: '',
+          officeType: '3'
         },
         tablePage: {
           total: 0,