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

src/components/Form/ProductCostForm.vue

@@ -49,7 +49,7 @@
                   :value="dict.name"></el-option>
               </el-select>
               <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min"
-                placeholder="输入宝马、奥迪等）多个输入，用，隔开"></el-input>
+                placeholder="输入（宝马、奥迪等）多个输入，用，隔开"></el-input>
               <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.minArray"
                 @change="checkboxChange($event, formItems.id, 'min')">
                 <el-checkbox v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.name"></el-checkbox>

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -56,7 +56,7 @@
           :formatter="updatetimeFormatter"></el-table-column>
         <el-table-column prop="validStatus" label="是否有效" align="center" width="80">
           <template slot-scope="scope">
-            <span :size="overSize" type="primary" @click="uplatequery(scope.$index, scope.row)">{{
+            <span :size="overSize" type="primary">{{
               scope.row.validStatus == 1 ? "有效" : "无效" }}</span>
           </template>
         </el-table-column>
@@ -214,7 +214,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item label="有效状态" prop="validStatus">
-                  <el-select v-model="agreement.validStatus" placeholder="请选择投保渠道" style="width: 100%">
+                  <el-select v-model="agreement.validStatus" placeholder="请选择有效状态" style="width: 100%">
                     <el-option label="有效" value="1"></el-option>
                     <el-option label="无效" value="2"></el-option>
                   </el-select>
@@ -439,9 +439,9 @@
               </el-form-item>
             </el-col>
             <el-col :span="10" :offset="2">
-              <el-form-item label="优先级" prop="sort">
+              <el-form-item label="优先级" >
                 <el-input style="width: 100%" v-model="productCostForm.priorityLevel"
-                  onkeyup="value=value.replace(/\D/g,'')" label="方案匹配优先级"></el-input>
+                  onkeyup="value=value.replace(/\D/g,'')" placeholder="输入数字"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -452,7 +452,9 @@
             <h4 style="color: tomato">交强险费用</h4>
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="jqCarCostsProportion">
-                <el-input v-model="productCostForm.jqCarCostsProportion" placeholder="请输入费用比例"></el-input>
+                <el-input v-model="productCostForm.jqCarCostsProportion"
+                  @blur="costRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
+                  placeholder="请输入费用比例"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5" :offset="1" v-if="permissions">
@@ -462,7 +464,8 @@
             </el-col>
             <el-col :span="5" :offset="1" v-if="permissions">
               <el-form-item label="总费用比例" prop="jqCostsProportion">
-                <el-input v-model="productCostForm.jqCostsProportion" @blur="jqCostsProportioninput"
+                <el-input v-model="productCostForm.jqCostsProportion"
+                  @blur="totalCostRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
                   placeholder="请输入总费用比例"></el-input>
               </el-form-item>
             </el-col>
@@ -505,7 +508,9 @@
 
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="syCarCostsProportion">
-                <el-input v-model="productCostForm.syCarCostsProportion" placeholder="请输入费用比例"></el-input>
+                <el-input v-model="productCostForm.syCarCostsProportion"
+                  @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"
+                  placeholder="请输入费用比例"></el-input>
               </el-form-item>
             </el-col>
 
@@ -518,7 +523,7 @@
             <el-col :span="5" :offset="1" v-if="permissions">
               <el-form-item label="总费用比例" prop="syCostsProportion">
                 <el-input v-model="productCostForm.syCostsProportion" placeholder="请输入总费用比例"
-                  @blur="syCostsProportioninput"></el-input>
+                  @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5" :offset="1">
@@ -556,7 +561,9 @@
             <h4 style="color: tomato">非车费用</h4>
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="noCarCostsProportion">
-                <el-input v-model="productCostForm.noCarCostsProportion" placeholder="请输入费用比例"></el-input>
+                <el-input v-model="productCostForm.noCarCostsProportion"
+                  @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"
+                  placeholder="请输入费用比例"></el-input>
               </el-form-item>
             </el-col>
 
@@ -569,7 +576,7 @@
             <el-col :span="5" :offset="1" v-if="permissions">
               <el-form-item label="总费用比例" prop="noCostsProportion">
                 <el-input v-model="productCostForm.noCostsProportion" placeholder="请输入总费用比例"
-                  @blur="syCostsProportioninput"></el-input>
+                  @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5" :offset="1">
@@ -660,7 +667,7 @@
       </kt-common-table>
     </el-dialog>
     <el-dialog title="产品因子录入" :visible.sync="productCostFactorDialogVisible" :close-on-click-modal="false" width="70%"
-      top="6vh" :fullscreen="true" @close="productCostFactoropenDialog">
+      top="6vh" :fullscreen="true" @close="productCostFactoropenDialog" >
       <Product-Cost-Form v-if="productCostFactorDialogVisible" :form="dynamicFormArray" :operator="operatorlist"
         over-size="small" @saveForm="productCostFactorSaveForm"
         @cancelForm="productCostFactorCancelForm"></Product-Cost-Form>
@@ -686,45 +693,45 @@ export default {
   data() {
     return {
       agreementHistoryRecordColumns: [
-        { prop: "agreementAbbreviation", label: "协议简称", minWidth: 120 },
         { prop: "agreementCode", label: "协议代码", minWidth: 180 },
         { prop: "agreementName", label: " 协议名称", minWidth: 160 },
+        { prop: "agreementAbbreviation", label: "协议简称", minWidth: 120 },
         {
           prop: "agreementType",
           label: " 协议类型",
           minWidth: 160,
           formatter: this.agreementtypeFormatter,
         },
+        { prop: "insuranceCompany", label: " 合作公司", minWidth: 160 },
         { prop: "dockingPerson", label: " 对接人", minWidth: 160 },
         { prop: "dockingPhone", label: " 联系方式（对接人）", minWidth: 160 },
-        { prop: "endDate", label: " 协议止期", minWidth: 160 },
+        { prop: "withTax", label: " 含增值税结算", minWidth: 160 },
         {
           prop: "matchType",
           label: " 保单日期类型",
           minWidth: 160,
           formatter: this.matchtypeFormatter,
         },
-        {
-          prop: "moneyTime",
-          label: " 结算周期",
-          minWidth: 160,
-          formatter: this.moneytimeFormatter,
-        },
+        { prop: "startDate", label: " 协议起期", minWidth: 160 },
+        { prop: "endDate", label: " 协议止期", minWidth: 160 },
         {
           prop: "moneyType",
           label: " 佣金发放方式",
           minWidth: 160,
           formatter: this.moneyTypeFormatter,
         },
-        { prop: "startDate", label: " 协议起期", minWidth: 160 },
         {
           prop: "validStatus",
           label: " 有效状态",
           minWidth: 160,
           formatter: this.agreestatusFormatter,
         },
-        { prop: "withTax", label: " 含增值税结算", minWidth: 160 },
-        { prop: "insuranceCompany", label: " 合作公司", minWidth: 160 },
+        {
+          prop: "moneyTime",
+          label: " 结算周期",
+          minWidth: 160,
+          formatter: this.moneytimeFormatter,
+        },
         {
           prop: "ptlAgreementAttribution",
           label: " 保险公司账号配置",
@@ -1255,10 +1262,10 @@ export default {
           { required: true, message: "请选择协议类型", trigger: "blur" },
         ],
         associationCompaniesId: [
-          { required: true, message: "请选择保险公司", trigger: "blur" },
+          { required: true, message: "请选择保险公司", trigger: "change" },
         ],
         partnerCompaniesId: [
-          { required: true, message: "请选择合作公司", trigger: "blur" },
+          { required: true, message: "请选择合作公司", trigger: "change" },
         ],
         cooperationChannels: [
           { required: true, message: "请选择合作渠道", trigger: "blur" },
@@ -1267,7 +1274,7 @@ export default {
           { required: true, message: "请添加对接人", trigger: "blur" },
         ],
         withTax: [
-          { required: true, message: "请选择含增值税结算", trigger: "blur" },
+          { required: true, message: "请选择含增值税结算", trigger: "change" },
         ],
         startDate: [
           { required: true, message: "请输入协议生效日期", trigger: "blur" },
@@ -1276,7 +1283,7 @@ export default {
           { required: true, message: "请输入协议失效日期", trigger: "blur" },
         ],
         matchType: [
-          { required: true, message: "请输入保单日期类型", trigger: "blur" },
+          { required: true, message: "请输入保单日期类型", trigger: "change" },
         ],
         moneytype: [
           { required: true, message: "请选择佣金发放方式", trigger: "blur" },
@@ -1284,7 +1291,7 @@ export default {
         moneyTime: [
           { required: true, message: "请选择结算周期", trigger: "blur" },
         ],
-        validStatus: [{ required: true, message: "请选择", trigger: "blur" }],
+        validStatus: [{ required: true, message: "请选择", trigger: "change" }],
       },
       costformRules: {
         costsStartDate: [
@@ -1343,14 +1350,6 @@ export default {
             trigger: "blur",
           },
         ],
-        priorityLevel: [
-          { required: true, message: "请输入方案优先级", trigger: "change" },
-          {
-            pattern: /^[1-9][0-9]{0,3}$/,
-            message: "请输入1-10000的整数",
-            trigger: "blur",
-          },
-        ],
       },
 
       underwritingRules: {
@@ -1560,6 +1559,7 @@ export default {
     //协议历史
     historyRecord(index, row) {
       this.agreementId = row.id;
+      this.agreementHistoryCostFindPage();
       this.agreementHistoryRecordDialogVisible = true;
     },
     agreementHistoryCostFindPage(data) {
@@ -1690,7 +1690,9 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
-                val.operator = '1';
+                if (!val.operator) {
+                  val.operator = '1';
+                }
                 break;
             }
             if (val.attrCode == 'LicenseNo') {
@@ -1721,7 +1723,9 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
-                val.operator = '1';
+              if (!val.operator) {
+                  val.operator = '1';
+                }
                 break;
             }
             if (val.attrCode == 'LicenseNo') {
@@ -2053,17 +2057,18 @@ export default {
       });
     },
     productCostFactoropenDialog() {
-      if (this.productCostAddDialogType == 'edit') {
+      if (this.productCostAddDialogType == 'add') {
         this.getFactorTemplate();
       }
     },
-    //弹框打开事件
+    //弹框关闭事件
     productcloseDialog() {
       for (const key in this.productCostForm) {
         if (key !== "agreementId" && key !== "costsAttrLinks") {
           this.productCostForm[key] = "";
         }
       }
+      this.getFactorTemplate();
       this.roductList1 = null;
     },
     underwritingRulescloseDialog() {
@@ -2093,46 +2098,42 @@ export default {
         this.parentkeys = [];
       }
     },
-
-    jqCostsProportioninput() {
-      let pay1 = this.productCostForm.jqCostsProportion; //总
-      let pay2 = this.productCostForm.jqCarCostsProportion; //费用
-      if (Number(pay1) >= Number(pay2)) {
-        this.productCostForm.jqCarOtherCostsProportion = pay1 - pay2;
-      } else {
-        //如果总比例不够扣减，则置空重新填
-        this.productCostForm.jqCostsProportion = null;
-        this.productCostForm.jqCarCostsProportion = null;
-        this.$message({
-          message: "总费用比例必须大于费用比例",
-          type: "error",
-        });
+    totalCostRatioInput(total, partial, other) {
+      //参数1为总费用，参数2为费用
+      let pay1 = this.productCostForm[total]; //总
+      let pay2 = this.productCostForm[partial]; //费用
+      if (pay1) {
+        if (Number(pay1) >= Number(pay2)) {
+          this.productCostForm[other] = pay1 - pay2;
+        } else {
+          //如果总比例不够扣减，则置空重新填
+          this.productCostForm[total] = null;
+          this.productCostForm[partial] = null;
+          this.$message({
+            message: "总费用比例必须大于费用比例",
+            type: "error",
+          });
+        }
       }
     },
-    syCostsProportioninput() {
-      let pay1 = this.productCostForm.syCostsProportion; //总
-      let pay2 = this.productCostForm.syCarCostsProportion; //费用
-      if (Number(pay1) >= Number(pay2)) {
-        this.productCostForm.syCarOtherCostsProportion = pay1 - pay2;
-      } else {
-        //如果总比例不够扣减，则置空重新填
-        this.productCostForm.syCostsProportion = null;
-        this.productCostForm.syCarCostsProportion = null;
-        this.$message({
-          message: "总费用比例必须大于等于费用比例",
-          type: "error",
-        });
+    costRatioInput(total, partial, other) {
+      //参数1为总费用，参数2为费用
+      let pay1 = this.productCostForm[total]; //总
+      let pay2 = this.productCostForm[partial]; //费用
+      if (pay1) {
+        if (Number(pay2) <= Number(pay1)) {
+          this.productCostForm[other] = pay1 - pay2;
+        } else {
+          //如果总比例不够扣减，则置空重新填
+          this.productCostForm[total] = null;
+          this.productCostForm[partial] = null;
+          this.$message({
+            message: "费用比例必须小于总费用比例",
+            type: "error",
+          });
+        }
       }
     },
-    //获取所有机构列表End
-    /**Split 开始 */
-    // changeTreeWidth(widthVal) {
-    //   // 初始化树的宽度
-    //   this.leftSplitWidth = Math.ceil(
-    //     (widthVal / this.$refs.elMain.$el.clientWidth) * 100
-    //   );
-    //   this.rightSplitWidth = 100 - this.leftSplitWidth;
-    // },
     // 获取树数据
     findLeftTreeData: function () {
       let params = {
@@ -2272,7 +2273,7 @@ export default {
     },
     moneytimeFormatter(row, column) {
       //结算周期
-      return "T+" + row.moneyType;
+      return "T+" + row.moneyTime;
     },
     moneyTypeFormatter(row, column) {
       let moneyType = row.moneyType;
@@ -2550,5 +2551,4 @@ export default {
 
 .el-icon-arrow-down {
   font-size: 12px;
-}
-</style>
+}</style>

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

@@ -93,9 +93,7 @@
             :lg="lgcell"
             :xl="xlcell"
           >
-            <el-button type="primary" size="small" @click="onSubmit('queryForm')"
-              >查询</el-button
-            >
+          <kt-button label="查询" size="small" type="primary" perms="insuranceSettlementManagement:generateSettlementDocument:query" @click="onSubmit('queryForm')"/>
           </el-col>
         </el-row>
       </el-form>
@@ -108,9 +106,8 @@
         :showBatchDelete="false"
         :showBatchSettled="true"
         :showBatchPrint="false"
-        permsButton1="sys:user:edit"
-        permsButton2="sys:user:edit"
-        permsButton3="sys:user:edit"
+        permsSettled="insuranceSettlementManagement:generateSettlementDocument:generate"
+        permsButton1="insuranceSettlementManagement:generateSettlementDocument:details"
         :data="pageResult"
         :columns="columns"
         @findPage="findPage"

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

@@ -82,9 +82,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="3">
-            <el-button type="primary" size="small" @click="onSubmit"
-              >查询</el-button
-            >
+            <kt-button label="查询" size="small" type="primary" perms="insuranceSettlementManagement:settlementInvoiceVerification:query" @click="onSubmit"/>
           </el-col>
         </el-row>
       </el-form>
@@ -96,9 +94,9 @@
         :showBatchDelete="false"
         :showBatchSettled="false"
         :showBatchPrint="false"
-        permsButton1="sys:user:edit"
-        permsButton2="sys:user:edit"
-        permsButton3="sys:user:edit"
+        permsButton1="insuranceSettlementManagement:settlementInvoiceVerification:settlementDetails"
+        permsButton2="insuranceSettlementManagement:settlementInvoiceVerification:verificationDetails"
+        permsButton3="insuranceSettlementManagement:settlementInvoiceVerification:verification"
         :data="pageResult"
         :columns="columns"
         @findPage="findPage"

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

@@ -63,9 +63,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-button type="primary" size="small" @click="onSubmit"
-          >查询</el-button
-        >
+        <kt-button label="查询" size="small" type="primary" perms="insuranceSettlementManagement:insuranceExpenseList:query" @click="onSubmit"/>
       </el-form>
     </div>
     <el-main ref="elMain" style="padding: 0px">
@@ -76,9 +74,7 @@
         :showBatchDelete="false"
         :showBatchSettled="false"
         :showBatchPrint="false"
-        permsButton1="sys:user:edit"
-        permsButton2="sys:user:edit"
-        permsButton3="sys:user:edit"
+        permsButton1="insuranceSettlementManagement:insuranceExpenseList:details"
         :data="pageResult"
         :columns="columns"
         @findPage="findPage"