diff --git a/miniprogram/pages/project_flowable/editTask/index.js b/miniprogram/pages/project_flowable/editTask/index.js
index 45fbdfb..732b398 100644
--- a/miniprogram/pages/project_flowable/editTask/index.js
+++ b/miniprogram/pages/project_flowable/editTask/index.js
@@ -26,6 +26,7 @@ Page({
comment: "",
taskId: "",
procInsId: "",
+ procDefKey: "",
backShow: false,
targetKey: "",
targetKeyList: [],
@@ -47,6 +48,7 @@ Page({
subDeptScopes: [],
persChange1: false,
persChange2: false,
+ gwmxChange0: false,
},
/**
@@ -71,6 +73,11 @@ Page({
fbAptitude: true
})
}
+ if(procDefKey == "flow_zxys_gzmjtys"){
+ this.setData({
+ gwmxChange0: true
+ })
+ }
if (procDefKey == "flow_xmglzdl_xmzbdwrybg" || procDefKey == "flow_xmglzdl_xmjldwrybg") {
this.setData({
persChange1: true
@@ -89,6 +96,7 @@ Page({
projectId: app.globalData.projectId,
projectName,
procInsId,
+ procDefKey,
procDefName,
deployId,
deptName,
diff --git a/miniprogram/pages/project_flowable/editTask/index.wxml b/miniprogram/pages/project_flowable/editTask/index.wxml
index 9abede3..35956e6 100644
--- a/miniprogram/pages/project_flowable/editTask/index.wxml
+++ b/miniprogram/pages/project_flowable/editTask/index.wxml
@@ -153,6 +153,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
审批内容 [仅可上传图片]
diff --git a/miniprogram/pages/project_flowable/initTask/index.js b/miniprogram/pages/project_flowable/initTask/index.js
index ecb2a59..bf40888 100644
--- a/miniprogram/pages/project_flowable/initTask/index.js
+++ b/miniprogram/pages/project_flowable/initTask/index.js
@@ -24,6 +24,7 @@ Page({
procDefId: "",
approveTitle: "",
deploymentId: "",
+ procDefKey: "",
activeName: "",
flowNodeList: [],
flowNodes: [],
@@ -44,6 +45,7 @@ Page({
subDeptApproachDate: "",
persChange1: false,
persChange2: false,
+ gwmxChange0: false,
},
/**
@@ -62,6 +64,11 @@ Page({
fbAptitude: true
})
}
+ if(procDefKey == "flow_zxys_gzmjtys"){
+ this.setData({
+ gwmxChange0: true
+ })
+ }
if (procDefKey == "flow_xmglzdl_xmzbdwrybg" || procDefKey == "flow_xmglzdl_xmjldwrybg") {
this.setData({
persChange1: true
@@ -82,6 +89,7 @@ Page({
procDefId,
approveTitle,
deploymentId,
+ procDefKey,
deptId: res.data.deptId,
deptName: res.data.deptName,
userId: res.data.userId,
diff --git a/miniprogram/pages/project_flowable/initTask/index.wxml b/miniprogram/pages/project_flowable/initTask/index.wxml
index cac29ba..bf1f9ab 100644
--- a/miniprogram/pages/project_flowable/initTask/index.wxml
+++ b/miniprogram/pages/project_flowable/initTask/index.wxml
@@ -109,6 +109,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
审批内容 [仅可上传图片]
diff --git a/miniprogram/pages/quality_manage/index.js b/miniprogram/pages/quality_manage/index.js
index 52e94f9..9420703 100644
--- a/miniprogram/pages/quality_manage/index.js
+++ b/miniprogram/pages/quality_manage/index.js
@@ -37,8 +37,22 @@ Page({
type4PassRate: 100,
},
//举牌验收
- checkValue: 0,
- checkPassRate: 100,
+ checkValueData: [{
+ type: 1,
+ typeName: '常规验收',
+ total: 0,
+ pass: 0,
+ passRate: 0.00
+ },
+ {
+ type: 2,
+ typeName: '隐蔽验收',
+ total: 0,
+ pass: 0,
+ passRate: 0.00
+ }
+ ],
+ checkValueList: [],
materialSealStatistics: [{
name: "其它",
value: 0,
@@ -107,6 +121,7 @@ Page({
this.getCheckDetectionData(projectId);
this.getMaterialSealData(projectId);
this.getCheckingData(projectId);
+ this.getCheckingList(projectId);
},
/**
@@ -289,13 +304,45 @@ Page({
success: res => {
res = res.data;
if (res.code == 200 && res.data) {
+ let dataList = this.data.checkValueData;
res.data.forEach((it, idx) => {
//数据绑定
- this.setData({
- checkValue: it.total,
- checkPassRate: (it.pass / it.total * 100).toFixed(2),
- })
+ it.passRate = (it.pass / it.total * 100).toFixed(2);
+ if (it.type == 1) {
+ dataList[0] = it;
+ } else {
+ dataList[1] = it;
+ }
});
+ this.setData({
+ checkValueData: dataList
+ })
+ }
+ }
+ })
+ },
+
+ /**
+ * 举牌验收详情
+ */
+ getCheckingList(projectId) {
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectchecking/findStatisticsInfosByProjectId',
+ data: {
+ projectId: projectId
+ },
+ method: "get",
+ success: res => {
+ res = res.data;
+ if (res.code == 200 && res.data) {
+ let list = [];
+ res.data.forEach((it, idx) => {
+ it.passRate = (it.pass / it.total * 100).toFixed(2);
+ list.push(it);
+ });
+ this.setData({
+ checkValueList: list
+ })
}
}
})
@@ -480,7 +527,7 @@ Page({
res = res.data;
if (res.code == "200") {
that.setData({
- todoDb: res.data.todo+res.data.approveLZYJ,
+ todoDb: res.data.todo + res.data.approveLZYJ,
approveDb: res.data.approve + res.data.zlCount,
aq: res.data.aqCount,
zl: res.data.zlCount,
diff --git a/miniprogram/pages/quality_manage/index.wxml b/miniprogram/pages/quality_manage/index.wxml
index 0df1e17..aab1461 100644
--- a/miniprogram/pages/quality_manage/index.wxml
+++ b/miniprogram/pages/quality_manage/index.wxml
@@ -1,454 +1,486 @@
-
-
-
-
-
- {{scslDb}}
- {{clfyDb}}
- {{jpysDb}}
- {{qyfsDb}}
- {{zl}}
- {{gcgnDb}}
-
- {{item.menu_name}}
-
-
-
-
-
-
-
-
- 实测实量
- 查看详情
-
-
-
-
-
-
-
-
- 质量隐患排查
- 查看详情
-
-
-
-
- 常规检查问题数
-
-
- 整改率
- {{securityCheck.routineRectificationRate}} %
-
-
-
- 已整改问题数
- {{securityCheck.routineProblemTotal}}
-
-
-
-
- 专项检查问题数
-
-
- 整改率
- {{securityCheck.specialRectificationRate}} %
-
-
-
- 已整改问题数
- {{securityCheck.specialProblemTotal}}
-
-
-
-
-
-
+
+
+
+
+
+ {{scslDb}}
+ {{clfyDb}}
+ {{jpysDb}}
+ {{qyfsDb}}
+ {{zl}}
+ {{gcgnDb}}
+
+ {{item.menu_name}}
+
+
+
-
-
- 取样复试
- 查看详情
-
-
-
-
-
-
- 材料封样
- 查看详情
-
-
-
-
-
-
-
-
- 举牌验收
- 查看详情
-
-
-
-
-
+
+
@@ -32,207 +32,175 @@
-
-
-
- 教育培训（{{trainTotal}}）
- 查看详情
+
+
教育培训
- 查看详情
+ 查看详情
-
+
- -->
-
-
-
- 安全隐患排查
- 查看详情
+
+
+
+
+ 安全隐患排查
+ 查看详情
+
-
-
-
- 常规检查问题数
-
-
- 整改率
- {{securityCheck.routineRectificationRate}} %
+
+
+
+
+ 常规检查问题数
+
+
+ 整改率
+ {{securityCheck.routineRectificationRate}} %
+
+
+
+ 已整改问题数
+ {{securityCheck.routineProblemTotal}}
-
-
- 已整改问题数
- {{securityCheck.routineProblemTotal}}
-
+
+
+
+ 专项检查问题数
+
+
+ 整改率
+ {{securityCheck.specialRectificationRate}} %
+
+
+
+ 已整改问题数
+ {{securityCheck.specialProblemTotal}}
-
-
- 专项检查问题数
-
-
- 整改率
- {{securityCheck.specialRectificationRate}} %
-
-
-
- 已整改问题数
- {{securityCheck.specialProblemTotal}}
-
-
-
-
-
+
+
+
-
-
-
- 特种作业人员
- 查看详情
-
-
-
-
-
-
-
- 项目保险
- 查看详情
-
-
-
-
-
-
-
-
- 在岗人员
- 查看详情
-
-
-
-
-
-
-
-
- 应急演练（{{emergencyDrillTotal}}）
- 查看详情
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 特种作业人员
+ 查看详情
+
+
+
+
+
+
+
+
+
+ 项目保险
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+ 在岗人员
+ 查看详情
+
+
+
+
+
+
+
+
+
+
+ 应急演练
+ 查看详情
+
+
+
+
+
-
-
-
+
+
+
项目概况
-
-
+
+
安全管理
{{aq}}
-
-
+
+
质量管理
{{approveDb}}
-
-
-
-
-
+
+
+
+
+
进度管理
-
-
+
+
更多功能
{{todoDb}}
-
-
-
-
+
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 67b3590..044cf06 100644
--- a/project.config.json
+++ b/project.config.json
@@ -277,7 +277,7 @@
"tabIndent": "auto",
"tabSize": 4
},
- "libVersion": "2.12.0",
+ "libVersion": "3.5.1",
"packOptions": {
"ignore": [],
"include": []