From ec75545ed1be0b5835b98d641f7369c4290eaa32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 1 Sep 2023 02:28:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
miniprogram/app.json | 9 +-
miniprogram/app.wxss | 8 +
.../project_checkDetection/add/index.js | 355 ++++++++++++++++++
.../project_checkDetection/add/index.json | 6 +
.../project_checkDetection/add/index.wxml | 129 +++++++
.../project_checkDetection/add/index.wxss | 7 +
.../project_checkDetection/check/index.js | 323 ++++++++++++++++
.../project_checkDetection/check/index.json | 4 +
.../project_checkDetection/check/index.wxml | 126 +++++++
.../project_checkDetection/check/index.wxss | 23 ++
.../project_checkDetection/info/index.js | 190 ++++++++++
.../project_checkDetection/info/index.json | 4 +
.../project_checkDetection/info/index.wxml | 139 +++++++
.../project_checkDetection/info/index.wxss | 23 ++
.../project_checkDetection/list/index.js | 201 ++++++++++
.../project_checkDetection/list/index.json | 8 +
.../project_checkDetection/list/index.wxml | 63 ++++
.../project_checkDetection/list/index.wxss | 1 +
.../pageage/project_materialSeal/add/index.js | 332 ++++++++++++++++
.../project_materialSeal/add/index.json | 12 +
.../project_materialSeal/add/index.wxml | 130 +++++++
.../project_materialSeal/add/index.wxss | 46 +++
.../project_materialSeal/info/index.js | 288 ++++++++++++++
.../project_materialSeal/info/index.json | 7 +
.../project_materialSeal/info/index.wxml | 117 ++++++
.../project_materialSeal/info/index.wxss | 23 ++
.../project_materialSeal/list/index.js | 139 +++++++
.../project_materialSeal/list/index.json | 7 +
.../project_materialSeal/list/index.wxml | 60 +++
.../project_materialSeal/list/index.wxss | 1 +
.../pageage/project_measure/add/index.js | 1 +
.../pageage/project_measure/add/index.wxml | 2 +-
.../quality/add/index.js | 4 +-
.../security/add/index.js | 4 +-
.../pageage/project_special/add/index.js | 4 +-
.../pageage/project_special/add/index.wxml | 4 +-
.../pageage/project_train/add/index.wxml | 4 +-
.../pageage/samplingRetesting/index.wxml | 5 +-
.../components/file-uploader-all/index.wxml | 2 +-
miniprogram/pages/login/login.wxml | 4 +-
miniprogram/pages/login/login.wxss | 10 +
.../pages/xiangmugaikuang/xiangmugaikuang.js | 18 +-
42 files changed, 2818 insertions(+), 25 deletions(-)
create mode 100644 miniprogram/pageage/project_checkDetection/add/index.js
create mode 100644 miniprogram/pageage/project_checkDetection/add/index.json
create mode 100644 miniprogram/pageage/project_checkDetection/add/index.wxml
create mode 100644 miniprogram/pageage/project_checkDetection/add/index.wxss
create mode 100644 miniprogram/pageage/project_checkDetection/check/index.js
create mode 100644 miniprogram/pageage/project_checkDetection/check/index.json
create mode 100644 miniprogram/pageage/project_checkDetection/check/index.wxml
create mode 100644 miniprogram/pageage/project_checkDetection/check/index.wxss
create mode 100644 miniprogram/pageage/project_checkDetection/info/index.js
create mode 100644 miniprogram/pageage/project_checkDetection/info/index.json
create mode 100644 miniprogram/pageage/project_checkDetection/info/index.wxml
create mode 100644 miniprogram/pageage/project_checkDetection/info/index.wxss
create mode 100644 miniprogram/pageage/project_checkDetection/list/index.js
create mode 100644 miniprogram/pageage/project_checkDetection/list/index.json
create mode 100644 miniprogram/pageage/project_checkDetection/list/index.wxml
create mode 100644 miniprogram/pageage/project_checkDetection/list/index.wxss
create mode 100644 miniprogram/pageage/project_materialSeal/add/index.js
create mode 100644 miniprogram/pageage/project_materialSeal/add/index.json
create mode 100644 miniprogram/pageage/project_materialSeal/add/index.wxml
create mode 100644 miniprogram/pageage/project_materialSeal/add/index.wxss
create mode 100644 miniprogram/pageage/project_materialSeal/info/index.js
create mode 100644 miniprogram/pageage/project_materialSeal/info/index.json
create mode 100644 miniprogram/pageage/project_materialSeal/info/index.wxml
create mode 100644 miniprogram/pageage/project_materialSeal/info/index.wxss
create mode 100644 miniprogram/pageage/project_materialSeal/list/index.js
create mode 100644 miniprogram/pageage/project_materialSeal/list/index.json
create mode 100644 miniprogram/pageage/project_materialSeal/list/index.wxml
create mode 100644 miniprogram/pageage/project_materialSeal/list/index.wxss
diff --git a/miniprogram/app.json b/miniprogram/app.json
index a25a8fe..9b98116 100644
--- a/miniprogram/app.json
+++ b/miniprogram/app.json
@@ -96,7 +96,14 @@
"project_special/info/index",
"project_measure/list/index",
"project_measure/add/index",
- "project_measure/info/index"
+ "project_measure/info/index",
+ "project_materialSeal/list/index",
+ "project_materialSeal/add/index",
+ "project_materialSeal/info/index",
+ "project_checkDetection/list/index",
+ "project_checkDetection/add/index",
+ "project_checkDetection/info/index",
+ "project_checkDetection/check/index"
],
"independent": false
}
diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index d3dd732..ef7571a 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -1499,6 +1499,14 @@ swiper-item video{
margin-bottom: 15rpx;
margin-left: -3rpx;
}
+.code_label_2{
+ font-size: 0.6rem;
+ width: 120rpx;
+ margin: auto;
+ text-align: center;
+ padding: 0.1rem;
+ border-radius: 0.5rem 0 0.5rem 0;
+}
.code_label_green{
background: green;
color: #FFFFFF;
diff --git a/miniprogram/pageage/project_checkDetection/add/index.js b/miniprogram/pageage/project_checkDetection/add/index.js
new file mode 100644
index 0000000..55c2b9e
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/add/index.js
@@ -0,0 +1,355 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ maxDate:new Date(2088,1,1).getTime(),
+ currentDate:new Date().getTime(),
+ deptId:"",
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ rectifierData:[],
+ loadShow:false,
+ checkTypeList:[],
+ checkType:"1",
+ materialName:"",
+ usePosition:"",
+ sampleNum:"",
+ qualifiedFlag:"Y",
+ witnessUser:"",
+ witnessUserName:"",
+ checkTime:"",
+ laboratoryName:"",
+ qualifiedFlagList:[{id:'Y',text:"是"},{id:'N',text:"否"}]
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {projectId,projectName} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ projectId,
+ projectName,
+ deptId:res.data.deptId,
+ loginName:res.data.loginName,
+ })
+ this.getAllProjectUserData();
+ this.getTypeList();
+ }
+ })
+ },
+
+ //查询项目人员数据
+ getAllProjectUserData(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectuserinfo/list',
+ method:"get",
+ data:{
+ projectId:that.data.projectId
+ },
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ that.setData({
+ rectifierData:res.data
+ })
+ }
+ }
+ })
+ },
+
+ getTypeList(){
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDetection/queryType',
+ method:"get",
+ data:{},
+ header:{
+ 'content-type': 'application/x-www-form-urlencoded'
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let list=[];
+ res.data.forEach(it =>{
+ list.push({"id":it.dictValue,"text":it.dictLabel});
+ })
+ that.setData({
+ checkTypeList:list
+ })
+ }
+ }
+ })
+ },
+
+ //材料名称
+ onInputMaterialNameValue(e){
+ let materialName = e.detail.value
+ this.setData({
+ materialName
+ })
+ },
+
+ //使用部位
+ onInputUsePositionValue(e){
+ let usePosition = e.detail.value
+ this.setData({
+ usePosition
+ })
+ },
+ //取样数量
+ onInputSampleNumValue(e){
+ let sampleNum = e.detail.value
+ this.setData({
+ sampleNum
+ })
+ },
+ //送检实验室名称
+ onInputLaboratoryNameValue(e){
+ let laboratoryName = e.detail.value
+ this.setData({
+ laboratoryName
+ })
+ },
+
+ //验收时间
+ onInputTime(e){
+ let checkTime = e.detail
+ this.setData({
+ checkTime
+ })
+ },
+
+ //添加抄送人
+ onAddSend(e){
+ if(e.detail.length>0){
+ let phoneNumbers="";
+ let userNames="";
+ e.detail.forEach(it =>{
+ phoneNumbers+=","+it.phoneNumber;
+ userNames+=","+it.userName;
+ });
+ this.setData({
+ witnessUserName:userNames.substring(1),
+ witnessUser:phoneNumbers.substring(1)
+ })
+ }else{
+ this.setData({
+ witnessUser:"",
+ witnessUserName:""
+ })
+ }
+ },
+
+ //取消页面
+ cancelSaveView(){
+ this.returnToPage()
+ },
+
+ //保存
+ onSubmitSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {projectId,deptId,checkType,
+ materialName,
+ usePosition,
+ sampleNum,
+ qualifiedFlag,
+ witnessUser,
+ witnessUserName,
+ checkTime,
+ laboratoryName,loginName} = that.data;
+ //数据效验
+ if(projectId==""||loginName==""||deptId==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(checkType==""){
+ app.toast("请选择送检类型!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(materialName==""){
+ app.toast("请填写材料名称!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(sampleNum==""){
+ app.toast("请填写取样数量!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(usePosition==""){
+ app.toast("请填写使用部位!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(qualifiedFlag==""){
+ app.toast("请选择是否提供合格证!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(qualifiedFlag==""){
+ app.toast("请选择是否提供合格证!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(witnessUser==""||witnessUserName==""){
+ app.toast("请选择见证人!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(checkTime==""){
+ app.toast("请选择送检时间!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(laboratoryName==""){
+ app.toast("请填写送检实验室名称!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ let params = {
+ projectId,
+ deptId,
+ checkType,
+ materialName,
+ usePosition,
+ sampleNum,
+ qualifiedFlag,
+ witnessUser,
+ witnessUserName,
+ checkTime:checkTime+":00",
+ laboratoryName,
+ createBy:loginName
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectDetection/add',
+ method:"POST",
+ data:params,
+ header: {
+ "Username": loginName,
+ "Content-Type": "application/json"
+ },
+ success(res){
+ that.setData({
+ loadShow:false
+ })
+ res = res.data
+ if(res.code == 200){
+ app.toast("添加成功!")
+ setTimeout(()=>{
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },200)
+ }
+ }
+ })
+ },
+
+ //选择检测类型
+ onSelectCheckType(e){
+ this.setData({
+ checkType:e.detail.id
+ })
+ },
+ //选择是否提供合格证
+ onSelectQualifiedFlag(e){
+ this.setData({
+ qualified:e.detail.id
+ })
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/add/index.json b/miniprogram/pageage/project_checkDetection/add/index.json
new file mode 100644
index 0000000..aeb0384
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/add/index.json
@@ -0,0 +1,6 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/add/index.wxml b/miniprogram/pageage/project_checkDetection/add/index.wxml
new file mode 100644
index 0000000..47405ef
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/add/index.wxml
@@ -0,0 +1,129 @@
+
+
+
+
+
+ {{projectName}}
+
+
+ 送检类型
+
+
+
+
+
+ 材料名称
+
+
+
+
+
+ 取样数量
+
+
+
+
+
+ 使用部位
+
+
+
+
+
+ 是否提供合格证
+
+
+
+
+
+ 见证人
+
+
+
+
+
+
+ 送检时间
+
+
+
+
+
+ 送检实验室名称
+
+
+
+
+
+
+ 取消
+ 提交送检
+
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_checkDetection/add/index.wxss b/miniprogram/pageage/project_checkDetection/add/index.wxss
new file mode 100644
index 0000000..38bd48d
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/add/index.wxss
@@ -0,0 +1,7 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+ background: none !important;
+}
+.van-image__img{
+ border-radius: 10rpx !important;
+}
diff --git a/miniprogram/pageage/project_checkDetection/check/index.js b/miniprogram/pageage/project_checkDetection/check/index.js
new file mode 100644
index 0000000..cd23387
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/check/index.js
@@ -0,0 +1,323 @@
+// pageage/project_checking/info/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id:"",
+ infoData:{},
+ loadShow:false,
+ loginName:"",
+ showDel:false,
+ detectionImageList:[],
+ minDetectionFileImages:[],
+ detectionFiles:[],
+ list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
+ detectionResult:"1",
+ detectionFileData:[],
+ fileType:["pdf","png","jpg","jpeg"],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ loginName:res.data.loginName
+ })
+ this.getInfo();
+ }
+ })
+ },
+
+ //取消页面
+ cancelSaveView(){
+ this.returnToPage()
+ },
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDetection/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let imageUrls = [];
+ let minImageUrls = [];
+ let fileUrls = [];
+ //判断附件
+ if(res.data.detectionFile){
+ res.data.detectionFile.split(',').forEach(element => {
+ let _file = element.split('.');
+ _file = _file[_file.length-1].toLocaleUpperCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
+ imageUrls.push(that.data.request+element);
+ minImageUrls.push(that.data.request+element+'.min.jpg');
+ }else{
+ fileUrls.push(element);
+ }
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ detectionImageList:imageUrls,
+ minDetectionFileImages:minImageUrls,
+ detectionFiles:fileUrls,
+ loadShow:false
+ })
+ //判断当前能否删除
+ if(res.data.createBy==that.data.loginName){
+ that.setData({
+ showDel:true
+ })
+ }
+ }
+ }
+ })
+ },
+
+ //保存
+ onSubmitSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {id,detectionResult,detectionFileData,loginName} = that.data;
+ //数据效验
+ if(id==""||loginName==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(detectionResult==""){
+ app.toast("请选择检测结果!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(detectionFileData.length==0){
+ app.toast("请上传检测报告!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ let _fileType = detectionFileData[0].path.split('.');
+ _fileType = _fileType[_fileType.length-1].toLowerCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if(this.data.fileType.indexOf(_fileType)==-1){
+ app.toast("检测报告不支持 [ "+_fileType+" ] 格式!")
+ that.setData({
+ loadShow:false
+ });
+ return;
+ }
+ detectionFileData.forEach(async (item)=>{
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let uploadName = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ let obj = await that.syncUploadImage(uploadUrl,item.path,uploadName);
+ let params = {
+ id,
+ checkState:"2",
+ detectionResult,
+ detectionFile:obj.data.fileName,
+ updateBy:loginName
+ }
+
+ wx.request({
+ url: app.globalData.reqUrl + "/wechat/projectDetection/edit",
+ method:"POST",
+ data:params,
+ header: {
+ "Username": loginName,
+ "Content-Type": "application/json"
+ },
+ success(res){
+ that.setData({
+ loadShow:false
+ })
+ res = res.data
+ if(res.code == 200){
+ app.toast("提交成功!")
+ setTimeout(()=>{
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },200)
+ }
+ }
+ })
+ })
+ },
+
+ /**
+ * 这里考虑上传图片异步问题，封装为同步
+ */
+ syncUploadImage(url,uploadFile,name) {
+ return new Promise((resolve, reject) => {
+ wx.uploadFile({
+ url, // 上传的服务器接口地址
+ filePath: uploadFile,
+ header: {
+ "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+ },
+ name, //上传的所需字段，后端提供
+ formData: { user: 'test' },
+ success: (res) => {
+ // 上传完成操作
+ const data = JSON.parse(res.data)
+ resolve({
+ data: data
+ })
+ },
+ fail: (err) => {
+ //上传失败：修改pedding为reject
+ console.log("访问接口失败", err);
+ wx.showToast({
+ title: "网络出错,上传失败",
+ icon: 'none',
+ duration: 1000
+ });
+ reject(err)
+ }
+ });
+ })
+ },
+
+ onDelete(){
+ //弹出确认
+ let that = this
+ wx.showModal({
+ title: '提示',
+ content: '是否确定删除此条数据？',
+ success: function (sm) {
+ if (sm.confirm) {
+ // 用户点击了确定 可以调用了
+ that.deleteData();
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
+ },
+ deleteData(){
+ let {id} = this.data
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDetection/remove',
+ header: {
+ "Username": this.data.loginName,
+ },
+ data:{
+ id:id
+ },
+ method:"get",
+ success(res){
+ app.toast("删除成功！")
+ wx.redirectTo({
+ url: `../list/index`,
+ })
+ }
+ })
+ },
+
+ //展示图片
+ showImg:function(e){
+ var that=this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
+ },
+ //选择检测类型
+ onSelect(e){
+ this.setData({
+ detectionResult:e.detail.id
+ })
+ },
+
+ fileUpload(options){
+ let file=options.detail;
+ this.setData({
+ detectionFileData: file
+ });
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/check/index.json b/miniprogram/pageage/project_checkDetection/check/index.json
new file mode 100644
index 0000000..b7b4e0b
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/check/index.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {"van-overlay": "@vant/weapp/overlay/index"},
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/check/index.wxml b/miniprogram/pageage/project_checkDetection/check/index.wxml
new file mode 100644
index 0000000..d58a638
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/check/index.wxml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+ {{infoData.projectName}}
+
+
+
+
+ 送检类型
+ {{infoData.checkTypeName}}
+
+
+
+
+ 材料名称
+ {{infoData.materialName}}
+
+
+
+
+ 取样数量
+ {{infoData.sampleNum}}
+
+
+
+
+ 使用部位
+ {{infoData.usePosition}}
+
+
+
+
+ 合格证
+
+ 已提供
+ 未提供
+
+
+
+
+
+ 见证人
+ {{infoData.witnessUserName}}
+
+
+
+
+ 送检时间
+ {{infoData.checkTime}}
+
+
+
+
+ 实验室
+ {{infoData.laboratoryName}}
+
+
+
+
+ 提交单位
+ {{infoData.deptName}}
+
+
+
+
+ 提交用户
+ {{infoData.createBy}}
+
+
+
+
+ 提交时间
+ {{infoData.createTime}}
+
+
+
+
+
+
+
+ 登记取样复试结果
+
+
+
+ 检测结果
+
+
+
+
+
+ 检测报告
+ [可上传PDF和图片格式]
+
+
+
+
+
+
+
+
+ 取消
+ 删除
+ 提交结果
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
diff --git a/miniprogram/pageage/project_checkDetection/check/index.wxss b/miniprogram/pageage/project_checkDetection/check/index.wxss
new file mode 100644
index 0000000..e8ea92e
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/check/index.wxss
@@ -0,0 +1,23 @@
+/* pageage/project_checking/info/index.wxss */
+.in-img-max:after{
+ display:block;
+ clear:both;
+ content:"";
+ visibility:hidden;
+ height:0
+ }
+ .in-img-max{
+ width: auto;
+ zoom:1
+ }
+ .in-img-div{
+ position: relative;
+ margin: 0 8px 8px 0;
+ float: left;
+ }
+ .in-img-div image{
+ width: 180rpx;
+ height: 180rpx;
+ border-radius: 15rpx;
+ position: relative;
+ }
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/info/index.js b/miniprogram/pageage/project_checkDetection/info/index.js
new file mode 100644
index 0000000..2f28621
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/info/index.js
@@ -0,0 +1,190 @@
+// pageage/project_checking/info/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id:"",
+ infoData:{},
+ loadShow:false,
+ loginName:"",
+ showDel:false,
+ detectionImageList:[],
+ minDetectionFileImages:[],
+ detectionFiles:[],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ loginName:res.data.loginName
+ })
+ this.getInfo();
+ }
+ })
+ },
+
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDetection/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let imageUrls = [];
+ let minImageUrls = [];
+ let fileUrls = [];
+ //判断附件
+ if(res.data.detectionFile){
+ res.data.detectionFile.split(',').forEach(element => {
+ let _file = element.split('.');
+ _file = _file[_file.length-1].toLocaleUpperCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
+ imageUrls.push(that.data.request+element);
+ minImageUrls.push(that.data.request+element+'.min.jpg');
+ }else{
+ fileUrls.push(element);
+ }
+ });
+ }
+ that.setData({
+ infoData:res.data,
+ detectionImageList:imageUrls,
+ minDetectionFileImages:minImageUrls,
+ detectionFiles:fileUrls,
+ loadShow:false
+ })
+ //判断当前能否删除
+ if(res.data.createBy==that.data.loginName){
+ that.setData({
+ showDel:true
+ })
+ }
+ }
+ }
+ })
+ },
+
+ onDelete(){
+ //弹出确认
+ let that = this
+ wx.showModal({
+ title: '提示',
+ content: '是否确定删除此条数据？',
+ success: function (sm) {
+ if (sm.confirm) {
+ // 用户点击了确定 可以调用了
+ that.deleteData();
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
+ },
+ deleteData(){
+ let {id} = this.data
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectDetection/remove',
+ header: {
+ "Username": this.data.loginName,
+ },
+ data:{
+ id:id
+ },
+ method:"get",
+ success(res){
+ app.toast("删除成功！")
+ wx.redirectTo({
+ url: `../list/index`,
+ })
+ }
+ })
+ },
+
+ //展示图片
+ showImg:function(e){
+ var that=this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index',
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/info/index.json b/miniprogram/pageage/project_checkDetection/info/index.json
new file mode 100644
index 0000000..ba2821f
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/info/index.json
@@ -0,0 +1,4 @@
+{
+ "usingComponents": {},
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/info/index.wxml b/miniprogram/pageage/project_checkDetection/info/index.wxml
new file mode 100644
index 0000000..666fea9
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/info/index.wxml
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+ {{infoData.projectName}}
+
+
+
+
+ 送检类型
+ {{infoData.checkTypeName}}
+
+
+
+
+ 材料名称
+ {{infoData.materialName}}
+
+
+
+
+ 取样数量
+ {{infoData.sampleNum}}
+
+
+
+
+ 使用部位
+ {{infoData.usePosition}}
+
+
+
+
+ 合格证
+
+ 已提供
+ 未提供
+
+
+
+
+
+ 见证人
+ {{infoData.witnessUserName}}
+
+
+
+
+ 送检时间
+ {{infoData.checkTime}}
+
+
+
+
+ 实验室
+ {{infoData.laboratoryName}}
+
+
+
+
+ 提交单位
+ {{infoData.deptName}}
+
+
+
+
+ 提交用户
+ {{infoData.createBy}}
+
+
+
+
+ 提交时间
+ {{infoData.createTime}}
+
+
+
+
+
+
+
+ 材料取样复试结果
+
+
+
+
+ 登记用户
+ {{infoData.updateBy}}
+
+
+
+
+ 登记时间
+ {{infoData.updateTime}}
+
+
+
+
+ 复试结果
+
+ 合格
+ 不合格
+
+
+
+
+
+ 检测报告
+
+
+
+
+
+
+ 下载附件
+
+
+
+
+
+
+
+ 删除
+
+
+
diff --git a/miniprogram/pageage/project_checkDetection/info/index.wxss b/miniprogram/pageage/project_checkDetection/info/index.wxss
new file mode 100644
index 0000000..e8ea92e
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/info/index.wxss
@@ -0,0 +1,23 @@
+/* pageage/project_checking/info/index.wxss */
+.in-img-max:after{
+ display:block;
+ clear:both;
+ content:"";
+ visibility:hidden;
+ height:0
+ }
+ .in-img-max{
+ width: auto;
+ zoom:1
+ }
+ .in-img-div{
+ position: relative;
+ margin: 0 8px 8px 0;
+ float: left;
+ }
+ .in-img-div image{
+ width: 180rpx;
+ height: 180rpx;
+ border-radius: 15rpx;
+ position: relative;
+ }
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/list/index.js b/miniprogram/pageage/project_checkDetection/list/index.js
new file mode 100644
index 0000000..5496027
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/list/index.js
@@ -0,0 +1,201 @@
+// pageage/safetyManagement/securityCheckGR/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ deptId:"",
+ loginName:"",
+ projectId:"",
+ minRoleId:"",
+ projectData:{},
+ initData: {},
+ show:false,
+ listData:[],
+ activeState:"sjz",
+ sjzCount:0,
+ ywcCount:0,
+ request:app.globalData.reqUrl
+ },
+
+ skipAdd(){
+ wx.redirectTo({
+ url: `../add/index?projectId=${this.data.initData.id}&projectName=`+this.data.initData.text,
+ })
+ },
+
+ getInfo(e){
+ let {id,checkState} = e.currentTarget.dataset.set
+ if(checkState=="1"){
+ wx.redirectTo({
+ url: `../check/index?id=${id}`,
+ })
+ }else{
+ wx.redirectTo({
+ url: `../info/index?id=${id}`,
+ })
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ deptId:res.data.deptId,
+ loginName:res.data.loginName,
+ projectId:app.globalData.projectId,
+ minRoleId:res.data.minRoleId,
+ initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+ })
+ this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId);
+ }
+ })
+ },
+
+ /**
+ * 查询项目举牌验收数据
+ */
+ getListData(projectId,deptId,minRoleId) {
+ var that = this;
+ //判断角色，
+ if(minRoleId==2||minRoleId==3||minRoleId==4){
+ deptId=0;
+ }
+ let param = {
+ "projectId": projectId,
+ "deptId":deptId,
+ "activeName":that.data.activeState
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectDetection/list',
+ data:param,
+ method: "get",
+ success: function (res) {
+ that.setData({
+ listData:res.data.data
+ })
+ }
+ });
+ this.queryCount(projectId,deptId);
+ },
+
+ //查询统计
+ queryCount(projectId,deptId){
+ //查询统计数量
+ let param = {
+ "projectId": projectId,
+ "deptId":deptId,
+ "activeName":this.data.activeState
+ }
+ let that = this;
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectDetection/queryCount',
+ data: param,
+ method: "get",
+ success: function (res) {
+ let check1=0;
+ let check2=0;
+ if(res.data.data.check1){
+ check1+=res.data.data.check1;
+ }
+ if(res.data.data.check2){
+ check2+=res.data.data.check2;
+ }
+ that.setData({
+ sjzCount:check1,
+ ywcCount:check2
+ });
+ }
+ });
+ },
+
+ /**
+ * 标签切换
+ */
+ typeJump(e){
+ let index = e.currentTarget.dataset.index;
+ let nav = "";
+ if(index == 1){
+ nav = 'sjz';
+ }else if(index == 2){
+ nav = 'ywc';
+ }
+
+ this.setData({
+ activeState:nav
+ });
+ this.getListData(this.data.projectId,this.data.deptId,this.data.minRoleId);
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../../../pages/gengduogongneng/gengduogongneng',
+ })
+ },
+
+ //项目切换 返回值
+ onProjectSelect(e){
+ let projectId = e.detail.id;
+ let projectName = e.detail.text;
+ app.globalData.projectId = projectId;
+ app.globalData.projectName = projectName;
+ this.onLoad();
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/list/index.json b/miniprogram/pageage/project_checkDetection/list/index.json
new file mode 100644
index 0000000..3dcb14a
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/list/index.json
@@ -0,0 +1,8 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index" ,
+ "van-popup": "@vant/weapp/popup/index"
+ },
+ "navigationStyle":"custom",
+ "navigationBarTitleText": "质量隐患排查"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxml b/miniprogram/pageage/project_checkDetection/list/index.wxml
new file mode 100644
index 0000000..06c99b5
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/list/index.wxml
@@ -0,0 +1,63 @@
+
+
+
+
+ 送检中（{{sjzCount}}）
+ 已完成（{{ywcCount}}）
+
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ 送检时间：{{item.checkTime}}
+ 送检中
+ 合格
+ 不合格
+
+
+
+
+
+ 送检类型：{{item.checkTypeName}}
+ 材料名称：{{item.materialName}}
+ 使用部位：{{item.usePosition}}
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_checkDetection/list/index.wxss b/miniprogram/pageage/project_checkDetection/list/index.wxss
new file mode 100644
index 0000000..f370194
--- /dev/null
+++ b/miniprogram/pageage/project_checkDetection/list/index.wxss
@@ -0,0 +1 @@
+/* pageage/project_checking_list/project_checking_list.wxss */
diff --git a/miniprogram/pageage/project_materialSeal/add/index.js b/miniprogram/pageage/project_materialSeal/add/index.js
new file mode 100644
index 0000000..9b46b8e
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/add/index.js
@@ -0,0 +1,332 @@
+// pageage/safetyManagement/addSafetyInspect/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ maxDate:new Date(2088,1,1).getTime(),
+ currentDate:new Date().getTime(),
+ deptId:"",
+ projectId:"",
+ projectName:"",
+ loginName:"",
+ imageInfoData:[],
+ materialName:"",
+ usePosition:"",
+ contractBrand:"",
+ useBrand:"",
+ sealDate:"",
+ signFileData:[],
+ alterationFileData:[],
+ limit:1,
+ showBgd:false
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {projectId,projectName} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ projectId,
+ projectName,
+ deptId:res.data.deptId,
+ loginName:res.data.loginName
+ })
+ }
+ })
+ },
+
+ // list 上传图片
+ onImagesArr(e){
+ var data = this.data.imageInfoData;
+ data = e.detail
+ this.setData({
+ imageInfoData:data
+ })
+ },
+ onImagesArrSignFiles(e){
+ var data = this.data.signFileData;
+ data = e.detail
+ this.setData({
+ signFileData:data
+ })
+ },
+ onImagesArrAlterationFiles(e){
+ var data = this.data.alterationFileData;
+ data = e.detail
+ this.setData({
+ alterationFileData:data
+ })
+ },
+
+ //取消页面
+ cancelSaveView(){
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },
+
+ //保存
+ onSave(){
+ this.setData({
+ loadShow:true
+ })
+ let that = this
+ let {projectId,projectName,deptId,loginName,imageInfoData,materialName,
+ usePosition,contractBrand,useBrand,sealDate,signFileData,alterationFileData} = that.data;
+ debugger
+ //数据效验
+ if(projectId==""||loginName==""||deptId==""){
+ app.toast("数据异常，请刷新页面重试!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(imageInfoData.length==0){
+ app.toast("请上传封样现场图片!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(materialName==""){
+ app.toast("请填写封样名称!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(usePosition==""){
+ app.toast("请填写使用部位!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(contractBrand==""){
+ app.toast("请填写合同指定品牌!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(useBrand==""){
+ app.toast("请填写拟用品牌!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(sealDate==""){
+ app.toast("请选择封样时间!")
+ that.setData({
+ loadShow:false
+ })
+ return;
+ }
+ if(signFileData.length==0){
+ app.toast("请上传会签单照片!")
+ that.setData({
+ loadShow:false
+ });
+ return;
+ }
+ if(contractBrand.indexOf(useBrand)==-1 && alterationFileData.length==0){
+ app.toast("请上传变更单照片!")
+ that.setData({
+ loadShow:false
+ });
+ return;
+ }
+ let fileUrls = [];
+ imageInfoData.forEach(async (item)=>{
+ let uploadUrl = app.globalData.uploadUrl+'/common/upload'
+ let name = "file"
+ //这里复杂的图片上传，改为同步上传，因为小程序只能上传一张图片
+ let obj = await that.syncUploadImage(uploadUrl,item,name);
+ fileUrls.push(obj.data.fileName);
+ //验证图片上传完毕
+ if(fileUrls.length == imageInfoData.length){
+ //上传会签单
+ let signFile = await that.syncUploadImage(uploadUrl,signFileData[0],name);
+ //上传变更单
+ let alterationFilePath = "";
+ if(alterationFileData.length>0){
+ obj = await that.syncUploadImage(uploadUrl,alterationFileData[0],name);
+ alterationFilePath = obj.data.fileName
+ }
+ let params = {
+ projectId,
+ projectName,
+ deptId,
+ imageUrls:fileUrls.toString(),
+ materialName,
+ usePosition,
+ contractBrand,
+ useBrand,
+ sealDate:sealDate+":00",
+ signFiles:signFile.data.fileName,
+ alterationFiles:alterationFilePath,
+ createBy:loginName
+ }
+ wx.request({
+ url: app.globalData.reqUrl + "/wechat/projectMaterialSeal/add",
+ method:"POST",
+ data:params,
+ header: {
+ "Username": loginName,
+ "Content-Type": "application/json"
+ },
+ success(res){
+ that.setData({
+ loadShow:false
+ })
+ res = res.data
+ if(res.code == 200){
+ app.toast("添加成功!")
+ setTimeout(()=>{
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },200)
+ }
+ }
+ })
+ }
+ })
+ },
+
+ /**
+ * 这里考虑上传图片异步问题，封装为同步
+ */
+ syncUploadImage(url,uploadFile,name) {
+ return new Promise((resolve, reject) => {
+ wx.uploadFile({
+ url, // 上传的服务器接口地址
+ filePath: uploadFile,
+ header: {
+ "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8"
+ },
+ name, //上传的所需字段，后端提供
+ formData: { user: 'test' },
+ success: (res) => {
+ // 上传完成操作
+ const data = JSON.parse(res.data)
+ resolve({
+ data: data
+ })
+ },
+ fail: (err) => {
+ //上传失败：修改pedding为reject
+ console.log("访问接口失败", err);
+ wx.showToast({
+ title: "网络出错,上传失败",
+ icon: 'none',
+ duration: 1000
+ });
+ reject(err)
+ }
+ });
+ })
+ },
+
+ materialNameAction: function (options) {
+ this.data.materialName = options.detail.value;
+ },
+ usePositionAction: function (options) {
+ this.data.usePosition = options.detail.value
+ },
+ contractBrandAction: function (options) {
+ this.data.contractBrand = options.detail.value
+ this.showBgdLabel()
+ },
+ useBrandAction: function (options) {
+ this.data.useBrand = options.detail.value
+ this.showBgdLabel()
+ },
+
+ showBgdLabel(){
+ if(this.data.contractBrand!="" && this.data.useBrand!="" && this.data.contractBrand.indexOf(this.data.useBrand)==-1){
+ this.setData({
+ showBgd:true
+ })
+ }else{
+ this.setData({
+ showBgd:false
+ })
+ }
+ },
+
+ //演练训练时间
+ onInputTime(e){
+ let sealDate = e.detail
+ this.setData({
+ sealDate
+ })
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/add/index.json b/miniprogram/pageage/project_materialSeal/add/index.json
new file mode 100644
index 0000000..7576d93
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/add/index.json
@@ -0,0 +1,12 @@
+{
+ "usingComponents": {
+ "van-row": "@vant/weapp/row",
+ "van-col": "@vant/weapp/col",
+ "van-popup": "@vant/weapp/popup",
+ "van-picker": "@vant/weapp/picker/index",
+ "van-area": "@vant/weapp/area/index",
+ "mkl-multi-select": "/components/@mkl/multi-select/index",
+ "van-overlay": "@vant/weapp/overlay/index"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/add/index.wxml b/miniprogram/pageage/project_materialSeal/add/index.wxml
new file mode 100644
index 0000000..ad0bf99
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/add/index.wxml
@@ -0,0 +1,130 @@
+
+
+
+
+
+ {{projectName}}
+
+
+ 封样图片
+
+
+
+
+
+ 封样名称
+
+
+
+
+
+ 使用部位
+
+
+
+
+
+ 合同指定品牌
+
+
+
+
+
+ 拟用品牌
+
+
+
+
+
+ 封样时间
+
+
+
+
+
+ 会签单图片
+
+
+
+
+
+ 变更单图片
+
+
+ 合同指定品牌和拟用品牌不一致时需要上传
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+ 数据加载中！请稍后...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_materialSeal/add/index.wxss b/miniprogram/pageage/project_materialSeal/add/index.wxss
new file mode 100644
index 0000000..39d0889
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/add/index.wxss
@@ -0,0 +1,46 @@
+/* pageage/safetyManagement/addSafetyInspect/index.wxss */
+.van-popup{
+ background: none !important;
+}
+.van-image__img{
+ border-radius: 10rpx !important;
+}
+.radio_custom_class{
+ padding: 10rpx 100rpx 10rpx 0;
+}
+.radio_label_class{
+ color: #ffffff !important;
+}
+.max_tab_name{
+ padding: 0 40rpx;
+ font-size:30rpx;
+ height: 460rpx;
+ overflow: auto;
+ margin-top: 20rpx;
+ text-align: center;
+ }
+ .van-popup.van-popup--bottom{
+ background: #232a44;
+ }
+ .van-popup {
+ background-color: var(--popup-background-color,#232a44) !important;
+ }
+ .font_color{
+ padding: 15rpx 0;
+ color: #157dd2;
+ }
+ .active{
+ font-size:30rpx;
+ font-weight: 600;
+ color: #14feff
+ }
+.option_list_title{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 20rpx 0;
+ }
+ .option_list_title_btn{
+ color: #1989fa;
+ font-size: 30rpx;
+ }
diff --git a/miniprogram/pageage/project_materialSeal/info/index.js b/miniprogram/pageage/project_materialSeal/info/index.js
new file mode 100644
index 0000000..f062615
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/info/index.js
@@ -0,0 +1,288 @@
+// pageage/project_checking/info/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ id:"",
+ infoData:{},
+ imageList:[],
+ minImageList:[],
+ loadShow:false,
+ loginName:"",
+ showDel:false,
+ signFileNames:[],
+ minSignFileImages:[],
+ signFileImages:[],
+ alterationFileNames:[],
+ minAlterationFileImages:[],
+ alterationFileImages:[],
+ request:app.globalData.reqUrl
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ let {id} = options
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ id,
+ loginName:res.data.loginName
+ })
+ this.getInfo();
+ }
+ })
+ },
+
+
+ /**
+ * 获取安全检查详情信息
+ *
+ */
+ getInfo(){
+ let {id} = this.data
+ let that = this
+ wx.request({
+ url: app.globalData.reqUrl+'/wechat/projectMaterialSeal/info',
+ method:"get",
+ data:{
+ id:id
+ },
+ success(res){
+ res = res.data
+ if(res.code == 200){
+ let urls = [];
+ let minUrls = [];
+ if(res.data.imageUrls){
+ res.data.imageUrls.split(',').forEach(element => {
+ urls.push(that.data.request+element);
+ minUrls.push(that.data.request+element+'.min.jpg');
+ });
+ }
+ let fileNames = [];
+ let minFileImages = [];
+ let fileImages = [];
+ //判断附件
+ if(res.data.signFiles){
+ res.data.signFiles.split(',').forEach(element => {
+ let _file = element.split('.');
+ _file = _file[_file.length-1].toLocaleUpperCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
+ fileImages.push(that.data.request+element);
+ minFileImages.push(that.data.request+element+'.min.jpg');
+ }else{
+ fileNames.push(element);
+ }
+ });
+ }
+ let fileNames2 = [];
+ let minFileImages2 = [];
+ let fileImages2 = [];
+ //判断附件
+ if(res.data.alterationFiles){
+ res.data.alterationFiles.split(',').forEach(element => {
+ let _file = element.split('.');
+ _file = _file[_file.length-1].toLocaleUpperCase();
+ //判断附件类型，如果是图片直接展示，非图片则显示附件
+ if(_file=="PNG"||_file=="JPG"||_file=="JPEG"){
+ fileImages2.push(that.data.request+element);
+ minFileImages2.push(that.data.request+element+'.min.jpg');
+ }else{
+ fileNames2.push(element);
+ }
+ });
+ }
+ that.setData({
+ signFileNames:fileNames,
+ minSignFileImages:minFileImages,
+ signFileImages:fileImages,
+ alterationFileNames:fileNames2,
+ minAlterationFileImages:minFileImages2,
+ alterationFileImages:fileImages2,
+ infoData:res.data,
+ imageList:urls,
+ minImageList:minUrls,
+ loadShow:false
+ })
+ //判断当前能否删除
+ if(res.data.createBy==that.data.loginName){
+ that.setData({
+ showDel:true
+ })
+ }
+ }
+ }
+ })
+ },
+
+ onDelete(){
+ //弹出确认
+ let that = this
+ wx.showModal({
+ title: '提示',
+ content: '是否确定删除此条数据？',
+ success: function (sm) {
+ if (sm.confirm) {
+ // 用户点击了确定 可以调用了
+ that.deleteData();
+ } else if (sm.cancel) {
+ console.log('用户点击取消');
+ }
+ }
+ })
+ },
+ deleteData(){
+ let {id} = this.data
+ let that = this;
+ wx.request({
+ url: app.globalData.reqUrl+"/wechat/projectMaterialSeal/remove",
+ header: {
+ "Username": this.data.loginName,
+ },
+ data:{
+ id:id
+ },
+ method:"get",
+ success(res){
+ app.toast("删除成功！")
+ wx.redirectTo({
+ url: `../list/index`
+ })
+ }
+ })
+ },
+
+ //展示图片
+ showImg:function(e){
+ var that=this;
+ wx.previewImage({
+ urls: that.data.imageList,
+ current: that.data.imageList[e.currentTarget.dataset.index]
+ })
+ },
+
+ //展示图片
+ showSignFileImg:function(e){
+ var that=this;
+ wx.previewImage({
+ urls: that.data.sifnFileImages,
+ current: that.data.sifnFileImages[e.currentTarget.dataset.index]
+ })
+ },
+
+ //展示图片
+ showAlterationFileImg:function(e){
+ var that=this;
+ wx.previewImage({
+ urls: that.data.alterationFileImages,
+ current: that.data.alterationFileImages[e.currentTarget.dataset.index]
+ })
+ },
+
+ downFile:function(e){
+ let idx = e.currentTarget.dataset['index'];
+ let that = this;
+ wx.downloadFile({
+ // 示例 url，并非真实存在
+ url: that.data.request+that.data.signFileNames[idx],
+ success: function (res) {
+ const filePath = res.tempFilePath
+ wx.openDocument({
+ filePath: filePath,
+ success: function (res) {
+ console.log('打开文档成功')
+ },
+ fail:function(res) {
+ console.log(res)
+ }
+ })
+ }
+ })
+ //app.toast("暂不支持下载！如需下载请前往后台管理系统！！")
+ },
+
+ downFile2:function(e){
+ let idx = e.currentTarget.dataset['index'];
+ let that = this;
+ wx.downloadFile({
+ // 示例 url，并非真实存在
+ url: that.data.request+that.alterationFileNames[idx],
+ success: function (res) {
+ const filePath = res.tempFilePath
+ wx.openDocument({
+ filePath: filePath,
+ success: function (res) {
+ console.log('打开文档成功')
+ },
+ fail:function(res) {
+ console.log(res)
+ }
+ })
+ }
+ })
+ //app.toast("暂不支持下载！如需下载请前往后台管理系统！！")
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../list/index'
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/info/index.json b/miniprogram/pageage/project_materialSeal/info/index.json
new file mode 100644
index 0000000..ef67f38
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/info/index.json
@@ -0,0 +1,7 @@
+{
+ "usingComponents": {
+ "van-popup": "@vant/weapp/popup/index"
+ },
+ "navigationStyle":"custom",
+ "navigationBarTitleText": "形象进度详情"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/info/index.wxml b/miniprogram/pageage/project_materialSeal/info/index.wxml
new file mode 100644
index 0000000..13aa6ca
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/info/index.wxml
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+ {{infoData.projectName}}
+
+
+
+
+ 封样图片
+
+
+
+
+
+
+
+
+
+ 封样名称
+ {{infoData.materialName}}
+
+
+
+
+ 使用部位
+ {{infoData.usePosition}}
+
+
+
+
+ 指定品牌
+ {{infoData.contractBrand}}
+
+
+
+
+ 拟用品牌
+ {{infoData.useBrand}}
+
+
+
+
+ 封样时间
+ {{infoData.sealDate}}
+
+
+
+
+ 会签单
+
+
+
+
+
+
+ 下载附件
+
+
+
+
+
+
+
+ 变更单
+
+
+
+
+
+
+ 下载附件
+
+
+
+
+
+
+ 提交单位
+
+ {{infoData.deptName}}
+
+
+
+
+
+ 提交用户
+ {{infoData.createBy}}
+
+
+
+
+ 提交时间
+ {{infoData.createTime}}
+
+
+
+
+
+
+ 删除
+
+
+
diff --git a/miniprogram/pageage/project_materialSeal/info/index.wxss b/miniprogram/pageage/project_materialSeal/info/index.wxss
new file mode 100644
index 0000000..e8ea92e
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/info/index.wxss
@@ -0,0 +1,23 @@
+/* pageage/project_checking/info/index.wxss */
+.in-img-max:after{
+ display:block;
+ clear:both;
+ content:"";
+ visibility:hidden;
+ height:0
+ }
+ .in-img-max{
+ width: auto;
+ zoom:1
+ }
+ .in-img-div{
+ position: relative;
+ margin: 0 8px 8px 0;
+ float: left;
+ }
+ .in-img-div image{
+ width: 180rpx;
+ height: 180rpx;
+ border-radius: 15rpx;
+ position: relative;
+ }
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/list/index.js b/miniprogram/pageage/project_materialSeal/list/index.js
new file mode 100644
index 0000000..2d668e6
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/list/index.js
@@ -0,0 +1,139 @@
+// pageage/safetyManagement/securityCheckGR/index.js
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ deptId:"",
+ loginName:"",
+ projectId:"",
+ initData: {},
+ show:false,
+ listData:[],
+ request:app.globalData.reqUrl
+ },
+
+ skipAdd(){
+ wx.redirectTo({
+ url: `../add/index?projectId=${this.data.initData.id}&projectName=${this.data.initData.text}`
+ })
+ },
+
+ getInfo(e){
+ let {id} = e.currentTarget.dataset.set
+ wx.redirectTo({
+ url: `../info/index?id=${id}`
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ //获取缓存数据
+ wx.getStorage({
+ key: 'userinfo',
+ success:res=>{
+ this.setData({
+ deptId:res.data.deptId,
+ loginName:res.data.loginName,
+ projectId:app.globalData.projectId,
+ minRoleId:res.data.minRoleId,
+ initData:{text:app.globalData.projectName,id:app.globalData.projectId}
+ })
+ this.getListData(app.globalData.projectId,res.data.deptId,res.data.minRoleId);
+ }
+ })
+ },
+
+ /**
+ * 查询项目举牌验收数据
+ */
+ getListData(projectId,deptId,minRoleId) {
+ var that = this;
+ //判断角色，
+ if(minRoleId==2||minRoleId==3||minRoleId==4){
+ deptId=0;
+ }
+ wx.request({
+ url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/list',
+ data: {
+ "deptId":deptId,
+ "projectId": projectId
+ },
+ method: "get",
+ success: function (res) {
+ that.setData({
+ listData:res.data.data
+ })
+ }
+ })
+ },
+
+ returnToPage: function () {
+ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
+ wx.redirectTo({
+ url: '../../../pages/gengduogongneng/gengduogongneng',
+ })
+ },
+
+ //项目切换 返回值
+ onProjectSelect(e){
+ let projectId = e.detail.id;
+ let projectName = e.detail.text;
+ app.globalData.projectId = projectId;
+ app.globalData.projectName = projectName;
+ this.onLoad();
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/list/index.json b/miniprogram/pageage/project_materialSeal/list/index.json
new file mode 100644
index 0000000..c38e268
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/list/index.json
@@ -0,0 +1,7 @@
+{
+ "usingComponents": {
+ "van-overlay": "@vant/weapp/overlay/index" ,
+ "van-popup": "@vant/weapp/popup/index"
+ },
+ "navigationStyle":"custom"
+}
\ No newline at end of file
diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxml b/miniprogram/pageage/project_materialSeal/list/index.wxml
new file mode 100644
index 0000000..d108e86
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/list/index.wxml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+ {{index < 9 ?'0'+(index+1):(index+1)}}
+ 封样时间：{{item.sealDate}}
+
+
+
+
+
+
+
+
+ 封样名称：{{item.materialName}}
+ 使用部位：{{item.usePosition}}
+ 拟用品牌：{{item.useBrand}}
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
diff --git a/miniprogram/pageage/project_materialSeal/list/index.wxss b/miniprogram/pageage/project_materialSeal/list/index.wxss
new file mode 100644
index 0000000..f370194
--- /dev/null
+++ b/miniprogram/pageage/project_materialSeal/list/index.wxss
@@ -0,0 +1 @@
+/* pageage/project_checking_list/project_checking_list.wxss */
diff --git a/miniprogram/pageage/project_measure/add/index.js b/miniprogram/pageage/project_measure/add/index.js
index bddea3a..bc87112 100644
--- a/miniprogram/pageage/project_measure/add/index.js
+++ b/miniprogram/pageage/project_measure/add/index.js
@@ -7,6 +7,7 @@ Page({
*/
data: {
maxDate:new Date(2088,1,1).getTime(),
+ currentDate:new Date().getTime(),
deptId:"",
projectId:"",
projectName:"",
diff --git a/miniprogram/pageage/project_measure/add/index.wxml b/miniprogram/pageage/project_measure/add/index.wxml
index 4691739..4a64444 100644
--- a/miniprogram/pageage/project_measure/add/index.wxml
+++ b/miniprogram/pageage/project_measure/add/index.wxml
@@ -66,7 +66,7 @@
测量时间
-
+
diff --git a/miniprogram/pageage/project_problemmodify/quality/add/index.js b/miniprogram/pageage/project_problemmodify/quality/add/index.js
index c164048..99cce42 100644
--- a/miniprogram/pageage/project_problemmodify/quality/add/index.js
+++ b/miniprogram/pageage/project_problemmodify/quality/add/index.js
@@ -176,8 +176,8 @@ Page({
onAddRecheckSend(e){
if(e.detail.length>0){
this.setData({
- recheckSend:e.detail[0].phoneNumber,
- recheckSendUser:e.detail[0].userName
+ recheckSend:e.detail[0].userName,
+ recheckSendUser:e.detail[0].phoneNumber
})
}
},
diff --git a/miniprogram/pageage/project_problemmodify/security/add/index.js b/miniprogram/pageage/project_problemmodify/security/add/index.js
index 8b74030..f70b482 100644
--- a/miniprogram/pageage/project_problemmodify/security/add/index.js
+++ b/miniprogram/pageage/project_problemmodify/security/add/index.js
@@ -176,8 +176,8 @@ Page({
onAddRecheckSend(e){
if(e.detail.length>0){
this.setData({
- recheckSend:e.detail[0].phoneNumber,
- recheckSendUser:e.detail[0].userName
+ recheckSend:e.detail[0].userName,
+ recheckSendUser:e.detail[0].phoneNumber
})
}
},
diff --git a/miniprogram/pageage/project_special/add/index.js b/miniprogram/pageage/project_special/add/index.js
index 4e48746..74195d8 100644
--- a/miniprogram/pageage/project_special/add/index.js
+++ b/miniprogram/pageage/project_special/add/index.js
@@ -247,8 +247,8 @@ Page({
this.data.credentialNumber = options.detail.value
},
- fileUpload(a,b,c){
- let file=a.detail;
+ fileUpload(options){
+ let file=options.detail;
this.setData({
credentialFileData: file
});
diff --git a/miniprogram/pageage/project_special/add/index.wxml b/miniprogram/pageage/project_special/add/index.wxml
index dc48af9..9d64779 100644
--- a/miniprogram/pageage/project_special/add/index.wxml
+++ b/miniprogram/pageage/project_special/add/index.wxml
@@ -53,7 +53,9 @@
- 证书附件
+ 证书附件
+ [可上传PDF和图片格式]
+
diff --git a/miniprogram/pageage/project_train/add/index.wxml b/miniprogram/pageage/project_train/add/index.wxml
index 1885c7b..bb3e754 100644
--- a/miniprogram/pageage/project_train/add/index.wxml
+++ b/miniprogram/pageage/project_train/add/index.wxml
@@ -48,7 +48,9 @@
- 相关文件
+ 相关文件
+ [可上传PDF/图片/WORD/PPT/XLS格式]
+
diff --git a/miniprogram/pageage/samplingRetesting/index.wxml b/miniprogram/pageage/samplingRetesting/index.wxml
index 32d268d..48fd717 100644
--- a/miniprogram/pageage/samplingRetesting/index.wxml
+++ b/miniprogram/pageage/samplingRetesting/index.wxml
@@ -6,9 +6,8 @@
- 待送检({{prepareDataList.length}})
- 检验中({{underwayDataList.length}})
- 已完成({{finishDataList.length}})
+ 送检中({{prepareDataList.length}})
+ 已完成({{finishDataList.length}})
diff --git a/miniprogram/pages/components/file-uploader-all/index.wxml b/miniprogram/pages/components/file-uploader-all/index.wxml
index 7cdfc5e..2df155c 100644
--- a/miniprogram/pages/components/file-uploader-all/index.wxml
+++ b/miniprogram/pages/components/file-uploader-all/index.wxml
@@ -3,7 +3,7 @@
- {{item.name}}
+ {{item.name}}
×
diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/login.wxml
index bfc4054..e260803 100644
--- a/miniprogram/pages/login/login.wxml
+++ b/miniprogram/pages/login/login.wxml
@@ -1,7 +1,7 @@
-
-
+
+
diff --git a/miniprogram/pages/login/login.wxss b/miniprogram/pages/login/login.wxss
index 66a1883..3198326 100644
--- a/miniprogram/pages/login/login.wxss
+++ b/miniprogram/pages/login/login.wxss
@@ -50,6 +50,16 @@ page{
.login_btn:active{
margin:82rpx 55rpx 0;
}
+.login_logo{
+ width: 100%;
+ height:150rpx;
+ text-align: center;
+ padding-top: 100rpx;
+}
+.login_logo image{
+ width: 77%;
+ height: 130rpx;
+}
diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
index 14e7761..0e15e9f 100644
--- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
+++ b/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js
@@ -631,25 +631,25 @@ Page({
//跳转到安全管控
XMSP:function(){
app.toast("敬请期待！");
- wx.redirectTo({
- url:'../newAddPage/safetyManagement/index'
- })
+ // wx.redirectTo({
+ // url:'../newAddPage/safetyManagement/index'
+ // })
},
//跳转到质量管理
ZLGL2:function(){
app.toast("敬请期待！");
- wx.redirectTo({
- url:'../Quality-Assurance/index'
- })
+ // wx.redirectTo({
+ // url:'../Quality-Assurance/index'
+ // })
},
//跳转到进度管理
JDGL2:function(){
app.toast("敬请期待！");
- wx.redirectTo({
+ // wx.redirectTo({
// //url: '../deepExcavation/index'
- url:'../../pageage/Progress-management/index'
- })
+ // url:'../../pageage/Progress-management/index'
+ // })
},
//跳转到更多功能