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

src/components/FormViewer/cardGourp.vue

@@ -78,7 +78,6 @@
       showActionButtonGroup: false,
       baseColProps: { lg: 24, md: 24 },
     });
-  console.log(props);
   watch(
     () => props.formData,
     (newVal) => {
@@ -146,13 +145,11 @@
         if (['createuser', 'modifyuser'].includes(childElement.type)) {
           var obj = {};
           obj[childElement.field] = userName;
-          console.log(obj);
           subTableDataStore.setGroupData(obj);
         }
         if (['createtime', 'modifytime'].includes(childElement.type)) {
           var obj = {};
           obj[childElement.field] = nowTime.value;
-          console.log(obj);
           subTableDataStore.setGroupData(obj);
         }
       });

src/components/FormViewer/index.vue

@@ -90,7 +90,6 @@
     issueId: String,
     isDetail: Boolean,
   });
-  console.log(props);
   const subTableId = ref(null);
   const subTableColumns: any = ref([]);
   const subTableDB = ref([]);
@@ -131,15 +130,11 @@
       },
     });
   async function getFormHistory() {
-    console.log('getFormHistory');
-
     const data = await LoadFormScheme({
       schemeId: props.formVerison,
     });
     if (data) {
       const scheme = JSON.parse(data.scheme);
-      console.log(scheme.formInfo.tabList);
-      console.log(props.formConfig);
       scheme.formInfo.tabList.forEach((tabElement, index) => {
         tabElement.schemas.forEach((element) => {
           //流程设置的表单显示和编辑与表单做关联
@@ -186,7 +181,6 @@
       subTableColumns.value = [];
       // 将card组件嵌套起来
       scheme.formInfo.tabList = cardNestStructure(scheme.formInfo.tabList);
-      console.log(scheme.formInfo.tabList);
       subTableDB.value = scheme.db;
       let disDetail = false;
       let tableColumns = [];
@@ -289,12 +283,10 @@
         }
       });
       formModalVisible.value = true;
-      console.log(formColumns);
       setTimeout(() => {
         subTableDataStore.setTableData(tableColumns);
         resetFields();
         if (!disDetail) {
-          console.log('赋值赋值');
           if (props.flowFormData) {
             setFieldsValue(props.flowFormData);
           }
@@ -303,7 +295,6 @@
     }
   }
   async function tabsChange(e) {
-    console.log('tabsChange');
     tabsKey.value = e;
     formColumns.forEach((element) => {
       element.show = false;
@@ -332,7 +323,6 @@
   }
 
   async function getFormDetail() {
-    console.log('getFormDetail');
     var instance = JSON.parse(props.instanceInfo);
     const querys = {
       id: props.formVerison,
@@ -356,7 +346,6 @@
         }
       });
     }
-    console.log(obj);
     cardGourpFormData.value = obj;
     subTableDataStore.setGroupData(obj);
     FieldsValue.value = obj;
@@ -395,7 +384,6 @@
   }
   const groupRef = ref();
   async function getForm() {
-    // console.log(groupRef.value.verify());
     try {
       let values = await validate();
       for (const key in values) {
@@ -407,14 +395,11 @@
           }
         }
       }
-      console.log(values);
-      console.log(FieldsValue.value);
       let cardValueList = Object.values(cardValues.value);
       cardValueList.forEach((item) => {
         values = { ...values, ...item };
       });
       let query = values;
-      console.log(query);
       // 存储子表的信息
       if (subTableDataStore.getTableData.length > 0) {
         subTableDataStore.getTableData.forEach((item) => {
@@ -427,7 +412,6 @@
           query[key] = subTableDataStore.getGroupData[key];
         }
       }
-      console.log(query);
       // 存储创建人、创建时间等内容
       if (createOrModifyList.value.length > 0) {
         createOrModifyList.value.forEach((item) => {
@@ -440,16 +424,12 @@
           }
         });
       }
-      console.log(query);
       return query;
     } catch (error) {
       console.log(error);
       return false;
     }
   }
-  async function getIssueInfo() {
-    console.log('111', props.issueId);
-  }
   defineExpose({
     getForm,
   });
@@ -460,9 +440,6 @@
     if (props.formVerison) {
       getFormHistory();
     }
-    if (props.issueId) {
-      getIssueInfo();
-    }
   });
 </script>
 

src/components/ProcessDesigner/package/penal/exclusiveGateway/index.vue

@@ -93,7 +93,6 @@
     (newVal) => {
       if (newVal.type == 'bpmn:ExclusiveGateway') {
         const currentNode = flowWfDataStore.getWfDataNode(newVal.id);
-        console.log(currentNode);
         if (currentNode) {
           node.value = currentNode;
         } else {
@@ -188,7 +187,6 @@
       }
       data.formulaVisible = false;
     }
-    console.log(node.value.conditions);
   }
   function handleSqlOk() {
     conditionSqlRef.value.validateForm();
@@ -210,7 +208,6 @@
     }
   }
   function onEdit(record) {
-    console.log(record);
     data.isEdit = true;
     propsData.value = record;
     if (record.type == 1) {

src/components/ProcessDesigner/package/penal/startEvent/index.vue

@@ -291,7 +291,6 @@
   onMounted(() => {
     if (props.element.type == 'bpmn:StartEvent') {
       const currentNode = flowWfDataStore.getWfDataNode(props.element.id);
-      console.log(currentNode);
       if (currentNode) {
         node.value = currentNode;
       } else {

src/components/ProcessDesigner/package/penal/userTask/index.vue

@@ -929,7 +929,6 @@
       value?: string;
     }[] = [];
     scheme.formInfo.tabList = cardNestStructure(scheme.formInfo.tabList);
-    console.log(scheme.formInfo.tabList);
     scheme.formInfo.tabList.forEach((tabElement) => {
       const {rFieldList, fieldList} = getRFields(tabElement.schemas,rfields,fields)
       rfields = rFieldList

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

@@ -64,7 +64,7 @@
       width="100%"
       wrap-class-name="full-modal"
       v-model:open="previewOpen"
-      title="11"
+      title="流程发起"
       :destroyOnClose="true"
     >
       <template #footer> </template>

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

@@ -337,7 +337,6 @@
     designerData.task = data.task;
     let content = JSON.parse(data.scheme.content);
     let wfData = content.wfData;
-    console.log('wfData', wfData);
     const map = new Map();
     const newArr = data.logs.filter((v) => !map.has(v.unitId) && map.set(v.unitId, v));
     rejectRelations.value = newArr;
@@ -372,7 +371,6 @@
       // 有PC系统表单时
       formUrlVisble.value = true;
       let url = '../../../' + currentNode.formUrl + '.vue';
-      console.log(url);
       // AsyncComponent.value = defineAsyncComponent(() => import(url));
       AsyncComponent.value = defineAsyncComponent({
         // 加载函数
@@ -553,7 +551,6 @@
     const currentNode: currentNodeObject =
       wfData.find((t) => t.id == designerData.task.unitId) || {};
     designerData.currentNode = currentNode;
-    console.log('currentNode', currentNode);
     // 设置审核按钮
     const btns: taskBtnsType[] = [];
     if (currentNode.type == 'bpmn:StartEvent') {
@@ -608,7 +605,6 @@
       formBoxRef.value
         .getForm()
         .then(async (res) => {
-          console.log(res);
           res[designerData.formCurrentNode.formRelationId] = instanceInfo.pkeyValue;
           for (var item in res) {
             if (res[item] == undefined) {
@@ -633,14 +629,12 @@
       //有系统表单，先存系统表单
       const funName = btn.code;
       const res = await pcForm.value[funName]();
-      console.log(res);
       handleSubmit(btn);
     } else {
       handleSubmit(btn);
     }
   }
   async function handleSubmit(btn) {
-    console.log('handleSubmit');
     const currentBtn = btn;
     designerData.currentBtn = currentBtn;
     let res: any;
@@ -668,8 +662,6 @@
             des: formData.value.des,
           });
         } else {
-          console.log(designerData.currentNode.rejectType);
-          console.log(btn.code);
           if (designerData.currentNode.rejectType == '2' && btn.code == 'disagree') {
             designerData.selectRejectNodeVisible = true;
             rejectOpen.value = true;

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

@@ -147,7 +147,6 @@
     },
   });
   async function handleDetail(record) {
-    console.log(record);
     if (record.type == 3) {
       previewOpen.value = true;
       childRecord.value = record;