普通报销,差旅报销前端台账修改

client/src/utils/dict.ts

@@ -139,6 +139,7 @@ export enum DICT_TYPE {
   WF_SEAL_TYPE = 'WF_SEAL_TYPE',
   WF_SEAL_NAME = 'WF_SEAL_NAME',
   FINANCE_STATUS = 'finance_status',
+  FINANCE_STATUS2 = 'finance_status2',
   PROJECT_STATUS = 'project_status',
   CONTRACT_COST_STATUS = 'CONTRACT_COST_STATUS',
   CONTRACT_SIGN_STATUS = 'contract_is_sign',

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

@@ -36,7 +36,7 @@
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS2)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -116,7 +116,11 @@
             <span>{{ dateFormatter2(null, null, scope.row.endTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="status" label="状态" />
+        <el-table-column label="状态" align="center" prop="flowStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.FINANCE_STATUS2" :value="scope.row.flowStatus" />
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" fixed="right" width="80">
           <template #default="scope">
             <div class="operateBtn" @click="operateClick(scope.row)">

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

@@ -33,7 +33,7 @@
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS2)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -109,7 +109,11 @@
             <span>{{ dateFormatter2(null, null, scope.row.endTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="status" label="状态" />
+        <el-table-column label="状态" align="center" prop="flowStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.FINANCE_STATUS2" :value="scope.row.flowStatus" />
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" fixed="right" width="80">
           <template #default="scope">
             <div class="operateBtn" @click="operateClick(scope.row)">

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

@@ -36,7 +36,7 @@
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS2)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -89,7 +89,11 @@
           label="申请时间"
         />
         <el-table-column align="center" prop="totalAmount" label="报销总金额" />
-        <el-table-column align="center" prop="status" label="状态" />
+        <el-table-column label="状态" align="center" prop="flowStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.FINANCE_STATUS2" :value="scope.row.flowStatus" />
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" width="80" fixed="right">
           <template #default="scope">
             <div class="operateBtn" @click="operateClick(scope.row)">

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

@@ -21,7 +21,7 @@
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS2)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"

client/src/views/OaSystem/mineCenter/rightChild/clbx.vue

@@ -25,7 +25,7 @@
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS2)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -77,7 +77,11 @@
           prop="projectDeptName"
           label="项目部门"
         />
-        <el-table-column align="center" prop="status" label="状态" />
+        <el-table-column label="状态" align="center" prop="flowStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.FINANCE_STATUS2" :value="scope.row.flowStatus" />
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" width="80" fixed="right">
           <template #default="scope">
             <div class="operateBtn" @click="operateClick(scope.row)">

client/src/views/OaSystem/mineCenter/rightChild/ptbx.vue

@@ -9,11 +9,23 @@
           style="width: 210px"
         />
       </div>
+      <div class="form" style="width: 380px">
+        <span class="formSpan">申请时间：</span>
+        <el-date-picker
+          v-model="queryParams.applyTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          unlink-panels
+          range-separator="到"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </div>
       <div class="form">
         <span class="formSpan">状态：</span>
         <el-select v-model="queryParams.status" placeholder="状态" clearable class="!w-240px">
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.FINANCE_STATUS2)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -48,7 +60,11 @@
           label="申请时间"
         />
         <el-table-column align="center" prop="totalAmount" label="报销总金额" />
-        <el-table-column align="center" prop="status" label="状态" />
+        <el-table-column label="状态" align="center" prop="flowStatus">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.FINANCE_STATUS2" :value="scope.row.flowStatus" />
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" width="80" fixed="right">
           <template #default="scope">
             <div class="operateBtn" @click="operateClick(scope.row)">