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

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

@@ -52,6 +52,14 @@
               <el-input v-model="formDataList.syOtherCostsProportion" class="inputType"></el-input>
             </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="协议选择">
+            <el-select size="small" v-model="formDataList.agreementId" placeholder="请选择协议类型" style="width: 100%" filterable>
+              <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
+                :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">

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

@@ -69,7 +69,14 @@
               <el-input v-model="formDataList.allFeeValue" class="inputType"></el-input>
             </el-form-item>
           </el-col>
-
+          <el-col :span="8">
+            <el-form-item label="协议选择">
+              <el-select size="small" v-model="formDataList.agreementId" placeholder="请选择协议类型" style="width: 100%" filterable>
+                <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
+                  :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">

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

@@ -42,6 +42,14 @@
               <el-input v-model="formDataList.otherFeerate" class="inputType"></el-input>
             </el-form-item>
         </el-col>
+        <el-col :span="20">
+          <el-form-item label="协议选择">
+            <el-select size="small" v-model="formDataList.agreementId" placeholder="请选择协议类型" style="width: 100%" filterable>
+              <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
+                :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">

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

@@ -199,6 +199,14 @@
               <el-input v-model="formDataEdit.noSuperviseCostsPremiums" size="small"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="协议选择">
+              <el-select size="small" v-model="formDataEdit.agreementId" placeholder="请选择协议类型" style="width: 100%" filterable>
+                <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
+                  :value="item.id"></el-option>
+                </el-select>
+              </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -675,7 +683,6 @@ export default {
     this.getDicType("agreementType"); //险种类型
     this.areaqueryList(1, 99, "provinceId");
     this.companyqueryList(0,'allPartnerCompaniesId');
-    this.agrmentlist();
 
     this.findPage();
     let params = {
@@ -700,6 +707,7 @@ export default {
         this.InsCompanyList = res.data;
       }
     });
+    this.agrmentlist();
   },
   methods: {
     // 编辑
@@ -707,7 +715,8 @@ export default {
       this.formDataEdit = {
         noSuperviseCostsProportion: row.noSuperviseCostsProportion,
         noSuperviseCostsPremiums: row.noSuperviseCostsPremiums,
-        id: row.id
+        id: row.id,
+        agreementId: row.agreementId
       }
       this.dialogVisibleEdit = true
     },

src/views/FinancialManagement/CarInsurance/PlatformSettlement/NonVehicleBalance.vue

@@ -135,6 +135,14 @@
               <el-input v-model="formDataList.noOtherCostsProportion" class="inputType"></el-input>
             </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="协议选择">
+            <el-select size="small" v-model="formDataList.agreementId" placeholder="请选择协议类型" style="width: 100%" filterable>
+              <el-option v-for="item in agreementTypeoptions" :key="item.dictValue" :label="item.agreementName"
+                :value="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">