Merge remote-tracking branch 'remotes/origin/master' into ldeyun

.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

manifest.json

@@ -2,8 +2,8 @@
     "name" : "数智产销",
     "appid" : "__UNI__9F097F0",
     "description" : "",
-    "versionName" : "1.1.2",
+    "versionName" : "1.1.3",
-    "versionCode" : 20250106,
+    "versionCode" : 20250120,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "cxc-szcx-uniapp-master",
+  "name": "cxc-szcx-uniapp",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

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)

pages/task/handle.vue

@@ -20,7 +20,9 @@
 			</view>
 		</customNav>
 		<component :is="comp" :dataId="dataId"></component>
-		<view class="btn f-row aic jcb" v-if="type == 0">
+		<view v-if="ifShow" style="display: block; margin: 10px;">
+			温馨提示:目前APP暂不支持电子签章审批,请登录PC端厂综合管理平台(https://10.75.166.6),在个人办公-我的任务中审批。</view>
+		<view class="btn f-row aic jcb" v-if="type == 0 && !ifShow">
 			<view class="refuse" @click="openpop(1)">
 				拒绝
 			</view>
@@ -28,7 +30,6 @@
 				同意
 			</view>
 		</view>
-
 		<uni-popup ref="popup" type="center">
 			<view class="popup">
 				<view class="title">
@@ -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()
+
 	})
 </script>
 <style>

pages/views/renliziyuan/renyuanxinxi/taizhang.vue

@@ -10,10 +10,10 @@
 								type="h5"></uni-title></uni-col>
 					</uni-row>
 					<uni-row>
-						<uni-col :span="11"><uni-easyinput v-model="xm" focus suffixIcon="search" clearable
+						<uni-col :span="11"><uni-easyinput v-model="xm" suffixIcon="search" clearable
 								placeholder="姓名模糊查询" @change="Search" @iconClick="Search" /></uni-col>
 						<uni-col :span="11" :push="2">
-							<uni-easyinput v-model="ldhth" focus suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
+							<uni-easyinput v-model="ldhth" suffixIcon="search" clearable placeholder="劳动合同号模糊查询"
 								@change="Search" @iconClick="Search" />
 						</uni-col>
 					</uni-row>
@@ -138,8 +138,6 @@
 	})
 
 	function detail(record) {
-		// console.log(record)
-
 		uni.navigateTo({
 			url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
 		})

store/update.js

@@ -37,12 +37,6 @@ export const useUpdateApp = defineStore('updateApp', () => {
 				} = res
 				result.apkUrl = baseUrl + result.apkUrl;
 				result.wgtUrl = baseUrl + result.wgtUrl
-				// res = {
-				// 	"update": "wgt",
-				// 	"wgtUrl": "D:\\opt\\AppUpdate\\wgt\\2.2.34.wgt",
-				// 	"apkUrl": null,
-				// 	"versionCode": "1.0.0"
-				// }
 				// updateOptions.force = res.is_force === 1
 				// updateOptions.content = res.update_content
 				updateOptions.wgtUrl = result.wgtUrl