diff --git a/jnpf-app/components/jnpf/jnpf-user-select/user-tree.vue b/jnpf-app/components/jnpf/jnpf-user-select/user-tree.vue
index 264a293d..abc9165a 100644
--- a/jnpf-app/components/jnpf/jnpf-user-select/user-tree.vue
+++ b/jnpf-app/components/jnpf/jnpf-user-select/user-tree.vue
@@ -413,6 +413,7 @@
this.close()
},
close() {
+ this.keyword = '';
this.$emit('input', false);
}
}
diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue
index 9bd5741c..269c52ce 100644
--- a/jnpf-app/pages/index/portal.vue
+++ b/jnpf-app/pages/index/portal.vue
@@ -248,6 +248,9 @@
import portalItem from '@/components/visualPortal/components/index.vue'
import defaultPortal from '@/components/visualPortal/components/defaultPortal.vue'
import request from '@/utils/request'
+ import {
+ getFlowTodoCount
+ } from "@/api/workFlow/flowEngine";
import {
auth
} from '@/api/portal/portal.js'
@@ -265,6 +268,7 @@
},
data() {
return {
+ flowTodoData: {},
homeInfo: {},
showWebView: true,
emptyImg: require(`@/static/image/defProtal.png`),
@@ -303,14 +307,26 @@
};
},
onShow() {
- this.getHomeInfo()
+ const query = {
+ flowCirculateType: this.flowCirculateType,
+ flowDoneType: this.flowDone,
+ toBeReviewedType: this.toBeReviewed,
+ }
+ getFlowTodoCount(query).then(res => {
+ this.flowTodoData = res.data
+ this.getHomeInfo()
+ this.userInfo = uni.getStorageSync('userInfo') || {}
+ this.mescrollInitByRef();
+ this.mescroll.resetUpScroll()
+ })
+ // this.getHomeInfo()
// this.$forceUpdate()
// this.token = uni.getStorageSync('token')
// if (!this.$store.state.chat.socket) chat.initSocket()
// this.mpPortalUrl = this.define.baseURL + '/pages/mpPortal/index?token=' + this.token
- this.userInfo = uni.getStorageSync('userInfo') || {}
- this.mescrollInitByRef();
- this.mescroll.resetUpScroll()
+ // this.userInfo = uni.getStorageSync('userInfo') || {}
+ // this.mescrollInitByRef();
+ // this.mescroll.resetUpScroll()
// this.$refs.mescrollRef.mescroll.resetUpScroll()
// if (!this.userInfo.appPortalId) return
// // #ifndef MP
@@ -384,7 +400,7 @@
this.authConfig = res.data || {}
let data = JSON.parse(res.data.formData) || {};
this.formData = []
- this.formData = data.layout ? JSON.parse(JSON.stringify(data.layout)) : []
+ this.formData = data.layout ? JSON.parse(JSON.stringify(data.layout)) : [];
this.handelFormData(data)
if (data.refresh.autoRefresh) {
setInterval(() => {
@@ -406,6 +422,16 @@
const loop = (list) => {
list.forEach(o => {
o.allRefresh = data.refresh
+ o.option.defaultValue.forEach(p => {
+
+ if(p.fullName == '待办事宜'){
+ p.num = this.flowTodoData.toBeReviewed
+ }
+ if(p.fullName == '抄送事宜'){
+ p.num = 0
+ p.num = this.flowTodoData.flowCirculate
+ }
+ })
o.show = false
if (o.visibility && o.visibility.length && o.visibility.includes('app')) o.show =
true
diff --git a/jnpf-app/pages/workFlow/flowBefore/index.vue b/jnpf-app/pages/workFlow/flowBefore/index.vue
index e745c7d7..a31f3884 100644
--- a/jnpf-app/pages/workFlow/flowBefore/index.vue
+++ b/jnpf-app/pages/workFlow/flowBefore/index.vue
@@ -109,7 +109,7 @@
审批
+ @click.stop="eventLauncher('audit')">通过
diff --git a/jnpf-app/pages/workFlow/operate/index.vue b/jnpf-app/pages/workFlow/operate/index.vue
index 9d27d987..f3bba210 100644
--- a/jnpf-app/pages/workFlow/operate/index.vue
+++ b/jnpf-app/pages/workFlow/operate/index.vue
@@ -56,7 +56,7 @@
- + 新增常用语
+ + 新增常用语
@@ -74,7 +74,7 @@
-
+
{{ btnTxt }}
@@ -172,6 +172,7 @@
commonWordsText: "",
show2: false,
show: false,
+ inputVisible: false,
btnTxt: '确认',
typeList: [{
fullName: "审批前",
@@ -310,6 +311,10 @@
uni.$off("confirm");
},
methods: {
+ showInput() {
+ this.inputVisible = true;
+ this.focus = true;
+ },
useTag(tag) {
this.dataForm.handleOpinion = tag;
},
@@ -373,6 +378,35 @@
this.getSelector();
});
},
+ handleInputConfirm() {
+ this.commonWordsData.commonWordsText = this.tagValue;
+ this.commonWordsData.commonWordsType = 1
+ this.commonWordsData.sortCode = 0
+ this.commonWordsData.enabledMark = 1
+ if (this.tagValue && this.tagValue != ''){
+ let funs = Create;
+ this.tagValue = '';
+ funs(this.commonWordsData)
+ .then((res) => {
+ this.focus = false;
+ this.inputVisible = false;
+ uni.showToast({
+ title: res.msg,
+ icon: "none",
+ complete: () => {
+ this.getSelector();
+ },
+ });
+ })
+ .catch((err) => {
+ this.show2 = false;
+ this.getSelector();
+ });
+ }else{
+ this.focus = false;
+ this.inputVisible = false;
+ }
+ },
cancel() {
this.show2 = false;
this.commonWordsText = "";
diff --git a/jnpf-java-boot/jnpf-system/jnpf-system-controller/src/main/java/jnpf/base/controller/CommonWordsController.java b/jnpf-java-boot/jnpf-system/jnpf-system-controller/src/main/java/jnpf/base/controller/CommonWordsController.java
index 0583057f..35cf9b74 100644
--- a/jnpf-java-boot/jnpf-system/jnpf-system-controller/src/main/java/jnpf/base/controller/CommonWordsController.java
+++ b/jnpf-java-boot/jnpf-system/jnpf-system-controller/src/main/java/jnpf/base/controller/CommonWordsController.java
@@ -122,6 +122,8 @@ public class CommonWordsController extends SuperController create(@RequestBody CommonWordsForm commonWordsForm) {
CommonWordsEntity entity = JsonUtil.getJsonToBean(commonWordsForm, CommonWordsEntity.class);
entity.setId(RandomUtil.uuId());
+ entity.setSortCode(0L);
+ entity.setEnabledMark(1);
commonWordsService.save(entity);
return ActionResult.success(MsgCode.SU001.get());
}