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

src/views/FinancialManagement/AcountWithdrawal/AcountBalance.vue

@@ -30,11 +30,11 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item>
-              <el-button size="small" @click="queryBalance">查询</el-button>
-            </el-form-item>
-          </el-col>
+          <el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="queryBalance" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </el-col>
         </el-row>
       </el-form>
     </div>

src/views/FinancialManagement/AcountWithdrawal/ExtendFee.vue

@@ -92,7 +92,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item>
-              <el-button @click="queryEsmInfo" size="small">查询</el-button>
+              <el-button @click="queryEsmInfo" type="primary" size="small" >查询</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -220,8 +220,13 @@ export default {
     },
     //-- formatter end--
     dateChange(e){
+      if (e == null) {
+          this.pageRequest.columnFilters.startdate.value = ''
+          this.pageRequest.columnFilters.enddate.value = ''
+        } else {
       this.pageRequest.columnFilters.startdate.value=e[0];
       this.pageRequest.columnFilters.enddate.value=e[1];
+        }
     },
     //--数据字典 begin --
     getDictItems: function (typeName) {

src/views/FinancialManagement/AcountWithdrawal/ExtendWithdrawalnotpay.vue

@@ -12,10 +12,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item>
-              <el-button @click="findPage" size="small">查询</el-button>
-            </el-form-item>
-          </el-col>
+          <el-form-item label-width="20px">
+            <el-button @click="findPage" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </el-col>
         </el-row>
       </el-form>
 

src/views/FinancialManagement/AcountWithdrawal/ExtendWithdrawalpaid.vue

@@ -11,10 +11,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item>
-              <el-button @click="findPage" size="small">查询</el-button>
-            </el-form-item>
-          </el-col>
+          <el-form-item label-width="20px">
+            <el-button @click="findPage" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </el-col>
         </el-row>
        </el-form>
 

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

@@ -34,17 +34,21 @@
 					  </el-select>
 				  </el-form-item>
 				</el-col>
-		        <el-col :span="12" style="height: 40px;">
+		        <el-col :span="6" style="height: 40px;">
 		          <el-form-item label="承保时间">
 		            <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
 		          </el-form-item>
 		        </el-col>
-		  
-		        <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+				<el-col :span="4">
+					<el-form-item label-width="20px">
+						<el-button @click="queryEsmInfo" type="primary">查询</el-button>
+					</el-form-item>
+				</el-col>
+		        <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
 		          <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
 		              <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
 		          </div>
-		        </el-col>
+		        </el-col> -->
 		      </el-row>
 		    </el-form>
 		  </div>

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

@@ -9,13 +9,7 @@
         label-width="90px"
       >
         <el-row>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="保险公司:">
               <el-select
                 v-model="pageRequest.companyId"
@@ -32,13 +26,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="机构:">
               <el-cascader
                 class="widths"
@@ -55,13 +43,7 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="结算月份:">
               <el-date-picker
                 class="widths"
@@ -75,13 +57,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="结算单号:">
               <el-input
                 v-model="pageRequest.settleno"
@@ -91,13 +67,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="结算状态:">
               <el-select
                 class="widths"
@@ -111,14 +81,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="4"
-            :offset="2"
-          >
+          <el-col :span="3">
             <el-button type="primary" size="small" @click="onSubmit"
               >查询</el-button
             >

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

@@ -6,16 +6,10 @@
         :model="pageRequest"
         class="demo-form-inline flex a-start u-f-sa"
         size="small"
-        label-width="90px"
+        label-width="80px"
       >
         <el-row>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="保险公司:">
               <el-select
                 v-model="pageRequest.companyId"
@@ -32,13 +26,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="出单时间:">
               <el-date-picker
                 class="widths"
@@ -54,13 +42,7 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="车牌号:">
               <el-input
                 v-model="pageRequest.licenseno"
@@ -70,13 +52,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6">
             <el-form-item label="协议号:">
               <el-input
                 v-model="pageRequest.agreementId"

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

@@ -23,28 +23,33 @@
                   </el-select>
               </el-form-item>
             </el-col>
-      				<el-col :span="6" style="height: 40px;">
-      				  <el-form-item label="投保险种">
-      					<el-select v-model="queryForm.riskCode" placeholder="请选择" style="width: 100%;" clearable>
-      						<el-option label="单交强" value="单交强"></el-option>
-      						<el-option label="单商业" value="单商业"></el-option>
-      						<el-option label="单三者" value="单三者"></el-option>
-      						<el-option label="交强+商业" value="交强+商业"></el-option>
-      						<el-option label="交强+三者" value="交强+三者"></el-option>
-      					  </el-select>
-      				  </el-form-item>
-      				</el-col>
-            <el-col :span="12" style="height: 40px;">
+			<el-col :span="6" style="height: 40px;">
+				<el-form-item label="投保险种">
+				<el-select v-model="queryForm.riskCode" placeholder="请选择" style="width: 100%;" clearable>
+					<el-option label="单交强" value="单交强"></el-option>
+					<el-option label="单商业" value="单商业"></el-option>
+					<el-option label="单三者" value="单三者"></el-option>
+					<el-option label="交强+商业" value="交强+商业"></el-option>
+					<el-option label="交强+三者" value="交强+三者"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+            <el-col :span="6" style="height: 40px;">
               <el-form-item label="承保时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
       
-            <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+            <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
               </div>
-            </el-col>
+            </el-col> -->
+			<el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="queryEsmInfo" type="primary" size="mini">查询</el-button>
+          </el-form-item>
+        </el-col>
           </el-row>
         </el-form>
       </div>

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

@@ -23,28 +23,33 @@
                   </el-select>
               </el-form-item>
             </el-col>
-      				<el-col :span="6" style="height: 40px;">
-      				  <el-form-item label="投保险种">
-      					<el-select v-model="queryForm.riskCode" placeholder="请选择" style="width: 100%;" clearable>
-      						<el-option label="单交强" value="单交强"></el-option>
-      						<el-option label="单商业" value="单商业"></el-option>
-      						<el-option label="单三者" value="单三者"></el-option>
-      						<el-option label="交强+商业" value="交强+商业"></el-option>
-      						<el-option label="交强+三者" value="交强+三者"></el-option>
-      					  </el-select>
-      				  </el-form-item>
-      				</el-col>
-            <el-col :span="12" style="height: 40px;">
+			<el-col :span="6" style="height: 40px;">
+				<el-form-item label="投保险种">
+				<el-select v-model="queryForm.riskCode" placeholder="请选择" style="width: 100%;" clearable>
+					<el-option label="单交强" value="单交强"></el-option>
+					<el-option label="单商业" value="单商业"></el-option>
+					<el-option label="单三者" value="单三者"></el-option>
+					<el-option label="交强+商业" value="交强+商业"></el-option>
+					<el-option label="交强+三者" value="交强+三者"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+            <el-col :span="6" style="height: 40px;">
               <el-form-item label="承保时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
       
-            <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+            <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
               </div>
-            </el-col>
+            </el-col> -->
+			<el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="queryEsmInfo" type="primary" size="mini">查询</el-button>
+          </el-form-item>
+        </el-col>
           </el-row>
         </el-form>
       </div>

src/views/FinancialManagement/CarInsurance/DeptSettlement/CommissionList.vue

@@ -124,7 +124,7 @@
           </el-col>
         <el-col :span="4">
           <el-form-item label-width="20px">
-            <el-button @click="getOrderList" size="small">查询</el-button>
+            <el-button @click="getOrderList" type="primary" size="small">查询</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -134,6 +134,7 @@
       permsDelete="sys:user:delete"
       :showBatchDelete="false"
       :showBatchPrint="true"
+      
       permsButton3="sys:user:edit"
       :data="pageResult"
       :columns="columns"
@@ -311,8 +312,13 @@ export default {
       this.findPage();
     },
     dateChange(e){
-      this.pageRequest.columnFilters.startdate.value=e[0];
-      this.pageRequest.columnFilters.enddate.value=e[1];
+      if (e == null) {
+        this.pageRequest.columnFilters.startdate.value = ''
+        this.pageRequest.columnFilters.enddate.value = ''
+      } else {
+        this.pageRequest.columnFilters.startdate.value=e[0];
+        this.pageRequest.columnFilters.enddate.value=e[1];
+      }
     },
     //确认是否关闭对话框
     handleClose(done) {
@@ -322,12 +328,10 @@ export default {
         })
         .catch((_) => {});
     },
-
     openVisible() {
       this.deptAccount();
       this.dialogVisible = true;
     },
-
     closeVisible() {
       this.withdrawal = "";
     },
@@ -342,7 +346,6 @@ export default {
           this.deptAccount();
         }
       });
-
       this.dialogVisible = false;
     },
     // 机构账户余额查询

src/views/FinancialManagement/CarInsurance/DeptSettlement/SettledCommissionList.vue

@@ -12,10 +12,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item>
-              <el-button @click="findPage" size="small">查询</el-button>
-            </el-form-item>
-          </el-col>
+          <el-form-item label-width="20px">
+            <el-button @click="findPage" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </el-col>
         </el-row>
       </el-form>
 

src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionList.vue

@@ -12,10 +12,15 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="findPage" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </el-col>
+          <!-- <el-col :span="4">
             <el-form-item>
               <el-button @click="findPage" size="small">查询</el-button>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
 

src/views/FinancialManagement/CarInsurance/DeptSettlement/UnsettledCommissionListExamine.vue

@@ -12,10 +12,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item>
-              <el-button @click="findPage" size="small">查询</el-button>
-            </el-form-item>
-          </el-col>
+          <el-form-item label-width="20px">
+            <el-button @click="findPage" type="primary" size="small">查询</el-button>
+          </el-form-item>
+        </el-col>
         </el-row>
       </el-form>
 

src/views/FinancialManagement/CarInsurance/PersonSettlement/CommissionList.vue

@@ -38,13 +38,6 @@
                   </el-select>
               </el-form-item>
             </el-col>
-
-            <!-- <el-col :span="12" style="height: 40px;">
-              <el-form-item label="出单时间">
-                <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
-              </el-form-item>
-            </el-col> -->
-			
 			<el-col :span="6" style="height: 40px;">
               <el-form-item label="结算状态">
                 <el-select v-model="queryForm.settlestatus" placeholder="请选择" style="width: 100%;" clearable>
@@ -55,20 +48,21 @@
             </el-col>
 			<el-col :span="6" style="height: 40px;">
               <el-form-item label="签单时间">
-                <el-date-picker v-model="queryForm.signDate" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
+                <el-date-picker v-model="queryForm.signDate" style="width:100%"   type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="u-f u-f-je" style="height:40px;">
-              <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
+            <el-col :span="24"  style="height:40px;">
+				<el-button @click="queryEsmInfo" type="primary" size="small" >查询</el-button>
+              <!-- <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
-              </div>
+              </div> -->
             </el-col>
           </el-row>
         </el-form>
       </div>
       <kt-common-table  permsDelete="sys:user:delete" :showOperation="false" :showBatchDelete="false" :showBatchSettled="true" :showBatchPrint="true" permsButton1="sys:user:edit" permsButton2="sys:user:edit" permsButton3="sys:user:edit" :data="pageResult" :columns="columns" @findPage="findPage" @handleSettled="handleTableSettled" @handlePrint="handlePrint">
         </kt-common-table>
-		</el-main>
+		</el-main>	
 
     <!-- 对话框 -->
     <el-dialog title="注释" v-dialogDrag :visible.sync="dialogVisible" width="800px" @close="closeDialog">
@@ -78,7 +72,7 @@
               <el-form-item label="订单号">
                 {{dataForm.ordernos}}
               </el-form-item>
-            </el-col>
+            </el-col> 
           </el-row>
           <el-row>
             <el-col :span="8">
@@ -1260,7 +1254,6 @@ export default {
       return (row.feeamount + row.disamount).toFixed(2);
     },
     //-- formatter end--
-
     queryEsmInfo() {
       if (this.queryForm.signDate != null) {
         var startdate = formatWithSeperator(
@@ -1303,6 +1296,7 @@ export default {
           that[typeName + "options"] = [];
         });
     },
+	
     //--数据字典 end --
 
     // 右侧列表的方法Start

src/views/FinancialManagement/CarInsurance/PersonSettlement/SettledCommissionList.vue

@@ -44,17 +44,22 @@
       					  </el-select>
       				  </el-form-item>
       				</el-col>
-            <el-col :span="12" style="height: 40px;">
+            <el-col :span="6" style="height: 40px;">
               <el-form-item label="承保时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
       
-            <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+            <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
               </div>
-            </el-col>
+            </el-col> -->
+			<el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="queryEsmInfo" type="primary" >查询</el-button>
+          </el-form-item>
+        </el-col>
           </el-row>
         </el-form>
       </div>

src/views/FinancialManagement/CarInsurance/PersonSettlement/UnsettledCommissionList.vue

@@ -33,27 +33,31 @@
                   </el-select>
               </el-form-item>
             </el-col>
-      				<el-col :span="6" style="height: 40px;">
-      				  <el-form-item label="投保险种">
-      					<el-select v-model="queryForm.riskCode" placeholder="请选择" style="width: 100%;" clearable>
-      						<el-option label="单交强" value="单交强"></el-option>
-      						<el-option label="单商业" value="单商业"></el-option>
-      						<el-option label="单三者" value="单三者"></el-option>
-      						<el-option label="交强+商业" value="交强+商业"></el-option>
-      						<el-option label="交强+三者" value="交强+三者"></el-option>
-      					  </el-select>
-      				  </el-form-item>
-      				</el-col>
-            <el-col :span="12" style="height: 40px;">
+			<el-col :span="6" style="height: 40px;">
+				<el-form-item label="投保险种">
+				<el-select v-model="queryForm.riskCode" placeholder="请选择" style="width: 100%;" clearable>
+					<el-option label="单交强" value="单交强"></el-option>
+					<el-option label="单商业" value="单商业"></el-option>
+					<el-option label="单三者" value="单三者"></el-option>
+					<el-option label="交强+商业" value="交强+商业"></el-option>
+					<el-option label="交强+三者" value="交强+三者"></el-option>
+					</el-select>
+				</el-form-item>
+			</el-col>
+            <el-col :span="6" style="height: 40px;">
               <el-form-item label="承保时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
-      
-            <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+			<el-col :span="4">
+				<el-form-item label-width="20px">
+					<el-button @click="queryEsmInfo" type="primary">查询</el-button>
+				</el-form-item>
+			</el-col>
+            <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
-              </div>
+              </div> -->
             </el-col>
           </el-row>
         </el-form>

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

@@ -34,17 +34,22 @@
       					  </el-select>
       				  </el-form-item>
       				</el-col>
-            <el-col :span="12" style="height: 40px;">
+            <el-col :span="6" style="height: 40px;">
               <el-form-item label="承保时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
       
-            <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+            <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
               </div>
-            </el-col>
+            </el-col> -->
+			<el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="queryEsmInfo" type="primary">查询</el-button>
+          </el-form-item>
+        </el-col>
           </el-row>
         </el-form>
       </div>

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

@@ -34,17 +34,22 @@
       					  </el-select>
       				  </el-form-item>
       				</el-col>
-            <el-col :span="12" style="height: 40px;">
+            <el-col :span="6" style="height: 40px;">
               <el-form-item label="承保时间">
                 <el-date-picker v-model="queryForm.date" style="width:100%"  type="daterange" align="left" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
               </el-form-item>
             </el-col>
       
-            <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
+            <!-- <el-col :span="24" class="u-f u-f-je" style="height: 40px;">
               <div class="u-f" style="margin-bottom: 20px; width: 60px;height: 32px; border-radius: 5px;overflow: hidden;" @click="queryEsmInfo" >
                   <div class="u-f u-f1 u-f-ajc" style="background: #409EFF;color:#fff">查询</div>
               </div>
-            </el-col>
+            </el-col> -->
+			<el-col :span="4">
+          <el-form-item label-width="20px">
+            <el-button @click="queryEsmInfo" type="primary" >查询</el-button>
+          </el-form-item>
+        </el-col>
           </el-row>
         </el-form>
       </div>

src/views/FinancialManagement/ExpenseManagement/ExpenseComponent.vue

@@ -390,7 +390,6 @@ export default {
         businessQuality: "0", //营业性质
         establishTime: "", //成立日期
         invoicingAmount: 0, //开票额度
-        // invoicingAmountExcess:0,//剩余开票额度
         juridicalPerson: "", //法人
         owned: "", //所属地
         accountQuality: "", //账户性质
@@ -427,29 +426,6 @@ export default {
         accountName: [
           { required: true, message: "户名不能为空", trigger: "blur" },
         ],
-        // businessQuality: [
-        //   { required: true, message: "请选择营业性质", trigger: "change" },
-        // ],
-        // owned: [
-        //   { required: true, message: "所属地不能为空", trigger: "change" },
-        // ],
-        // juridicalPerson: [
-        //   { required: true, message: "法人不能为空", trigger: "change" },
-        // ],
-        // establishTime: [
-        //   {
-        //     required: true,
-        //     message: "请选择成立日期",
-        //     trigger: "change",
-        //   },
-        // ],
-        // biller: [
-        //   {
-        //     required: true,
-        //     message: "开票员不能为空",
-        //     trigger: "blur",
-        //   },
-        // ],
       },
       interiorRules: {
         //卡表单规则
@@ -493,18 +469,14 @@ export default {
   },
   mounted() {},
   methods: {
-    addYear() {
-      this.$emit("addYear");
-    },
-    removeYear() {
-      this.$emit("removeYear");
-    },
+    //账户类别change事件
     outChange(e) {
       this.$nextTick(() => {
         this.$refs.formData.clearValidate();
       });
       this.$emit("outChange", e);
     },
+    //证书有效期change事件
     setDateInterval(e) {
       this.$emit("setDateInterval", e);
     },

src/views/FinancialManagement/ExpenseManagement/ExpenseManagement.vue

@@ -14,20 +14,6 @@
             <el-option label="外部账户" value="1"></el-option>
           </el-select>
         </el-form-item>
-        <!-- <el-form-item label="账户性质" label-width="95px" prop="accountQuality">
-          <el-select
-            v-model="queryFrom.accountQuality"
-            placeholder="请选择账户性质"
-            clearable
-          >
-            <el-option
-              v-for="item in account_qualityData"
-              :key="item.value + 'aa'"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item label="户名" label-width="95px" prop="invCompanyName">
           <el-input
             v-model="queryFrom.accountName"
@@ -439,7 +425,7 @@ export default {
   mounted() {},
   data() {
     return {
-      type: 1, //1为账户信息，2为卡信息
+      type: 1, //1为账户信息，2为卡信息 账户和卡判断条件
       /**
        * 账户收入模块
        */
@@ -447,8 +433,7 @@ export default {
       collectionData: [], //收入  转账方下拉菜单数组
       fundFlowData: [], //资金用途字典数据
       payment_methodsData: [], //收入  支付方式字典数据
-      inComeFormData: {
-        //收入form表单
+      inComeFormData: {//收入form表单
         collectionMessage: "", //收款名字
         fundFlow: "", //资金流向
         applyAmount: "", //金额
@@ -457,8 +442,7 @@ export default {
         payMethod: [], //转账方
         fundUse: "", //资金用途
       },
-      inComeFormRules: {
-        //收入规则
+      inComeFormRules: {//收入规则
         company: [
           { required: true, message: "转账方不能为空", trigger: "change" },
         ],
@@ -476,9 +460,7 @@ export default {
       operationWidth: 200, //操作列宽度
       account_qualityData: [], //账户性质数据字典
       nature_businessData: [], //营业性质数据字典
-      queryFrom: {
-        //查询条件
-        // accountQuality: "", //账户性质查询
+      queryFrom: {//查询条件
         bankCardNum: "", //银行卡号查询
         accountName: "", //户名查询
       },
@@ -487,12 +469,11 @@ export default {
       button2Name: "收入",
       expendButton1Name: "确认已转账",
       formDataId: "", //数据Id
-      pageRequest: {
-        // 列表查询条件
+      pageRequest: {// 列表查询条件
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
       },
-      // 数据列
+      // 账户表格数据列
       columns: [
         {
           prop: "outerFlagName",
@@ -567,8 +548,7 @@ export default {
           sortable: false,
         },
       ],
-      //子部数据列
-      childColums: [
+      childColums: [//卡表格数据列
         {
           prop: "accountQualityName",
           label: "账户性质",
@@ -581,14 +561,24 @@ export default {
           minWidth: 170,
           sortable: false,
         },
-        { prop: "bank", label: "开户行", minWidth: 300, sortable: false },
+        { 
+         prop: "bank",
+         label: "开户行", 
+         minWidth: 300, 
+         sortable: false 
+        },
         {
           prop: "bankName",
           label: "开户行名称",
           minWidth: 300,
           sortable: false,
         },
-        { prop: "bankNum", label: "开户行号", minWidth: 150, sortable: false },
+        { 
+          prop: "bankNum",
+          label: "开户行号",
+          minWidth: 150,
+          sortable: false
+        },
         {
           prop: "balance",
           label: "余额",
@@ -619,12 +609,6 @@ export default {
           minWidth: 120,
           sortable: false,
         },
-        {
-          prop: "insuranceProfit",
-          label: "保险公司回款",
-          minWidth: 120,
-          sortable: false,
-        },
         {
           prop: "priDayLines",
           label: "对私单日限额",
@@ -699,7 +683,6 @@ export default {
         businessQuality: "", //营业性质
         establishTime: "", //成立日期
         invoicingAmount: 0, //开票额度
-        // invoicingAmountExcess:0,//剩余开票额度
         juridicalPerson: "", //法人
         owned: "", //所属地
         biller: "", //开票员
@@ -717,7 +700,6 @@ export default {
         dayStrokeNum: 0, //单日转账笔数限制
         dayStrokeNumExcess: 0, //单日转账笔数剩余
         fiscalProfit: 0, //	财务公司利润
-        insuranceProfit: 0, //保险公司回款
         priDayLines: 0, //对私单日限额
         priDayLinesExcess: 0, //对私单日限额剩余
         priSingleLines: 0, //对私单笔限额
@@ -733,8 +715,7 @@ export default {
       /**
        * 支出模块
        */
-      expendColumns: [
-        // 支出数据列
+      expendColumns: [//支出表格数据列
         {
           prop: "company",
           label: "转账方",
@@ -766,8 +747,7 @@ export default {
           sortable: false,
         },
       ],
-      expendPageResult: {
-        //支出表格参数
+      expendPageResult: {//支出表格参数
         pageNo: 1,
         pageSize: 10,
       },
@@ -918,7 +898,7 @@ export default {
       this.$api.expense.getAccountByAccountName().then((res) => {
         if (res.code == 200) {
           let arr = [];
-          /**获取所有外部用户 */
+          /**获取所有用户信息 */
           // let outArr = res.data.filter((item) => item.outerFlag == 1);
           res.data.forEach((item) => {
             if (item.invAccountCardList != null) {
@@ -1035,7 +1015,7 @@ export default {
           this.expendPageResult = {
             content: res.data.records,
             pageNum: res.data.current,
-            pageSize: res.data.size,
+            pageSize: res.data.size, 
             totalPages: res.data.pages,
             totalSize: res.data.total,
           };
@@ -1118,7 +1098,6 @@ export default {
     //数据字典
     business(typeName) {
       this.$api.dict.findByLableName(typeName).then((res) => {
-        // this.account_qualityData = res.data;
         this[typeName + "Data"] = res.data;
         if (typeName == "account_quality" && this.accountData.length == 0) {
           this.findPage();
@@ -1196,14 +1175,14 @@ export default {
     resetForm() {
       this.dialogFormVisible = false;
       this.formDataId = "";
-      if (this.type == 1) {
+      //账户信息form值清空
+      if (this.type == 1) { 
         this.accountFormData = {
           outerFlag: "0", //账户类别
           accountName: "", //户名
           businessQuality: "", //营业性质
           establishTime: "", //成立日期
           invoicingAmount: 0, //开票额度
-          // invoicingAmountExcess:0,//剩余开票额度
           juridicalPerson: "", //法人
           owned: "", //所属地
           tentativeEstimates: "", //暂估值

src/views/FinancialManagement/ExpenseManagement/PaymentManagement.vue

@@ -496,7 +496,7 @@ export default {
       pageRequest: {
         // 列表查询条件
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 20,
         invoiceTime: "", //开票日期
         invoiceBy: "", //开票方
         biller: "", //开票员
@@ -1028,7 +1028,7 @@ export default {
     // 查询
     queryStaffInfo() {
       this.pageRequest.pageNo = 1;
-      this.pageRequest.pageSize = 10;
+      this.pageRequest.pageSize = 20;
       this.findPage();
     },
   },

src/views/FinancialManagement/ExpenseManagement/Profit.vue

@@ -122,7 +122,6 @@ export default {
   name: "ExpenseMessage",
   components: { KtCommonTable, KtButton },
   created() {
-    // this.business();
   },
   mounted() {
     this.findPage();

src/views/FinancialManagement/ReconciliationSystem/ReceivablePayableCollection/ChannelAccount.vue

@@ -8,13 +8,7 @@
         label-width="120px"
       >
         <el-row>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6" >
             <el-form-item label="组员：">
               <el-input
                 v-model="pageRequest.member"
@@ -24,13 +18,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6" >
             <el-form-item label="收款人名称：">
               <el-input
                 v-model="pageRequest.payee"
@@ -40,13 +28,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6" >
             <el-form-item label="渠道名称：">
               <el-input
                 v-model="pageRequest.channelName"
@@ -56,13 +38,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col
-            :xs="xscell"
-            :sm="smcell"
-            :md="mdcell"
-            :lg="lgcell"
-            :xl="xlcell"
-          >
+          <el-col :span="6" >
           <el-button type="primary" size="small" @click="Search"
               >查询</el-button
             >

src/views/Letter/Letter.vue

@@ -1563,7 +1563,6 @@
                   :data="anshengInsuranceData1"
                   border
                   v-if="anshengInsurancetype"
-                  @row-click="ASDrivingChange"
                   ref="RsTable"
                   highlight-current-row
                   :header-cell-style="{ background: '#F2F7FC', fontWeight: '700', color: '#ee7000' }"
@@ -5689,17 +5688,6 @@ else{
     RSDrivingChange(row){
       this.renshouaccidentalDrivingVo=row;
     },
-    //安盛驾意险选择
-    ASDrivingChange(row){
-      if(this.AStemplateSelection==row.productCode){
-        this.AStemplateSelection=null;
-        this.anshengaccidentalDrivingVo={};
-      }else{
-        this.AStemplateSelection=row.productCode;
-        this.anshengaccidentalDrivingVo.productCode=row.productCode;
-        this.anshengaccidentalDrivingVo.productName=row.productName;
-      }
-    },
     //众安驾意险选择
     ZADrivingChange(row){
       this.zhonganaccidentalDrivingVo=row;
@@ -5710,8 +5698,11 @@ else{
     HBDrivingRadio(row){
       this.HBDrivingChange(row)
     },
+    //安盛驾意险选择
     ASDrivingRadio(row){
-      this.ASDrivingChange(row)
+      this.AStemplateSelection=row.productCode;
+      this.anshengaccidentalDrivingVo.productCode=row.productCode;
+      this.anshengaccidentalDrivingVo.productName=row.productName;
     },
     ZADrivingRadio(row){
       this.ZADrivingChange(row)
@@ -5729,8 +5720,8 @@ else{
             val.clauseName=val.clauses
             val.clauseContent=val.clausesContext
           })
-            this.zijinengageListData = res.data;
-          });
+          this.zijinengageListData = res.data;
+        });
     },
     //紫金特约选择
     zijinengageChange(select, row) {