ly 1 年間 前
コミット
e4f7b2e0a2

+ 22 - 13
src/views/business/housingFund/declare/index.vue

@@ -22,14 +22,7 @@
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
         <el-input
           v-model="queryParams.companyName"
@@ -37,6 +30,7 @@
           clearable
           style="width: 150px"
           @keyup.enter="handleQuery"
+          size="small" 
         />
       </el-form-item>
       <el-form-item label="所属月:">
@@ -48,6 +42,7 @@
           value-format="YYYY-MM-01"
           @change="currentMonthChange"
           :disabled-date="disabledDateHandler"
+          size="small" 
         />
       </el-form-item>
       <el-form-item label="状态:">
@@ -60,6 +55,7 @@
           :clearable="true"
           style="width: 130px"
           @clear="clearStatus"
+          
         >
           <el-option
             v-for="item in selectStatus"
@@ -69,15 +65,25 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="审核人:" prop="verifierName">
+        <el-input size="small" v-model="queryParams.verifierName" placeholder="请输入审核人" clearable style="width: 130px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item prop="dateFilter" label="审核时间:">
+        <el-date-picker size="small" v-model="queryParams.dateFilter" type="daterange" clearable
+          format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
+          end-placeholder="业务日期" style="width: 70%;"></el-date-picker>
+      </el-form-item>
       <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:funddeclare:person']">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
+        <el-button type="primary" icon="Search" @click="handleQuery" size="small" 
           >搜索</el-button
         >
-        <el-button icon="operation" @click="moreSearch = true">更多</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button icon="operation" @click="moreSearch = true" size="small" >更多</el-button>
+        <el-button icon="Refresh" @click="resetQuery" size="small" >重置</el-button>
       </el-form-item>
     </el-form>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="flag">
@@ -215,7 +221,10 @@
         align="center"
         prop="serviceName"
       />
-      <el-table-column label="操作" width="80" align="center" prop="">
+      <el-table-column label="审核人" align="center" prop="verifierName" min-width="100" />
+      <el-table-column label="审核时间" align="center" prop="verifierTime" min-width="100"
+        :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="操作" width="80" align="center" prop="">
         <template #default="scope">
           <el-button
             size="small"
@@ -229,7 +238,7 @@
             >退回</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- 分页 -->
     <pagination

+ 25 - 12
src/views/business/production/financialReportTax/index.vue

@@ -16,33 +16,42 @@
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="77px">
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item label="客户名称:">
-        <el-input v-model="queryParams.companyName" type="text" placeholder="请输入客户名称" :clearable="true"
-          style="width: 220px" />
+        <el-input v-model="queryParams.companyName" type="text"       size="small"  placeholder="请输入客户名称" :clearable="true"
+          style="width: 130px" />
       </el-form-item>
       <el-form-item label="客户标签:">
-        <el-select v-model="queryParams.customerLabelId" style="width:100%" clearable>
+        <el-select v-model="queryParams.customerLabelId"       size="small"    style="width: 130px" clearable>
           <el-option v-for="item in options" :key="item.id" :label="item.lable" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="报税所属期:" prop="year">
-        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" style="width: 120px" :clearable="false"
+      <el-form-item label="所属期:" prop="year">
+        <el-date-picker v-model="currentMonth" type="month" size="small" format="YYYY年MM月" style="width: 120px" :clearable="false"
           value-format="YYYY-MM-01" :disabled-date="disabledDateHandler" @change="monthChangeHandler" />
       </el-form-item>
       <el-form-item label="报税状态:">
-        <el-select v-model="queryParams.status" type="text" placeholder="状态" :clearable="true" style="width: 130px">
+        <el-select v-model="queryParams.status" type="text" placeholder="状态" :clearable="true" size="small" style="width: 130px">
           <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="审核人:" prop="verifierName">
+        <el-input size="small" v-model="queryParams.verifierName" placeholder="请输入审核人" clearable style="width: 130px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item prop="dateFilter" label="审核时间:">
+        <el-date-picker size="small" v-model="queryParams.dateFilter" type="daterange" clearable
+          format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
+          end-placeholder="业务日期" style="width: 70%;"></el-date-picker>
+      </el-form-item>
       <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:taxes:person']">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="operation" @click="moreSearch = true">更多</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery" size="small">搜索</el-button>
+        <el-button icon="operation" @click="moreSearch = true" size="small">更多</el-button>
+        <el-button icon="Refresh" @click="resetQuery" size="small">重置</el-button>
       </el-form-item>
     </el-form>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="flag">
@@ -72,7 +81,6 @@
         </template>
       </el-table-column>
       <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
       <el-table-column label="纳税性质" align="center" width="100" prop="taxType" />
       <el-table-column label="是否零申报" align="center" min-width="80" prop="isZero">
         <template #default="scope">
@@ -145,6 +153,11 @@
         </template>
       </el-table-column>
       <el-table-column label="执行人" align="center" min-width="100" prop="serviceName" />
+      <el-table-column label="审核人" align="center" prop="verifierName" min-width="100" />
+      <el-table-column label="审核时间" align="center" prop="verifierTime" min-width="100"
+        :show-overflow-tooltip="true" />
+        <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="150"
+        :show-overflow-tooltip="true" />
       <!-- <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button size="small" link type="primary" :disabled="

+ 27 - 17
src/views/business/production/financialReportTaxIsZero/index.vue

@@ -20,32 +20,26 @@
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form
-      class="list-search-container"
-      size="small"
-      :model="queryParams"
-      ref="queryRef"
-      :inline="true"
-      label-width="78px"
-    >
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item label="客户名称:">
         <el-input
           v-model="queryParams.companyName"
-          type="text"
+          type="text" size="small"
           placeholder="请输入客户名称"
           :clearable="true"
-          style="width: 220px"
+          style="width: 130px"
         />
       </el-form-item>
       <el-form-item label="客户标签:">
-        <el-select v-model="queryParams.customerLabelId" style="width:100%" clearable>
+        <el-select v-model="queryParams.customerLabelId"   size="small"  style="width: 130px" clearable>
           <el-option v-for="item in options" :key="item.id" :label="item.lable" :value="item.id" />
         </el-select>
       </el-form-item>
-      <el-form-item label="报税所属期:" prop="year">
+      <el-form-item label="所属期:" prop="year">
         <el-date-picker
           v-model="currentMonth"
           type="month"
+          size="small"
           format="YYYY年MM月"
           value-format="YYYY-MM-01"
           :clearable="false"
@@ -58,6 +52,7 @@
         <el-select
           v-model="queryParams.status"
           type="text"
+          size="small"
           placeholder="状态"
           :clearable="true"
           style="width: 130px"
@@ -70,16 +65,26 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="审核人:" prop="verifierName">
+        <el-input size="small" v-model="queryParams.verifierName" placeholder="请输入审核人" clearable style="width: 130px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item prop="dateFilter" label="审核时间:">
+        <el-date-picker size="small" v-model="queryParams.dateFilter" type="daterange" clearable
+          format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
+          end-placeholder="业务日期" style="width: 70%;"></el-date-picker>
+      </el-form-item>
 <!-- 
       <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:taxeszero:person']">  
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery"
+        <el-button type="primary" icon="Search" size="small"  @click="handleQuery"
           >搜索</el-button
         >
-        <el-button icon="operation" @click="moreSearch = true">更多</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button icon="operation" @click="moreSearch = true" size="small"  >更多</el-button>
+        <el-button icon="Refresh" @click="resetQuery" size="small" >重置</el-button>
       </el-form-item>
     </el-form>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="flag">
@@ -120,12 +125,12 @@
         prop="fromCompanyName"
         width="180"
       />
-      <el-table-column
+      <!-- <el-table-column
         label="税号"
         align="center"
         prop="socialCreditCode"
         width="180"
-      />
+      /> -->
       <el-table-column
         label="纳税性质"
         align="center"
@@ -226,6 +231,11 @@
         </template>
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" />
+      <el-table-column label="审核人" align="center" prop="verifierName" min-width="100" />
+      <el-table-column label="审核时间" align="center" prop="verifierTime" min-width="100"
+        :show-overflow-tooltip="true" />
+        <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="150"
+        :show-overflow-tooltip="true" />
       <!-- <el-table-column
         label="操作"
         align="center"

+ 20 - 7
src/views/business/socialSecurity/declare/index.vue

@@ -15,14 +15,13 @@
       </el-dropdown>
     </div>
     <!-- 搜索区 -->
-    <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-      label-width="78px">
+    <el-form class="list-search-container" :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+        <el-input v-model="queryParams.companyName"  size="small"  style="width: 130px" placeholder="请输入客户名称" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="所属月:">
-        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false"
+        <el-date-picker v-model="currentMonth"  size="small"  type="month" style="width: 130px" format="YYYY年MM月" :clearable="false"
           value-format="YYYY-MM-01" @change="currentMonthChange" :disabled-date="disabledDateHandler" />
       </el-form-item>
       <el-form-item label="状态:">
@@ -31,13 +30,23 @@
           <el-option v-for="item in selectStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="审核人:" prop="verifierName">
+        <el-input size="small" v-model="queryParams.verifierName" placeholder="请输入审核人" clearable style="width: 130px"
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <el-form-item prop="dateFilter" label="审核时间:">
+        <el-date-picker size="small" v-model="queryParams.dateFilter" type="daterange" clearable
+          format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
+          end-placeholder="业务日期" style="width: 70%;"></el-date-picker>
+      </el-form-item>
       <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:declare:person']">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item> -->
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="operation" @click="moreSearch = true">更多</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"  size="small" >搜索</el-button>
+        <el-button icon="operation" @click="moreSearch = true"  size="small" >更多</el-button>
+        <el-button icon="Refresh" @click="resetQuery"  size="small" >重置</el-button>
       </el-form-item>
     </el-form>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="flag">
@@ -124,6 +133,10 @@
         </template>
       </el-table-column>
       <el-table-column label="执行人" width="80" align="center" prop="serviceName" />
+      <el-table-column label="审核人" align="center" prop="verifierName" min-width="100" />
+      <el-table-column label="审核时间" align="center" prop="verifierTime" min-width="100"
+        :show-overflow-tooltip="true" />
+
       <!-- <el-table-column label="操作" width="80" align="center" prop="">
         <template #default="scope">
           <el-button v-hasPermi="['business:socialSecurityDeclare:edit']" size="small" type="primary" link :disabled="