fix:结算状态查询字段更改

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryFeesSettled.vue

@@ -239,6 +239,21 @@ export default {
           name: "data",
           type: "slot",
         },
+        {
+          label: "结清状态",
+          prop: "status",
+          type: "select",
+          options: [
+            {
+              label: "开票未结清",
+              value: "0",
+            },
+            {
+              label: "开票已结清",
+              value: "1",
+            },
+          ],
+        },
       ],
       tableConfig: {
         columns: [

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/DocumentaryUnsettled.vue

@@ -207,6 +207,21 @@ export default {
           name: "data",
           type: "slot",
         },
+        {
+          label: "结清状态",
+          prop: "status",
+          type: "select",
+          options: [
+            {
+              label: "开票未结清",
+              value: "0",
+            },
+            {
+              label: "开票已结清",
+              value: "1",
+            },
+          ],
+        },
       ],
       tableConfig: {
         columns: [

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicedAndSettled.vue

@@ -234,7 +234,7 @@ export default {
         },
         {
           label: "结清状态",
-          prop: "settlementStatus",
+          prop: "status",
           type: "select",
           options: [
             {

src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/InvoicingUnsettled.vue

@@ -416,7 +416,7 @@ export default {
         },
         {
           label: "结清状态",
-          prop: "settlementStatus",
+          prop: "status",
           type: "select",
           options: [
             {

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryFeesSettled.vue

@@ -1,230 +1,307 @@
 <template>
   <!--布局容器-->
   <div class="invoiceAnd" style="width: 99%; margin-top: 0px">
-    <templateTable :formList="formList" :searchData.sync="searchData" :tableConfig="tableConfig" :data="tableData"
-      @findPage="findPage" @resetForm="resetForm" @handleSearchList="handleSearchList" :pagination="pageData">
+    <templateTable
+      :formList="formList"
+      :searchData.sync="searchData"
+      :tableConfig="tableConfig"
+      :data="tableData"
+      @findPage="findPage"
+      @resetForm="resetForm"
+      @handleSearchList="handleSearchList"
+      :pagination="pageData"
+    >
       <template slot="data">
-          <yearMonthYay ref="yearMonthYay" @getYearData="getYearData"  @getMonthData="getMonthData"  @getDayData="getDayData"></yearMonthYay>
+        <yearMonthYay
+          ref="yearMonthYay"
+          @getYearData="getYearData"
+          @getMonthData="getMonthData"
+          @getDayData="getDayData"
+        ></yearMonthYay>
       </template>
       <template slot="保司机构">
-        <el-cascader v-model="pageData.partnerCompaniesIdList" size="small" :show-all-levels="false" ize="small"
-          :options="ztreeNodes" :props='{
+        <el-cascader
+          v-model="pageData.partnerCompaniesIdList"
+          size="small"
+          :show-all-levels="false"
+          ize="small"
+          :options="ztreeNodes"
+          :props="{
             checkStrictly: true,
-            value: "id",
-            label: "name",
-            children: "children",
-        }' clearable filterable></el-cascader>
+            value: 'id',
+            label: 'name',
+            children: 'children',
+          }"
+          clearable
+          filterable
+        ></el-cascader>
       </template>
     </templateTable>
-    <el-dialog title="记录" :visible.sync="dialogVisiblerecord" width="30%" :before-close="handleCloserecord">
-      <templateTable ref="templateTable1" :pagination="pageDatarecord" @getList="getListrecord"
-        :tableConfig="tableConfigDetailrecord" :data="formTableDatarecord" @findPage="findPageDetailrecord">
+    <el-dialog
+      title="记录"
+      :visible.sync="dialogVisiblerecord"
+      width="30%"
+      :before-close="handleCloserecord"
+    >
+      <templateTable
+        ref="templateTable1"
+        :pagination="pageDatarecord"
+        @getList="getListrecord"
+        :tableConfig="tableConfigDetailrecord"
+        :data="formTableDatarecord"
+        @findPage="findPageDetailrecord"
+      >
         <template slot="imageUrl" slot-scope="scope">
-          <img v-if="scope.row.imageUrl" :src="`${process + scope.row.imageUrl}`" class="imageclass" @click.stop="showViewer=true; ProViewImg=process + scope.row.imageUrl" />
+          <img
+            v-if="scope.row.imageUrl"
+            :src="`${process + scope.row.imageUrl}`"
+            class="imageclass"
+            @click.stop="
+              showViewer = true;
+              ProViewImg = process + scope.row.imageUrl;
+            "
+          />
         </template>
       </templateTable>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisiblerecord = false">取消</el-button>
+        <el-button size="small" @click="dialogVisiblerecord = false"
+          >取消</el-button
+        >
       </span>
     </el-dialog>
-    <el-dialog title="明细" :visible.sync="dialogVisiblerecordDetail" width="50%" :before-close="handleCloserecorddetail">
-            <templateTable ref="templateTable1"   :pagination="pageDatarecorddetail" @getList="getListrecorddetail"
-                :tableConfig="tableConfigDetailrecorddetail" :data="recordDetailData" @findPage="findPageDetailrecorddatail">
-            </templateTable>
-            <span slot="footer" class="dialog-footer">
-                <el-button size="small" @click="dialogVisiblerecordDetail = false">取消</el-button>
-            </span>
-        </el-dialog>
-        <el-image-viewer v-if="showViewer" :on-close="closeViewer"  :z-index="9999" :url-list="[ProViewImg]" />
-
+    <el-dialog
+      title="明细"
+      :visible.sync="dialogVisiblerecordDetail"
+      width="50%"
+      :before-close="handleCloserecorddetail"
+    >
+      <templateTable
+        ref="templateTable1"
+        :pagination="pageDatarecorddetail"
+        @getList="getListrecorddetail"
+        :tableConfig="tableConfigDetailrecorddetail"
+        :data="recordDetailData"
+        @findPage="findPageDetailrecorddatail"
+      >
+      </templateTable>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisiblerecordDetail = false"
+          >取消</el-button
+        >
+      </span>
+    </el-dialog>
+    <el-image-viewer
+      v-if="showViewer"
+      :on-close="closeViewer"
+      :z-index="9999"
+      :url-list="[ProViewImg]"
+    />
   </div>
 </template>
 <script>
-import templateTable from '@/components/TemplateTable/index.vue'
-import { mapState } from 'vuex'
-import yearMonthYay from '../../PlatformSettlement/yearMonthYay.vue'
+import templateTable from "@/components/TemplateTable/index.vue";
+import { mapState } from "vuex";
+import yearMonthYay from "../../PlatformSettlement/yearMonthYay.vue";
 
 export default {
   name: "baosi",
-  components: {  templateTable,yearMonthYay ,
+  components: {
+    templateTable,
+    yearMonthYay,
     "el-image-viewer": () =>
-      import("element-ui/packages/image/src/image-viewer")
-  },
-  created() {
+      import("element-ui/packages/image/src/image-viewer"),
   },
+  created() {},
   computed: {
     ...mapState({
-      perms: state => state.user.perms
-    })
+      perms: (state) => state.user.perms,
+    }),
   },
   data() {
     return {
-      process:process.env.BASE_URL,
-      showViewer:false,
-      ProViewImg:[],
-      ztreeNodes:[],
-      recordDetailData:[],
+      process: process.env.BASE_URL,
+      showViewer: false,
+      ProViewImg: [],
+      ztreeNodes: [],
+      recordDetailData: [],
       pageDatarecorddetail: {
-                pageNum: 1,
-                pageSize: 20,
-                totalSize:0
-            },
+        pageNum: 1,
+        pageSize: 20,
+        totalSize: 0,
+      },
       dialogVisiblerecordDetail: false,
       dialogVisiblerecord: false,
-      recorddetailids:'',
+      recorddetailids: "",
       tableConfigDetailrecorddetail: {
-                columns: [
-                    {
-                        prop: "licenseno",
-                        label: "车牌号",
-                        type: "text"
-                    },
-                    {
-                        prop: "noPolicyno",
-                        label: "非车保单号",
-                        type: "text"
-                    },
-                    {
-                        prop: "insuredName",
-                        label: "被保人",
-                        type: "text"
-                    },
-                    {
-                        prop: "noPremium",
-                        label: "非车保费",
-                        type: "text"
-                    },
-                    {
-                        prop: "noOtherCostsProportion",
-                        label: "非车跟单比例",
-                        type: "text"
-                    },
-                    {
-                        prop: "noOtherCostsPremium",
-                        label: "非车跟单金额",
-                        type: "text"
-                    },
-                ],
-                loading: true,
-                isPaginationShow:true
-            },
+        columns: [
+          {
+            prop: "licenseno",
+            label: "车牌号",
+            type: "text",
+          },
+          {
+            prop: "noPolicyno",
+            label: "非车保单号",
+            type: "text",
+          },
+          {
+            prop: "insuredName",
+            label: "被保人",
+            type: "text",
+          },
+          {
+            prop: "noPremium",
+            label: "非车保费",
+            type: "text",
+          },
+          {
+            prop: "noOtherCostsProportion",
+            label: "非车跟单比例",
+            type: "text",
+          },
+          {
+            prop: "noOtherCostsPremium",
+            label: "非车跟单金额",
+            type: "text",
+          },
+        ],
+        loading: true,
+        isPaginationShow: true,
+      },
       formTableDatarecord: [],
       tableConfigDetailrecord: {
         columns: [
           {
             prop: "settlementTime",
             label: "进账日期",
-            type: "text"
+            type: "text",
           },
           {
             prop: "expendAmount",
             label: "进帐金额",
-            type: "text"
+            type: "text",
           },
           {
             name: "imageUrl",
             label: "进帐截图",
-            type: "slot"
+            type: "slot",
           },
-
         ],
         loading: true,
-        isPaginationShow: true
+        isPaginationShow: true,
       },
       pageDatarecord: {
         pageNum: 1,
         pageSize: 20,
-        totalSize: 0
+        totalSize: 0,
       },
-      year: '',
+      year: "",
       searchData: {},
       formList: [
-                {
-                    label: "保险公司",
-                    prop: "companyName",
-                    type: "company",
-                },
-                {
-                label: "合作公司名称",
-                name: "保司机构",
-                type: "slot",
-                },
-                {
-                    label: "年月日",
-                    name: "data",
-                    type: "slot",
-                    },
-            ],
+        {
+          label: "保险公司",
+          prop: "companyName",
+          type: "company",
+        },
+        {
+          label: "合作公司名称",
+          name: "保司机构",
+          type: "slot",
+        },
+        {
+          label: "年月日",
+          name: "data",
+          type: "slot",
+        },
+        {
+          label: "结清状态",
+          prop: "status",
+          type: "select",
+          options: [
+            {
+              label: "开票未结清",
+              value: "0",
+            },
+            {
+              label: "开票已结清",
+              value: "1",
+            },
+          ],
+        },
+      ],
       tableConfig: {
         columns: [
           {
             prop: "companyName",
             label: "保险公司名称",
-            type: "text"
+            type: "text",
           },
           {
             prop: "partnerCompaniesName",
             label: "合作公司名称",
-            type: "text"
+            type: "text",
           },
           {
             prop: "otherFeevalue",
             label: "总跟单费",
-            type: "text"
+            type: "text",
           },
           {
             prop: "allInvoicCommissionFeevalue",
             label: "已开票金额",
-            type: "text"
+            type: "text",
           },
           {
             prop: "readyCommissionFeevalue",
             label: "已开票已结算",
-            type: "text"
+            type: "text",
           },
           {
             prop: "expendAmount",
             label: "实收金额 ",
-            type: "text"
+            type: "text",
           },
           {
             prop: "taxesFees",
             label: "税费",
-            type: "text"
+            type: "text",
           },
           {
             prop: "invoicCommissionFeevalue",
             label: "已开票未结算",
-            type: "text"
+            type: "text",
           },
           {
             prop: "noInvoicCommissionFeevalue",
             label: "未开票",
-            type: "text"
+            type: "text",
           },
           {
             prop: "unSettledAmount",
             label: "未结算金额",
-            type: "text"
+            type: "text",
           },
         ],
         loading: true,
         isPaginationShow: true,
-        showSummary:true,
-        tableHeight:'none',
+        showSummary: true,
+        tableHeight: "none",
         optBtns: [
           {
-            type: 'primary',
-            label: '记录',
-            click: (row, index) => { return this.haldRecord(row) },
+            type: "primary",
+            label: "记录",
+            click: (row, index) => {
+              return this.haldRecord(row);
+            },
           },
           {
-              type: 'primary',
-              label: '明细',
-              click: (row, index) => { return this.haldRecordDetail(row) },
-          }
-        ]
-
+            type: "primary",
+            label: "明细",
+            click: (row, index) => {
+              return this.haldRecordDetail(row);
+            },
+          },
+        ],
       },
       tableData: [],
       formData: {},
@@ -232,18 +309,20 @@ export default {
         pageNum: 1,
         pageSize: 20,
         agreementType: 2,
-        isNotCar: '1',
-        isNotDocumentary: '1'
+        isNotCar: "1",
+        isNotDocumentary: "1",
       },
     };
   },
   created() {
-    this.$api.insCompany.findLeftInsTree( {
+    this.$api.insCompany
+      .findLeftInsTree({
         classname: "",
-        type: '1',
-        }).then((res) => {
-      this.ztreeNodes = res.data;
-    });
+        type: "1",
+      })
+      .then((res) => {
+        this.ztreeNodes = res.data;
+      });
     this.findPage();
   },
   methods: {
@@ -251,93 +330,92 @@ export default {
       this.showViewer = false;
     },
     resetForm() {
-            this.formData={}
-            this.pageData.partnerCompaniesIdList=[]
-            this.$refs.yearMonthYay.clear()
-        },
+      this.formData = {};
+      this.pageData.partnerCompaniesIdList = [];
+      this.$refs.yearMonthYay.clear();
+    },
     handleCloserecorddetail() {
-            this.dialogVisiblerecordDetail = false
-        },
+      this.dialogVisiblerecordDetail = false;
+    },
     haldRecordDetail(row) {
-            this.dialogVisiblerecordDetail = true
-            this.getListrecorddetail(row)
-        },
-        getListrecorddetail(data) {
-            this.findPageDetailrecorddatail(data)
-        },
-        findPageDetailrecorddatail(data) {
-            this.tableConfigDetailrecorddetail.loading = true;
-            this.$api.task
-                .fncplyFeeQuery({
-                  partnerCompaniesId: data.partnerCompaniesId,
-                  agreementType: '2',
-                  // handlingFeesStatus: '1',
-                  isNotDocumentary: '1',
-                  isNotCar:'1',
-                  ...this.pageDatarecorddetail
-                 })
-                .then(res => {
-                    if (res.code == 200) {
-                      this.recordDetailData = res.data.content;
-                      this.pageDatarecorddetail = {
-                        pageNum: res.data.pageNum,
-                        pageSize: res.data.pageSize,
-                        totalSize: res.data.totalSize,
-                      }
-                        this.tableConfigDetailrecorddetail.loading = false;
-                    }
-                    else {
-                        this.tableConfigDetailrecorddetail.loading = false;
-                        this.$message.error(res.msg)
-                    }
-                });
-        },
+      this.dialogVisiblerecordDetail = true;
+      this.getListrecorddetail(row);
+    },
+    getListrecorddetail(data) {
+      this.findPageDetailrecorddatail(data);
+    },
+    findPageDetailrecorddatail(data) {
+      this.tableConfigDetailrecorddetail.loading = true;
+      this.$api.task
+        .fncplyFeeQuery({
+          partnerCompaniesId: data.partnerCompaniesId,
+          agreementType: "2",
+          // handlingFeesStatus: '1',
+          isNotDocumentary: "1",
+          isNotCar: "1",
+          ...this.pageDatarecorddetail,
+        })
+        .then((res) => {
+          if (res.code == 200) {
+            this.recordDetailData = res.data.content;
+            this.pageDatarecorddetail = {
+              pageNum: res.data.pageNum,
+              pageSize: res.data.pageSize,
+              totalSize: res.data.totalSize,
+            };
+            this.tableConfigDetailrecorddetail.loading = false;
+          } else {
+            this.tableConfigDetailrecorddetail.loading = false;
+            this.$message.error(res.msg);
+          }
+        });
+    },
     haldRecord(row) {
-      this.findPageDetailrecord(row)
-      this.dialogVisiblerecord = true
+      this.findPageDetailrecord(row);
+      this.dialogVisiblerecord = true;
     },
     findPageDetailrecord(data) {
-      this.tableConfigDetailrecord.loading = true
+      this.tableConfigDetailrecord.loading = true;
+      this.$api.task;
+      // .settlementFeesQuery({
       this.$api.task
-        // .settlementFeesQuery({
-        this.$api.task.fncSettlementQueryRecord({
+        .fncSettlementQueryRecord({
           partnerCompaniesId: data.partnerCompaniesId,
-          agreementType: '2',
-          handlingFeesStatus: '1',
-          isNotCar:'1',
-          settlementStatus:'2',
-          ...this.pageDatarecord
+          agreementType: "2",
+          handlingFeesStatus: "1",
+          isNotCar: "1",
+          settlementStatus: "2",
+          ...this.pageDatarecord,
         })
-        .then(res => {
+        .then((res) => {
           if (res.code == 200) {
             this.formTableDatarecord = res.data;
             this.pageDatarecord = {
               pageNum: res.data.pageNum,
               pageSize: res.data.pageSize,
               totalSize: res.data.totalSize,
-            }
+            };
             this.tableConfigDetailrecord.loading = false;
-          }
-          else {
+          } else {
             this.tableConfigDetail.loading = false;
-            this.$message.error(res.msg)
+            this.$message.error(res.msg);
           }
         });
     },
     getListrecord(data) {
-      this.findPageDetailrecord()
+      this.findPageDetailrecord();
     },
     handleCloserecord() {
-      this.dialogVisiblerecord = false
+      this.dialogVisiblerecord = false;
     },
-    getYearData(val){
-      this.formData.year=val
+    getYearData(val) {
+      this.formData.year = val;
     },
-    getMonthData(val){
-      this.formData.month=val
+    getMonthData(val) {
+      this.formData.month = val;
     },
-    getDayData(val){
-      this.formData.day=val
+    getDayData(val) {
+      this.formData.day = val;
     },
     // 查询
     handleSearchList(data) {
@@ -347,17 +425,16 @@ export default {
     findPage(data) {
       this.tableConfig.loading = true;
       this.$api.task
-        .allOtherAmount({...this.pageData,...data,...this.formData})
-        .then(res => {
-          if (res.code==200) {
-            this.tableData = res.data?res.data:[]
+        .allOtherAmount({ ...this.pageData, ...data, ...this.formData })
+        .then((res) => {
+          if (res.code == 200) {
+            this.tableData = res.data ? res.data : [];
             // this.pageData.pageNum = res.data.pageNum;
             // this.pageData.pageSize = res.data.pageSize;
             // this.pageData.totalSize = res.data.totalSize;
             this.tableConfig.loading = false;
-          }
-          else{
-            this.$message.error(res.msg)
+          } else {
+            this.$message.error(res.msg);
           }
         });
     },
@@ -369,20 +446,18 @@ export default {
       this.pageData.pageNum = val;
       this.findPage();
     },
-
-  }
+  },
 };
 </script>
 
 <style scoped>
-
-.invoiceAnd >>>.el-table__body-wrapper {
-    overflow-y: auto !important;
-    height: auto !important;
-  }
-  .imageclass {
-    max-width: 100px;
-    max-height: 50px;
-    text-align: center;
-  }  
+.invoiceAnd >>> .el-table__body-wrapper {
+  overflow-y: auto !important;
+  height: auto !important;
+}
+.imageclass {
+  max-width: 100px;
+  max-height: 50px;
+  text-align: center;
+}
 </style>

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/DocumentaryUnsettled.vue

@@ -207,6 +207,21 @@ export default {
           name: "data",
           type: "slot",
         },
+        {
+          label: "结清状态",
+          prop: "status",
+          type: "select",
+          options: [
+            {
+              label: "开票未结清",
+              value: "0",
+            },
+            {
+              label: "开票已结清",
+              value: "1",
+            },
+          ],
+        },
       ],
       tableConfig: {
         columns: [

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicedAndSettled.vue

@@ -231,7 +231,7 @@ export default {
         },
         {
           label: "结清状态",
-          prop: "settlementStatus",
+          prop: "status",
           type: "select",
           options: [
             {

src/views/FinancialManagement/CarInsurance/CompanySettlement/NoCarInsurance/InvoicingUnsettled.vue

@@ -393,7 +393,7 @@ export default {
         },
         {
           label: "结清状态",
-          prop: "settlementStatus",
+          prop: "status",
           type: "select",
           options: [
             {