添加报销并实发、报销不实发功能

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

@@ -50,6 +50,18 @@
           </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 +147,7 @@
           userId: '', // 人员id
           year: '', // 年份
           reimbursementType: '', // 报销类型
+          reimbursementFsalary: '', // 实发类型
           reimbursementQuota: '', // 年报销额度
           reimbursementAmount: '', // 报销金额
           reimbursementQuotaDay: '', // 日报销额度

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

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

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

@@ -2,6 +2,18 @@
   <div class="el-scrollbar__wrap wrap-white padding-20">
 
     <el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm"  @keyup.enter.native="refreshList()" @submit.native.prevent>
+
+      <el-form-item label="实发类型" prop="searchForm.reimbursementFsalary">
+        <el-select v-model="searchForm.reimbursementFsalary" clearable placeholder="请选择">
+          <el-option
+            v-for="item in reimbursementFsalaryList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item
         label="报销额度"
         class="priceFormItem"
@@ -82,6 +94,11 @@
             >
             </el-table-column>
             <el-table-column
+              prop="reimbursementFsalary"
+              label="实发类型"
+            >
+            </el-table-column>
+            <el-table-column
               prop="reimbursementDay"
               label="报销天数"
             >
@@ -115,12 +132,14 @@
     data () {
       return {
         searchDates: '',
+        reimbursementFsalaryList: '',  // 实发类型列表
         searchForm: {
           year: '',
           beginDate: '',
           endDate: '',
           beginReimbursementQuota: '',
           endReimbursementQuota: '',
+          reimbursementFsalary: '',  // 实发类型
           userId: ''
         },
         title: '',
@@ -142,6 +161,7 @@
           reimbursementQuota: '',  // 报销额度
           alreadyReimbursementAmount: '',  // 已报销额度
           surplusReimbursementAmount: '',  // 剩余报销额度
+          reimbursementFsalary: '',  // 实发类型
           remarks: '',  // 备注
           columnList: []
         },
@@ -205,6 +225,7 @@
           this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
         })
       }
     },
@@ -226,12 +247,14 @@
           this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
           this.loading = false
         })
       },
       resetSearch () {
         this.$refs.inputForm.resetFields()
         // eslint-disable-next-line no-unused-expressions
+        this.searchForm.reimbursementFsalary = ''
         this.searchForm.beginReimbursementQuota = ''
         this.searchForm.endReimbursementQuota = ''
         this.searchDates = ''

src/views/modules/reimbursementSys/assess/reimbursementBusinessForm.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: '', // 日报销额度

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

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

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

@@ -2,6 +2,20 @@
   <div class="el-scrollbar__wrap wrap-white padding-20">
 
     <el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm"  @keyup.enter.native="refreshList()" @submit.native.prevent>
+
+
+      <el-form-item label="实发类型" prop="searchForm.reimbursementFsalary">
+        <el-select v-model="searchForm.reimbursementFsalary" clearable placeholder="请选择">
+          <el-option
+            v-for="item in reimbursementFsalaryList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
       <el-form-item
         label="报销额度"
         class="priceFormItem"
@@ -82,6 +96,11 @@
             >
             </el-table-column>
             <el-table-column
+              prop="reimbursementFsalary"
+              label="实发类型"
+            >
+            </el-table-column>
+            <el-table-column
               prop="reimbursementDay"
               label="报销天数"
             >
@@ -115,12 +134,14 @@
     data () {
       return {
         searchDates: '',
+        reimbursementFsalaryList: '',  // 实发类型列表
         searchForm: {
           year: '',
           beginDate: '',
           endDate: '',
           beginReimbursementQuota: '',
           endReimbursementQuota: '',
+          reimbursementFsalary: '',  // 实发类型
           userId: ''
         },
         title: '',
@@ -142,6 +163,7 @@
           reimbursementQuota: '',  // 报销额度
           alreadyReimbursementAmount: '',  // 已报销额度
           surplusReimbursementAmount: '',  // 剩余报销额度
+          reimbursementFsalary: '',  // 报销来源
           remarks: '',  // 备注
           columnList: []
         },
@@ -205,6 +227,7 @@
           this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
         })
       }
     },
@@ -226,12 +249,14 @@
           this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
           this.loading = false
         })
       },
       resetSearch () {
         this.$refs.inputForm.resetFields()
         // eslint-disable-next-line no-unused-expressions
+        this.searchForm.reimbursementFsalary = ''
         this.searchForm.beginReimbursementQuota = ''
         this.searchForm.endReimbursementQuota = ''
         this.searchDates = ''

src/views/modules/reimbursementSys/project/reimbursementBusinessForm.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>
@@ -143,6 +154,7 @@
           reimbursementDay: '', // 报销天数
           surplusReimbursementDay: '', // 剩余报销天数
           oldSurplusReimbursementDay: '', // 剩余报销天数(比较数据)
+          reimbursementFsalary: '', // 实发类型
           remarks: '' // 备注
 
         }

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

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

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

@@ -2,6 +2,18 @@
   <div class="el-scrollbar__wrap wrap-white padding-20">
 
     <el-form size="small" :inline="true"  class="query-form" ref="searchForm" :model="searchForm"  @keyup.enter.native="refreshList()" @submit.native.prevent>
+
+      <el-form-item label="实发类型" prop="searchForm.reimbursementFsalary">
+        <el-select v-model="searchForm.reimbursementFsalary" clearable placeholder="请选择">
+          <el-option
+            v-for="item in reimbursementFsalaryList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item
         label="报销额度"
         class="priceFormItem"
@@ -82,6 +94,11 @@
             >
             </el-table-column>
             <el-table-column
+              prop="reimbursementFsalary"
+              label="实发类型"
+            >
+            </el-table-column>
+            <el-table-column
               prop="reimbursementDay"
               label="报销天数"
             >
@@ -115,12 +132,14 @@
     data () {
       return {
         searchDates: '',
+        reimbursementFsalaryList: '',  // 实发类型列表
         searchForm: {
           year: '',
           beginDate: '',
           endDate: '',
           beginReimbursementQuota: '',
           endReimbursementQuota: '',
+          reimbursementFsalary: '',  // 实发类型
           userId: ''
         },
         title: '',
@@ -142,6 +161,7 @@
           reimbursementQuota: '',  // 报销额度
           alreadyReimbursementAmount: '',  // 已报销额度
           surplusReimbursementAmount: '',  // 剩余报销额度
+          reimbursementFsalary: '',  // 实发类型
           remarks: '',  // 备注
           columnList: []
         },
@@ -205,6 +225,7 @@
           this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
         })
       }
     },
@@ -226,12 +247,14 @@
           this.columnForm.alreadyReimbursementAmount = data.alreadyReimbursementAmount
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
           this.loading = false
         })
       },
       resetSearch () {
         this.$refs.inputForm.resetFields()
         // eslint-disable-next-line no-unused-expressions
+        this.searchForm.reimbursementFsalary = ''
         this.searchForm.beginReimbursementQuota = ''
         this.searchForm.endReimbursementQuota = ''
         this.searchDates = ''

src/views/modules/reimbursementSys/reimbursementBusinessForm.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: '', // 日报销额度

src/views/modules/reimbursementSys/reimbursementBusinessList.vue

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

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

@@ -13,6 +13,17 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="实发类型" prop="searchForm.reimbursementFsalary">
+        <el-select v-model="searchForm.reimbursementFsalary" clearable placeholder="请选择">
+          <el-option
+            v-for="item in reimbursementFsalaryList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item
         label="报销额度"
         class="priceFormItem"
@@ -94,6 +105,11 @@
             >
             </el-table-column>
             <el-table-column
+              prop="reimbursementFsalary"
+              label="实发类型"
+            >
+            </el-table-column>
+            <el-table-column
               prop="reimbursementDay"
               label="报销天数"
             >
@@ -136,6 +152,7 @@
       return {
         searchDates: '',
         reimbursementAddressList: '',  // 报销来源列表
+        reimbursementFsalaryList: '',  // 实发类型列表
         searchForm: {
           year: '',
           beginDate: '',
@@ -143,6 +160,7 @@
           beginReimbursementQuota: '',
           endReimbursementQuota: '',
           reimbursementAddress: '',  // 报销来源
+          reimbursementFsalary: '',  // 实发类型
           userId: ''
         },
         title: '',
@@ -165,6 +183,7 @@
           alreadyReimbursementAmount: '',  // 已报销额度
           surplusReimbursementAmount: '',  // 剩余报销额度
           reimbursementAddress: '',  // 报销来源
+          reimbursementFsalary: '',  // 实发类型
           columnList: []
         },
 
@@ -227,6 +246,7 @@
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
           this.reimbursementAddressList = data.reimbursementAddressList
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
         })
       }
     },
@@ -249,6 +269,7 @@
           this.columnForm.surplusReimbursementAmount = data.surplusReimbursementAmount
           this.columnForm.reimbursementQuotaDay = data.reimbursementQuotaDay
           this.reimbursementAddressList = data.reimbursementAddressList
+          this.reimbursementFsalaryList = data.reimbursementFsalaryList
           this.loading = false
         })
       },
@@ -256,6 +277,7 @@
         this.$refs.inputForm.resetFields()
         // eslint-disable-next-line no-unused-expressions
         this.searchForm.reimbursementAddress = ''
+        this.searchForm.reimbursementFsalary = ''
         this.searchForm.beginReimbursementQuota = ''
         this.searchForm.endReimbursementQuota = ''
         this.searchDates = ''

src/views/modules/sys/login/login.vue

@@ -69,7 +69,7 @@
               </el-form-item>-->
             </el-form>
         </div>
-         <el-image class="right" src="/static/img/right1.png"></el-image>
+         <el-image src="/static/img/right.png"></el-image>
 
 
       </div>