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

components.d.ts

@@ -34,6 +34,7 @@ declare module 'vue' {
     NModal: typeof import('naive-ui')['NModal']
     NNotificationProvider: typeof import('naive-ui')['NNotificationProvider']
     NotPassed: typeof import('./src/components/NotPassed.vue')['default']
+    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopover: typeof import('naive-ui')['NPopover']
     NPopselect: typeof import('naive-ui')['NPopselect']
     NProgress: typeof import('naive-ui')['NProgress']

src/store/modules/user.ts

@@ -124,6 +124,11 @@ export const useUserStore = defineStore({
         // 默认设置为第一个租户
         const firstTenant = data.tenantList.length > 0 ? data.tenantList[0] : null
         const tenantId = firstTenant ? firstTenant.id : ''
+        data.frontmenuTList.forEach(ele=>{
+          if(ele.description === 'AI工单'){
+            ele.description = '图审审批管理'
+          }
+        })
         storage.set(CURRENT_USER, data, ex)
         storage.set(TENANT_ID, tenantId)
         this.setUserInfo(data)

src/views/final/comp/NewFilterModal.vue

@@ -84,10 +84,10 @@ const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: null,
+  logic: 'where',
   conditions: [{
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   }],
 })

src/views/home/aside/comp/modals/NewFilterModal.vue

@@ -84,10 +84,10 @@ const formRef = ref<FormInst | null>(null)
 
 const formValue = reactive<FormType>({
   name: null,
-  logic: null,
+  logic: 'where',
   conditions: [{
     type: null,
-    operator: null,
+    operator: 'eq',
     result: null,
   }],
 })

src/views/home/content/modal/LoginSuccessModal.vue

@@ -13,7 +13,7 @@ const toolsData = ref({} as any);
 async function getData(){
   const res=await getToolsCount();
   toolsData.value=res.data || {};
-  if(!JSON.parse(res.message)){
+  if(res.code == 'OK'){
     showModal();
   }
 }

src/views/task/modal/CustomSettingModal.vue

@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { defineEmits, defineProps, onMounted, ref } from 'vue'
+import { computed, defineEmits, defineProps, onMounted, ref } from "vue";
-import { getAllfieldList, getfieldList, savefield } from '@/api/home/filter'
+import { getAllfieldList, getfieldList, savefield } from "@/api/home/filter";
-import { ReportInfoConfig } from '@/config/workorder'
+import { ReportInfoConfig } from "@/config/workorder";
-import { useUser } from '@/store/modules/user'
+import { useUser } from "@/store/modules/user";
 
 const props = defineProps({
   reviewType: {
@@ -10,140 +10,143 @@ const props = defineProps({
     default: () => 3,
     require: true,
   },
-})
+});
-const emit = defineEmits(['onOk'])
+const emit = defineEmits(["onOk"]);
 
 onMounted(async () => {
-  const userStore = useUser()
+  const userStore = useUser();
-  const userInfo = userStore.getUserInfo
+  const userInfo = userStore.getUserInfo;
-  let res
+  let res;
-  res = await getAllfieldList(props.reviewType) // 所有筛选项目
+  res = await getAllfieldList(props.reviewType); // 所有筛选项目
-  const allList = res.data
+  const allList = res.data;
-  res = await getfieldList(props.reviewType, userInfo.id) // 当前用户选择的项目
+  res = await getfieldList(props.reviewType, userInfo.id); // 当前用户选择的项目
-  const useList = res.data
+  const useList = res.data;
   /**
    * name 标题
    * id 键值
    * fix 是否默认
    * checked 是否选中
    */
-  const userFieldFixed = useList.userFieldFixed?.split(',')
+  const userFieldFixed = useList.userFieldFixed?.split(",");
-  const userFieldUnFixed = useList.userFieldUnFixed?.split(',')
+  const userFieldUnFixed = useList.userFieldUnFixed?.split(",");
   allList.map((v) => {
     const item = {
       name: v.fieldDesc,
       id: v.name,
       fix: v.isrequired == 2,
       checked:
-        v.isrequired == 2
+        v.isrequired == 2 ||
-        || Boolean(userFieldFixed?.find(v2 => v2 == v.name))
+        Boolean(userFieldFixed?.find((v2) => v2 == v.name)) ||
-        || Boolean(userFieldUnFixed?.find(v2 => v2 == v.name)),
+        Boolean(userFieldUnFixed?.find((v2) => v2 == v.name)),
-    }
+    };
-    offList.value.push(item)
+    offList.value.push(item);
-  })
+  });
-})
+});
-
+
-const offList = ref<any[]>([])
+const offList = ref<any[]>([]);
 function generatList() {
-  const keys = Object.keys(ReportInfoConfig)
+  const keys = Object.keys(ReportInfoConfig);
-  const hideList: object[] = []
+  const hideList: object[] = [];
   for (const key of keys) {
-    const name = ReportInfoConfig[key]?.label
+    const name = ReportInfoConfig[key]?.label;
-    const isDefault = ReportInfoConfig[key]?.isDefault
+    const isDefault = ReportInfoConfig[key]?.isDefault;
 
     // 系统配置为Y且不是默认配置
     if (!isDefault) {
       hideList.push({
         id: key,
-        name: name || '未配置',
+        name: name || "未配置",
         fix: isDefault,
         checked: ReportInfoConfig[key].isDefault,
-      })
+      });
     }
   }
 
-  const fixedList = generateDefaultList()
+  const fixedList = generateDefaultList();
 
-  hideList.unshift(...fixedList)
+  hideList.unshift(...fixedList);
 
-  offList.value = hideList
+  offList.value = hideList;
-  return { hideList }
+  return { hideList };
 }
 
 function generateDefaultList() {
   return Object.keys(ReportInfoConfig).reduce((acc, key) => {
-    const { label, isDefault } = ReportInfoConfig[key]
+    const { label, isDefault } = ReportInfoConfig[key];
 
     if (isDefault) {
       const config = {
         id: key,
-        name: label || '未配置',
+        name: label || "未配置",
         fix: true,
         checked: true,
+      };
+      return [...acc, config];
+    } else {
+      return acc;
     }
-      return [...acc, config]
+  }, []);
-    }
-    else {
-      return acc
-    }
-  }, [])
 }
 
-const show = ref(false)
+const show = ref(false);
-const checkAll = ref(false)
+const checkAll = computed(() => {
+  return offList.value.length == selectIds.value.length;
+});
 
 function showModal() {
-  show.value = true
+  show.value = true;
 }
 
 function closeModal() {
-  show.value = false
+  show.value = false;
 }
 async function handleSumbit(e: MouseEvent) {
-  const userStore = useUser()
+  const userStore = useUser();
-  const userInfo = userStore.getUserInfo
+  const userInfo = userStore.getUserInfo;
-  let userField = ''
+  let userField = "";
   offList.value.map((v) => {
-    if (v.checked)
+    if (v.checked) userField += `${v.id},`;
-      userField += `${v.id},`
+  });
-  })
+  userField = userField.slice(0, userField.length - 1);
-  userField = userField.slice(0, userField.length - 1)
+  savefield(props.reviewType, userInfo.id, userField);
-  savefield(props.reviewType, userInfo.id, userField)
+  e.preventDefault();
-  e.preventDefault()
+  closeModal();
-  closeModal()
+  emit("onOk");
-  emit('onOk')
 }
 
 defineExpose({
   showModal,
-})
+});
 
 // generatList();
 
-const selectIds = ref<string[]>([])
+const selectIds = ref<string[]>([]);
 
 function onCheckAllChange(value) {
-  const ids: string[] = []
+  const ids: string[] = [];
 
   for (const item of offList.value) {
     if (!item.fix) {
-      item.checked = value
+      item.checked = value;
-      ids.push(item.id)
+      ids.push(item.id);
     }
   }
 
-  selectIds.value = value ? ids : []
+  selectIds.value = value ? ids : [];
 }
 
 function onCheckChange(checked: any, item: any) {
-  const index = selectIds.value.indexOf(item.id)
+  const index = selectIds.value.indexOf(item.id);
 
-  item.checked = checked
+  item.checked = checked;
 
-  if (index === -1 && checked)
+  if (index === -1 && checked) selectIds.value.push(item.id);
-    selectIds.value.push(item.id)
+  else selectIds.value.splice(index, 1);
-  else selectIds.value.splice(index, 1)
 }
+
+const indeterminate = computed(() => {
+  return offList.value.length > 0 && offList.value.length > selectIds.value.length;
+});
 </script>
 
 <template>
@@ -171,8 +174,10 @@ function onCheckChange(checked: any, item: any) {
                   <div class="draggable-li" style="background: #f8f8f8">
                     <n-checkbox
                       v-model:checked="checkAll"
-                      label="全部"
+                      label="全选"
                       @update:checked="onCheckAllChange"
+                      :class="{ checkAll: indeterminate }"
+                      :indeterminate="indeterminate"
                     />
                   </div>
                   <div class="content">
@@ -199,9 +204,7 @@ function onCheckChange(checked: any, item: any) {
       </div>
       <template #footer>
         <div class="wrapper-footer">
-          <n-button type="info" @click="handleSumbit">
+          <n-button type="info" @click="handleSumbit"> 确定 </n-button>
-            确认
-          </n-button>
           <n-button secondary style="margin-left: 15px" @click="closeModal">
             取消
           </n-button>
@@ -288,7 +291,7 @@ function onCheckChange(checked: any, item: any) {
     color: #333;
     display: flex;
     align-items: center;
-    border-bottom: 1px solid #E8E8E8;
+    border-bottom: 1px solid #e8e8e8;
   }
 
   .disable-check {
@@ -296,9 +299,7 @@ function onCheckChange(checked: any, item: any) {
   }
 }
 
-::v-deep(
+::v-deep(.n-card.n-card--content-segmented > .n-card__content:not(:first-child)) {
-    .n-card.n-card--content-segmented > .n-card__content:not(:first-child)
-  ) {
   border: 0px;
 }
 
@@ -306,5 +307,4 @@ function onCheckChange(checked: any, item: any) {
   --n-padding-top: 0px;
   --n-padding-bottom: 12px;
 }
-
 </style>

src/views/worksheet/aside/ListItem.vue

@@ -28,15 +28,16 @@ const props = defineProps({
     default: () => [],
   },
 });
-const isDismissTask = ref(false)
 const svgName = computed(() => {
   return props.selected ? "taskpack-select" : "taskpack";
 });
 
+const popconfirmTarget: any = ref(null)
+const popconfirmRef: any = ref(null)
 
 function handleDismissTask() {
-  isDismissTask.value = true
   emit('dismisClick',  props.mouseOverTask.id)
+  popconfirmRef.value[0]?.setShow(false); // 关闭 popconfirm
 }
 
 onMounted(async () => {
@@ -44,7 +45,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="list-item" :class="{ 'list-item-selected': selected }">
+  <div class="list-item" :class="{ 'list-item-selected': selected }" ref="popconfirmTarget">
     <div v-for="(item, index) in showFieldList" :key="index">
       <div v-if="item.id === 'name'" class="list-item-header">
         <div class="id-wrap">
@@ -54,12 +55,15 @@ onMounted(async () => {
               {{ listItem.name }}
             </n-ellipsis>
             <span class="list-item-header-selected">({{ listItem.pictureCount }})</span>
-            <n-popover placement="bottom" trigger="hover" >
+            <n-popconfirm id="taskPopconfirmRef" ref="popconfirmRef" :show-icon="false" :show-arrow="false"
+              placement="bottom" trigger="click">
               <template #trigger>
-                <span class="dismiss-task-pack"  v-show="mouseOverTask?.id" style="cursor: pointer;" @click.stop="handleDismissTask">...</span>
+                <span class="dismiss-task-pack" v-show="mouseOverTask?.id" style="cursor: pointer;">...</span>
               </template>
-              <span>解散任务包</span>
+              <template #action>
-            </n-popover>
+                <span @click="handleDismissTask" style="cursor: pointer;">解散任务包</span>
+              </template>
+            </n-popconfirm>
           </span>
         </div>
       </div>

src/views/worksheet/aside/WorkSheetList.vue

@@ -126,14 +126,17 @@ async function search(word: string) {
 function overTaskHandelr(item: any) {
   overTask.value = item
 }
-function leaveTaskHandler() {
+function leaveTaskHandler(event) {
+  if(event?.relatedTarget?.id !=="taskPopconfirmRef"){
     overTask.value = null;
+  }
 }
 const message = useMessage()
 function dismisClick(packageId:string) {
   deletePackage({packageId: packageId}).then((res) => {
     if(res.code==="OK"){
       message.success("解散任务包成功")
+      reset()
       loadMore()
     }
   })

src/views/worksheet/content/Content.vue

@@ -194,6 +194,7 @@ watch(
     if (isEmpty(packageid)) {
       listData.value.length = 0;
       totalCount.value = 0;
+      taskDetailInfo.value = {}
       return;
     }
     queryDetail(packageid)

src/views/worksheet/modal/ApprovalModal.vue

@@ -78,7 +78,7 @@ async function viewRepeat(e: MouseEvent) {
 
 async function getShowStatus() {
   const res = await getToolsCount();
-  if (!JSON.parse(res.message)) {
+  if (res.code == 'OK') {
     show.value = true;
   }
 }