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

src/http/moudules/letter.js

@@ -1133,3 +1133,19 @@ export const updateExternalOrder = (data) => {
     data
   })
 }
+
+export const getInquiryNowFee = (data) => {
+  return axios({
+    url: "/plt/new/agreement/getInquiryNowFee",
+    method: "post",
+    data
+  })
+}
+
+export const getProductId = (data) => {
+  return axios({
+    url: "/plt/new/agreement/getProductId",
+    method: "post",
+    data
+  })
+}

src/http/moudules/task.js

@@ -1769,3 +1769,19 @@ export const exportAmountAuditing = (data) => {
   })
 }
 
+//批量修改比例（车险）
+export const batchOperation = (data) => {
+  return axios({
+    url: "/fnc/plyFee/bxImportOtherConfirm",
+    method: "put",
+    data
+  })
+}
+//批量修改比例（非车）
+export const noCarBatchOperation = (data) => {
+  return axios({
+    url: "/fnc/plyFee/noBxImportOtherConfirm",
+    method: "put",
+    data
+  })
+}

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -126,6 +126,14 @@
                       onkeyup="value=value.replace(/\D/g,'')" placeholder="输入数字"></el-input>
                   </el-form-item>
                 </el-col>
+                <el-col :span="10">
+                  <el-form-item label="是否现询">
+                      <el-select v-model="productCostForm.isInquiryNow" placeholder="请选择">
+                        <el-option value="1" label="是"></el-option>
+                        <el-option value="0" label="否"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
 
               <el-row v-if="productjqincludes">
@@ -137,13 +145,13 @@
                       placeholder="请输入费用比例"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="5" :offset="1" v-if="permissions && !$route.query.isExternal">
+                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input disabled v-model="productCostForm.jqCarOtherCostsProportion"
                       placeholder="请输入其他费用比例"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="5" :offset="1" v-if="permissions && !$route.query.isExternal">
+                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="jqCostsProportion">
                     <el-input v-model="productCostForm.jqCostsProportion"
                       @blur="totalCostRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
@@ -192,14 +200,14 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="permissions && !$route.query.isExternal">
+                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input v-model="productCostForm.syCarOtherCostsProportion" placeholder="请输入其他费用比例"
                       disabled></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="permissions && !$route.query.isExternal">
+                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="syCostsProportion">
                     <el-input v-model="productCostForm.syCostsProportion" placeholder="请输入总费用比例"
                       @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"></el-input>
@@ -246,14 +254,14 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="permissions && !$route.query.isExternal">
+                <el-col :span="5" :offset="1"  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input v-model="productCostForm.noCarOtherCostsProportion" placeholder="请输入其他费用比例"
                       disabled></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="permissions && !$route.query.isExternal">
+                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="noCostsProportion">
                     <el-input v-model="productCostForm.noCostsProportion" placeholder="请输入总费用比例"
                       @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"></el-input>
@@ -1274,6 +1282,7 @@ export default {
       this.productCostForm.costsAttrLinks = Arraydata.myArray ?Arraydata.myArray:[];
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          // productUpdateObj
           if (this.productCostAddDialogType == "add") {
             this.$api.insCompany
               .productCostSave(this.productCostForm)
@@ -1284,6 +1293,7 @@ export default {
                     message: res.msg,
                   });
                   this.productCostAddVehicleFactorVisible = false;
+                  // this.productCostForm.isInquiryNow = undefined
                   this.productCostFindPage();
                 } else {
                   this.$message({
@@ -1306,6 +1316,7 @@ export default {
                     message: res.msg,
                   });
                   this.productCostAddVehicleFactorVisible = false;
+                  // this.productCostForm.isInquiryNow = undefined
                   this.productCostFindPage();
                 } else {
                   this.$message({
@@ -1806,9 +1817,6 @@ export default {
     }
   }
 
-  .el-step__title,
-  .el-step__icon-inner {}
-
   .el-step__description.is-finish,
   .el-step__head.is-finish {
     color: #333;

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

@@ -329,6 +329,9 @@
         <el-table-column prop="syOtherCostsPremium" label="商业跟单金额">
         </el-table-column>
       </el-table>
+      <footer style="margin-top: 15px;display: flex;justify-content: flex-end;">
+        <el-button type="primary" @click="confrimBatch">确认</el-button>
+      </footer>
     </el-dialog>
     <el-dialog :visible.sync="dialogVisibleprogress" width="25%">
       <el-upload
@@ -1149,11 +1152,22 @@ export default {
       this.dialogVisibleprogress = true;
       this.progressPercent = 0;
     },
+    //打开批量操作修改比例弹框
     handBatchratio() {
       this.dialogVisibleradio = true;
       this.tableDataRadio = {};
       this.fileListRadio = [];
     },
+    confrimBatch(){
+      this.$api.task.batchOperation({resultList:this.tableDataRadio.resultList}).then((res) => {
+        if (res.code == 200) {
+          this.$message.success('操作成功')
+
+          this.dialogVisibleradio = false;
+          
+        } 
+      });
+    },
     drivinguploadRadio(file, fileList) {
       this.fileListRadio = [];
       const params = new FormData(); // 声明formData数据类型

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

@@ -160,6 +160,9 @@
             label="非车跟单金额">
           </el-table-column>
         </el-table>
+      <footer style="margin-top: 15px;display: flex;justify-content: flex-end;">
+        <el-button type="primary" @click="confrimBatch">确认</el-button>
+      </footer>
     </el-dialog>
     <el-dialog  :visible.sync="dialogVisibleprogress" width="25%" >
       <el-upload style="margin-bottom:10px" action="#" class="upload-demo" :limit="1" :auto-upload="false"
@@ -865,6 +868,16 @@ drivinguploadBatchs(file, fileList){
       this.fileListRadio=[]
       this.tableDataRadio={}
     },
+    confrimBatch(){
+      this.$api.task.noCarBatchOperation({resultList:this.tableDataRadio.resultList}).then((res) => {
+        if (res.code == 200) {
+          this.$message.success('操作成功')
+
+          this.dialogVisibleradio = false;
+          
+        } 
+      });
+    },
     drivinguploadRadio(file, fileList){
       this.fileListRadio=fileList
       const params = new FormData(); // 声明formData数据类型

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -457,6 +457,24 @@ export default {
         //       },
         //   ]
         // },
+        {
+          name: 'jqPolicyNo',
+          label: '交强保单号',
+          type: 'input',
+          Retained: true,
+        },
+        {
+          name: 'syPolicyNo',
+          label: '商业保单号',
+          type: 'input',
+          Retained: true,
+        },
+        {
+          name: 'noPolicyNo',
+          label: '非车保单号',
+          type: 'input',
+          Retained: true,
+        },
       ],
       orderInfo: {
         //选中的订单

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -316,6 +316,24 @@ export default {
           type: 'date',
           list: 'payList'
         },
+        {
+          name: 'jqPolicyNo',
+          label: '交强保单号',
+          type: 'input',
+          Retained: true,
+        },
+        {
+          name: 'syPolicyNo',
+          label: '商业保单号',
+          type: 'input',
+          Retained: true,
+        },
+        {
+          name: 'noPolicyNo',
+          label: '非车保单号',
+          type: 'input',
+          Retained: true,
+        },
       ],
       orderInfo: {
         //选中的订单

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresEnd.vue

@@ -62,6 +62,11 @@
             >
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="支付时间">
+            <el-date-picker v-model="queryForm.timeFiltering" type="daterange" range-separator="至" value-format="yyyy-MM-dd"
+              start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button
               size="small"
@@ -376,10 +381,19 @@ export default {
         this.queryForm.startTime = "";
         this.queryForm.endTime = "";
       }
+      if (this.queryForm.timeFiltering && this.queryForm.timeFiltering.length > 0) {
+        this.queryForm.startAuditingTime = this.queryForm.timeFiltering[0];
+        this.queryForm.endAuditingTime = this.queryForm.timeFiltering[1];
+      } else {
+        this.queryForm.startAuditingTime = "";
+        this.queryForm.endAuditingTime = "";
+      }
+      let form={...this.queryForm}
+      delete form.timeFiltering
       that.$api.task
         .payqueryPage({
           ...this.pageRequest,
-          ...this.queryForm,
+          ...form,
           amountStatus: "1",
         })
         .then((res) => {
@@ -391,7 +405,7 @@ export default {
 
       that.$api.task
         .querySumAmount({
-          ...this.queryForm,
+          ...form,
           ...this.pageRequest,
         })
         .then((res) => {

src/views/FinancialManagement/WithdrawalManagement/WithdrawalProceduresPending.vue

@@ -26,6 +26,11 @@
               start-placeholder="开始日期" end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="支付时间">
+            <el-date-picker v-model="queryForm.timeFiltering" type="daterange" range-separator="至" value-format="yyyy-MM-dd"
+              start-placeholder="开始日期" end-placeholder="结束日期">
+            </el-date-picker>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="findPage">查询</el-button>
           </el-form-item>
@@ -260,8 +265,17 @@ export default {
         this.queryForm.startTime = "";
         this.queryForm.endTime = "";
       }
+      if (this.queryForm.timeFiltering && this.queryForm.timeFiltering.length > 0) {
+        this.queryForm.startAuditingTime = this.queryForm.timeFiltering[0];
+        this.queryForm.endAuditingTime = this.queryForm.timeFiltering[1];
+      } else {
+        this.queryForm.startAuditingTime = "";
+        this.queryForm.endAuditingTime = "";
+      }
+      let form={...this.queryForm}
+      delete form.timeFiltering
       that.$api.task
-        .payqueryPage({ ...this.pageRequest, ...this.queryForm, amountStatus: '1' })
+        .payqueryPage({ ...this.pageRequest, ...form, amountStatus: '1' })
         .then(res => {
           if (res.code == 200) {
             that.pageResult = res.data;
@@ -270,7 +284,7 @@ export default {
         .then(data != null ? data.callback : "");
         that.$api.task
         .querySumAmount({
-          ...this.queryForm,
+          ...form,
           ...this.pageRequest,
         })
         .then(res => {

src/views/Task/daikeComponents/KtLetter.vue

@@ -892,9 +892,12 @@
             <el-col :span="2" style="margin: 0 42px 0 35px">
               <span>保险公司</span>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <span>报价协议</span>
             </el-col>
+            <el-col :span="3" v-if="isLetter == '3'" style="margin-right: 20px;">
+              <span>现询协议</span>
+            </el-col>
             <el-col :span="3" v-if="isLetter !== '3'">
               <span>报价结果</span>
             </el-col>
@@ -935,7 +938,7 @@
                   " />
                 <span>{{ reslistitem.namesimple }}</span>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="4">
                 <el-select size="small" v-if="reslistitem.isTaxSource && reslistitem.isTaxSource == '1'
                   " :disabled="true" placeholder="默认" style="width: 230px" v-model="isTaxSourceModel"
                   :clearable="true"></el-select>
@@ -970,6 +973,11 @@
                   </div>
                 </el-select>
               </el-col>
+              <el-col :span="3" style="margin-right: 20px;">
+                <el-select :disabled="!reslistitem.checked" size="small" v-model="reslistitem.isInquiryNow" @change="inquiryNowListChange">
+                  <el-option v-for="(item, index) in inquiryNowList" :key="index" :label="item.costsDescription" :value="item.id"></el-option>
+                </el-select>
+              </el-col>
               <el-col :span="3">
                 <span style="color: #d42426; font-weight: bold">
                   {{
@@ -1359,7 +1367,7 @@
                   </el-form-item>
                   <el-form-item label=" ">
                     <el-select clearable v-model="guoRenaccidentForm.prodCode" @change="grcxchangeChild">
-                      <el-option v-for="(item, index) in guoRenaccidentDataListChild" :key="item.projectCode"
+                      <el-option v-for="(item) in guoRenaccidentDataListChild" :key="item.projectCode"
                         :label="item.projectName" :value="item.projectCode"></el-option>
                     </el-select>
                   </el-form-item>
@@ -1455,7 +1463,7 @@
                         :value="item.projectCode"></el-option>
                     </el-select>
                     <el-select clearable v-model="dajiaaccidentForm.projectCode" @change="djcxchangeChild">
-                      <el-option v-for="(item, index) in dajiaaccidentDataListChild" :key="item.projectCode"
+                      <el-option v-for="(item) in dajiaaccidentDataListChild" :key="item.projectCode"
                         :label="item.projectName" :value="item.projectCode"></el-option>
                     </el-select>
                   </div>
@@ -1535,7 +1543,7 @@
                   " />
                 <span>{{ reslistitem.namesimple }}</span>
               </el-col>
-              <el-col :span="5">
+              <el-col :span="4">
                 <el-select size="small" v-if="reslistitem.isTaxSource && reslistitem.isTaxSource == '1'
                   " :disabled="true" placeholder="默认" style="width: 230px" v-model="isTaxSourceModel"
                   :clearable="true"></el-select>
@@ -1570,6 +1578,11 @@
                   </div>
                 </el-select>
               </el-col>
+              <!-- <el-col :span="3" style="margin-right: 20px;">
+                <el-select :disabled="!reslistitem.checked" size="small" v-model="reslistitem.isInquiryNow" @change="inquiryNowListChange">
+                  <el-option v-for="(item, index) in inquiryNowList" :key="index" :label="item.costsDescription" :value="item.id"></el-option>
+                </el-select>
+              </el-col> -->
               <el-col :span="3">
                 <div v-show="reslistitem.quoteCode == '0'">
                   <span>未报价</span>
@@ -2216,7 +2229,7 @@
                   </el-form-item>
                   <el-form-item label=" ">
                     <el-select clearable v-model="guoRenaccidentForm.prodCode" @change="grcxchangeChild">
-                      <el-option v-for="(item, index) in guoRenaccidentDataListChild" :key="item.projectCode"
+                      <el-option v-for="(item) in guoRenaccidentDataListChild" :key="item.projectCode"
                         :label="item.projectName" :value="item.projectCode"></el-option>
                     </el-select>
                   </el-form-item>
@@ -2313,7 +2326,7 @@
                     </el-select>
                     <el-select size="small" style="width: 250px" clearable v-model="dajiaaccidentForm.projectCode"
                       @change="djcxchangeChild">
-                      <el-option v-for="(item, index) in dajiaaccidentDataListChild" :key="item.projectCode"
+                      <el-option v-for="(item) in dajiaaccidentDataListChild" :key="item.projectCode"
                         :label="item.projectName" :value="item.projectCode"></el-option>
                     </el-select>
                   </div>
@@ -3289,6 +3302,7 @@ export default {
       }
     };
     return {
+      inquiryNowList: [],   // 现询列表
       taikangtemplateSelection: [], // 泰康
       taikangInsuranceDataTable: [],
       taikangaccidentDataList: [],
@@ -5754,8 +5768,39 @@ export default {
     Payment(id, item) {
       this.carcode(id, item);
     },
+    // 现询
+    getInquiryNowList(agreementId, riskList, kindList) {
+      let productId = ''
+      this.inquiryNowList = []
+      this.$api.letter.getProductId({
+        riskList: riskList,
+        kindList: kindList
+      }).then((res) => {
+        if (res.code == 200) {
+          productId =  res.data
+          this.$api.letter.getInquiryNowFee({
+            agreementId: agreementId,
+            productId: productId
+          }).then((resp) => {
+            if (resp.code == 200) {
+              this.inquiryNowList = resp.data
+            }
+          })
+        }
+      })
+    },
+    inquiryNowListChange(data) {
+      this.inquiryNowList.forEach((val) => {
+        if (val.id == data) {
+          this.policyNumberForm.jqCostsProportion = val.jqCostsProportion
+          this.policyNumberForm.noCostsProportion = val.noCostsProportion
+          this.policyNumberForm.syCostsProportion = val.syCostsProportion
+        }
+      })
+    },
     //选择协议  val:协议id  row：协议列表  index：下标  item：保险公司数据集合
     agreementChange(val, row, index, item) {
+      this.getInquiryNowList(val, this.riskList, this.kindList)
       this.kindListFun();
       if (this.isLetter == "3") {
         this.isLetter3agreementId = "";
@@ -6812,6 +6857,8 @@ export default {
           stageFlag: type,
           jqstartdate: this.jqstartDate,
           jqenddate: this.jqendDate,
+          systartdate : this.systartDate,
+          syenddate : this.syendDate,
           kind: this.kindList,
           risk: this.riskList,
           kindList: this.kindList,