bug修复

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: {