bug修复

src/components/Form/src/components/Upload.vue

@@ -65,11 +65,14 @@
         >
             <plus-outlined v-if="listType == 'picture-card'" />
             <div :style="style" v-else>
-                <a-button :loading="loading" :disabled="loading" v-if="!disabled">
+               <UploadOutlined v-if="!isShowBtnIcon" style="font-size: 18px;" />
-                    <upload-outlined />
+               <template v-else>
-                      {{ btnTip || '点击上传' }}
+                 <a-button :loading="loading" :disabled="loading" v-if="!disabled">
-                </a-button>
+                     <upload-outlined />
-                <div v-if="VITE_GLOB_UPLOAD_ALERT_TIP?.trim()" style="color: red; margin-top: 8px">
+                       {{btnTip || '上传'}}
+                 </a-button>
+               </template>
+                <div v-if="VITE_GLOB_UPLOAD_ALERT_TIP?.trim()&& isShowTip" style="color: red; margin-top: 8px">
                     {{ VITE_GLOB_UPLOAD_ALERT_TIP }}
                 </div>
             </div>
@@ -173,6 +176,14 @@
         dataDelete: { // 是否调接口删除
             type: Boolean,
             default: false
+        },
+        isShowTip: {
+            type: Boolean,
+            default: true
+        },
+        isShowBtnIcon: {
+            type: Boolean,
+            default: true
         }
     });
 
@@ -340,6 +351,7 @@
     };
     function handleClick() {
         list.value = [];
+        emit('click');
     }
     const handleRemove = async (info) => {
         const id = info.response ? info.response.data.id : info.id;

src/layouts/default/header/components/notify/index.vue

@@ -223,8 +223,8 @@
 
             const viewOpen = ref(false);
             const viewData = ref({});
-            function handleView(record, num) {
+            function handleView(record) {
-              viewData.value = {...record, typeId: num};
+              viewData.value = {...record};
               viewOpen.value = true;
             }
             function handleViewClose() {
@@ -385,7 +385,7 @@
                     await setSystemNoticeRead([ids]);
                 } else {
                     await setOaRead([ids]);
-                    handleView(record, num)
+                    handleView(record)
                 }
                 if (listData.value[num - 1].unreadNum > 0) listData.value[num - 1].unreadNum -= 1;
             }

src/views/approve/Appro/components/config.ts

@@ -63,7 +63,7 @@ export const columns: BasicColumn[] = [
     title: '编号',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [
     title: '签报类型',
     componentType: 'select',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -90,7 +90,7 @@ export const columns: BasicColumn[] = [
     title: '缓级',
     componentType: 'select',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -99,7 +99,7 @@ export const columns: BasicColumn[] = [
     title: '拟稿人',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 
@@ -108,7 +108,7 @@ export const columns: BasicColumn[] = [
     title: '拟稿人所属部门',
     componentType: 'input',
     align: 'left',
-
+    
     sorter: true,
   },
 
@@ -117,7 +117,7 @@ export const columns: BasicColumn[] = [
     title: '拟稿日期',
     componentType: 'select',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -126,7 +126,7 @@ export const columns: BasicColumn[] = [
     title: '审批状态',
     componentType: 'select',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 ];

src/views/mdm/Bank/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <PageWrapper dense fixedHeight contentFullHeight contentClass="flex" class="cusFormStyle bankStyle">
+  <PageWrapper dense fixedHeight contentFullHeight contentClass="flex" class="bankStyle">
       <BasicTable @register="registerTable" ref="tableRef"   @row-dbClick="dbClickRow">
        
         <template #toolbar>
@@ -373,7 +373,7 @@ const logPath = ref('/mdm/bank/datalog');
   };
 </script>
 <style lang="less">
-  .cusFormStyle .cusSearchForm .advanceRow> div:nth-of-type(3){
+  .bankStyle .cusSearchForm .advanceRow> div:nth-of-type(3){
     display: none;
   }
   .bankStyle .w-full .advanceRow> div:nth-of-type(4){

src/views/sales/GradeSystem/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <PageWrapper dense fixedHeight contentFullHeight contentClass="flex cusFormStyle GradeSystem">
+  <PageWrapper dense fixedHeight contentFullHeight contentClass="flex GradeSystem">
       <BasicTable @register="registerTable" ref="tableRef"   @row-dbClick="dbClickRow">
        
         <template #toolbar>
@@ -360,7 +360,7 @@
   };
 </script>
 <style lang="less">
-  .cusFormStyle .cusSearchForm .advanceRow> div:nth-of-type(3){
+  .GradeSystem .cusSearchForm .advanceRow> div:nth-of-type(3){
     display: none;
   }
   .GradeSystem .w-full .advanceRow> div:nth-of-type(4){

src/views/sales/ScoreCustomer/components/config.ts

@@ -59,7 +59,7 @@ export const columns: BasicColumn[] = [
     title: '评价分数',
     componentType: 'input',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
   {
@@ -67,7 +67,7 @@ export const columns: BasicColumn[] = [
     title: '评价日期',
     componentType: 'date',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
     title: '审批状态',
     componentType: 'select',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 ];

src/views/supplier/ScoreSupplier/components/config.ts

@@ -60,7 +60,7 @@ export const columns: BasicColumn[] = [
     title: '评价分数',
     componentType: 'input',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
   {
@@ -68,7 +68,7 @@ export const columns: BasicColumn[] = [
     title: '评价日期',
     componentType: 'time',
     align: 'left',
-
+    width: 120,
     sorter: true,
   },
 
@@ -77,7 +77,7 @@ export const columns: BasicColumn[] = [
     title: '审批状态',
     componentType: 'select',
     align: 'left',
-
+    width: 100,
     sorter: true,
   },
 ];

src/views/workflow/design/bpmn/modeler/custom/CustomContextPad.ts

@@ -10,6 +10,8 @@ import { getChildLanes } from './../util/LaneUtil';
 
 import { getTranslate } from './../util/TranslateUtil';
 import { useI18n } from '/@/hooks/web/useI18n';
+import { storeToRefs } from 'pinia';
+import { useBpmnStore } from '/@bpmn/store/bpmn';
 const { t } = useI18n();
 export default function ContextPadProvider(
   this: any,
@@ -216,6 +218,16 @@ ContextPadProvider.prototype.getContextPadEntries = function (element: {
   if (isAny(businessObject, ['bpmn:Lane', 'bpmn:Participant'])) {
   }
   if (is(businessObject, 'bpmn:FlowNode')) {
+    const store = useBpmnStore();
+    const { info } = storeToRefs(store);
+    let isSecond = false
+    let num = 0
+    info.value.forEach((v) => {
+      num++
+      if (num==2&& v.id==element.id) {
+        isSecond = true
+      }
+      })
     if (is(businessObject, 'bpmn:EventBasedGateway')) {
     } else if (
       isEventType(businessObject, 'bpmn:BoundaryEvent', 'bpmn:CompensateEventDefinition')
@@ -267,7 +279,7 @@ ContextPadProvider.prototype.getContextPadEntries = function (element: {
           },
         },
         delete: {
-          group: is(element, 'bpmn:StartEvent') ? 'none' : 'event2',
+          group: is(element, 'bpmn:StartEvent') || isSecond ? 'none' : 'event2',
           className: 'bpmn-icon-trash',
           title: getTranslate(t('删除')),
           action: {