Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/index.vue

@@ -468,13 +468,18 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="审核人">
+                <el-input v-model="firstForm.auditUser" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="驳回时间">
                 <el-date-picker v-model="firstForm.auditTime" type="daterange" range-separator="至"
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
-            <el-col :span="isTrue ? 16 : 8" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="24" style="display: flex;align-items: flex-start; justify-content: flex-end">
               <el-button plain @click="handleExport('2')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -487,8 +492,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" :height="tableHeight"
-          style="width: 100%; margin-top: 20px;" highlight-current-row>
+        <el-table :data="thirdData" :height="tableHeight" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120"></el-table-column>
           <el-table-column prop="mobile" label="业务员手机号" width="120"></el-table-column>
@@ -502,6 +506,7 @@
           <el-table-column prop="auditTime" label="驳回时间" width="120"></el-table-column>
           <el-table-column prop="signingTime" label="签单时间" width="120"></el-table-column>
           <el-table-column prop="payTime" label="支付时间" width="120"></el-table-column>
+          <el-table-column prop="auditUser" label="审核人" width="120"></el-table-column>
           <el-table-column prop="quotationTime" label="报价时间" width="120"></el-table-column>
           <el-table-column label="操作" fixed="right" width="300">
             <template #default="scope">
@@ -574,6 +579,11 @@
                   start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD" value-format="YYYY-MM-DD" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="审核人">
+                <el-input v-model="firstForm.auditUser" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="疑问时间">
                 <el-date-picker v-model="firstForm.problemTime" type="daterange" range-separator="至"
@@ -603,7 +613,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :span="isTrue ? 16 : 8" style="display: flex;align-items: flex-start; justify-content: flex-end">
+            <el-col :span="24" style="display: flex;align-items: flex-start; justify-content: flex-end">
               <el-button plain @click="handleExport('3')">数据导出</el-button>
               <el-button type="primary" @click="handleSearch">搜索</el-button>
               <el-button plain @click="handleReset">重置</el-button>
@@ -616,8 +626,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="forthData" :height="tableHeight" style="width: 100%; margin-top: 20px;"
-          highlight-current-row>
+        <el-table :data="forthData" :height="tableHeight" style="width: 100%; margin-top: 20px;" highlight-current-row>
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="attrType" label="业务员类型" width="120">
           </el-table-column>

src/views/receivable/handingFee/ticket.vue

@@ -15,6 +15,7 @@
             <el-option value="ptlAgreement" label="出单协议"></el-option>
             <el-option value="orderType" label="订单类型"></el-option>
             <el-option value="signYear" label="签单年份"></el-option>
+            <el-option value="signMonth" label="签单月份"></el-option>
             <el-option value="licenseNo" label="车牌号"></el-option>
             <el-option value="jqPolicyNo" label="交强险保单号"></el-option>
             <el-option value="syPolicyNo" label="商业险保单号"></el-option>
@@ -53,9 +54,12 @@
             <el-option value="2" label="代客录单"></el-option>
             <el-option value="3" label="补录订单"></el-option>
           </el-select>
-          <el-date-picker v-if="item.name == 'signYear'" style="width: 350px" format="YYYY" value-format="YYYY"
+          <el-date-picker v-if="item.name == 'signYear' " style="width: 350px" format="YYYY" value-format="YYYY"
             v-model="yearrangesearch" type="yearrange" range-separator="-" :disabled="item.type == '为空'"
             @change="handlePtlAgreementChange(index, $event)" />
+             <el-date-picker v-if="item.name == 'signMonth'" style="width: 350px" format="YYYY-MM" value-format="YYYY-MM"
+            v-model="monthrangesearch" type="monthrange" range-separator="-" :disabled="item.type == '为空'"
+            @change="handlePtlAgreementChange(index, $event)" />
           <el-input v-if="item.name == 'licenseNo' || item.name == 'jqPolicyNo' || item.name == 'syPolicyNo' || item.name == 'jyPolicyNo'"
             placeholder="请输入" style="width: 350px" v-model="item.search" />
         </div>
@@ -68,7 +72,7 @@
       <p>应收明细</p>
       <el-button type="primary" @click="addTicket">添加应收</el-button>
     </div>
-    <el-table :data="tableData" style="height: calc(100% - 300px)" show-summary
+    <el-table :data="tableData" style="height: calc(100% - 350px)" show-summary
       :summary-method="val => getSummaries(val, ['jqPremium', 'jqSuperviseCostsProportion', 'syPremium', 'sySuperviseCostsProportion', 'receivableAmount', 'receivableAmount4Car', 'receivableAmount4Other','carInsuranceSuperviseCostsPremiums','nonCarInsuranceSuperviseCostsPremiums'])">
       <template #empty>
         <div v-if="noData">暂无应收，点击<el-button link type="primary" @click="batchShow = true">导入应收</el-button></div>
@@ -288,6 +292,7 @@ const insurerContract = ref()//保险公司协议
 const multipleSearch = ref('')
 const orderTypesearch = ref('')
 const yearrangesearch = ref('')
+const monthrangesearch = ref('')
 const datesearch = ref('')
 const countShow = ref(false)
 const countForm = ref({
@@ -331,6 +336,10 @@ let searchList = ref([
     name: 'signYear',
     type: '等于',
     search: ''
+  }, {
+    name: 'signMonth',
+    type: '等于',
+    search: ''
   },
   {
     name: 'licenseNo',