ly 1 tahun lalu
induk
melakukan
ea7888904e

+ 17 - 6
src/views/business/production/archiveTicket/index.vue

@@ -15,27 +15,36 @@
       </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.trim="queryParams.companyName" size="small" type="text" placeholder="客户名称" :clearable="true"
           style="width: 140px" />
       </el-form-item>
       <el-form-item label="客户标签:">
-        <el-select v-model="queryParams.customerLabelId" style="width:100%" clearable>
+        <el-select v-model="queryParams.customerLabelId" style="width:100%" clearable size="small">
           <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="所属月:">
-        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月" :clearable="false" value-format="YYYY-MM-01"
+        <el-date-picker v-model="currentMonth" type="month" format="YYYY年MM月"  size="small" :clearable="false" value-format="YYYY-MM-01"
           @change="currentMonthChange" :disabled-date="disabledDateHandler" />
       </el-form-item>
       <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:upload:person']">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item> -->
+      <el-form-item label="上传人:" prop="finishUserName">
+        <el-input size="small" v-model="queryParams.finishUserName" 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>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</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="Refresh" @click="resetQuery" size="small">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -71,6 +80,8 @@
       </el-table-column>
       <el-table-column label="来源" align="center" min-width="80" prop="fromCompanyName" />
       <el-table-column label="纳税性质" prop="taxType" min-width="110" align="center" />
+      <el-table-column label="上传人" align="center" prop="finishUserName" min-width="100" />
+      <el-table-column label="上传时间" align="center" prop="finishTime" min-width="100"/>
       <el-table-column label="操作" width="130" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button size="small" link type="primary" v-hasPermi="['business:archiveReceiveTicket:upload']" circle

+ 26 - 13
src/views/business/production/keepAccount/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" placeholder="请输入客户名称" style="width: 150px" clearable
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" size="small" style="width: 130px" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="客户标签:">
-        <el-select v-model="queryParams.customerLabelId" style="width:100%" clearable>
+        <el-select v-model="queryParams.customerLabelId" style="width:130px" clearable size="small">
           <el-option v-for="item in options" :key="item.id" :label="item.lable" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -38,14 +37,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:account: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">
@@ -55,7 +63,7 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 列表区 -->
-    <el-table v-loading="loading" :data="list" size="small" border  height="100%"
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250">
@@ -78,12 +86,11 @@
       </el-table-column>
       <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
       <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="所属期" width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
             scope.row.checkoutDate }} -->
-            {{ proxy.moment().subtract(1, "month").format("yyyy")+"-"+queryParams.month}}
+          {{ proxy.moment().subtract(1, "month").format("yyyy")+"-"+queryParams.month}}
         </template>
       </el-table-column>
       <el-table-column align="center">
@@ -130,6 +137,12 @@
         </el-table-column>
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" width="100">
+        <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>
     </el-table>
     <!-- 分页 -->
@@ -138,7 +151,7 @@
     <form-dialog ref="formDialogRef" :get-list="getList" />
     <view-dialog ref="viewDialogRef" :get-list="getList" />
     <!-- 更多搜索弹窗 -->
-    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable :close-on-click-modal = "false"> 
+    <el-dialog title="更多搜索" v-model="moreSearch" width="620px" append-to-body draggable :close-on-click-modal="false">
       <el-form :model="queryParams" ref="queryRef" size="small" label-width="100">
         <el-row :gutter="20">
           <el-col :span="12">
@@ -189,7 +202,7 @@
     listKeepAccount,
     exportKeepAccount,
   } from "@/api/business/production/keepAccount";
-   import { listLableNoPage } from "@/api/business/lable"
+  import { listLableNoPage } from "@/api/business/lable"
   import { listCompany } from "@/api/business/crm/company";
   import { reactive, ref, toRefs } from "vue";
   import formDialog from "./form";
@@ -389,7 +402,7 @@
       companyName: "",
     };
     if (activeName.value != null && activeName.value === 'second') {
-        queryParams.value.principal = useUserStore().user.userId;
+      queryParams.value.principal = useUserStore().user.userId;
     }
     handleQuery();
   }

+ 285 - 253
src/views/business/production/onceWork/index.vue

@@ -8,42 +8,38 @@
         </el-button>
         <template #dropdown>
           <el-dropdown-menu>
-            <el-dropdown-item
-              icon="Download"
-              @click="handleExport"
-              v-hasPermi="['business:entrust:workOrder:current:export']"
-            >
-              导出</el-dropdown-item
-            >
+            <el-dropdown-item icon="Download" @click="handleExport"
+              v-hasPermi="['business:entrust:workOrder:current:export']">
+              导出</el-dropdown-item>
           </el-dropdown-menu>
         </template>
       </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" size="small" :model="queryParams" ref="queryRef" :inline="true"
+      label-width="78px">
       <el-form-item label="客户名称:" prop="companyName">
-        <el-input
-          v-model="queryParams.companyName"
-          style="width: 150px"
-          placeholder="请输入客户名称"
-          clearable
-          @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="工单状态:" prop="recordStatus">
+        <el-select v-model="queryParams.recordStatus" placeholder="请选择工单状态" clearable @change="handleQuery">
+          <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="handlerName">
+        <el-input v-model="queryParams.handlerName" style="width: 150px" placeholder="请输入领取人" clearable
+          @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="项目:" prop="taskTypeName">
+        <el-input v-model="queryParams.taskTypeName" style="width: 150px" placeholder="请输入项目" clearable
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:once: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 type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -54,22 +50,11 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 列表区 -->
-    <el-table
-      v-loading="loading"
-      :data="list"
-      size="small"
-      border
-      height="100%"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table v-loading="loading" :data="list" size="small" border height="100%"
+      @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column
-        label="客户名称"
-        align="center"
-        min-width="250"
-        prop="companyName"
-      />
+      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" />
       <!-- <el-table-column
         label="税号"
         align="center"
@@ -81,30 +66,66 @@
           {{ scope.row.type === 1 ? "循环工单" : "代办工单" }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="项目"
-        align="center"
-        prop="taskTypeName"
-        width="200"
-      >
-      <template #default="scope">
-        {{
-          scope.row.noContract === 1? scope.row.remark: `${scope.row.taskTypeName}${scope.row.alterType ?`-${scope.row.alterType}` : ""}${scope.row.taskTypeDetailName? `-${scope.row.taskTypeDetailName}` : ""}`
-        }}
-      </template>
+      <el-table-column label="项目" align="center" prop="taskTypeName" width="200" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{
+          scope.row.noContract === 1? scope.row.remark: `${scope.row.taskTypeName}${scope.row.alterType
+          ?`-${scope.row.alterType}` : ""}${scope.row.taskTypeDetailName? `-${scope.row.taskTypeDetailName}` : ""}`
+          }}
+        </template>
       </el-table-column>
-      <el-table-column
-      label="说明"
-      align="center"
-      prop="explain"
-      min-width="180"
-    />
-      <el-table-column label="执行人" align="center" width="100">
+      <el-table-column label="说明" align="center" prop="explain" min-width="180" />
+      <el-table-column label="委托时间" align="center" min-width="140">
         <template #default="scope">
           {{
-            scope.row.entrust != null
-              ? scope.row.entrust.toAccountName
-              : scope.row.serviceName
+          scope.row.record != undefined
+          ? scope.row.record.entrustTime
+          : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="执行人" align="center" width="100" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{
+          scope.row.entrust != null
+          ? scope.row.entrust.toAccountName
+          : scope.row.serviceName
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="领取人" align="center" min-width="100" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{
+          scope.row.record != undefined
+          ? scope.row.record.handlerName
+          : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="领取时间" align="center" min-width="140">
+        <template #default="scope">
+          {{
+          scope.row.record != undefined
+          ? scope.row.record.handlerTime
+          : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="完成人" align="center" min-width="100">
+        <template #default="scope">
+          {{
+          scope.row.record != undefined
+          ? scope.row.record.recorderName
+          : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="完成时间" align="center" min-width="140">
+        <template #default="scope">
+          {{
+          scope.row.record != undefined
+          ? scope.row.record.updateTime
+          : ""
           }}
         </template>
       </el-table-column>
@@ -114,36 +135,28 @@
             {{ getStatusLabel(scope.row) }}
             <el-popover placement="top-start" width="250" trigger="hover">
               <div style="display: flex; flex-direction: row">
-                <div
-                  v-for="item in selectStatus"
-                  :key="item.value"
-                  style="display: flex; flex-direction: row; margin-right: 10px"
-                >
-                  <div
-                    :style="{
+                <div v-for="item in selectStatus" :key="item.value"
+                  style="display: flex; flex-direction: row; margin-right: 10px">
+                  <div :style="{
                       backgroundColor: item.color,
                       width: '14px',
                       height: '14px',
                       margin: 'auto',
                       borderRadius: '50%',
                       border: item.color === '#fff' ? '1px solid #ddd' : 'none',
-                    }"
-                  />
-                  <div
-                    style="
+                    }" />
+                  <div style="
                       display: inline-block;
                       margin-left: 10px;
                       line-height: 36px;
                       font-size: 10px;
-                    "
-                  >
+                    ">
                     {{ item.label }}
                   </div>
                 </div>
               </div>
               <template #reference>
-                <span
-                  style="
+                <span style="
                     color: #fff;
                     font-size: 12px;
                     text-align: center;
@@ -153,136 +166,128 @@
                     height: 14px;
                     background-color: #ccc;
                     border-radius: 50%;
-                  "
-                  >?</span
-                >
+                  ">?</span>
               </template>
             </el-popover>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="80" align="center" prop="">
+      <el-table-column label="操作" width="130" align="center" prop="">
         <template #default="scope">
-          <el-button
-            v-show="scope.row.record == null || scope.row.record.status !== 3"
-            size="small"
-            type="primary"
-            link
-            v-hasPermi="['business:production:onceWork:finished']"
-            @click="finishedHandle(scope.row)"
-            >完成</el-button
-          >
-          <el-button
-          v-show="scope.row.record == null || scope.row.record.status !== 3"
-          size="small"
-          type="primary"
-          link
-          v-hasPermi="['business:production:onceWork:finished']"
-          @click="finishedHandle2(scope.row)"
-          >领取</el-button
-        >
+
+          <el-button v-show="scope.row.record != null && scope.row.record.status == 1" size="small" type="primary" link
+            v-hasPermi="['business:production:onceWork:finished']" @click="finishedHandle(scope.row)">
+            完成
+          </el-button>
+          <el-button v-show="scope.row.record == null || scope.row.record.status == 0" size="small" type="primary" link
+            v-hasPermi="['business:production:onceWork:finished']" @click="finishedHandle2(scope.row)">
+            领取
+          </el-button>
+
+          <el-button v-show="scope.row.record !== undefined && scope.row.record.status == 1" size="small" type="primary"
+            link v-hasPermi="['business:production:onceWork:finished']" @click="finishedHandle3(scope.row)">
+            取消领取
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- <contract-form ref="contractRef" :get-list="getList" /> -->
     <!-- 分页 -->
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
   </div>
 </template>
 
 <script setup name="Company">
-import {
-  listOnceWorkOrder,
-  saveDetail,
-  exportOnceWork,receive
-} from "@/api/business/production/onceWorkOrder";
-import { toRefs } from "vue";
-import useUserStore from "@/store/modules/user";
-const { proxy } = getCurrentInstance();
 
-const data = reactive({
-  selectStatus: [
-    {
-      label: "未开始",
-      value: 0,
-      color: "#888",
-    },
-    {
-      label: "办理中",
-      value: 1,
-      color: "#FFB836",
-    },
-    {
-      label: "已完成",
-      value: 3,
-      color: "#2FCB81",
-    },
- 
-  ],
-});
 
-const { selectStatus } = toRefs(data);
+  import {
+    listOnceWorkOrder,
+    saveDetail,
+    exportOnceWork, receive
+  } from "@/api/business/production/onceWorkOrder";
+  import { toRefs } from "vue";
+  import useUserStore from "@/store/modules/user";
+  const { proxy } = getCurrentInstance();
+
+  const data = reactive({
+    selectStatus: [
+      {
+        label: "未开始",
+        value: 0,
+        color: "#888",
+      },
+      {
+        label: "办理中",
+        value: 1,
+        color: "#FFB836",
+      },
+      {
+        label: "已完成",
+        value: 3,
+        color: "#2FCB81",
+      },
 
-/** 字典数组区 */
-/** 查询 对象 */
-const tenant = useUserStore().tenant;
-const list = ref([]);
-const loading = ref(true);
-const ids = ref([]);
-const selections = ref([]);
-const oneself = ref(false);
-const single = ref(false);
-const multiple = ref(false);
-const total = ref(0);
-const prev = ref([]);
-const flag = ref(checkPermission(['business:once:person']))
-const activeName = flag.value ? ref('first') : ref('second');
-const setEntrustDialogRef = ref(null);
 
-const { contract_verify_status } = proxy.useDict("contract_verify_status");
-const { contract_status } = proxy.useDict("contract_status");
-/** 查询对象 */
-const queryParams = ref({
-  pageNum: 1,
-  pageSize: 20,
-  orderByColumn: "create_time",
-  companyName: "",
-  type: 2,
-  principal:tenant.versionId !== '4' && !flag.value ? useUserStore().user.userId : null,
-});
+    ],
+  });
 
-const editStatus = {
-  startMonth: false,
-};
+  const { selectStatus } = toRefs(data);
 
-/***********************  方法区  ****************************/
+  /** 字典数组区 */
+  /** 查询 对象 */
+  const tenant = useUserStore().tenant;
+  const list = ref([]);
+  const loading = ref(true);
+  const ids = ref([]);
+  const selections = ref([]);
+  const oneself = ref(false);
+  const single = ref(false);
+  const multiple = ref(false);
+  const total = ref(0);
+  const prev = ref([]);
+  const flag = ref(checkPermission(['business:once:person']))
+  const activeName = flag.value ? ref('first') : ref('second');
+  const setEntrustDialogRef = ref(null);
 
-/** 查询company列表 */
-function getList() {
-  loading.value = true;
-  listOnceWorkOrder(queryParams.value).then((response) => {
-    list.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
+  const { contract_verify_status } = proxy.useDict("contract_verify_status");
+  const { contract_status } = proxy.useDict("contract_status");
+  /** 查询对象 */
+  const queryParams = ref({
+    pageNum: 1,
+    pageSize: 20,
+    orderByColumn: "create_time",
+    companyName: "",
+    type: 2,
+    principal: tenant.versionId !== '4' && !flag.value ? useUserStore().user.userId : null,
   });
-}
 
-/** 是否为自己负责 */
-function handleOneself() {
-  if (oneself.value) {
-    queryParams.value.principal = useUserStore().user.userId;
-  } else {
-    queryParams.value.principal = null;
+  const editStatus = {
+    startMonth: false,
+  };
+
+  /***********************  方法区  ****************************/
+
+  /** 查询company列表 */
+  function getList() {
+    loading.value = true;
+    listOnceWorkOrder(queryParams.value).then((response) => {
+      list.value = response.rows;
+      total.value = response.total;
+      loading.value = false;
+    });
   }
-  getList();
-}
-function checkPermission(templatePermission) {
+
+  /** 是否为自己负责 */
+  function handleOneself() {
+    if (oneself.value) {
+      queryParams.value.principal = useUserStore().user.userId;
+    } else {
+      queryParams.value.principal = null;
+    }
+    getList();
+  }
+  function checkPermission(templatePermission) {
     const all_permission = "*:*:*";
     const permissions = useUserStore().permissions;
     const hasPermissions = permissions.some((permission) => {
@@ -302,94 +307,121 @@ function checkPermission(templatePermission) {
       handleOneself()
     }
   }
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
-}
+  /** 搜索按钮操作 */
+  function handleQuery() {
+    queryParams.value.pageNum = 1;
+    getList();
+  }
 
-/** 重置按钮操作 */
-function resetQuery() {
-  proxy.resetForm("queryRef");
-  if (activeName.value != null && activeName.value === 'second') {
-        queryParams.value.principal = useUserStore().user.userId;
+  /** 重置按钮操作 */
+  function resetQuery() {
+    proxy.resetForm("queryRef");
+    if (activeName.value != null && activeName.value === 'second') {
+      queryParams.value.principal = useUserStore().user.userId;
     }
-  handleQuery();
-}
+    handleQuery();
+  }
 
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map((item) => item.id);
-  selections.value = selection;
-  single.value = selection.length != 1;
-  multiple.value = selection.length > 0;
-}
+  // 多选框选中数据
+  function handleSelectionChange(selection) {
+    ids.value = selection.map((item) => item.id);
+    selections.value = selection;
+    single.value = selection.length != 1;
+    multiple.value = selection.length > 0;
+  }
 
-/** 导出按钮操作 */
-function handleExport() {
-  exportOnceWork(queryParams.value);
-}
+  /** 导出按钮操作 */
+  function handleExport() {
+    exportOnceWork(queryParams.value);
+  }
 
-function getStatusStyle(row) {
-  if (row.record == null) {
-    return { color: getStatusColor(0), verticalAlign: "middle" };
-  } else {
-    return {
-      color: getStatusColor(row.record.status),
-      verticalAlign: "middle",
-    };
+  function getStatusStyle(row) {
+    if (row.record == null) {
+      return { color: getStatusColor(0), verticalAlign: "middle" };
+    } else {
+      return {
+        color: getStatusColor(row.record.status),
+        verticalAlign: "middle",
+      };
+    }
   }
-}
-function getStatusColor(status) {
-  const index = selectStatus.value.findIndex((v) => v.value === status);
-  return index >= 0 ? selectStatus.value[index].color : "#fff";
-}
-function getStatusLabel(row) {
-  const index = selectStatus.value.findIndex(
-    (v) => v.value === (row.record == null ? 0 : row.record.status)
-  );
-  return index >= 0 ? selectStatus.value[index].label : "";
-}
+  function getStatusColor(status) {
+    const index = selectStatus.value.findIndex((v) => v.value === status);
+    return index >= 0 ? selectStatus.value[index].color : "#fff";
+  }
+  function getStatusLabel(row) {
+    const index = selectStatus.value.findIndex(
+      (v) => v.value === (row.record == null ? 0 : row.record.status)
+    );
+    return index >= 0 ? selectStatus.value[index].label : "";
+  }
+
+  function finishedHandle(row) {
+    proxy.$modal
+      .confirm("确认完成工单么?")
+      .then((_) => {
 
-function finishedHandle(row) {
-  proxy.$modal
-    .confirm("确认完成工单么?")
-    .then((_) => {
-      console.log(row);
-      const finishedValue =
-        row.record != null
-          ? row.record
-          : {
+        const finishedValue =
+          row.record != null
+            ? row.record
+            : {
               companyId: row.companyId,
               workOrderId: row.id,
               tenantId: row.tenantId,
               status: 3,
             };
-      saveDetail(finishedValue).then((res) => getList());
-    })
-    .catch((_) => {
-      proxy.$modal.msgError("取消完成工单");
-    });
-}
-function finishedHandle2(row) {
-  proxy.$modal
-    .confirm("确认领取工单么?")
-    .then((_) => {
-      console.log(row);
-      const finishedValue =
-        row.record != null
-          ? row.record
-          : {
+
+
+        loading.value = true
+        saveDetail(finishedValue).then((res) => getList());
+      })
+      .catch((_) => {
+        proxy.$modal.msgError("取消完成工单");
+      }).finally(() => loading.value = false);
+
+  }
+  function finishedHandle2(row) {
+    proxy.$modal
+      .confirm("确认领取工单么?")
+      .then((_) => {
+        console.log(row);
+        const finishedValue =
+          row.record != null
+            ? row.record
+            : {
               companyId: row.companyId,
               workOrderId: row.id,
               tenantId: row.tenantId,
               status: 1,
             };
-            receive(finishedValue).then((res) => getList());
-    })
-    .catch((_) => {
-      proxy.$modal.msgError("取消领取工单");
-    });
-}
-getList();
+        loading.value = true
+        receive(finishedValue).then((res) => getList());
+      })
+      .catch((_) => {
+        proxy.$modal.msgError("取消领取工单");
+      }).finally(() => loading.value = false);
+  }
+
+  function finishedHandle3(row) {
+    proxy.$modal
+      .confirm("确认取消领取么?")
+      .then((_) => {
+        console.log(row);
+        const finishedValue =
+          row.record != null
+            ? row.record
+            : {
+              companyId: row.companyId,
+              workOrderId: row.id,
+              tenantId: row.tenantId,
+              status: 0,
+            };
+        loading.value = true
+        receive(finishedValue).then((res) => getList());
+      })
+      .catch((_) => {
+        proxy.$modal.msgError("取消领取工单");
+      }).finally(() => loading.value = false);
+  }
+  getList();
 </script>

+ 21 - 8
src/views/business/production/receiveTicket/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="77px">
+    <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" placeholder="请输入客户名称" style="width: 150px" clearable
+        <el-input v-model="queryParams.companyName" placeholder="请输入客户名称" size="small" style="width: 150px" clearable
           @keyup.enter="handleQuery" />
       </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:100%" clearable>
           <el-option v-for="item in options" :key="item.id" :label="item.lable" :value="item.id" />
         </el-select>
       </el-form-item>
@@ -38,13 +37,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:task: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>
 
@@ -79,7 +88,6 @@
       </el-table-column>
       <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="90" />
       <el-table-column label="纳税性质" min-width="90" align="center" prop="taxType" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="180" />
       <el-table-column label="所属期" width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
@@ -133,6 +141,11 @@
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </el-table-column>
+      <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>
     <!-- 分页 -->
     <pagination  v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"

+ 4 - 4
src/views/business/production/receiveTicket/view.vue

@@ -455,12 +455,12 @@ function ticketNumberChange() {
   amount += form.value.incomeTicket;
   amount += form.value.costTicket;
   amount += form.value.feeTicketNumber;
-  amount += form.value.ssafTicket;
-  amount += form.value.salaryTicket;
-  amount += form.value.bankSlipsNumber;
   amount += form.value.bankCopyNumber;
-  amount += form.value.bankCopy;
+  amount += form.value.bankSlipsNumber;
+  amount += form.value.salaryTicket;
+  amount += form.value.ssafTicket;
   amount += form.value.otherTicket;
+
   form.value.sumNumber = amount;
 }
 

+ 23 - 9
src/views/business/production/salary/index.vue

@@ -17,19 +17,19 @@
       </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="客户名称:" prop="companyName">
-        <el-input v-model="queryParams.companyName" style="width: 150px" placeholder="请输入客户名称" clearable
+        <el-input v-model="queryParams.companyName" style="width: 130px"   size="small"  placeholder="请输入客户名称" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="客户标签:">
-        <el-select v-model="queryParams.customerLabelId" style="width:100%" clearable>
+        <el-select v-model="queryParams.customerLabelId" style="width:130px"  size="small"  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="月份:">
-        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" style="width: 130px"
+        <el-select v-model.trim="queryParams.month"  placeholder="月份"  size="small"  style="width: 130px"
           :clearable="false" @change="handleQuery">
           <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
@@ -40,13 +40,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>
         <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:noindividual:person']">
           <el-switch v-model="oneself" @change="handleOneself" />
         </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">
@@ -82,7 +92,7 @@
       </el-table-column>
       <el-table-column label="来源" align="center" min-width="80" prop="fromCompanyName" />
       <el-table-column label="纳税性质" min-width="100" align="center" prop="taxType" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
+      
       <el-table-column label="所属期" min-width="90" align="center">
         <template #default="scope">
           <!-- {{
@@ -140,6 +150,10 @@
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </el-table-column>
+      <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>
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"

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

@@ -17,36 +17,46 @@
       </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" placeholder="请输入客户名称" clearable style="width: 150px"
+        <el-input v-model="queryParams.companyName" size="small"  placeholder="请输入客户名称" clearable style="width: 130px"
           @keyup.enter="handleQuery" />
       </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="月份:">
-        <el-select v-model.trim="queryParams.month" size="small" placeholder="月份" style="width: 130px"
+        <el-select size="small" v-model.trim="queryParams.month" placeholder="月份" style="width: 130px"
           @change="handleQuery" :clearable="false">
           <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态:">
-        <el-select v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
+        <el-select  v-model.trim="queryParams.status" prop="status" size="small" type="text" placeholder="状态"
           :clearable="true" style="width: 130px" @clear="clearStatus">
           <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:wage: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"  size="small"  icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="operation"  size="small" @click="moreSearch = true">更多</el-button>
+        <el-button icon="Refresh"  size="small"  @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick" v-if="flag">
@@ -83,7 +93,7 @@
       </el-table-column>
       <el-table-column label="来源" align="center" prop="fromCompanyName" min-width="100" />
       <el-table-column label="纳税性质" align="center" min-width="130" prop="taxType" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
+   
       <el-table-column label="所属期" min-width="90" align="center">
         <template #default="scope">
           <!-- {{ moment().subtract(1, "month").format("YYYY年MM月") }} -->
@@ -134,8 +144,10 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
-      </el-table-column>
+      <el-table-column label="执行人" align="center" prop="serviceName" min-width="100"/>
+      <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>
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"

+ 22 - 7
src/views/business/socialSecurity/confirm/index.vue

@@ -18,10 +18,9 @@
       </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" style="width: 130px" size="small" placeholder="请输入客户名称" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="月份:">
@@ -36,14 +35,25 @@
           <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:confirm: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">
       <el-tab-pane label="全部" name="first">
@@ -58,7 +68,6 @@
       <el-table-column label="客户名称" align="center" prop="companyName" min-width="250" />
       <el-table-column label="来源" align="center" prop="fromCompanyName" width="100" />
       <el-table-column label="纳税性质" width="100" align="center" prop="taxType" />
-      <el-table-column label="税号" align="center" prop="socialCreditCode" min-width="200" />
       <el-table-column label="所属期" min-width="90" align="center">
         <template #default="scope">
           <!-- {{ scope.row.currentDate != null && scope.row.currentDate > scope.row.checkoutDate ? scope.row.currentDate :
@@ -112,6 +121,11 @@
       </el-table-column>
       <el-table-column label="执行人" align="center" prop="serviceName" min-width="100">
       </el-table-column>
+        <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>
     <!-- 分页 -->
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
@@ -150,6 +164,7 @@
                 <el-option v-for="item in selectMonths" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
+            
           </el-col>
         </el-row>
       </el-form>