From 13519318e06f0a84f09f113aba0dcfb8d77b6806 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Fri, 17 Jan 2025 18:33:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6focus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- package-lock.json | 2 +- pages/login/login.vue | 4 ++-- pages/views/renliziyuan/renyuanxinxi/taizhang.vue | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/manifest.json b/manifest.json index c9a1214..48e3d51 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "appid" : "__UNI__9F097F0", "description" : "", "versionName" : "1.1.2", - "versionCode" : 20250106, + "versionCode" : 20250117, "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/views/renliziyuan/renyuanxinxi/taizhang.vue b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue index 5c25ddf..8d6664a 100644 --- a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue +++ b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue @@ -10,10 +10,10 @@ type="h5"> - - From a04694b7242f42b5159e47eaddf7b526ab5ac18b Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Mon, 20 Jan 2025 15:10:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- manifest.json | 4 ++-- pages/login/login.vue | 16 ++++++++-------- .../views/renliziyuan/renyuanxinxi/taizhang.vue | 2 -- 4 files changed, 11 insertions(+), 13 deletions(-) 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 48e3d51..f4dadb4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "数智产销", "appid" : "__UNI__9F097F0", "description" : "", - "versionName" : "1.1.2", - "versionCode" : 20250117, + "versionName" : "1.1.3", + "versionCode" : 20250120, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/login/login.vue b/pages/login/login.vue index 1b8252c..e9dc56f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,17 +98,17 @@ }); /*生产环境 begin */ - // loginApi({ - // username: un, - // password: pw, - // ip: getDeviceIp() + loginApi({ + username: un, + password: pw, + ip: getDeviceIp() /*生产环境 end */ /*开发环境 begin */ - localLoginApi({ - username: username.value, - password: password.value, - captcha: 'app' + // localLoginApi({ + // username: username.value, + // password: password.value, + // captcha: 'app' /*开发环境 end */ }).then((loginres) => { if (loginres.success) { diff --git a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue index 8d6664a..f3ab63f 100644 --- a/pages/views/renliziyuan/renyuanxinxi/taizhang.vue +++ b/pages/views/renliziyuan/renyuanxinxi/taizhang.vue @@ -138,8 +138,6 @@ }) function detail(record) { - // console.log(record) - uni.navigateTo({ url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record)) }) From 911c4c365a05d730886aeb89c96b6d583d70b527 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Wed, 22 Jan 2025 17:03:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E7=AD=BE=E7=AB=A0=E8=8A=82=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E5=88=99=E6=98=BE=E7=A4=BA=E6=B8=A9=E9=A6=A8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=B9=B6=E9=9A=90=E8=97=8F=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/login/login.vue | 16 ++++++++-------- pages/task/handle.vue | 20 ++++++++++++++++++-- store/update.js | 6 ------ 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/pages/login/login.vue b/pages/login/login.vue index e9dc56f..1b8252c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,17 +98,17 @@ }); /*生产环境 begin */ - loginApi({ - username: un, - password: pw, - ip: getDeviceIp() + // loginApi({ + // username: un, + // password: pw, + // ip: getDeviceIp() /*生产环境 end */ /*开发环境 begin */ - // localLoginApi({ - // username: username.value, - // password: password.value, - // captcha: 'app' + localLoginApi({ + username: username.value, + password: password.value, + captcha: 'app' /*开发环境 end */ }).then((loginres) => { if (loginres.success) { 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() + })