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

src/components/Form/ProductCostForm.vue

@@ -58,10 +58,14 @@
                 @change="checkboxChange($event, formItems.id, 'min')">
                 <el-checkbox v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.name"></el-checkbox>
               </el-checkbox-group>
-              <el-radio-group v-if="formItems.attrType == 'radio'" v-model="formItems.min">
-                <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
-                }}</el-radio-button>
-              </el-radio-group>
+              <div class="flex " v-if="formItems.attrType == 'radio'">
+                <el-radio-group v-model="formItems.min">
+                  <el-radio-button v-for="dict in formItems.dictLabal" :key="dict.id" :label="dict.code">{{ dict.name
+                  }}</el-radio-button>
+                </el-radio-group>
+                <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
+                  @click="radiouncheck(formItems)">取消选择</el-button>
+              </div>
             </el-form-item>
           </el-col>
         </div>
@@ -438,6 +442,10 @@ export default {
     }
   },
   methods: {
+    radiouncheck(data) {
+      data.min=null;
+    },
+    //车牌全选
     LicenseNoCheckedChange(value, name, prop) {
       let carPlateCollection = this.localForm.myArray.find(val => val.attrCode == name);
       carPlateCollection.minArray = [];

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -431,7 +431,7 @@
           <el-button type="success" @click="expenseCopy">费用复制</el-button>
         </el-form-item>
       </el-form>
-      <kt-common-table :tableHeights="680" :SerialShow="false" :operationWidth="250" :showOperation="true"
+      <kt-common-table :tableHeights="600" :SerialShow="false" :operationWidth="250" :showOperation="true"
         :showBatchDelete="true" :showBatchSettled="false" :showBatchPrint="false" :data="productPageResult"
         :columns="productColumns" @findPage="productCostFindPage" button2Name="编辑"
         permsButton2="agreement:input:productCost" @handleButton2="productUpdate" deleteName="批量修改"