ly 1 سال پیش
والد
کامیت
88538ff76b

+ 24 - 12
src/views/business/production/IndividualIncomeTaxIs/index.vue

@@ -16,34 +16,42 @@
     </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" placeholder="请输入客户名称" :clearable="true"
-          style="width: 220px" />
+        <el-input size="small" v-model="queryParams.companyName" type="text" 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 size="small" v-model="queryParams.customerLabelId" 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 size="small" v-model="currentMonth" type="month" format="YYYY年MM月" style="width: 130px" :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 size="small" v-model="queryParams.status" type="text" placeholder="状态" :clearable="true" 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:individual: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">
@@ -74,7 +82,6 @@
       </el-table-column>
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
       <el-table-column label="来源" align="center" prop="fromCompanyName" width="180" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" width="180" />
       <el-table-column label="纳税性质" align="center" width="100" prop="taxType" />
       <el-table-column label="人员信息" align="center">
         <template #default="scope">
@@ -146,6 +153,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" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button size="small" type="text" :disabled="

+ 25 - 13
src/views/business/production/IndividualIncomeTaxIsZero/index.vue

@@ -16,34 +16,42 @@
     </div>
 
 
-      <!-- 搜索区 -->
-      <el-form class="list-search-container" size="small" :model="queryParams" ref="queryRef" :inline="true"
-        label-width="80px">
+    <!-- 搜索区 -->
+    <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" placeholder="请输入客户名称" :clearable="true" style="width: 220px" />
+          <el-input v-model="queryParams.companyName" placeholder="请输入客户名称"   size="small" :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"
+        <el-form-item label="所属期:" prop="year" >
+          <el-date-picker  size="small" v-model="currentMonth" type="month"  format="YYYY年MM月" style="width: 130px"
             value-format="YYYY-MM-01" :disabled-date="disabledDateHandler" @change="monthChangeHandler"
             :clearable="false" />
         </el-form-item>
         <el-form-item label="个税状态:">
-          <el-select v-model="queryParams.status" placeholder="状态" :clearable="true" style="width: 130px">
+          <el-select v-model="queryParams.status" size="small" placeholder="状态" :clearable="true" 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:nowage:person']"> 
         </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">
@@ -73,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="人员信息" min-width="60" align="center">
           <template #default="scope">
@@ -149,6 +156,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" min-width="80" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button size="small" link type="primary" :disabled="