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

src/http/moudules/task.js

@@ -1857,4 +1857,12 @@ export const addOrUpdateAll = (data) => {
     url: '/sysUserLinkPtlAgreement/addOrUpdateAll/'+data,
     method: 'post'
   })
+}
+
+//任务管理查询报价的保司机构
+export const queryPartnerCompaniesList = (status) => {
+  return axios({
+    url: "/fnc/importAsync/queryPartnerCompaniesList?status="+status,
+    method: "get",
+  })
 }

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

@@ -411,9 +411,11 @@
       </el-upload>
       <templateTable
         ref="templateTable1"
+        :formList="formListbatch"
         :tableConfig="tableConfigbatch"
         :data="batchData"
         @findPage="findPagegbatch"
+        @handleSearchList="handleSearchListbatch"
         :pagination="pageDataPro"
         @getList="getListgbatch"
         @selectionChange="selectionChangebatch"
@@ -468,6 +470,19 @@ export default {
   },
   data() {
     return {
+      formListbatch: [
+        {
+          label: "上传时间",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
+      ],
       process: process.env.BASE_URL,
       dockingPersonOption: [],
       rulesAdd: {
@@ -1016,7 +1031,7 @@ export default {
     this.areaqueryList(1, 99, "provinceId");
     this.companyqueryList(0, "allPartnerCompaniesId");
     this.agrmentlist();
-
+    this.getCompanyList();
     this.findPage();
     let params = {
       classname: "",
@@ -1048,6 +1063,12 @@ export default {
     });
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("2").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1224,10 +1245,13 @@ export default {
       this.dialogVisibleBatch = true;
       this.findPagegbatch();
     },
-    findPagegbatch() {
+    handleSearchListbatch(data) {
+      this.findPagegbatch(data);
+    },
+    findPagegbatch(data) {
       this.tableConfigbatch.loading = true;
       this.$api.task
-        .importAsyncQuery({ ...this.pageDataPro, handStatus: 2 })
+        .importAsyncQuery({ ...this.pageDataPro, handStatus: 2, ...data})
         .then((res) => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false;

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

@@ -180,7 +180,7 @@
     </el-dialog>
     <el-dialog
       :visible.sync="dialogVisibleBatch"
-      width="45%"
+      width="50%"
       :before-close="handleCloseBatch"
     >
       <el-form
@@ -212,7 +212,9 @@
               <el-input v-model="InvoicingData.taxPoints"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="InvoicingData.invoicingMethod == '1'">
+          </el-row> 
+          <el-row>
+          <el-col :span="10" v-if="InvoicingData.invoicingMethod == '1'">
             <el-form-item label="开票号：" prop="invoicId">
               <el-input v-model="InvoicingData.invoicId"></el-input>
             </el-form-item>
@@ -502,6 +504,7 @@ export default {
   },
   data() {
     return {
+      companyList : [], //保司机构列表
       excelFileList: [],
       confirmDisabled: false,
       riskcodeList: [],
@@ -511,6 +514,12 @@ export default {
           prop: "createTime",
           type: "date",
         },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
       ],
       rulesAdd: {
         agreeId: [
@@ -944,11 +953,6 @@ export default {
             label: "任务id",
             type: "text",
           },
-          {
-            prop: "partnerCompaniesName",
-            label: "保司名称",
-            type: "text",
-          },
           {
             prop: "partnerCompaniesName",
             label: "保司名称 ",
@@ -1107,6 +1111,12 @@ export default {
     });
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("0").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1529,6 +1539,7 @@ export default {
       }
     },
     balanceFunPro() {
+      this.getCompanyList();
       // this.assembly('batchInvoicing',2)
       this.batchData = [];
       this.InvoicingData = {};

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

@@ -375,9 +375,11 @@
       </el-upload>
       <templateTable
         ref="templateTable1"
+        :formList="formListbatch"
         :tableConfig="tableConfigbatch"
         :data="batchData"
         @findPage="findPagegbatch"
+        @handleSearchList="handleSearchListbatch"
         :pagination="pageDataPro"
         @getList="getListgbatch"
         @selectionChange="selectionChangebatch"
@@ -432,6 +434,19 @@ export default {
   },
   data() {
     return {
+      formListbatch: [
+        {
+          label: "上传时间",
+          prop: "createTime",
+          type: "date",
+        },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
+      ],
       process: process.env.BASE_URL,
       dockingPersonOption: [],
       riskcodeList: [],
@@ -952,8 +967,15 @@ export default {
         this.InsCompanyList = res.data;
       }
     });
+    this.getCompanyList();
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("3").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型
@@ -1126,10 +1148,13 @@ export default {
       this.dialogVisibleBatch = true;
       this.findPagegbatch();
     },
-    findPagegbatch() {
+    handleSearchListbatch(data) {
+      this.findPagegbatch(data);
+    },
+    findPagegbatch(data) {
       this.tableConfigbatch.loading = true;
       this.$api.task
-        .importAsyncQuery({ ...this.pageDataPro, handStatus: 3 })
+        .importAsyncQuery({ ...this.pageDataPro, handStatus: 3,...data })
         .then((res) => {
           if (res.code == 200) {
             this.tableConfigbatch.loading = false;

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

@@ -510,6 +510,12 @@ export default {
           prop: "createTime",
           type: "date",
         },
+        {
+          label: "保司机构",
+          prop: "partnerCompaniesId",
+          type: "select",
+          options: [],
+        },
       ],
       ztreeNodes: [],
       productsTypeoptions: [],
@@ -968,6 +974,7 @@ export default {
     };
   },
   created() {
+    
     this.$api.dept.findDeptTree("9", "").then((res) => {
       this.treedata = res.data;
     });
@@ -1012,8 +1019,15 @@ export default {
       }
     });
     this.agrmentlist();
+    this.getCompanyList();
   },
   methods: {
+    getCompanyList() {
+      this.$api.task.queryPartnerCompaniesList("1").then((res) => {
+        this.companyList = res.data;
+        this.formListbatch[1].options = res.data;
+      });
+    },
     drivinguploadExcel(file, fileList) {
       this.progressPercent = 0;
       const params = new FormData(); // 声明formData数据类型