精简费用报销

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-04-12
+ * @since 2023-04-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -462,6 +462,12 @@ public class TimeType extends Model<TimeType> {
     @TableField("wait_check_alert_time")
     private String waitCheckAlertTime;
 
+    /**
+     * 0-否 1-是  是否开启简易费用报销
+     */
+    @TableField("easy_expense")
+    private Integer easyExpense;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -956,7 +956,7 @@
                     </span>
                   </template>
                 </el-table-column>
-                <el-table-column  prop="departmentName" :label="$t('departmentsuod')" >
+                <el-table-column  prop="departmentName" :label="$t('departmentsuod')" v-if="this.user.timeType.easyExpense==0">
                   <template slot-scope="scope" >
                     <span v-if="user.userNameNeedTranslate == '1'">
                       <ww-open-data type='departmentName' :openid='scope.row.departmentName'></ww-open-data>
@@ -976,22 +976,22 @@
                   
                 </el-table-column> -->
                 <el-table-column prop="expenseType" :label="$t('costtype')"></el-table-column>
-                <el-table-column prop="invoiceType" :label="$t('ppertype')">
+                <el-table-column prop="invoiceType" :label="$t('ppertype')" v-if="this.user.timeType.easyExpense==0">
                   <template slot-scope="scope">
                     {{scope.row.invoiceType == null?'':(scope.row.invoiceType == 0 ? '增值税专用发票' : '增值税普通发票')}}
                   </template>
                 </el-table-column>
-                <el-table-column prop="amount" :label="$t('amountof')+'('+ $t('tax') +')'"   align="right">
+                <el-table-column prop="amount" :label="this.user.timeType.easyExpense==0?$t('amountof')+'('+ $t('tax') +')': $t('amountof')"   align="right">
                   <template slot-scope="scope">
                         {{scope.row.amount}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="amount" :label="$t('taxs')"   align="right">
+                <el-table-column prop="amount" :label="$t('taxs')"   align="right" v-if="this.user.timeType.easyExpense==0">
                   <template slot-scope="scope">
                         {{scope.row.taxValue == null?'0.00':scope.row.taxValue.toFixed(2)}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="amount" :label="$t('amountof')+'('+ $t('notax') +')'"   align="right">
+                <el-table-column prop="amount" :label="$t('amountof')+'('+ $t('notax') +')'"   align="right" v-if="this.user.timeType.easyExpense==0">
                   <template slot-scope="scope">
                         {{(scope.row.amount-scope.row.taxValue).toFixed(2)}}
                     </template>

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -81,7 +81,7 @@
               </el-col>
             </el-form-item>
             <!-- 发票张数 -->
-            <el-form-item :label="$t('invoicenumber')">
+            <el-form-item :label="$t('invoicenumber')" v-if="this.user.timeType.easyExpense==0">
               <el-input v-model="addForm.ticketNum" style="width: 150px"></el-input>
             </el-form-item>
             <!-- 费用主类型 -->
@@ -139,7 +139,7 @@
                 </el-date-picker>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('invoices')" width="175px">
+            <el-table-column :label="$t('invoices')" width="175px" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-select size="small" v-model="scope.row.invoiceType" :placeholder="$t('pleaseselectthetypeoffee')" style="width: 150px;">
                   <el-option :label="$t('vATspecialinvoice')" value="0"></el-option>
@@ -154,22 +154,22 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('amountoffees')" width="135px">
+            <el-table-column :label="this.user.timeType.easyExpense==0?$t('amountoffees'):'费用金额'" width="135px">
               <template slot-scope="scope">
                 <el-input size="small" :id="'upam'+scope.$index" v-model="scope.row.amount" @input="zhi(scope.$index)" @change="shiqu(scope.row.amount)" @keyup.native="restrictNumber('upam'+scope.$index)"></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="invoiceNo" :label="$t('invoiceno')" width="135px">
+            <el-table-column prop="invoiceNo" :label="$t('invoiceno')" width="135px" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-input size="small" v-model.number="scope.row.invoiceNo"></el-input>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('shui-shuai')" width="135px">
+            <el-table-column :label="$t('shui-shuai')" width="135px" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-input size="small" type= "number"  v-model="scope.row.taxPercent" @input="zhi(scope.$index)"></el-input>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('taxs')" width="135px">
+            <el-table-column :label="$t('taxs')" width="135px" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-input size="small" v-model="scope.row.taxValue" @input="zhis(scope.$index)"></el-input>
               </template>
@@ -280,8 +280,8 @@
                 </template>
               </el-table-column>
               <el-table-column prop="createDate" :label="$t('fillinthedate')" ></el-table-column>
-              <el-table-column prop="ticketNum" :label="$t('invoicenumber')" ></el-table-column>
-              <el-table-column prop="type" :label="$t('ppertype')" >
+              <el-table-column prop="ticketNum" :label="$t('invoicenumber')" v-if="this.user.timeType.easyExpense==0"></el-table-column>
+              <el-table-column prop="type" :label="$t('ppertype')" v-if="this.user.timeType.easyExpense==0">
                 <template slot-scope="scope">
                   {{scope.row.expenseMainTypeName}}
                 </template>
@@ -410,7 +410,7 @@
                 <span v-else>{{scope.row.happenDate}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="invoiceType" :label="$t('invoices')" width="172">
+            <el-table-column prop="invoiceType" :label="$t('invoices')" width="172" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-select size="small" v-if="!flg" v-model="scope.row.invoiceType" :placeholder="$t('pleaseselectthetypeoffee')" style="width: 150px;">
                   <el-option :label="$t('vATspecialinvoice')" :value="0"></el-option>
@@ -427,25 +427,25 @@
                 <span v-else>{{scope.row.expenseType}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="amount" :label="$t('amountoffees')" width="172">
+            <el-table-column prop="amount" :label="this.user.timeType.easyExpense==0?$t('amountoffees'):'费用金额'" width="172">
               <template slot-scope="scope">
                 <el-input size="small"  v-if="!flg" :id="'am'+scope.$index" v-model="scope.row.amount" @input="zhiNum(scope.$index, scope)" @change="kan" @keyup.native="restrictNumber('am'+scope.$index)"></el-input>
                 <span v-else>￥{{scope.row.amount}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="invoiceNo" :label="$t('invoiceno')" width="172">
+            <el-table-column prop="invoiceNo" :label="$t('invoiceno')" width="172" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-input size="small" v-if="!flg" v-model.number="scope.row.invoiceNo"></el-input>
                 <span v-else>{{scope.row.invoiceNo}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="taxPercent" :label="$t('shui-shuai')" width="172">
+            <el-table-column prop="taxPercent" :label="$t('shui-shuai')" width="172" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-input size="small"  v-if="!flg" v-model="scope.row.taxPercent" @input="zhiNum(scope.$index, scope)"></el-input>
                 <span v-else>{{scope.row.taxPercent}}</span>
               </template>
             </el-table-column>
-            <el-table-column prop="taxValue" :label="$t('taxs')+'('+$t('yuan')+')'" width="172">
+            <el-table-column prop="taxValue" :label="$t('taxs')+'('+$t('yuan')+')'" width="172" v-if="this.user.timeType.easyExpense==0">
               <template slot-scope="scope">
                 <el-input size="small"  v-if="!flg" v-model="scope.row.taxValue"></el-input>
                 <span v-else>￥{{scope.row.taxValue}}</span>

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/details.vue

@@ -51,7 +51,7 @@
                 />
             </van-popup>
             <!-- 发票张数 -->
-            <van-field label="发票张数" :readonly="!canEdit">
+            <van-field label="发票张数" :readonly="!canEdit" v-if="user.timeType.easyExpense==0">
                 <template #input>
                     <van-stepper v-model="editForm.ticketNum" :disabled="!canEdit" disable-input @plus="ticNumChange(1)" @minus="ticNumChange(0)" />
                 </template>
@@ -115,6 +115,7 @@
                         readonly
                         clickable
                         required
+                        v-if="user.timeType.easyExpense==0"
                     >
                         <template #input>{{
                             inTypeList[item.invoiceType]
@@ -129,7 +130,7 @@
                         required
                     ></van-field>
                     <van-field
-                        label="费用金额（含税）："
+                        :label="`${user.timeType.easyExpense==0?'费用金额（含税）':'费用金额'}：`"
                         v-model="item.amount"
                         type="number"
                         :readonly="!canEdit"
@@ -139,15 +140,18 @@
                         label="发票号："
                         v-model="item.invoiceNo"
                         readonly
+                        v-if="user.timeType.easyExpense==0"
                     ></van-field>
                     <van-field
                         label="税率%："
                         v-model="item.taxPercent"
                         :readonly="!canEdit"
+                        v-if="user.timeType.easyExpense==0"
                     ></van-field>
                     <van-field
                         label="税额："
                         readonly
+                        v-if="user.timeType.easyExpense==0"
                     ><template #input>￥{{getTaxValue(item.amount,item.taxPercent)}}</template></van-field>
                     <van-field label="备注：" v-model="item.remark" :readonly="!canEdit"></van-field>
                     <van-field
@@ -201,7 +205,7 @@
                     />
                 </van-popup>
                 <!-- 发票种类 -->
-                <van-popup v-model="in_typeShow" position="bottom" v-if="canEdit">
+                <van-popup v-model="in_typeShow" position="bottom" v-if="canEdit && user.timeType.easyExpense==0" >
                     <van-picker
                         show-toolbar
                         :columns="inTypeList"

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/index.vue

@@ -41,7 +41,7 @@
                             @cancel="createDateShow = false; $forceUpdate();" :min-date="minDate" :max-date="maxDate" />
                     </van-popup>
                     <!-- 发票张数 -->
-                    <van-field label="发票张数">
+                    <van-field label="发票张数" v-if="user.timeType.easyExpense==0">
                         <template #input>
                             <van-stepper v-model="editForm.ticketNum" disable-input @plus="ticNumChange(1)"
                                 @minus="ticNumChange(0)" />
@@ -72,16 +72,16 @@
                             </van-field>
                             <van-field label="费用日期：" v-model="item.happenDate"
                                 @click="in_dateShow = true, invoiceIndex = index" readonly clickable required></van-field>
-                            <van-field label="发票种类：" v-model="item.invoiceType"
+                            <van-field label="发票种类：" v-model="item.invoiceType" v-if="user.timeType.easyExpense==0"
                                 @click="in_typeShow = true, invoiceIndex = index" readonly clickable required>
                                 <template #input>{{ inTypeList[item.invoiceType] }}</template>
                             </van-field>
                             <van-field label="费用类型：" v-model="item.expenseType"
                                 @click="in_exTypeShow = true, invoiceIndex = index" readonly clickable required></van-field>
-                            <van-field label="费用金额（含税）：" v-model="item.amount" type="number" required></van-field>
-                            <van-field label="发票号：" v-model="item.invoiceNo"></van-field>
-                            <van-field label="税率%：" v-model="item.taxPercent"></van-field>
-                            <van-field label="税额：" readonly>
+                            <van-field :label="`${user.timeType.easyExpense==0?'费用金额（含税）':'费用金额'}：`" v-model="item.amount" type="number" required></van-field>
+                            <van-field label="发票号：" v-model="item.invoiceNo" v-if="user.timeType.easyExpense==0"></van-field>
+                            <van-field label="税率%：" v-model="item.taxPercent" v-if="user.timeType.easyExpense==0"></van-field>
+                            <van-field label="税额：" readonly v-if="user.timeType.easyExpense==0">
                                 <template #input>￥{{ getTaxValue(item.amount, item.taxPercent) }}</template>
                             </van-field>
                             <van-field label="备注：" v-model="item.remark" autosize></van-field>
@@ -156,7 +156,7 @@
                                 <span v-else>{{ item.ownerName }}</span>
                             </div>
                             <div><span>填报日期：</span><span>{{ item.createDate }}</span></div>
-                            <div><span>发票张数：</span><span>{{ item.ticketNum }}</span></div>
+                            <div v-if="user.timeType.easyExpense==0"><span>发票张数：</span><span>{{ item.ticketNum }}</span></div>
                             <div><span>费用类型：</span><span>{{ item.expenseMainTypeName }}</span></div>
                             <!-- <div><span>状态：</span><span>{{item.status}}</span></div> -->
                             <!-- <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div> -->
@@ -203,7 +203,7 @@
                                 <span v-else>{{ item.ownerName }}</span>
                             </div>
                             <div><span>填报日期：</span><span>{{ item.createDate }}</span></div>
-                            <div><span>发票张数：</span><span>{{ item.ticketNum }}</span></div>
+                            <div v-if="user.timeType.easyExpense==0"><span>发票张数：</span><span>{{ item.ticketNum }}</span></div>
                             <div><span>费用类型：</span><span>{{ item.expenseMainTypeName }}</span></div>
                             <!-- <div><span>状态：</span><span>{{item.status}}</span></div> -->
                             <!-- <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div> -->
@@ -353,8 +353,8 @@ export default {
             this.getUserList()
         }
         this.getProjectList()
-        this.getExTypeList()
         this.getExpensMainTypes()
+        this.getExTypeList()
     },
     methods: {
         back() {
@@ -505,14 +505,14 @@ export default {
                 if (!this.invoiceList[i].happenDate) {
                     required2 = '费用日期'
                 }
-                if (!this.invoiceList[i].invoiceType) {
-                    required3 = '发票种类'
-                }
+                // if (!this.invoiceList[i].invoiceType) {
+                //     required3 = '发票种类'
+                // }
                 if (!this.invoiceList[i].expenseType) {
                     required4 = '费用类型'
                 }
                 if (!this.invoiceList[i].amount) {
-                    required5 = '费用金额（含税）'
+                    required5 = this.user.timeType.easyExpense==0?'费用金额（含税）':'费用金额'
                 }
             }
             if (required1 || required2 || required3 || required4 || required5) {
@@ -559,6 +559,7 @@ export default {
                                     // }
                                     this.formshowText.name = ''
                                     this.formshowText.inProjectName = []
+                                    this.expenseMainType.text=''
                                     this.invoiceList = []
                                     this.uploader = []
                                     this.formshowText.name = this.user.name;