Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-admin/src/main/java/com/dsk/web/controller/system/SysPushController.java

 package com.dsk.web.controller.system;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.PageQuery;
@@ -11,6 +12,8 @@ import com.dsk.system.service.ISysPushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 系统推送(SysPush)表控制层
  *
@@ -39,6 +42,10 @@ public class SysPushController extends BaseController {
      */
     @PostMapping
     public R<Void> add(@RequestBody SysPush bean) {
+        List<SysPush> list = baseService.list(Wrappers.<SysPush>lambdaQuery().eq(SysPush::getContact, bean.getContact()));
+        if(CollectionUtils.isNotEmpty(list)){
+            return R.fail("当前推送电话已存在！");
+        }
         return toAjax(baseService.save(bean));
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditPageBody.java

@@ -26,6 +26,10 @@ public class EnterpriseCreditPageBody extends BasePage {
      * 截止时间（年月日）
      */
     private String dateTo;
+    /**
+     * 类型（是否历史 0：否 1：是）
+     */
+    private Integer type;
 
     public boolean isVaildCid() {
         return 0 == cid;

dsk-operate-ui/src/api/consultingOrgManagement/index.js

@@ -99,3 +99,15 @@ export const updateCustomFormDataApi = (data) => request({
   method: "post",
   data
 });
+
+
+/**
+ *  oss文件上传地址
+ * @param {*} data 
+ * @returns 
+ */
+export const uploadFileToOssApi = (data) => request({
+  url: "/system/oss/upload",
+  method: "post",
+  data
+});

dsk-operate-ui/src/assets/styles/supplierlist.scss

@@ -248,3 +248,6 @@
 .el-range-editor--medium{
   text-align: left;
 }
+.el-date-editor .el-range-input{
+  text-align: left;
+}

dsk-operate-ui/src/components/DskPhotoInput/index.vue

+<template>
+  <div class="dsk-photo-input-container">
+    <el-badge :value="0" class="item" type="primary">
+      <div class="dsk-photo-input-inner" @click.stop="uploadFile">
+        <i class="el-icon-plus"></i>
+        <span>上传图片</span>
+      </div>
+    </el-badge>
+    <el-upload :on-change="handleChange" action="#" :accept="allowTypes.join(',')" :auto-upload="false" :show-file-list="false" :limit="limit"
+      ref="elUploadDskUploadIns" class="el-upload-dsk-upload-ins"></el-upload>
+  </div>
+</template>
+<script>
+import { uploadFileToOssApi } from "@/api/consultingOrgManagement";
+export default {
+  name: "dskPhotoInput",
+  props: {
+    limit: {
+      type: [String, Number],
+      default: 1
+    }
+  },
+  data() {
+    return {
+      allowTypes: [".jpg", ".png", ".svg", ".gif", ".jpeg"],
+      comFileList: []
+    };
+  },
+  //可访问data属性
+  created() {
+
+  },
+  //计算集
+  computed: {
+
+  },
+  //方法集
+  methods: {
+    async handleChange(file, fileList) {
+      try {
+        /** 
+       * @type {string}
+      */
+        let fileName = file.name;
+        let fileType = "";
+        const index = fileName.lastIndexOf(".");
+        if (index) fileType = fileName.slice(index);
+
+        if (!this.allowTypes.includes(fileType.toLowerCase())) {
+          return this.$message.warning(`只支持上传${this.allowTypes.join(" , ")}类型图片`);
+        }
+        // 验证通过进行上传
+        const result = this.uploadHandle(file.raw, fileType);
+      } catch (error) {
+
+      }
+    },
+    uploadFile() {
+      this.$refs["elUploadDskUploadIns"].$el.querySelector(".el-upload__input").click();
+    },
+    async uploadHandle(file, fileType) {
+      try {
+        const formData = new FormData();
+        formData.append("file", file);
+        const result = await uploadFileToOssApi(formData);
+        if (result.code == 200 && result.data) {
+          this.comFileList.push({
+            url: result.data.url,
+            type: fileType,
+            fileName: ""
+          });
+        }
+      } catch (error) {
+
+      }
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.dsk-photo-input-container {
+  width: 100%;
+  height: 32px;
+
+  .dsk-photo-input-inner {
+    width: 106px;
+    height: 32px;
+    background: #ffffff;
+    border: 1px solid #dcdfe6;
+
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0px 16px;
+    box-sizing: border-box;
+    color: rgba(35, 35, 35, 0.8);
+    font-size: 14px;
+    font-weight: 400;
+    cursor: pointer;
+
+    &:hover {
+      color: #0081ff;
+      border-color: #0081ff;
+    }
+  }
+
+  ::v-deep .el-upload-dsk-upload-ins {
+    width: 0px;
+    height: 0px;
+    opacity: 0;
+    position: relative;
+    z-index: -999;
+  }
+}
+</style>

dsk-operate-ui/src/layout/components/Sidebar/SidebarItem.vue

 <template>
   <div v-if="!item.hidden">
     <!-- 展开 -->
-    <template v-if="!isCollapse">
+    <!--&lt;!&ndash;<template v-if="!isCollapse">&ndash;&gt;  菜单白色样式需要此处与else的内容配合-->
+    <template>
       <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow">
         <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path,onlyOneChild.query)">
           <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
@@ -18,39 +19,39 @@
       </el-submenu>
     </template>
     <!-- 收起 -->
-    <template v-else>
-      <div v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow"
-        class="side-retract">
-        <el-popover placement="right-start" popper-class="side-popover side-one-popover" :visible-arrow="true" trigger="hover"
-          :disabled="onlyOneChild.meta||item.meta?false:true">
-          <div class="side-container">
-            <div class="side-title">
-              <!--<app-link v-if="onlyOneChild.meta || item.meta" :to="resolvePath(onlyOneChild.path || item.path)">-->
-              <app-link :to="resolvePath(onlyOneChild.path || item.path,onlyOneChild.query)">
-                {{ onlyOneChild.meta.title || item.meta.title }}
-              </app-link>
+    <!--<template v-else>-->
+      <!--<div v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children || onlyOneChild.noShowingChildren) && !item.alwaysShow"-->
+        <!--class="side-retract">-->
+        <!--<el-popover placement="right-start" popper-class="side-popover side-one-popover" :visible-arrow="true" trigger="hover"-->
+          <!--:disabled="onlyOneChild.meta||item.meta?false:true">-->
+          <!--<div class="side-container">-->
+            <!--<div class="side-title">-->
+              <!--&lt;!&ndash;<app-link v-if="onlyOneChild.meta || item.meta" :to="resolvePath(onlyOneChild.path || item.path)">&ndash;&gt;-->
+              <!--<app-link :to="resolvePath(onlyOneChild.path || item.path,onlyOneChild.query)">-->
+                <!--{{ onlyOneChild.meta.title || item.meta.title }}-->
+              <!--</app-link>-->
 
-            </div>
-          </div>
-          <item v-if="onlyOneChild.meta" slot="reference" :icon="sideIcon(item, onlyOneChild)" />
-        </el-popover>
-      </div>
-      <div v-else class="side-retract">
-        <el-popover placement="right-start" popper-class="side-popover" :visible-arrow="true" trigger="hover" :disabled="item.meta?false:true">
-          <div class="side-container">
-            <div class="side-title">{{ item.meta.title }}</div>
-            <ul class="side-list">
-              <li v-for="child in item.children" :key="child.path">
-                <app-link v-if="child.meta" :to="resolvePath(child.path,child.query)">
-                  {{ child.meta.title }}
-                </app-link>
-              </li>
-            </ul>
-          </div>
-          <item v-if="item.meta" slot="reference" :icon="sideIcon(item)" />
-        </el-popover>
-      </div>
-    </template>
+            <!--</div>-->
+          <!--</div>-->
+          <!--<item v-if="onlyOneChild.meta" slot="reference" :icon="sideIcon(item, onlyOneChild)" />-->
+        <!--</el-popover>-->
+      <!--</div>-->
+      <!--<div v-else class="side-retract">-->
+        <!--<el-popover placement="right-start" popper-class="side-popover" :visible-arrow="true" trigger="hover" :disabled="item.meta?false:true">-->
+          <!--<div class="side-container">-->
+            <!--<div class="side-title">{{ item.meta.title }}</div>-->
+            <!--<ul class="side-list">-->
+              <!--<li v-for="child in item.children" :key="child.path">-->
+                <!--<app-link v-if="child.meta" :to="resolvePath(child.path,child.query)">-->
+                  <!--{{ child.meta.title }}-->
+                <!--</app-link>-->
+              <!--</li>-->
+            <!--</ul>-->
+          <!--</div>-->
+          <!--<item v-if="item.meta" slot="reference" :icon="sideIcon(item)" />-->
+        <!--</el-popover>-->
+      <!--</div>-->
+    <!--</template>-->
   </div>
 </template>
 

dsk-operate-ui/src/utils/generator/custom-design-options.js

@@ -34,7 +34,6 @@ export const defaultComOptions = [
     formAttribute: {
       // 验证规则
       rules: {},
-      designRules: {},
       // 是否必填
       required: false,
       // 字段名称
@@ -65,7 +64,6 @@ export const defaultComOptions = [
     formAttribute: {
       // 验证规则
       rules: {},
-      designRules: {},
       // 是否必填
       required: false,
       // 字段名称
@@ -100,7 +98,6 @@ export const defaultComOptions = [
         message: "请输入选项值",
         trigger: ["change", "blur"]
       },
-      designRules: {},
       // 是否必填
       required: false,
       // 字段名称
@@ -134,7 +131,6 @@ export const defaultComOptions = [
     formAttribute: {
       // 验证规则
       rules: {},
-      designRules: {},
       // 是否必填
       required: false,
       // 字段名称
@@ -187,16 +183,6 @@ export const defaultComOptions = [
           return callback();
         }
       },
-      designRules: {
-        trigger: ["blur"],
-        validator: (rule, value, callback) => {
-          const phoneReg = /^1[3-9]\d{9}$/;
-          if (value && !phoneReg.test(value)) {
-            return callback(`请输入正确的联系电话`);
-          }
-          return callback();
-        }
-      },
       // 是否必填
       required: false,
       // 字段名称
@@ -229,23 +215,13 @@ export const defaultComOptions = [
       rules: {
         trigger: ["blur"],
         validator: (rule, value, callback) => {
-          console.log("value", value);
+          // console.log("value", value);
           if (value && !validEmail(value)) {
             return callback(new Error(`请输入正确的电子邮箱`));
           }
           return callback();
         }
       },
-      designRules: {
-        trigger: ["blur"],
-        validator: (rule, value, callback) => {
-          console.log("value", value);
-          if (value && !validEmail(value)) {
-            return callback(`请输入正确的电子邮箱`);
-          }
-          return callback();
-        }
-      },
       requiredRules: {
         trigger: ["blur"],
         validator: (rule, value, callback) => {

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

@@ -293,6 +293,7 @@ export default {
     }
 
     .el-form-item__content {
+      line-height: 32px;
       .el-input {
         .el-input__inner {
           height: 32px;
@@ -301,6 +302,10 @@ export default {
           color: #232323;
         }
       }
+      .el-input__suffix {
+        display: flex;
+        align-items: center;
+      }
     }
 
     /* 下拉框样式重置 */

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

 <template>
   <div class="subfield-item-container" :class="classCreate(comChildModuleInfo.comType)" :style="styles" @click="activeSubfieldItem">
     <img src="@/assets/images/consultingAgencyManagement/customForm/icon_drag@2x.png" alt="" class="subfield-module-item-dragg-target-icon">
-    <el-form-item class="subfield-module-form-item" :class="{'is-required': comChildModuleInfo.formAttribute.required}"
+    <el-form-item class="subfield-module-form-item"
+      :class="{'is-required': comChildModuleInfo.formAttribute.required,'is-error' : comChildModuleInfo.formAttribute.isError}"
       :label="comChildModuleInfo.formAttribute.label" :prop="propValue">
       <!-- 单行文本类型 -->
       <el-input v-model="comChildModuleInfo.componentAttribute.value" :placeholder="comChildModuleInfo.componentAttribute.placeholder" clearable
@@ -27,7 +28,7 @@
       <dsk-email-input v-model="comChildModuleInfo.componentAttribute.value" :placeholder="comChildModuleInfo.componentAttribute.placeholder"
         :clearable="true" :disabled="isDisabled" v-if="comChildModuleInfo.comType == 'email'"></dsk-email-input>
       <!-- 图片类型 -->
-
+      <dsk-photo-input v-if="comChildModuleInfo.comType == 'photo'"></dsk-photo-input>
     </el-form-item>
 
     <img src="@/assets/images/consultingAgencyManagement/customForm/icon_delete@2x.png" alt="" class="remove-subfield-item-icon"
@@ -38,10 +39,12 @@
 import { cloneDeep } from "lodash-es";
 import Schema from "async-validator";
 import DskEmailInput from "@/components/DskEmailInput";
+import DskPhotoInput from "@/components/DskPhotoInput";
 export default {
   name: "subfieldItem",
   components: {
-    DskEmailInput
+    DskEmailInput,
+    DskPhotoInput
   },
   props: {
     childModuleInfo: Object,
@@ -128,13 +131,14 @@ export default {
       try {
         const { formAttribute, componentAttribute } = item;
         const validator = new Schema({
-          value: formAttribute.designRules
+          value: formAttribute.rules
         });
-        console.log(validator);
         const flag = await validator.validate({ value: componentAttribute.value }, { first: true });
-        console.log(flag);
+        if (flag) {
+          this.$set(this.comChildModuleInfo.formAttribute, "isError", false);
+        }
       } catch (error) {
-        console.log(error);
+        this.$set(this.comChildModuleInfo.formAttribute, "isError", true);
       }
     },
     // 根据命中的id 来添加发布订阅