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

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -1372,10 +1372,14 @@ export default {
       productHistoryRecordColumns: [
         //数据列
         { prop: "productName", label: " 产品名称", minWidth: 160 },
-        { prop: "costsDescription", label: "费用描述", minWidth: 120 },
         { prop: "modifierName", label: "操作人", minWidth: 120 },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
         { prop: "operatorType", label: "操作类型", minWidth: 120, formatter: this.operatorTypeFormatter },
+        { prop: "costsDescription", label: "费用描述", minWidth: 120 },
+        { prop: "costsAttrLinks", label: "费用因子描述", minWidth: 680 },
+        { prop: "costsStartDate", label: "费用起期", minWidth: 180 },
+        { prop: "costsEndDate", label: "费用止期", minWidth: 180 },
+        { prop: "priorityLevel", label: "方案优先级", minWidth: 180 },
         {
           prop: "jqCarCostsProportion",
           label: "费用比例（交强）",
@@ -1496,10 +1500,7 @@ export default {
           label: "非车出口比例五级",
           minWidth: 160,
         },
-        { prop: "costsAttrLinks", label: "费用因子描述", minWidth: 680 },
-        { prop: "costsStartDate", label: "费用起期", minWidth: 180 },
-        { prop: "costsEndDate", label: "费用止期", minWidth: 180 },
-        { prop: "priorityLevel", label: "方案优先级", minWidth: 180 },
+
       ],
       productColumns: [
         //数据列
@@ -2283,6 +2284,7 @@ export default {
     productUpdateChange(e) {
       let name = this.productsTypeoptions.find(item => item.dictValue == e).dictTag;
       this.productUpdateObj.productName=name;
+      this.productCostForm.productName=[name];
     },
     accidentAddRule() {
       this.nonVehicleRuledialogVisible = true;
@@ -2534,10 +2536,12 @@ export default {
             }
             return val;
           })
-          this.$nextTick(() => {
             this.dynamicFormArray = obj.costsAttrLinkList;
             this.productCostForm = obj;
-          });
+            // this.productUpdateObj.productId= this.productCostForm.productId;
+          // this.productUpdateObj.productName= this.productCostForm.productName;
+          this.productCostForm.productId = [this.productCostForm.productId]
+          this.productCostForm.productName = [this.productCostForm.productName]
           this.productHistoryDetailsDialogVisible = true;
         } else {
           this.$message({