ZaiZai 1 year ago
parent
commit
cd337d9846
3 changed files with 14 additions and 6 deletions
  1. 4 4
      config/index.js
  2. 2 2
      manifest.json
  3. 8 0
      pages/task/detail.vue

+ 4 - 4
config/index.js

@@ -18,10 +18,10 @@ export default {
     },
     //正式环境
     baseApi: {
-        api: 'http://192.168.0.109:8090/',  //请求地址
-        form: 'http://192.168.0.109:5173/', //表单地址
-        //api: 'http://47.110.251.215:8090/', //请求地址
-        //form: 'https://user.hcxxy.com/',    //表单地址
+        //api: 'http://192.168.0.109:8090/',  //请求地址
+        //form: 'http://192.168.0.109:5173/', //表单地址
+        api: 'http://47.110.251.215:8090/', //请求地址
+        form: 'https://user.hcxxy.com/',    //表单地址
         wss: 'wss://business.hcxxy.com/wss/websocket/', //长连接地址
     },
     //H5测试设置

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "工程云家",
     "appid" : "__UNI__A0B807E",
     "description" : "智慧数字工程",
-    "versionName" : "2.1.5",
-    "versionCode" : 215,
+    "versionName" : "2.1.6",
+    "versionCode" : 216,
     "transformPx" : false,
     "networkTimeout" : {
         "request" : 300000,

+ 8 - 0
pages/task/detail.vue

@@ -116,6 +116,8 @@ import dayjs from "dayjs";
 //初始变量
 const store = useAppStore()
 const instance = getCurrentInstance().proxy
+const projectId = ref(store.projectId);
+const contractId = ref(store.contractId);
 const userInfo = ref(store.userInfo);
 const taskList = ref([])
 const taskInfo = ref({})
@@ -184,6 +186,8 @@ const getTaskInfo = async () => {
 //获取审批详情
 const queryApprovalParameter = async ({parallelProcessInstanceId, formDataId, approvalType}) => {
     const { data } = await mainApi.queryApprovalParameter({
+        projectId: projectId.value,
+        contractId: contractId.value,
         parallelProcessInstanceId: parallelProcessInstanceId ?? '',
         formDataId: formDataId ?? '',
         approvalType: approvalType ?? ''
@@ -200,6 +204,8 @@ const queryApprovalParameter = async ({parallelProcessInstanceId, formDataId, ap
 //查询PDF数量
 const queryPDFnumApi = async (pdfUrl) => {
     const { data } = await mainApi.queryPDFnum({
+        projectId: projectId.value,
+        contractId: contractId.value,
         url: pdfUrl
     })
     return data ? data : 0
@@ -383,6 +389,8 @@ const batchCompleteApprovalTaskApi = async (obj = {}) => {
     let parallelProcessInstanceIds = arrToKey(rows, 'parallelProcessInstanceId', ',')
     return await mainApi.batchCompleteApprovalTask({
         ...obj,
+        projectId: projectId.value,
+        contractId: contractId.value,
         taskIds,
         approvalType,
         formDataId,