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

src/design/color.less

@@ -18,6 +18,10 @@ html {
   // component
   --component-background-color: #fff;
 
+  // component-onlineform-formdesign
+  --component-onlineform-formdesign-background-color: #EBEDF1;
+  --component-onlineform-formdesign-alert-background-color: #FFFBE6;
+
   // app
   --app-content-background-color: #fafafa;
 
@@ -35,6 +39,10 @@ html {
     // component
     --component-background-color: #151515;
 
+    // component-onlineform-formdesign
+    --component-onlineform-formdesign-background-color: #303030;
+    --component-onlineform-formdesign-alert-background-color: #303030;
+
     // app
     --app-content-background-color: #1e1e1e;
 
@@ -53,6 +61,9 @@ html {
 
 @component-background: var(--component-background-color);
 
+@component-onlineform-formdesign-background-color: var(--component-onlineform-formdesign-background-color);
+@component-onlineform-formdesign-alert-background-color: var(--component-onlineform-formdesign-alert-background-color);
+
 // :export {
 //   name: "less";
 //   mainColor: @mainColor;

src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue

@@ -521,11 +521,7 @@
       padding: 1px;
 
       &-textarea {
-        // @if @border-color-base == #141414 {
-        background-color: @border-color-base;
-        // } @else  {
-        //   background-color: #fffbe6;
-        // }
+        background-color: @component-onlineform-formdesign-alert-background-color;
       }
     }
   }

src/views/demo/form-design/components/VFormDesign/components/FormProps.vue

@@ -266,11 +266,7 @@
       padding: 1px;
 
       &-textarea {
-        // @if @border-color-base == #141414 {
-        background-color: @border-color-base;
-        // } @else  {
-        //   background-color: #fffbe6;
-        // }
+        background-color: @component-onlineform-formdesign-alert-background-color;
       }
     }
   }

src/views/demo/form-design/components/VFormDesign/styles/drag.less

@@ -1,7 +1,7 @@
 .draggable-box {
   height: 100%;
   overflow: auto;
-  background-color: @background-color;
+  background-color: @component-onlineform-formdesign-background-color;
   
 
   :deep(.list-main) {
@@ -36,7 +36,6 @@
       min-height: 60px;
       padding: 8px;
       margin: 3px;
-
       overflow: hidden;
       transition: all 0.3s;
       border-radius: 3px;

src/views/demo/form-design/components/VFormDesign/styles/variable.less

@@ -1,5 +1,4 @@
 // 表单设计器样式
-@background-color: #EBEDF1;
 @primary-color: #1E5EFFFF;
 @layout-color: #A91EFFFF;
 

src/views/demo/onlineform/formModule/modalForm.vue

@@ -111,7 +111,8 @@
   // 表单选择声明
   const [registerModal, { openModal }] = useModal();
   // 表单ref
-  let formModuleRef: FormInstance | null = null;
+  // let formModuleRef: FormInstance | null = null;
+  const formModuleRef = ref()
   // 版本options
   const formVerisons = ref([]);
   // 上级options
@@ -247,9 +248,9 @@
     async () => {
       if (props.isNextSteps) {
         // 判断数据表字段重复
-        if (formModuleRef) {
+        if (formModuleRef.value) {
           try {
-            const valid = await formModuleRef.validate();
+            const valid = await formModuleRef.value.validate();
             if (valid.errorFields) {
               emit('set-steps-current', false);
             } else {

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

@@ -138,7 +138,7 @@
     var query = {
       id: record.id,
     };
-    if (record.isStart == 1 && record.isCancel == 0) {
+    if (record.isFinished == 1 || record.isAgain == 1) {
       return createMessage.warning('重新提交和结束的流程不能催办');
     }
     const data = await urge(query);
@@ -154,6 +154,15 @@
       taskId: record.id,
       id: record.processId,
     };
+    // isFinished 1 结束
+    // isAgain 1 重新提交
+    // isStart 1表示开始处理过了 0 还没人处理过
+    // isCancel 1 是否允许撤销 1 允许 0 不允许
+    if (record.isFinished == 1 || record.isAgain == 1) {
+      return createMessage.warning('重新提交和结束的流程不能撤销');
+    } else if (record.isStart != 0 && record.isCancel != 1) {
+      return createMessage.warning('不能撤销');
+    }
     if (record.isStart == 0) {
       const data = await revoke({
         id: record.id,