Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

src/views/FinancialManagement/ExpenseManagement/ExpenseApplyFor.vue

@@ -36,11 +36,20 @@
         </el-form-item>
         <el-form-item label="申请日期" label-width="95px" prop="applyTime">
           <el-date-picker
+            v-model="queryFrom.applyTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="queryFrom.applyTime"
             type="date"
             placeholder="选择日期"
           >
-          </el-date-picker>
+          </el-date-picker> -->
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="queryStaffInfo"
@@ -771,6 +780,8 @@ export default {
     },
     //搜索列表功能
     queryStaffInfo() {
+      this.pageRequest.pageNo = 1
+      this.pageRequest.pageSize = 20
       this.findPage();
     },
     //查询列表
@@ -779,7 +790,12 @@ export default {
         this.pageRequest.pageNo = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
-      let obj = { ...this.queryFrom, ...this.pageRequest };
+      let obj = JSON.parse(JSON.stringify({ ...this.queryFrom, ...this.pageRequest }))
+      if (obj.applyTime!=null&&obj.applyTime.length>0) {
+        obj.applyTimeStart = obj.applyTime[0];
+        obj.applyTimeEnd= obj.applyTime[1];
+      }
+      delete obj.applyTime;
       this.$api.expense
         .getAccountExcel(obj)
         .then((res) => {

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -92,7 +92,7 @@
           <el-descriptions-item label="开票金额总和">{{
             allNumObj.invoiceMoneySum
           }}</el-descriptions-item>
-          <!-- <el-descriptions-item label="进账金额总和">{{
+          <el-descriptions-item label="进账金额总和">{{
             allNumObj.payoutMoneySum
           }}</el-descriptions-item>
           <el-descriptions-item label="未进账金额总和">{{
@@ -100,7 +100,7 @@
           }}</el-descriptions-item>
           <el-descriptions-item label="开票数总和">{{
             allNumObj.invoiceNumSum
-          }}</el-descriptions-item> -->
+          }}</el-descriptions-item>
           <el-descriptions-item label="税额总和">{{
             allNumObj.taxSum
           }}</el-descriptions-item>
@@ -200,7 +200,7 @@
                 <el-form-item label="开票金额" prop="invoiceMoney">
                   <el-input-number
                     v-model="formData.invoiceMoney"
-                    :min="1"
+                    :min="-99999999999999999"
                     :max="99999999999999999"
                     label=""
                   ></el-input-number>
@@ -673,7 +673,7 @@ export default {
           outBankCardNum: "", //支出卡号
           biller: "", //开票员
           invoiceBy: "", //开票方
-          invoiceMoney: "", //开票金额
+          invoiceMoney: 0, //开票金额
           invoiceNum: 1, //发票数
           invoiceSubjects: "", //开票科目
           invoiceTime: "", //开票日期
@@ -891,7 +891,7 @@ export default {
             //编辑
           } else if (this.formDataId && this.typeStatus == 1) {
             params.invoiceBy = this.formData.invoiceBy.nameValue; //开票方
-            params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
+            // params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
             params.invoiceSubjects =
               params.invoiceSubjects1 + "*" + params.invoiceSubjects2; //开票科目
             params.otherUnit = params.otherUnit.nameValue; //对方单位名称
@@ -909,7 +909,7 @@ export default {
             //新增
           } else {
             params.invoiceBy = this.formData.invoiceBy.nameValue; //开票方
-            params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
+            // params.bigApplyAmount = toChies(params.invoiceMoney); //大写金额
             params.invoiceSubjects =
               params.invoiceSubjects1 + "*" + params.invoiceSubjects2; //开票科目
             params.otherUnit = params.otherUnit.nameValue; //对方单位名称