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

src/views/receivable/documentary/ticket.vue

@@ -12,8 +12,9 @@
           <el-select v-model="item.name" style="margin-right: 20px; width: 220px" disabled>
             <el-option value="companyId" label="保险公司"></el-option>
             <el-option value="signYear" label="年份"></el-option>
+            <el-option value="signDate" label="月份"></el-option>
           </el-select>
-          <el-select v-model="item.type" v-if="item.name != 'signDate'" style="margin-right: 20px; width: 150px"
+          <el-select v-model="item.type"  style="margin-right: 20px; width: 150px"
             @change="val => signDateSelectChange(index, val)">
             <el-option value="等于" label="等于"></el-option>
             <el-option value="包含" label="包含"></el-option>
@@ -28,12 +29,15 @@
           <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 == 'signDate'" style="width: 350px" format="YYYY-MM" value-format="YYYY-MM"
+            v-model="item.search" type="month" range-separator="-" :disabled="item.type == '为空'"
+            @change="handlePtlAgreementChange(index, $event)" />
         </div>
         <el-button type="primary" class="w-88px" @click="initData">搜索</el-button>
 
       </div>
     </div>
-    <el-table :data="tableData" ref="tableRef" style="height: calc(100% - 160px)" @select="handleSelection"
+    <el-table :data="tableData" ref="tableRef" style="height: calc(100% - 200px)" @select="handleSelection"
       @select-all="handleSelectAll">
       <el-table-column type="selection" width="50" fixed="left" :selectable="selectable"></el-table-column>
       <el-table-column prop="partnerCompanyName" label="保险公司"></el-table-column>
@@ -243,6 +247,11 @@ let searchList = ref([
     name: 'signYear',
     type: '等于',
     search: ''
+  },
+  {
+    name: 'signDate',
+    type: '等于',
+    search: ''
   }
 ])
 const datesearch = ref('')