甬台温

config/index.js

@@ -1,5 +1,5 @@
 export default {
-    title: "工程云家",
+    title: "甬台温工程管理",
     platform: 'client',         //app的key，用于检测升级
     key: 'uni-app',             //配置主键,目前用于存储
     clientId: 'uni-app',        // 客户端id
@@ -12,15 +12,15 @@ export default {
     tokenTime: 1700,
     //测试环境
     testApi: {
-        api: 'http://192.168.0.109:8090/',  //请求地址
-        form: 'http://192.168.0.109:5173/', //表单地址
-        wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
+        api: 'http://183.247.216.148:28090/', //请求地址
+        form: 'http://183.247.216.148:25174/',    //表单地址
+        wss: '', //长连接地址
     },
     //正式环境
     baseApi: {
-        api: 'http://39.108.216.210:8090/', //请求地址
-        form: 'https://user.hcxxy.com/',    //表单地址
-        wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
+        api: 'http://183.247.216.148:28090/', //请求地址
+        form: 'http://183.247.216.148:25174/',    //表单地址
+        wss: '', //长连接地址
     },
     //H5测试设置
     vite: {

config/index210.js

@@ -0,0 +1,32 @@
+export default {
+    title: "工程云家",
+    platform: 'client',         //app的key，用于检测升级
+    key: 'uni-app',             //配置主键,目前用于存储
+    clientId: 'uni-app',        // 客户端id
+    clientSecret: 'app_secret', // 客户端密钥
+    tenantMode: true,   // 是否开启租户模式
+    tenantId: "000000", // 管理组租户编号
+    captchaMode: false, // 是否开启验证码模式
+    switchMode: false,  // 是否开启部门切换模式
+    lockPage: '/lock',
+    tokenTime: 1700,
+    //测试环境
+    testApi: {
+        //api: 'http://192.168.0.109:8090/',  //请求地址
+        //form: 'http://192.168.0.199:5174/', //表单地址
+        api: 'http://39.108.216.210:8090/', //请求地址
+        form: 'https://user.hcxxy.com/',    //表单地址
+        wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
+    },
+    //正式环境
+    baseApi: {
+        api: 'http://39.108.216.210:8090/', //请求地址
+        form: 'https://user.hcxxy.com/',    //表单地址
+        wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
+    },
+    //H5测试设置
+    vite: {
+        port: '3001',
+        host: '0.0.0.0'
+    }
+}

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "工程云家",
-    "appid" : "__UNI__A0B807E",
+    "name" : "甬台温工程管理",
+    "appid" : "__UNI__29D7BD4",
     "description" : "智慧数字工程",
-    "versionName" : "2.2.3",
-    "versionCode" : 223,
+    "versionName" : "2.2.5",
+    "versionCode" : 225,
     "transformPx" : false,
     "networkTimeout" : {
         "request" : 300000,
@@ -131,7 +131,8 @@
                     "bought" : 1,
                     "pid" : "14059",
                     "parameters" : {}
-                }
+                },
+                "appid_android" : "uni.UNIA0B807E"
             }
         }
     },

manifest210.json

@@ -0,0 +1,163 @@
+{
+    "name" : "工程云家",
+    "appid" : "__UNI__A0B807E",
+    "description" : "智慧数字工程",
+    "versionName" : "2.2.5",
+    "versionCode" : 225,
+    "transformPx" : false,
+    "networkTimeout" : {
+        "request" : 300000,
+        "connectSocket" : 300000,
+        "uploadFile" : 600000,
+        "downloadFile" : 600000
+    },
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "nvueStyleCompiler" : "uni-app",
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+        },
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "Camera" : {},
+            "VideoPlayer" : {}
+        },
+        /* 模块配置 */
+        "distribute" : {
+            /* 应用发布信息 */
+            "android" : {
+                /* android打包配置 */
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "minSdkVersion" : 24,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "schemes" : "hczcapp"
+            },
+            "ios" : {
+                "devices" : "iphone",
+                "privacyDescription" : {
+                    "NSPhotoLibraryUsageDescription" : "上传声像文件，更换用户头像等功能需要获取设备上的照片权限，请允许。",
+                    "NSPhotoLibraryAddUsageDescription" : "上传声像文件，更换用户头像等功能需要获取设备上的照片权限，请允许。",
+                    "NSCameraUsageDescription" : "上传声像文件，更换用户头像等功能需要获取设备上的摄像头权限，请允许。",
+                    "NSAppleMusicUsageDescription" : "上传声像文件，更换用户头像等功能需要获取设备上的媒体资料库权限，请允许。"
+                },
+                "dSYMs" : false,
+                "idfa" : false,
+                "urltypes" : "hczcapp"
+            },
+            /* ios打包配置 */
+            "sdkConfigs" : {
+                "ad" : {},
+                "push" : {
+                    "unipush" : {}
+                }
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            },
+            "splashscreen" : {
+                "useOriginalMsgbox" : false,
+                "androidStyle" : "common"
+            }
+        },
+        "nativePlugins" : {
+            "lemonjk-FileSelect" : {
+                "__plugin_info__" : {
+                    "name" : "APP文件选择(支持安卓13和苹果)",
+                    "description" : "支持双端的APP文件选取插件",
+                    "platforms" : "Android,iOS",
+                    "url" : "https://ext.dcloud.net.cn/plugin?id=14059",
+                    "android_package_name" : "uni.UNIA0B807E",
+                    "ios_bundle_id" : "com.hczcapp.hczc",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "14059",
+                    "parameters" : {}
+                },
+                "appid_android" : "uni.UNIA0B807E"
+            }
+        }
+    },
+    /* SDK配置 */
+    "quickapp" : {},
+    /* 快应用特有相关 */
+    "mp-weixin" : {
+        /* 小程序特有相关 */
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true
+    },
+    "h5" : {
+        "sdkConfigs" : {
+            "maps" : {}
+        },
+        "router" : {
+            "base" : "./",
+            "mode" : "hash"
+        },
+        "title" : "数字工程"
+    },
+    "vueVersion" : "3",
+    "fallbackLocale" : "zh-Hans",
+    "locale" : "zh-Hans"
+}

pages/data-fill/dataTable.vue

@@ -259,9 +259,13 @@ const toShowHideClick = async ({ pkeyId, isBussShow }) => {
     }
     uni.showLoading({title: '操作请求中...', mask: true});
     const bussShow = isBussShow === 2 ? 1 : 2 //状态(1显示 2隐藏)
+    const {contractIdRelation, primaryKeyId } = treeNode.value;
+    const type = Number(contractInfo.value?.contractType ?? '')
     const { error, code, msg } = await wbsApi.showBussTab({
         pkeyId: pkey_id,
         status: bussShow,
+        classify: type,
+        nodeId: primaryKeyId,
     })
     uni.hideLoading();
     if (!error && code === 200) {

pages/login/login.vue

@@ -9,7 +9,7 @@
         <view class="hc-login-container">
             <view class="hc-login-center">
                 <view class="hc-login-title">欢迎登录</view>
-                <view class="hc-login-text">泓创让每一个数据更具价值</view>
+                <view class="hc-login-text">让每一个数据更具价值</view>
                 <view class="hc-login-form">
                     <view class="hc-login-form-item">
                         <input class="hc-login-input" v-model="formData.username" placeholder="请输入登录账户"/>

pages/report/report.vue

@@ -94,9 +94,7 @@ const getEventChannel = async () => {
 const fixedFlowData = ref([])
 const linkUserJoinString = ref('')
 const isFixedFlow = ref(false)
-const fixedFlowDefault = [{
-    value: 0, text: '自定义流程', disable: false, linkUserJoinString: null
-}]
+const fixedFlowDefault = [{value: 0, text: '自定义流程', disable: false, linkUserJoinString: null}]
 const getFixedFlowDataApi = async () => {
     uni.showLoading({title: '获取数据中...', mask: true});
     const { type, typeData } = props.value
@@ -150,9 +148,13 @@ const queryFixedFlowApi = async (type, datas) => {
     linkUserJoinString.value = ''
     fixedFlowData.value = fixedFlowDefault
     const { projectId, contractId } = props.value
+    const {ids, classify} = formData.value
     const { error, code, data, msg } = await queryFixedFlow({
         projectId: projectId,
         contractId: contractId,
+        classifyType: classify,
+        nodeId: ids,
+        tableOwner: "1",
         ...flowJson,
     })
     if (!error && code === 200) {
@@ -227,13 +229,16 @@ const userTasksClick = () => {
         },
         success: function(res){
             const { type, typeData, projectId, contractId } = props.value
-            const {userTasks} = formData.value
+            const {ids, userTasks, classify} = formData.value
             res.eventChannel.emit('flowUserData', {
                 type: type,
                 typeData: typeData,
                 projectId: projectId,
                 contractId: contractId,
-                selectedData: userTasks
+                selectedData: userTasks,
+                classifyType: classify,
+                nodeId: ids,
+                tableOwner: "1",
             })
         }
     });

pages/report/tasks-user.vue

@@ -118,11 +118,14 @@ const submitClick = async () => {
 
 //检查所选的流程环节处理人是否具有审批权限（三大填报页、日志列表的批量上报、首件列表的批量上报）
 const getCheckCustomFlowUserIsEVisaPermissions = async (flowJson, newUser, newUserId) => {
-    const { projectId, contractId } = props.value
+    const { projectId, contractId, nodeId, tableOwner, classifyType } = props.value
     const { error, code, data, msg } = await checkFlowUser({
         projectId: projectId,
         contractId: contractId,
         customFlowUserList: newUserId,
+        classifyType: classifyType,
+        tableOwner: tableOwner,
+        nodeId: nodeId,
         ...flowJson,
     })
     //处理数据
@@ -137,11 +140,14 @@ const getCheckCustomFlowUserIsEVisaPermissions = async (flowJson, newUser, newUs
 
 //资料查询页面
 const getCheckCustomFlowUserIsEVisaPermissionsQuery = async (flowJson, newUser, newUserId) => {
-    const { projectId, contractId } = props.value
+    const { projectId, contractId, nodeId, tableOwner, classifyType } = props.value
     const { error, code, data, msg } = await checkFlowUserQuery({
         projectId: projectId,
         contractId: contractId,
         customFlowUserList: newUserId,
+        classifyType: classifyType,
+        tableOwner: tableOwner,
+        nodeId: nodeId,
         ...flowJson,
     })
     //处理数据

pages/task/detail.vue

@@ -9,7 +9,7 @@
             </template>
             <view class="task-name">{{taskInfo.taskName}}</view>
             <view class="task-report-info">
-                <view>上报人：{{taskInfo.reportUserName}}</view>
+                <view>上报人：{{taskInfo.taskReportUserName}}</view>
                 <view>{{taskInfo.startTime}}</view>
             </view>
         </uni-section>

pages/task/index.vue

@@ -58,10 +58,13 @@
                         </view>
                         <text>{{item.startTime}}提交的申请</text>
                     </view>
-                    <view class="card-actions-item">
+                    <view class="card-actions-item" v-if="taskType === 1">
                         <uni-icons type="calendar" size="18" color="#EE5B20"/>
                         <text class="card-actions-item-text" style="color: #EE5B20;">审批</text>
                     </view>
+                    <view class="card-actions-item" v-else>
+                        <text class="card-actions-item-text">{{item.taskStatusName}}</text>
+                    </view>
                 </view>
             </uni-card>
         </z-paging>