开票状态条件添加

client/src/views/OaSystem/financialManagement/kpglPage/deptIndex.vue

@@ -26,21 +26,13 @@
         <span class="formSpan">项目名称：</span>
         <el-input v-model="queryParams.xmmc" style="width: 160px" placeholder="请输入项目名称" />
       </div>
-      <div class="form">
+      <div class="form" style="width: 380px">
         <span class="formSpan">开票状态：</span>
-        <el-select
-          v-model="queryParams.flowStatus"
-          placeholder="请选择开票状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.INVOICE_OUT_STATUS)"
-            :key="dict.value as number"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        <el-checkbox-group v-model="queryParams.flowStatusList" :min="1" :max="3">
+          <el-checkbox v-for="item in typeOptions" :key="item.value" :label="item.value">
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
       </div>
 
       <div class="form" style="width: 380px">
@@ -214,6 +206,20 @@ const user = wsCache.get(CACHE_KEY.USER)
 const deptId = user.user.deptId ? user.user.deptId : ''
 const invoiceTime = ref([])
 const returnTime = ref([])
+const typeOptions = [
+  {
+    value: 101,
+    label: '已回款'
+  },
+  {
+    value: 102,
+    label: '已开票'
+  },
+  {
+    value: 105,
+    label: '开票中'
+  }
+]
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -223,6 +229,7 @@ const queryParams = reactive({
   deptId: deptId,
   managerId: '',
   xmmc: '',
+  flowStatusList: [101, 102],
   flowStatus: '',
   invoiceOn: '',
   invoiceOff: '',

client/src/views/OaSystem/financialManagement/kpglPage/index.vue

@@ -50,7 +50,7 @@
 
       <div class="form" style="width: 380px">
         <span class="formSpan">开票状态：</span>
-        <el-checkbox-group v-model="type" :min="1" :max="3">
+        <el-checkbox-group v-model="queryParams.flowStatusList" :min="1" :max="3">
           <el-checkbox v-for="item in typeOptions" :key="item.value" :label="item.value">
             {{ item.label }}
           </el-checkbox>
@@ -230,18 +230,17 @@ import download from '@/utils/download'
 
 defineOptions({ name: 'KpglPage' })
 
-const type: any = ref(['101', '102'])
 const typeOptions = [
   {
-    value: '101',
+    value: 101,
     label: '已回款'
   },
   {
-    value: '102',
+    value: 102,
     label: '已开票'
   },
   {
-    value: '105',
+    value: 105,
     label: '开票中'
   }
 ]
@@ -258,6 +257,7 @@ const queryParams = reactive({
   deptId: '',
   managerId: '',
   xmmc: '',
+  flowStatusList: [101, 102],
   flowStatus: '',
   invoiceOn: '',
   invoiceOff: '',

client/src/views/OaSystem/financialManagement/kpglPage/myIndex.vue

@@ -22,21 +22,13 @@
         <span class="formSpan">项目名称：</span>
         <el-input v-model="queryParams.xmmc" style="width: 160px" placeholder="请输入项目名称"
       /></div>
-      <div class="form">
+      <div class="form" style="width: 380px">
         <span class="formSpan">开票状态：</span>
-        <el-select
-          v-model="queryParams.flowStatus"
-          placeholder="请选择开票状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.INVOICE_OUT_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
+        <el-checkbox-group v-model="queryParams.flowStatusList" :min="1" :max="3">
+          <el-checkbox v-for="item in typeOptions" :key="item.value" :label="item.value">
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
       </div>
 
       <div class="form" style="width: 380px">
@@ -219,6 +211,20 @@ const userId = user.user.id ? user.user.id : ''
 
 const invoiceTime = ref([])
 const returnTime = ref([])
+const typeOptions = [
+  {
+    value: 101,
+    label: '已回款'
+  },
+  {
+    value: 102,
+    label: '已开票'
+  },
+  {
+    value: 105,
+    label: '开票中'
+  }
+]
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
@@ -228,6 +234,7 @@ const queryParams = reactive({
   deptId: '',
   managerId: userId,
   xmmc: '',
+  flowStatusList: [101, 102],
   flowStatus: '',
   invoiceOn: '',
   invoiceOff: '',