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

src/components/Form/retrievalForm.vue

@@ -43,8 +43,9 @@
           </template>
           <template v-else-if="field.type === 'date'">
             <el-date-picker
-              type="daterange"
-              value-format="yyyy-MM-dd"
+              :type="field.list == 'payList' ? 'datetimerange' : 'daterange'"
+              :format="field.list == 'payList' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
+              :value-format="field.list == 'payList' ? 'yyyy-MM-dd HH:mm:ss' : 'yyyy-MM-dd'"
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"

src/http/moudules/insCompany.js

@@ -593,14 +593,22 @@ export const deleteDrivingInsurance = (data) => {
     data
   })
 }
-//批量修改
-export const endDateBatch = (data) => {
+//批量修改  弃用
+export const endDateBatch = (data) => { 
   return axios({
     url: '/plt/new/agreement/costs/endDateBatch',
     method: "post",
     data
   })
 }
+//批量修改 新接口
+export const bulkOperation = (data) => {
+  return axios({
+    url: '/plt/new/agreement/costs/costsBatch',
+    method: "post",
+    data
+  })
+}
 //批量删除
 export const deleteBatch = (data) => {
   return axios({

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -99,7 +99,13 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="对接人">
+              <el-input :size="overSize" clearable v-model.trim="queryForm.dockingPerson" placeholder="请输入对接人"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div style="font-weight: bold;font-size: 15px;color: #242833;" class="p-1 flex j-s a-c">
@@ -153,6 +159,13 @@
         <el-table-column prop="endDate" label="协议失效日期" align="center"></el-table-column>
         <el-table-column prop="matchType" label="匹配日期类型" align="center" :formatter="matchtypeFormatter"></el-table-column>
         <el-table-column prop="moneyTime" label="结算周期" align="center" :formatter="moneytimeFormatter"></el-table-column>
+        <el-table-column prop="validStatus" label="是否启用" align="center">
+          <template slot-scope="scope">
+            <span
+              :style="{ background: scope.row.validStatus == '1' ? 'linear-gradient( 180deg, #66CDBB 0%, #33A08D 100%)' : '#A6A6A6', borderRadius: '4px', padding: '4px 10px', color: '#fff' }">{{
+                scope.row.validStatus == 1 ? "启用" : "禁用" }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="validStatus" label="审核方式" align="center" width="100">
           <template slot-scope="scope">
             <span
@@ -175,20 +188,13 @@
           </template>
         </el-table-column> -->
         <el-table-column prop="updateTime" label="修改时间" align="center" :formatter="updatetimeFormatter"></el-table-column>
-        <el-table-column prop="validStatus" label="是否启用" align="center">
-          <template slot-scope="scope">
-            <span
-              :style="{ background: scope.row.validStatus == '1' ? 'linear-gradient( 180deg, #66CDBB 0%, #33A08D 100%)' : '#A6A6A6', borderRadius: '4px', padding: '4px 10px', color: '#fff' }">{{
-                scope.row.validStatus == 1 ? "启用" : "禁用" }}</span>
-          </template>
-        </el-table-column>
         <el-table-column prop="modifiedName" label="修改人" align="center" width="130"></el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
-            <kt-button label="复制协议" :size="overSize" type="text" perms="agreement:input:update"
-              @click="agreementCopy(scope.$index, scope.row)" style="color: #2D4D89 !important " />
             <kt-button label="编辑" :size="overSize" type="text" perms="agreement:input:update"
               @click="uplatequery(scope.$index, scope.row)" style="color: #2D4D89 !important " />
+            <kt-button label="复制协议" :size="overSize" type="text" perms="agreement:input:update"
+              @click="agreementCopy(scope.$index, scope.row)" style="color: #2D4D89 !important " />
             <kt-button label="删除" :size="overSize" type="text" perms="agreement:input:delete"
               @click="deletequery(scope.$index, scope.row)" style="color: #D42426 !important " />
               <kt-button label="协议轨迹" :size="overSize" type="text" perms="agreement:input:update"

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -384,19 +384,157 @@
       </div>
 
     </el-dialog>
-    <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="30%">
+    <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="50%">
       <div class="tab-panestyle">
-        <el-form :inline="true" :model="batchUpdateForm" class="demo-form-inline  tab-panecent" style="padding: 20px;">
-          <el-form-item label="费用起期：">
-            <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsStartDate" type="datetime"
-              placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="费用止期：">
-            <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsEndDate" type="datetime"
-              placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate1">
-            </el-date-picker>
-          </el-form-item>
+        <el-form :inline="true" :model="batchUpdateForm" id="bulkOperation" class="demo-form-inline  tab-panecent" style="padding: 20px;">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="费用起期：">
+                <el-date-picker size="small"  v-model="batchUpdateForm.costsStartDate" type="datetime"
+                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="费用止期：">
+                <el-date-picker size="small"  v-model="batchUpdateForm.costsEndDate" type="datetime"
+                  placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate1">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="title">交强险费用</div>
+            <el-col :span="8">
+              <el-form-item label="总费用比例" prop="jqCostsProportion">
+                <el-input-number size="small" :controls="false" :precision="0" v-model="batchUpdateForm.jqCostsProportion"
+                  placeholder="请输入总费用比例"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例一级" prop="jqExportRadioLevel1">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel1" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例二级" prop="jqExportRadioLevel2">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel2" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例三级" prop="jqExportRadioLevel3">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel3" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例四级" prop="jqExportRadioLevel4">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel4" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交强管理比例五级" prop="jqExportRadioLevel5">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.jqExportRadioLevel5" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="title">商业险费用</div>
+            <el-col :span="8">
+              <el-form-item label="总费用比例" prop="syCostsProportion">
+                <el-input-number size="small" :controls="false" :precision="0" v-model="batchUpdateForm.syCostsProportion"
+                  placeholder="请输入总费用比例"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例一级	" prop="syExportRadioLevel1">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel1" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例二级	" prop="syExportRadioLevel2">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel2" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例三级	" prop="syExportRadioLevel3">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel3" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例四级	" prop="syExportRadioLevel4">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel4" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="商业手续比例五级	" prop="syExportRadioLevel5">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.syExportRadioLevel5" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="title">非车费用</div>
+            <el-col :span="8">
+              <el-form-item label="总费用比例" prop="noCostsProportion">
+                <el-input-number size="small" :controls="false" :precision="0" v-model="batchUpdateForm.noCostsProportion"
+                  placeholder="请输入总费用比例"></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例一级	" prop="noCarExportRadioLevel1">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel1" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例二级	" prop="noCarExportRadioLevel2">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel2" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例三级	" prop="noCarExportRadioLevel3">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel3" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例四级	" prop="noCarExportRadioLevel4">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel4" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="非车手续比例五级	" prop="noCarExportRadioLevel5">
+                <el-input-number size="small" :controls="false" :precision="2" 
+                  v-model="batchUpdateForm.noCarExportRadioLevel5" placeholder="请输入管理费比例">
+                </el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -1269,7 +1407,8 @@ export default {
       }
     },
     batchCostsubmit() {
-      this.$api.insCompany.endDateBatch(this.batchUpdateForm).then((res) => {
+      console.log(this.batchUpdateForm);
+      this.$api.insCompany.bulkOperation(this.batchUpdateForm).then((res) => {
         if (res.code == '200') {
           this.batchdialogVisible = false;
           this.productCostFindPage();
@@ -1471,7 +1610,9 @@ export default {
     },
     //产品批量编辑
     batchUpdate(data) {
-      this.batchUpdateForm.ids = data;
+      this.batchUpdateForm = {
+        ids: data, 
+      };
       this.batchdialogVisible = true;
     },
     //产品编辑
@@ -1952,5 +2093,40 @@ export default {
   background: #f2f7fc;
   border-color: #fff;
 }
+// 批量操作弹窗样式
+#bulkOperation{
+  .title{
+    color: #333;
+    font-size: 16px;
+    font-weight: 500;
+    padding-bottom: 20px;
+  }
+  .el-form-item{
+    margin-bottom: 20px;
+    >>>.el-form-item__content{
+      width: 100%;
+      line-height: normal;
+      .el-date-editor.el-input, .el-date-editor.el-input__inner{
+        width: 100%;
+      }
+    }
+    >>>.el-form-item__label{
+      height: 22px;
+      line-height: 22px;
+      margin-bottom: 10px;
+    }
+    >>>.el-input-number{
+      width: 100%;
+      .el-input__inner{
+        color: #333;
+        text-align: left;
+        &:focus{
+          color: #333;
+        }
+      }
+    }
+  }
+}
+
 </style>
 

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -11,7 +11,7 @@
       </el-form-item>
 
       <el-form-item label="协议选择">
-        <el-select size="small" clearable filterable v-model="productpageRequest.agreementId" :placeholder="'请输入'">
+        <el-select size="small" multiple clearable collapse-tags filterable v-model="productpageRequest.agreementIdList" :placeholder="'请输入'">
           <el-option v-for="(s, i) in agreementList" :key="i" :label="s.agreementName" :value="s.id"></el-option>
         </el-select>
       </el-form-item>
@@ -278,7 +278,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
         companyId: "",
-        agreementId: "",
+        agreementIdList: [],
         costsDescription: [],
         productCode: [],
       },

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

@@ -103,7 +103,7 @@
       ></el-table-column>
       <el-table-column
         prop="insuredname"
-        label="投保人姓名"
+        label="被保险人"
         align="center"
         width="150"
       ></el-table-column>
@@ -427,23 +427,23 @@ export default {
             },
           ],
         },
-        {
-          name: "problemOrder",
-          label: "疑问订单",
-          type: "select",
-          optionsIabel: "label",
-          optionsValue: "value",
-          options: [
-            {
-              label: "是",
-              value: "1",
-            },
-            {
-              label: "否",
-              value: "0",
-            },
-          ],
-        },
+        // {
+        //   name: "problemOrder",
+        //   label: "疑问订单",
+        //   type: "select",
+        //   optionsIabel: "label",
+        //   optionsValue: "value",
+        //   options: [
+        //     {
+        //       label: "是",
+        //       value: "1",
+        //     },
+        //     {
+        //       label: "否",
+        //       value: "0",
+        //     },
+        //   ],
+        // },
         {
           name: ["quoteStartDateStr", "quoteEndDateStr"],
           label: "报价时间",

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

@@ -776,7 +776,7 @@ export default {
 
     },
     tableRowClassName(row) {
-      if (row.row.isExternal === 1) {
+      if (row.row.problemOrder === 1) {
         return "flagRow";
       }
       else {

src/views/FinancialManagement/ExpenseManagement/TransferRecord.vue

@@ -35,12 +35,15 @@
             clearable
           ></el-input>
         </el-form-item>
-        <el-form-item label="交易时间" label-width="95px" prop="createTime">
+        <el-form-item label="交易时间" label-width="95px" prop="dateRange">
           <el-date-picker
-            v-model="pageRequest.createTime"
-            type="date"
+            v-model="pageRequest.dateRange"
+            type="daterange"
             value-format="yyyy-MM-dd"
-            placeholder="选择日期">
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="dateChange">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="金额" label-width="95px" prop="applyAmount">
@@ -97,6 +100,7 @@ export default {
         company: "",
         fundUse: "",
         revenueOutlay: "",
+        dateRange: []
       },
       columns: [
         // 数据列
@@ -236,11 +240,20 @@ export default {
         this.dictionariesData = res.data;
       });
     },
+    dateChange(event, filed) {
+      if (event) {
+        this.pageRequest.createTimeStart = event[0];
+        this.pageRequest.createTimeEnd = event[1];
+      } else {
+        this.pageRequest.createTimeStart = "";
+        this.pageRequest.createTimeEnd = "";
+      }
+    },
   },
 };
 </script>
 
-    <style scoped>
+<style scoped>
 .operation {
   margin-left: 14px !important;
   margin-top: 15px !important ;