merge

dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/CustomFormDesign.vue

@@ -6,8 +6,8 @@
         <div class="design-header fields-header">字段组件</div>
         <div class="design-main fields-main">
           <vuedraggable :list="defaultComOptions" :group="{name: 'customComGroup', pull: 'clone', put: false}" class="design-draggable-fields"
-            draggable=".draggable-fields-item" ghostClass="dragClass" :clone="targetComClone" :sort="false" :disabled="!subfieldModuleList.length"
-            @end="fieldsOnEnd">
+            draggable=".draggable-fields-item" ghostClass="subfield-origin-dragClass" :clone="targetComClone" :sort="false"
+            :disabled="!subfieldModuleList.length" @end="fieldsOnEnd">
             <transition-group name="fade" tag="div" class="draggable-fields-list">
               <div class="draggable-fields-item" :class="{'has-no-subfield-module' : !subfieldModuleList.length}"
                 v-for="(item,index) of defaultComOptions" :key="index" @click="fieldsItemClick">
@@ -22,19 +22,21 @@
       <div class="custom-form-design-options">
         <div class="design-header options-header">表单配置</div>
         <div class="design-main options-main">
-          <el-form class="custom-design-el-form" ref="customDesignFormRef" :rules="{}" @submit.native.prevent>
+          <el-form class="custom-design-el-form" ref="customDesignFormRef" :model="" :rules="{}" @submit.native.prevent>
 
             <!-- 最外层dragg容器 拖动模块module .subfield-module-dragg-target-icon -->
             <vuedraggable :list="subfieldModuleList" group="customSubfieldmodule" class="subfield-module-container"
               draggable=".subfield-module-item-container" handle=".subfield-module-dragg-target-icon" :animation="340">
               <!-- 添加的分栏模块以及chidren模块 -->
               <transition-group name="fade" tag="div" class="subfield-module-list">
-                <vuedraggable v-for="(item,index) of subfieldModuleList" draggable=".subfield-item-container"
-                  handle=".subfield-module-item-dragg-target-icon" tag="subfield-module" :list="item.children" group="customComGroup"
-                  :component-data="createComponentData(item)" :key="item.uid" :animation="340">
+                <div class="subfield-module-draggable-list" v-for="(item,index) of subfieldModuleList" :key="item.uid">
+                  <vuedraggable draggable=".subfield-item-container" handle=".subfield-module-item-dragg-target-icon" tag="subfield-module"
+                    :list="item.children" group="customComGroup" :component-data="createComponentData(item)" :animation="340"
+                    ghostClass="subfield-item-dragClass" :sort="true">
                     <subfield-item v-for="(child,index) of item.children" :key="child.uid" :parentUid="item.uid" :childModuleInfo="child"
                       @removeModuleItem="removeModuleItem"></subfield-item>
                   </vuedraggable>
+                </div>
               </transition-group>
             </vuedraggable>
 
@@ -107,7 +109,6 @@ export default {
     targetComClone(v) {
       const cloneTarget = JSON.parse(JSON.stringify(v));
       cloneTarget.uid = v4();
-      console.log(cloneTarget);
       return cloneTarget;
     },
     // 字段组件结束拖动
@@ -161,7 +162,7 @@ export default {
       }
     },
     removeDialogClose() {
-      this.removeSubfieldModuleUid = "";
+      this.removeSubfieldModule = {};
     },
     removeOk() {
       const index = this.subfieldModuleList.findIndex(item => item.uid == this.removeSubfieldModule.uid);
@@ -184,8 +185,27 @@ export default {
     display: flex;
     min-width: 1140px;
 
-    .dragClass {
-      border: 1px solid #0081ff;
+    .subfield-origin-dragClass,
+    .subfield-item-dragClass {
+      display: flex;
+      align-items: center;
+      background: rgba(0, 129, 255, 0.3);
+      height: 56px;
+      padding: 0px 16px;
+      box-sizing: border-box;
+      color: rgba(35, 35, 35, 0.8);
+      font-size: 14px;
+      font-weight: 400;
+
+      & > img {
+        width: 16px;
+        height: 16px;
+        margin-right: 16px;
+      }
+    }
+
+    .subfield-origin-dragClass {
+      height: auto;
     }
 
     .design-header {
@@ -254,7 +274,7 @@ export default {
           padding: 0px 16px;
           box-sizing: border-box;
           margin-top: 12px;
-          cursor: pointer;
+          cursor: move;
           user-select: none;
 
           &:hover {

dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SubfieldItem.vue

@@ -57,7 +57,7 @@ export default {
   .subfield-module-item-dragg-target-icon {
     width: 14px;
     height: 14px;
-    cursor: pointer;
+    cursor: move;
   }
 
   ::v-deep .subfield-module-form-item {

dsk-operate-ui/src/views/consultingOrgManagement/components/CustomForm/components/SubfieldModule.vue

@@ -97,7 +97,7 @@ export default {
       & > img {
         width: 14px;
         height: 14px;
-        cursor: pointer;
+        cursor: move;
       }
       & > span {
         font-size: 14px;

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/index.vue

@@ -153,8 +153,8 @@ export default {
       const _form = queryConditionFiltering(this.form);
       // 处理时间
       if (_form?.cooperationTime?.length) {
-        _form.projectStartTime = _form?.cooperationTime[0];
-        _form.projectEndTime = _form?.cooperationTime[1];
+        _form.minLastCooperateDate = _form?.cooperationTime[0];
+        _form.maxLastCooperateDate = _form?.cooperationTime[1];
       }
 
       delete _form.cooperationTime;