diff --git a/.env.development b/.env.development index b6fc12c..47afe86 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ # 开发环境 # 请求接口地址 -VITE_REQUEST_BASE_URL = https://36.112.48.190 +VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 diff --git a/manifest.json b/manifest.json index c9a1214..f4dadb4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "数智产销", "appid" : "__UNI__9F097F0", "description" : "", - "versionName" : "1.1.2", - "versionCode" : 20250106, + "versionName" : "1.1.3", + "versionCode" : 20250120, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/package-lock.json b/package-lock.json index 4f569ab..ed89a0e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "cxc-szcx-uniapp-master", + "name": "cxc-szcx-uniapp", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/pages/login/login.vue b/pages/login/login.vue index a3bda2e..1b8252c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -64,7 +64,7 @@ const { proxy } = getCurrentInstance() - + /** 系统信息 */ const systemInfo = uni.getSystemInfoSync() /**是否明文显示密码*/ @@ -109,7 +109,7 @@ username: username.value, password: password.value, captcha: 'app' - /*开发环境 end */ + /*开发环境 end */ }).then((loginres) => { if (loginres.success) { uni.setStorageSync('token', loginres.result.token) diff --git a/pages/task/handle.vue b/pages/task/handle.vue index f4c4929..3f54230 100644 --- a/pages/task/handle.vue +++ b/pages/task/handle.vue @@ -20,7 +20,9 @@ - + + 温馨提示:目前APP暂不支持电子签章审批,请登录PC端厂综合管理平台(https://10.75.166.6),在个人办公-我的任务中审批。 + 拒绝 @@ -28,7 +30,6 @@ 同意 - @@ -110,6 +111,7 @@ } const comp = ref(null) const dataId = ref('') + const ifShow = ref(false) //20250122 判断是否是签章业务 提示文字 const getProcessNodeInfo = (taskId) => { getProcessNodeInfoApi({ taskId @@ -196,6 +198,18 @@ } }) } + /**判断是否是电子签章节点任务,是则显示温馨提示并隐藏审批按钮*/ + const getIfShow = () => { + if (taskInfo.value.taskId == 'task1705482211321' || taskInfo.value.taskId == 'task1705482639673' || + taskInfo.value.taskId == 'task1714092890849' || taskInfo.value.taskId == 'task1714092955682' || + taskInfo.value.taskId == 'task1689151174324' || taskInfo.value.taskId == 'task1677809773570' || + taskInfo.value.taskId == 'task1689579219152') + { // 签章业务:非常规 承包商资质审查 招标采购 公务接待 房屋租赁 + ifShow.value = true; + } else { + ifShow.value = false; + } + } const taskInfo = ref(null) let type = null onLoad((options) => { @@ -207,6 +221,8 @@ getProcessNodeInfo(taskInfo.value.id) getProcessTaskTransInfo() + getIfShow() + })