diff --git a/.workflow/branch-pipeline.yml b/.workflow/branch-pipeline.yml
new file mode 100644
index 0000000..9d2a292
--- /dev/null
+++ b/.workflow/branch-pipeline.yml
@@ -0,0 +1,53 @@
+version: '1.0'
+name: branch-pipeline
+displayName: BranchPipeline
+stages:
+ - stage:
+ name: compile
+ displayName: 编译
+ steps:
+ - step: build@maven
+ name: build_maven
+ displayName: Maven 构建
+ # 支持6、7、8、9、10、11六个版本
+ jdkVersion: 8
+ # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+ mavenVersion: 3.3.9
+ # 构建命令
+ commands:
+ - mvn -B clean package -Dmaven.test.skip=true
+ # 非必填字段,开启后表示将构建产物暂存,但不会上传到制品库中,7天后自动清除
+ artifacts:
+ # 构建产物名字,作为产物的唯一标识可向下传递,支持自定义,默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+ - name: BUILD_ARTIFACT
+ # 构建产物获取路径,是指代码编译完毕之后构建物的所在路径,如通常jar包在target目录下。当前目录为代码库根目录
+ path:
+ - ./target
+ - step: publish@general_artifacts
+ name: publish_general_artifacts
+ displayName: 上传制品
+ # 上游构建任务定义的产物名,默认BUILD_ARTIFACT
+ dependArtifact: BUILD_ARTIFACT
+ # 上传到制品库时的制品命名,默认output
+ artifactName: output
+ dependsOn: build_maven
+ - stage:
+ name: release
+ displayName: 发布
+ steps:
+ - step: publish@release_artifacts
+ name: publish_release_artifacts
+ displayName: '发布'
+ # 上游上传制品任务的产出
+ dependArtifact: output
+ # 发布制品版本号
+ version: '1.0.0.0'
+ # 是否开启版本号自增,默认开启
+ autoIncrement: true
+triggers:
+ push:
+ branches:
+ exclude:
+ - master
+ include:
+ - .*
diff --git a/.workflow/master-pipeline.yml b/.workflow/master-pipeline.yml
new file mode 100644
index 0000000..5d926c2
--- /dev/null
+++ b/.workflow/master-pipeline.yml
@@ -0,0 +1,51 @@
+version: '1.0'
+name: master-pipeline
+displayName: MasterPipeline
+stages:
+ - stage:
+ name: compile
+ displayName: 编译
+ steps:
+ - step: build@maven
+ name: build_maven
+ displayName: Maven 构建
+ # 支持6、7、8、9、10、11六个版本
+ jdkVersion: 8
+ # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+ mavenVersion: 3.3.9
+ # 构建命令
+ commands:
+ - mvn -B clean package -Dmaven.test.skip=true
+ # 非必填字段,开启后表示将构建产物暂存,但不会上传到制品库中,7天后自动清除
+ artifacts:
+ # 构建产物名字,作为产物的唯一标识可向下传递,支持自定义,默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+ - name: BUILD_ARTIFACT
+ # 构建产物获取路径,是指代码编译完毕之后构建物的所在路径,如通常jar包在target目录下。当前目录为代码库根目录
+ path:
+ - ./target
+ - step: publish@general_artifacts
+ name: publish_general_artifacts
+ displayName: 上传制品
+ # 上游构建任务定义的产物名,默认BUILD_ARTIFACT
+ dependArtifact: BUILD_ARTIFACT
+ # 上传到制品库时的制品命名,默认output
+ artifactName: output
+ dependsOn: build_maven
+ - stage:
+ name: release
+ displayName: 发布
+ steps:
+ - step: publish@release_artifacts
+ name: publish_release_artifacts
+ displayName: '发布'
+ # 上游上传制品任务的产出
+ dependArtifact: output
+ # 发布制品版本号
+ version: '1.0.0.0'
+ # 是否开启版本号自增,默认开启
+ autoIncrement: true
+triggers:
+ push:
+ branches:
+ include:
+ - master
diff --git a/.workflow/pr-pipeline.yml b/.workflow/pr-pipeline.yml
new file mode 100644
index 0000000..3f7579d
--- /dev/null
+++ b/.workflow/pr-pipeline.yml
@@ -0,0 +1,40 @@
+version: '1.0'
+name: pr-pipeline
+displayName: PRPipeline
+stages:
+ - stage:
+ name: compile
+ displayName: 编译
+ steps:
+ - step: build@maven
+ name: build_maven
+ displayName: Maven 构建
+ # 支持6、7、8、9、10、11六个版本
+ jdkVersion: 8
+ # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+ mavenVersion: 3.3.9
+ # 构建命令
+ commands:
+ - mvn -B clean package -Dmaven.test.skip=true
+ # 非必填字段,开启后表示将构建产物暂存,但不会上传到制品库中,7天后自动清除
+ artifacts:
+ # 构建产物名字,作为产物的唯一标识可向下传递,支持自定义,默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+ - name: BUILD_ARTIFACT
+ # 构建产物获取路径,是指代码编译完毕之后构建物的所在路径,如通常jar包在target目录下。当前目录为代码库根目录
+ path:
+ - ./target
+ - step: publish@general_artifacts
+ name: publish_general_artifacts
+ displayName: 上传制品
+ # 上游构建任务定义的产物名,默认BUILD_ARTIFACT
+ dependArtifact: BUILD_ARTIFACT
+ # 构建产物制品库,默认default,系统默认创建
+ artifactRepository: default
+ # 上传到制品库时的制品命名,默认output
+ artifactName: output
+ dependsOn: build_maven
+triggers:
+ pr:
+ branches:
+ include:
+ - master
diff --git a/src/components/Form/src/jeecg/components/SzSelectDept.vue b/src/components/Form/src/jeecg/components/SzSelectDept.vue
new file mode 100644
index 0000000..d1c4d5e
--- /dev/null
+++ b/src/components/Form/src/jeecg/components/SzSelectDept.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
diff --git a/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue b/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue
new file mode 100644
index 0000000..4a3f579
--- /dev/null
+++ b/src/components/Form/src/jeecg/components/modal/SzDeptSelectModal.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+ 全部勾选
+ 取消全选
+ 展开全部
+ 折叠全部
+
+
+ 树操作
+
+
+
+
+
+
diff --git a/src/views/bg/bqtakepulse/BgTakepulseList.vue b/src/views/bg/bqtakepulse/BgTakepulseList.vue
index a8f7393..19a21bb 100644
--- a/src/views/bg/bqtakepulse/BgTakepulseList.vue
+++ b/src/views/bg/bqtakepulse/BgTakepulseList.vue
@@ -26,13 +26,13 @@
牵头部门
-
+
协办部门
-
+
@@ -132,7 +132,7 @@
import {columns, superQuerySchema} from './BgTakepulse.data';
import {list, deleteOne, getImportUrl, getExportUrl, saveOrUpdate, bgTakepulseFeedbackList} from './BgTakepulse.api';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
- import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+ import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import Icon from '/@/components/Icon/index';
import { startProcessSchedules } from '/@/api/common/api';
import { dateUtil } from '/@/utils/dateUtil';
diff --git a/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
index c659336..ac8dc51 100644
--- a/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
+++ b/src/views/bg/bqtakepulse/components/BgTakepulseBPMForm.vue
@@ -66,7 +66,7 @@
-
-
-
+
-
+
@@ -156,7 +156,7 @@
import { queryDataById, saveOrUpdate } from '../BgTakepulse.api';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue';
- import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+ import SzSelectDept from '/@/components/Form/src/jeecg/components/SzSelectDept.vue';
import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import { Form } from 'ant-design-vue';
@@ -167,7 +167,7 @@
components:{
JDictSelectTag,
JSwitch,
- JSelectDept,
+ SzSelectDept,
JSelectUser,
JFormContainer,
},