4.0.54 修改审批界面

package.json

@@ -1,7 +1,7 @@
 {
   "name": "client-base-v4",
   "description": "Leanwo Prodog Client",
-  "version": "4.0.53",
+  "version": "4.0.54",
   "author": "yangzhijie1488 <yangzhijie1488@163.com>",
   "scripts": {
     "dev": "cross-env webpack serve --config ./webpack.dev.js",

src/workflow/ApprovedWorkflow.vue

@@ -6,8 +6,8 @@
         :placeholder="$t('lang.NeedApproveWorkflow.describe1')"
         enter-button="搜索"
         allow-clear
-        style="width: 300px;"
-        @search="searchDatas"
+        style="width: 300px"
+        @search="queryDatas"
       />
     </a-col>
     <a-col>
@@ -15,11 +15,12 @@
       <WorkflowSearch :function-type="3" @get-search-params="searchWorkflow" />
     </a-col>
   </a-row>
-  <CommonTable
-    ref="table"
+  <a-table
+    sticky
+    bordered
+    :pagination="false"
     :columns="approveColumns"
     :data-source="approveDatas"
-    @get-pager="getPageParams"
   >
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'title'">
@@ -37,13 +38,26 @@
         >{{ record.description }}</span>
         <span v-else style="white-space: pre-line">{{ record.content }}</span>
       </template>
+      <template v-if="column.key === 'documentStatus'">
+        <a-tag v-if="record.documentStatus === '已完成'" color="success">
+          已完成
+        </a-tag>
+        <a-tag v-if="record.documentStatus === '进行中'" color="processing">
+          进行中
+        </a-tag>
+      </template>
       <template v-if="column.key === 'operation'">
         <a-button type="link" @click="selectTaskInfo(record)">
           {{ $t("lang.NeedApproveWorkflow.viewTasks") }}
         </a-button>
       </template>
     </template>
-  </CommonTable>
+    <template v-if="approveDatas.length > 0 && isShowMore" #footer>
+      <div style="text-align: center">
+        <a-button type="link" @click="loadMore">加载更多</a-button>
+      </div>
+    </template>
+  </a-table>
   <Loading v-if="isLoading" />
   <CustomerTask
     ref="customerTask"
@@ -57,7 +71,6 @@ import { ref, reactive, defineEmits, onMounted } from 'vue';
 import Common from '../common/Common';
 import WorkflowType from './WorkflowType.vue';
 import WorkflowSearch from './WorkflowSearch.vue';
-import CommonTable from '../common/CommonTable.vue';
 import { ajaxApi } from '../api/workflow/workflow.js';
 import { message } from 'ant-design-vue';
 import { approvedColumns } from './configData.js';
@@ -67,62 +80,85 @@ import CustomerTask from './CustomerTask.vue';
 import { Notify } from 'pc-component-v3';
 
 const emit = defineEmits(['refreshStasticCount']);
-const total = ref(0);
-const table = ref(null);
 const customerTask = ref(null);
 const selectedTaskId = ref(null);
 const isLoading = ref(false);
+const isShowMore = ref(true);
 const approveDatas = ref([]);
 const approveColumns = ref(approvedColumns);
 const searchParams = ref({});
 const filterParams = ref({});
 const pager = reactive({
-  start: 1,
-  length: 20,
+  start: 0,
+  length: 10,
 });
 
 onMounted(() => {
-  searchDatas();
+  searchDatas(true);
 });
 
-// 查询,回到第一页
-const searchDatas = () => {
-  table.value.backFirstPage();
+// 查询条件时从0开始
+const queryDatas = () => {
+  pager.start = 0;
+  isShowMore.value = true;
+  searchDatas(true);
+};
+
+// 加载更多时push
+const loadMore = () => {
+  pager.start += 10;
+  searchDatas();
 };
 
-// 获取分页
-const getPageParams = (start, length) => {
-  pager.start = (start - 1) * length;
-  pager.length = length;
+// 查询
+const searchDatas = isSearch => {
   const params = { ...searchParams.value, ...filterParams.value, ...pager };
-  searchApprove(params);
+  searchApprove(params, isSearch);
 };
 
 // 获取类型no
 const getTypeNo = windowNo => {
+  pager.start = 0;
+  isShowMore.value = true;
   searchParams.value.windowNo = windowNo;
-  searchDatas();
+  searchDatas(true);
 };
 
 // 通过高级查询搜索
 const searchWorkflow = value => {
+  pager.start = 0;
+  isShowMore.value = true;
   filterParams.value = value;
-  searchDatas();
+  searchDatas(true);
 };
 
 // 查询数据API
-const searchApprove = params => {
+const searchApprove = (params, isSearch) => {
   isLoading.value = true;
   const url = 'api/WorkflowResource/approved';
   ajaxApi(url, params).then(
     success => {
       if (success.errorCode === 0) {
         if (success.datas && success.datas.length > 0) {
+          const allDatas = JSON.parse(JSON.stringify(approveDatas.value));
           success.datas.forEach(item => {
             item.content = parseContent(item.content);
+            if (!isSearch) {
+              allDatas.push(item);
+            }
           });
-          approveDatas.value = success.datas;
+          const ids = new Set(allDatas.map(item => item.id));  
+          approveDatas.value = allDatas.filter(item => ids.has(item.id));
+          if (isSearch) {
+            approveDatas.value = success.datas;
+          }
         } else {
+          if (!isSearch) {
+            message.info('没有更多数据了。');
+            isShowMore.value = false;
+            isLoading.value = false;
+            return;
+          }
           approveDatas.value = [];
         }
       } else {
@@ -182,4 +218,7 @@ const parseContent = content => {
 </script>
 
 <style scoped>
+.ant-table-wrapper {
+  margin-top: 8px;
+}
 </style>

src/workflow/CopyTaskWorkflow.vue

@@ -29,7 +29,7 @@
     bordered
     :pagination="false"
     :columns="approveColumns"
-    :data-source="approveDatas"
+    :data-source="copyDatas"
   >
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'title'">
@@ -48,10 +48,10 @@
         <span v-else style="white-space: pre-line">{{ record.content }}</span>
       </template>
       <template v-if="column.key === 'documentStatus'">
-        <a-tag v-if="record.documentStatus == '已完成'" color="success">
+        <a-tag v-if="record.documentStatus === '已完成'" color="success">
           已完成
         </a-tag>
-        <a-tag v-if="record.documentStatus == '进行中'" color="processing">
+        <a-tag v-if="record.documentStatus === '进行中'" color="processing">
           进行中
         </a-tag>
       </template>
@@ -61,7 +61,7 @@
         </a-button>
       </template>
     </template>
-    <template v-if="approveDatas.length > 0" #footer>
+    <template v-if="copyDatas.length > 0 && isShowMore" #footer>
       <div style="text-align: center">
         <a-button type="link" @click="loadMore">加载更多</a-button>
       </div>
@@ -90,7 +90,8 @@ const emit = defineEmits(['refreshStasticCount']);
 const customerTask = ref(null);
 const selectedTaskId = ref(null);
 const isLoading = ref(false);
-const approveDatas = ref([]);
+const isShowMore = ref(true);
+const copyDatas = ref([]);
 const approveColumns = ref(approvedColumns);
 const searchParams = ref({
   condition: '',
@@ -108,6 +109,7 @@ onMounted(() => {
 // 查询条件时从0开始
 const queryDatas = () => {
   pager.start = 0;
+  isShowMore.value = true;
   searchDatas(true);
 };
 
@@ -127,6 +129,7 @@ const searchDatas = isSearch => {
 const statusChange = value => {
   if (!value) searchParams.value.processStatusQuery = 'ALL';
   pager.start = 0;
+  isShowMore.value = true;
   searchDatas(true);
 };
 
@@ -141,19 +144,20 @@ const searchApprove = (params, isSearch) => {
           success.datas.forEach(item => {
             item.content = parseContent(item.content);
             if (!isSearch) {
-              approveDatas.value.push(item);
+              copyDatas.value.push(item);
             }
           });
           if (isSearch) {
-            approveDatas.value = success.datas;
+            copyDatas.value = success.datas;
           }
         } else {
           if (!isSearch) {
             message.info('没有更多数据了。');
+            isShowMore.value = false;
             isLoading.value = false;
             return;
           }
-          approveDatas.value = [];
+          copyDatas.value = [];
         }
       } else {
         message.warning(success.errorMessage);

src/workflow/MyApplyWorkflow.vue

@@ -6,8 +6,8 @@
         :placeholder="$t('lang.NeedApproveWorkflow.describe1')"
         enter-button="搜索"
         allow-clear
-        style="width: 300px;"
-        @search="searchDatas"
+        style="width: 300px"
+        @search="queryDatas"
       />
     </a-col>
     <a-col>
@@ -15,24 +15,37 @@
       <WorkflowSearch :function-type="4" @get-search-params="searchWorkflow" />
     </a-col>
   </a-row>
-  <CommonTable
-    ref="table"
-    :total="total"
+  <a-table
+    sticky
+    bordered
+    :pagination="false"
     :columns="approveColumns"
-    :data-source="approveDatas"
-    @get-pager="getPageParams"
+    :data-source="applyDatas"
   >
     <template #bodyCell="{ column, record }">
       <template v-if="column.key === 'description'">
         <span style="white-space: pre-line">{{ record.content }}</span>
       </template>
+      <template v-if="column.key === 'documentStatus'">
+        <a-tag v-if="record.documentStatus === '已完成'" color="success">
+          已完成
+        </a-tag>
+        <a-tag v-if="record.documentStatus === '进行中'" color="processing">
+          进行中
+        </a-tag>
+      </template>
       <template v-if="column.key === 'operation'">
         <a-button type="link" @click="selectTaskInfo(record)">
           {{ $t("lang.NeedApproveWorkflow.viewTasks") }}
         </a-button>
       </template>
     </template>
-  </CommonTable>
+    <template v-if="applyDatas.length > 0 && isShowMore" #footer>
+      <div style="text-align: center">
+        <a-button type="link" @click="loadMore">加载更多</a-button>
+      </div>
+    </template>
+  </a-table>
   <Loading v-if="isLoading" />
   <CustomerTask
     ref="customerTask"
@@ -46,7 +59,6 @@ import { ref, reactive, defineEmits, onMounted } from 'vue';
 import Common from '../common/Common';
 import WorkflowType from './WorkflowType.vue';
 import WorkflowSearch from './WorkflowSearch.vue';
-import CommonTable from '../common/CommonTable.vue';
 import { ajaxApi } from '../api/workflow/workflow.js';
 import { message } from 'ant-design-vue';
 import { approvedColumns } from './configData.js';
@@ -56,51 +68,60 @@ import CustomerTask from './CustomerTask.vue';
 import { Notify } from 'pc-component-v3';
 
 const emit = defineEmits(['refreshStasticCount']);
-const total = ref(0);
-const table = ref(null);
 const customerTask = ref(null);
 const selectedTaskId = ref(null);
 const isLoading = ref(false);
-const approveDatas = ref([]);
+const isShowMore = ref(true);
+const applyDatas = ref([]);
 const approveColumns = ref(approvedColumns);
 const searchParams = ref({});
 const filterParams = ref({});
 const pager = reactive({
-  start: 1,
-  length: 20,
+  start: 0,
+  length: 10,
 });
 
 onMounted(() => {
   searchDatas();
 });
 
-// 查询,回到第一页
-const searchDatas = () => {
-  table.value.backFirstPage();
+// 查询条件时从0开始
+const queryDatas = () => {
+  pager.start = 0;
+  isShowMore.value = true;
+  searchDatas(true);
 };
 
-// 获取分页
-const getPageParams = (start, length) => {
-  pager.start = (start - 1) * length;
-  pager.length = length;
+// 加载更多时push
+const loadMore = () => {
+  pager.start += 10;
+  searchDatas();
+};
+
+// 查询
+const searchDatas = isSearch => {
   const params = { ...searchParams.value, ...filterParams.value, ...pager };
-  searchApprove(params);
+  searchApprove(params, isSearch);
 };
 
 // 获取类型no
 const getTypeNo = windowNo => {
+  pager.start = 0;
+  isShowMore.value = true;
   searchParams.value.windowNo = windowNo;
-  searchDatas();
+  searchDatas(true);
 };
 
 // 通过高级查询搜索
 const searchWorkflow = value => {
+  pager.start = 0;
+  isShowMore.value = true;
   filterParams.value = value;
-  searchDatas();
+  searchDatas(true);
 };
 
 // 查询数据API
-const searchApprove = params => {
+const searchApprove = (params, isSearch) => {
   isLoading.value = true;
   const url = 'api/WorkflowResource/myApply';
   ajaxApi(url, params).then(
@@ -109,12 +130,21 @@ const searchApprove = params => {
         if (success.datas && success.datas.length > 0) {
           success.datas.forEach(item => {
             item.content = parseContent(item.content);
+            if (!isSearch) {
+              applyDatas.value.push(item);
+            }
           });
-          total.value = success.total;
-          approveDatas.value = success.datas;
+          if (isSearch) {
+            applyDatas.value = success.datas;
+          }
         } else {
-          total.value = 0;
-          approveDatas.value = [];
+          if (!isSearch) {
+            message.info('没有更多数据了。');
+            isShowMore.value = false;
+            isLoading.value = false;
+            return;
+          }
+          applyDatas.value = [];
         }
       } else {
         message.warning(success.errorMessage);
@@ -173,4 +203,7 @@ const parseContent = content => {
 </script>
 
 <style scoped>
+.ant-table-wrapper {
+  margin-top: 8px;
+}
 </style>

src/workflow/NeedApproveWorkflow.vue

@@ -19,7 +19,7 @@
     ref="table"
     :total="total"
     :columns="approveColumns"
-    :data-source="approveDatas"
+    :data-source="needApproveDatas"
     @get-pager="getPageParams"
   >
     <template #bodyCell="{ column, record }">
@@ -73,7 +73,7 @@ const table = ref(null);
 const customerTask = ref(null);
 const selectedTaskId = ref(null);
 const isLoading = ref(false);
-const approveDatas = ref([]);
+const needApproveDatas = ref([]);
 const approveColumns = ref(needApproveColumns);
 const searchParams = ref({});
 const filterParams = ref({});
@@ -123,10 +123,10 @@ const searchApprove = params => {
             item.content = parseContent(item.content);
           });
           total.value = success.total;
-          approveDatas.value = success.datas;
+          needApproveDatas.value = success.datas;
         } else {
           total.value = 0;
-          approveDatas.value = [];
+          needApproveDatas.value = [];
         }
       } else {
         message.warning(success.errorMessage);

src/workflow/NotApproveWorkflow.vue

@@ -6,8 +6,8 @@
         :placeholder="$t('lang.NeedApproveWorkflow.describe1')"
         enter-button="搜索"
         allow-clear
-        style="width: 300px;"
-        @search="searchDatas"
+        style="width: 300px"
+        @search="queryDatas"
       />
     </a-col>
     <a-col>
@@ -15,28 +15,24 @@
       <WorkflowSearch :function-type="6" @get-search-params="searchWorkflow" />
     </a-col>
   </a-row>
-  <CommonTable
-    ref="table"
-    :total="total"
+  <a-table
+    sticky
+    bordered
+    :pagination="false"
     :columns="approveColumns"
-    :data-source="approveDatas"
-    @get-pager="getPageParams"
+    :data-source="notApproveDatas"
   >
     <template #bodyCell="{ column, record }">
-      <template v-if="column.key === 'title'">
-        <span v-if="record.category != 'CurdWindow'">
-          {{ record.name }}
-        </span>
-        <span v-else>
-          {{ record.title }}
-        </span>
-      </template>
       <template v-if="column.key === 'description'">
-        <span
-          v-if="record.category != 'CurdWindow'"
-          style="white-space: pre-line"
-        >{{ record.description }}</span>
-        <span v-else style="white-space: pre-line">{{ record.content }}</span>
+        <span style="white-space: pre-line">{{ record.content }}</span>
+      </template>
+      <template v-if="column.key === 'documentStatus'">
+        <a-tag v-if="record.documentStatus === '已完成'" color="success">
+          已完成
+        </a-tag>
+        <a-tag v-if="record.documentStatus === '进行中'" color="processing">
+          进行中
+        </a-tag>
       </template>
       <template v-if="column.key === 'operation'">
         <a-button type="link" @click="selectTaskInfo(record)">
@@ -44,7 +40,12 @@
         </a-button>
       </template>
     </template>
-  </CommonTable>
+    <template v-if="notApproveDatas.length > 0 && isShowMore" #footer>
+      <div style="text-align: center">
+        <a-button type="link" @click="loadMore">加载更多</a-button>
+      </div>
+    </template>
+  </a-table>
   <Loading v-if="isLoading" />
   <CustomerTask
     ref="customerTask"
@@ -58,7 +59,6 @@ import { ref, reactive, defineEmits, onMounted } from 'vue';
 import Common from '../common/Common';
 import WorkflowType from './WorkflowType.vue';
 import WorkflowSearch from './WorkflowSearch.vue';
-import CommonTable from '../common/CommonTable.vue';
 import { ajaxApi } from '../api/workflow/workflow.js';
 import { message } from 'ant-design-vue';
 import { approvedColumns } from './configData.js';
@@ -68,51 +68,60 @@ import CustomerTask from './CustomerTask.vue';
 import { Notify } from 'pc-component-v3';
 
 const emit = defineEmits(['refreshStasticCount']);
-const total = ref(0);
-const table = ref(null);
 const customerTask = ref(null);
 const selectedTaskId = ref(null);
 const isLoading = ref(false);
-const approveDatas = ref([]);
+const isShowMore = ref(true);
+const notApproveDatas = ref([]);
 const approveColumns = ref(approvedColumns);
 const searchParams = ref({});
 const filterParams = ref({});
 const pager = reactive({
-  start: 1,
-  length: 20,
+  start: 0,
+  length: 10,
 });
 
 onMounted(() => {
   searchDatas();
 });
 
-// 查询,回到第一页
-const searchDatas = () => {
-  table.value.backFirstPage();
+// 查询条件时从0开始
+const queryDatas = () => {
+  pager.start = 0;
+  isShowMore.value = true;
+  searchDatas(true);
+};
+
+// 加载更多时push
+const loadMore = () => {
+  pager.start += 10;
+  searchDatas();
 };
 
-// 获取分页
-const getPageParams = (start, length) => {
-  pager.start = (start - 1) * length;
-  pager.length = length;
+// 查询
+const searchDatas = isSearch => {
   const params = { ...searchParams.value, ...filterParams.value, ...pager };
-  searchApprove(params);
+  searchApprove(params, isSearch);
 };
 
 // 获取类型no
 const getTypeNo = windowNo => {
+  pager.start = 0;
+  isShowMore.value = true;
   searchParams.value.windowNo = windowNo;
-  searchDatas();
+  searchDatas(true);
 };
 
 // 通过高级查询搜索
 const searchWorkflow = value => {
+  pager.start = 0;
+  isShowMore.value = true;
   filterParams.value = value;
-  searchDatas();
+  searchDatas(true);
 };
 
 // 查询数据API
-const searchApprove = params => {
+const searchApprove = (params, isSearch) => {
   isLoading.value = true;
   const url = 'api/WorkflowResource/refuse';
   ajaxApi(url, params).then(
@@ -121,12 +130,21 @@ const searchApprove = params => {
         if (success.datas && success.datas.length > 0) {
           success.datas.forEach(item => {
             item.content = parseContent(item.content);
+            if (!isSearch) {
+              notApproveDatas.value.push(item);
+            }
           });
-          total.value = success.total;
-          approveDatas.value = success.datas;
+          if (isSearch) {
+            notApproveDatas.value = success.datas;
+          }
         } else {
-          total.value = 0;
-          approveDatas.value = [];
+          if (!isSearch) {
+            message.info('没有更多数据了。');
+            isShowMore.value = false;
+            isLoading.value = false;
+            return;
+          }
+          notApproveDatas.value = [];
         }
       } else {
         message.warning(success.errorMessage);
@@ -185,4 +203,7 @@ const parseContent = content => {
 </script>
 
 <style scoped>
+.ant-table-wrapper {
+  margin-top: 8px;
+}
 </style>