Merge branch 'test' of https://git.mcnetmart.com/guoxiangbin/ocr-web into fix/updatesyspic

src/config/aside.ts

@@ -107,7 +107,7 @@ export const asideMap: Recordable<AsideEntity> = {
     component: IztaskrromVue,
   },
   iztaskstatus: {
-    label: '任务状态',
+    label: '任务审批状态',
     defaultValue: null,
     isDefaultFilter: false,
     key: 'iztaskstatus',

src/config/workorder.ts

@@ -37,7 +37,7 @@ export const workPackageMap: Recordable<PackageEntity> = {
     key: 'upuser',
   },
   status: {
-    label: '任务状态',
+    label: '任务审批状态',
     isDefault: false,
     key: 'upuser',
   },
@@ -168,6 +168,6 @@ export const fieldMap = {
   field13: '病历号',
   field14: '是否重复',
   field15: '任务类型',
-  field16: '任务状态',
+  field16: '任务审批状态',
   field17: '项目类别',
 }

src/store/modules/dictonary.ts

@@ -116,7 +116,7 @@ export const useDictionaryStore = defineStore({
       // this.fetchIzShowList(); //废弃
       this.fetchIzProjectList();
       this.fetchIztaskrromList();
-      this.fetchIztaskstatusList();
+      this.fetchIztaskstatusList(); 
       this.fetchIzvisitproList();
       this.fetchIzfirmList();
       this.fetchIzproductnameList();

src/views/final/content/Content.vue

@@ -415,9 +415,19 @@ async function formatColumns() {
       key: columnsRef.value[index].key,
       fixed: columnsRef.value[index].fixed || undefined,
       width: 200,
+         sorter: 'default',
+      renderSorterIcon: ({ order }) => {
+        if (order === false)
+          return h(SvgIcon, { name: 'sort-2' })
+        if (order === 'ascend')
+          return h(SvgIcon, { name: 'sort-1' })
+        if (order === 'descend')
+          return h(SvgIcon, { name: 'sort-3' })
+      },
       render(row: any) {
         return row.fromusername
       },
+   
     }
   }
 
@@ -545,7 +555,7 @@ async function handleSorterChange(value) {
   else if (name === 'similarityscore')
     name = 'similarity_score'
   else if (name === 'fromusername')
-    name = 'fromuserid'
+    name = 'field1'
 
   sortname.value = name
   sortorder.value = value.order === 'ascend' ? 'asc' : 'desc'
@@ -729,7 +739,7 @@ function validate(items: any[]) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex,type:'table' },
   })
 }
 

src/views/final/content/ListContent.vue

@@ -189,7 +189,7 @@ async function query(
     ...params,
   })
   const { data, pageCount, totalCount } = result
-  // console.log(data, pageCount, totalCount);
+   console.log(data, pageCount, totalCount);
   const newlist = []
   const oldlist = tableData.value
   if (oldlist.length > 0) {
@@ -239,7 +239,7 @@ function isValidTimestamp(value) {
 function goDetail(row) {
   router.push({
     name: 'final-detail',
-    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndex },
+    query: { id: row.id, packageid: row.packageid, taskindex: row.taskIndexm,type:'card' },
   })
 }
 // 小结批量不通过
@@ -423,6 +423,7 @@ function checkBottom() {
   if (!container)
     return
 
+
   // const { scrollTop, clientHeight, scrollHeight } = container;
   const scrollTop = window.pageYOffset || document.documentElement.scrollTop
 
@@ -434,11 +435,13 @@ function checkBottom() {
   const scrollHeight = document.documentElement.scrollHeight
 
   clearTimeout(debounceTimer)
+ // console.log(pagination)
   debounceTimer = setTimeout(() => {
-    if (scrollTop + clientHeight >= scrollHeight - 10) {
+    if (scrollTop + clientHeight >= scrollHeight -500&&!(pagination.pageCount<num)) {
       num = num + 1
       console.log(num)
-      query(num, 20,{},props.taskvalue)
+      console.log( pagination.pageCount)
+     query(num, 20,{},props.taskvalue)
       //  fetchData(); // 接近底部时加载更多数据
     }
   }, 500)

src/views/final/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
+import { ref , onMounted} from 'vue'
 import Aside from './aside/Aside.vue'
 import Content from './content/Content.vue'
 import ListContent from './content/ListContent.vue'
@@ -26,6 +26,15 @@ if(asideref.value?.showSearch){
   }
 
 }
+onMounted(()=>{
+   const searchParams = new URLSearchParams(window.location.search);
+  const type = searchParams.get('type');
+  if(type=='table'){
+   showList.value=false
+  }else{
+    showList.value=true
+  }
+})
 </script>
 
 <template>

src/views/home/aside/comp/items/Iztaskstatus.vue

@@ -57,7 +57,7 @@ const labStyle = {
 }
 
 onBeforeMount(async () => {
-  const list = await configStore.fetchIztaskstatusList()
+  const list = await configStore.fetchizstatusListt()
   options.value = list
 })
 const isLoadValue = ref(false)
@@ -71,7 +71,7 @@ function onChange(value: Array<string>) {
   <n-form :model="formValue" style="padding: 0px 10px;" :rules="rules">
     <n-form-item :label="label" path="plans" :label-style="labStyle">
       <n-select filterable
-        v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择任务状态" multiple :options="options"
+        v-model:value="formValue.plans" :max-tag-count="2" placeholder="请选择任务审批状态" multiple :options="options"
         @update:value="onChange"
       />
     </n-form-item>

src/views/task/content/Content.vue

@@ -552,7 +552,13 @@ function reloadList(param, text) {
 }
 
 function goBack() {
+   const searchParams = new URLSearchParams(window.location.search);
+  const type = searchParams.get('type');
+  if(type){
+ router.push({ name: 'final', query: { type: type} }) 
+  }else{
   router.back()
+  }
 }
 
 function switchBatch() {