Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

src/views/demo/onlineform/formCall/CreateOrModifyComponent/index.vue

@@ -30,8 +30,6 @@ import dayjs from 'dayjs';
 const props = defineProps(['data'])
 const show = props.data.display
 const isTime = ['createtime', 'modifytime'].includes(props.data.type)
-console.log(show)
-console.log(isTime)
 const nowTime = ref(dayjs().format('YYYY-MM-DD HH:mm:ss'))
 const userName = localStorage.getItem('fireUserLoginName')
 </script>

src/views/demo/workflow/task/index.vue

@@ -1,7 +1,12 @@
 <template>
   <ScrollContainer>
     <div ref="wrapperRef" :class="prefixCls">
-      <Tabs tab-position="left" :tabBarStyle="tabBarStyle" v-model:activeKey="component">
+      <Tabs
+        tab-position="left"
+        :tabBarStyle="tabBarStyle"
+        v-model:activeKey="componentCode"
+        @change="changeKey"
+      >
         <template v-for="item in settingList" :key="item.key">
           <TabPane :tab="item.name">
             <div :style="'display: flex; height:' + data.height">
@@ -15,7 +20,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { reactive } from 'vue';
+  import { reactive, ref } from 'vue';
   import { Tabs } from 'ant-design-vue';
   import { ScrollContainer } from '@/components/Container';
   import { settingList } from './data';
@@ -31,7 +36,8 @@
   } from './page';
 
   const route = useRoute();
-  const component = route.query.component;
+  let componentCode = ref('');
+  componentCode.value = route.query.component;
   const TabPane = Tabs.TabPane;
   const tabs = {
     CreateFlow,
@@ -50,6 +56,9 @@
   const tabBarStyle = {
     width: '220px',
   };
+  function changeKey(e) {
+    componentCode.value = e;
+  }
 </script>
 <style lang="less" scoped>
   .account-setting {

src/views/demo/workflow/task/process/audit.vue

@@ -114,7 +114,7 @@
                       :color="btn.type"
                       :type="btn.type ? btn.type : 'primary'"
                       @click="handleBtnClick(btn)"
-                      >{{ btn.name }} {{ btn.code }}</a-button
+                      >{{ btn.name }}</a-button
                     >
                   </a-form-item>
                 </a-form>
@@ -634,6 +634,7 @@
     }
   }
   async function handleSubmit(btn) {
+    console.log('handleSubmit')
     const currentBtn = btn;
     designerData.currentBtn = currentBtn;
     let res: any;
@@ -678,7 +679,7 @@
             //   return;
             // }
           }
-          // res = await auditFun();
+          res = await auditFun();
         }
         break;
     }