开票管理查询和页面修改

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -49,11 +49,20 @@
         </el-form-item>
         <el-form-item label="开票日期" label-width="95px" prop="invoiceTime">
           <el-date-picker
+            v-model="pageRequest.invoiceTime"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+          <!-- <el-date-picker
             v-model="pageRequest.invoiceTime"
             value-format="yyyy-MM-dd"
             type="date"
             placeholder="选择开票日期"
-          ></el-date-picker>
+          ></el-date-picker> -->
         </el-form-item>
         <el-form-item
           ><el-button type="primary" size="small" @click="queryStaffInfo"
@@ -83,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="未进账金额总和">{{
@@ -91,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>
@@ -854,13 +863,16 @@ export default {
               params.entProfit[item.profitEng] = item.profit;
             });
             this.affiliationData2.forEach((item) => {
-              params.outProfit[item.profitEng] = item.profit*-1;
+              params.outProfit[item.profitEng] = item.profit * -1;
             });
             //转化资金归属
             let obj = {
               invoiceId: this.formDataId, //id
               payoutMoney: this.formData.payoutMoney, //进账金额
-              fundFlow: params.otherUnit.nameValue + "→" + this.formData.invoiceBy.nameValue, //资金流向
+              fundFlow:
+                params.otherUnit.nameValue +
+                "→" +
+                this.formData.invoiceBy.nameValue, //资金流向
               payMethod: params.payMethod.join(","), //支付方式
               fundUse: this.formData.fundUse[this.formData.fundUse.length - 2], //资金用途
               fundFen: this.formData.fundUse[this.formData.fundUse.length - 1], //资金用途分项
@@ -970,8 +982,8 @@ export default {
             res.data.otherUnit = obj2;
           }
           if (this.typeStatus == 1) {
-            res.data.invoiceSubjects1 = res.data.invoiceSubjects.split('*')[0]
-            res.data.invoiceSubjects2 = res.data.invoiceSubjects.split('*')[1]
+            res.data.invoiceSubjects1 = res.data.invoiceSubjects.split("*")[0];
+            res.data.invoiceSubjects2 = res.data.invoiceSubjects.split("*")[1];
           }
           this.formData = JSON.parse(JSON.stringify(res.data));
         } else {
@@ -986,12 +998,18 @@ export default {
         this.pageRequest.pageNo = data.pageRequest.pageNum;
         this.pageRequest.pageSize = data.pageRequest.pageSize;
       }
+      let params = JSON.parse(JSON.stringify(this.pageRequest));
+      if (params.invoiceTime!=null&&params.invoiceTime.length>0) {
+        params.invoiceTimeStart = params.invoiceTime[0];
+        params.invoiceTimeEnd= params.invoiceTime[1];
+      }
+      delete params.invoiceTime;
       this.$api.expense
-        .getInvAccountIncoice(this.pageRequest)
+        .getInvAccountIncoice(params)
         .then((res) => {
           if (res.code == 200) {
             res.data.records.forEach((item) => {
-              item.clearFlagName = item.clearFlag==0?'未清':'已清'
+              item.clearFlagName = item.clearFlag == 0 ? "未清" : "已清";
               item.invoiceTypeName = this.businessZh(
                 this.invoice_typeData,
                 item.invoiceType,
@@ -1004,7 +1022,7 @@ export default {
                   ).label
                 : "";
             });
-           
+
             this.pageResult = {
               content: res.data.records,
               pageNum: res.data.current,