sxyanzhu
/
jhwxapp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

main
姜玉琦 2024-01-21 20:09:42 +08:00
parent 0fbd41895e
commit 6887b0bcf8
17 changed files with 331 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
miniprogram/pageage/project_checking/add/index.js
View File

@ -26,6 +26,11 @@ Page({
superviseUserName:"",
checkWorkingPosition:"",
intro:"",
dataTypeLvl1:"a",
dataTypeLvl2:"",
dataTypeLvl1List:[],
dataTypeLvl2List:[],
dataTypeLvl2AllList:[],
list:[{id:1,text:"合格"},{id:2,text:"不合格"}]
},
@ -45,7 +50,8 @@ Page({
loginName:res.data.loginName,
userName:res.data.nickName
})
this.getProjectUserData()
this.getProjectUserData();
this.getDataTypeLvlList();
}
})
},
@ -96,13 +102,88 @@ Page({
})
},
//查询验收类型数据
getDataTypeLvlList(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType',
method:"get",
data:{
type:"project_checking_data_type_lvl1"
},
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({
dataTypeLvl1List:list,
})
}
}
})
wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType',
method:"get",
data:{
type:"project_checking_data_type_lvl2"
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
let tempData = []
res.data.forEach(it =>{
if(it.cssClass=="1"){
tempData.push({"id":it.dictValue,"text":it.dictLabel});
}
})
that.setData({
dataTypeLvl2List:tempData,
dataTypeLvl2AllList:res.data,
dataTypeLvl2:tempData[0].id,
})
}
}
})
},
//切换验收结果
onSelectType(e){
this.setData({
checkingResult:e.detail.id
})
},
},
//验收类型
onSelectTypeLvl1(e){
this.setData({
dataTypeLvl1:e.detail.id
})
let tempData = []
this.dataTypeLvl2AllList.forEach(it =>{
if(it.cssClass==e.detail.id){
tempData.push({"id":it.dictValue,"text":it.dictLabel});
}
})
this.setData({
dataTypeLvl2List:tempData,
dataTypeLvl2:tempData[0].id,
})
},
//类型分类
onSelectTypeLvl2(e){
this.setData({
dataTypeLvl2:e.detail.id
})
},
//工序部位
onInputCheckWorkingPositionValue(e){
let checkWorkingPosition = e.detail.value
@ -166,7 +247,7 @@ Page({
loadShow:true
})
let that = this
let {projectId,deptId,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,checkingResult,imageInfoData,loginName,userName} = that.data;
let {projectId,deptId,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,checkingResult,imageInfoData,loginName,userName,dataTypeLvl1,dataTypeLvl2} = that.data;
//数据效验
if(projectId==""||deptId==""||loginName==""){
app.toast("数据异常，请刷新页面重试!")
@ -182,6 +263,20 @@ Page({
})
return;
}
if(dataTypeLvl1==""){
app.toast("请选择验收类型!")
that.setData({
loadShow:false
})
return;
}
if(dataTypeLvl2==""){
app.toast("请选择类型分类!")
that.setData({
loadShow:false
})
return;
}
if(qualityUser==""||qualityUserName==""){
app.toast("请选择质量专员!")
that.setData({
@ -247,7 +342,9 @@ Page({
//checkResult:checkingResult,
approveStatus:"1",
createBy:loginName,
imageUrls:fileUrls.toString()
imageUrls:fileUrls.toString(),
dataTypeLvl1,
dataTypeLvl2,
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectchecking/add',

12
miniprogram/pageage/project_checking/add/index.wxml
View File

@ -22,6 +22,18 @@
<file-uploader bindimages="onImagesArr"></file-uploader>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">验收类型</view>
<view class="inspect_info_content">
<voucher-select columns="{{dataTypeLvl1List}}" placeholder="请选择验收类型" bindchange="onSelectTypeLvl1"></voucher-select>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">类型分类</view>
<view class="inspect_info_content">
<voucher-select columns="{{dataTypeLvl2List}}" placeholder="请选择类型分类" bindchange="onSelectTypeLvl2"></voucher-select>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">质量专员</view>
<view class="inspect_info_content">

110
miniprogram/pageage/project_checking/edit/index.js
View File

@ -30,6 +30,11 @@ Page({
activeName:"",
flowRecordList:[],
minUrls:[],
dataTypeLvl1:"",
dataTypeLvl2:"",
dataTypeLvl1List:[],
dataTypeLvl2List:[],
dataTypeLvl2AllList:[],
list:[{id:1,text:"合格"},{id:2,text:"不合格"}],
request:app.globalData.reqUrl
},
@ -38,13 +43,13 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
let {id} = options
let {id,dt1} = options
//获取缓存数据
wx.getStorage({
key: 'userinfo',
success:res=>{
this.setData({
id,
id,dt1,
projectId:app.globalData.projectId,
projectName:app.globalData.projectName,
deptId:res.data.deptId,
@ -52,6 +57,7 @@ Page({
userName:res.data.nickName
})
this.getProjectUserData();
this.getDataTypeLvlList();
this.getInfo();
this.getAuditinfo();
}
@ -104,12 +110,88 @@ Page({
})
},
//查询验收类型数据
getDataTypeLvlList(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType',
method:"get",
data:{
type:"project_checking_data_type_lvl1"
},
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({
dataTypeLvl1List:list,
})
}
}
})
wx.request({
url: app.globalData.reqUrl+'/wechat/projectchecking/queryDictType',
method:"get",
data:{
type:"project_checking_data_type_lvl2"
},
header:{
'content-type': 'application/x-www-form-urlencoded'
},
success(res){
res = res.data
if(res.code == 200){
let tempData = []
res.data.forEach(it =>{
if(it.cssClass==that.data.dt1){
tempData.push({"id":it.dictValue,"text":it.dictLabel});
}
})
that.setData({
dataTypeLvl2List:tempData,
dataTypeLvl2AllList:res.data
})
}
}
})
},
//切换验收结果
onSelectType(e){
this.setData({
checkingResult:e.detail.id
})
},
},
//验收类型
onSelectTypeLvl1(e){
this.setData({
dataTypeLvl1:e.detail.id
})
let tempData = []
this.dataTypeLvl2AllList.forEach(it =>{
if(it.cssClass==e.detail.id){
tempData.push({"id":it.dictValue,"text":it.dictLabel});
}
})
this.setData({
dataTypeLvl2List:tempData,
dataTypeLvl2:tempData[0].id,
})
},
//类型分类
onSelectTypeLvl2(e){
this.setData({
dataTypeLvl2:e.detail.id
})
},
//工序部位
onInputCheckWorkingPositionValue(e){
@ -158,6 +240,8 @@ Page({
}
that.setData({
infoData:res.data,
dataTypeLvl1:res.data.dataTypeLvl1,
dataTypeLvl2:res.data.dataTypeLvl2,
qualityUser:res.data.qualityUser,
qualityUserName:res.data.qualityUserName,
superviseUser:res.data.superviseUser,
@ -243,7 +327,7 @@ Page({
loadShow:true
})
let that = this
let {id,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,imageInfoData,loginName} = that.data;
let {id,qualityUser,qualityUserName,superviseUser,superviseUserName,checkWorkingPosition,intro,checkTime,imageInfoData,loginName,dataTypeLvl1,dataTypeLvl2} = that.data;
//数据效验
if(id==""){
app.toast("数据异常，请刷新页面重试!")
@ -259,6 +343,20 @@ Page({
})
return;
}
if(dataTypeLvl1==""){
app.toast("请选择验收类型!")
that.setData({
loadShow:false
})
return;
}
if(dataTypeLvl2==""){
app.toast("请选择类型分类!")
that.setData({
loadShow:false
})
return;
}
if(qualityUser==""||qualityUserName==""){
app.toast("请选择质量专员!")
that.setData({
@ -319,7 +417,9 @@ Page({
checkingDate:checkTime,
approveStatus:"1",
updateBy:loginName,
imageUrls:fileUrls.toString()
imageUrls:fileUrls.toString(),
dataTypeLvl1,
dataTypeLvl2,
}
wx.request({
url: app.globalData.reqUrl + '/wechat/projectchecking/edit',

12
miniprogram/pageage/project_checking/edit/index.wxml
View File

@ -52,6 +52,18 @@
<file-uploader bindimages="onImagesArr" fileUrlArray="{{imageInfoData}}"></file-uploader>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">验收类型</view>
<view class="inspect_info_content">
<voucher-select columns="{{dataTypeLvl1List}}" placeholder="请选择测量类型" bindchange="onSelectTypeLvl1" selectValue="{{infoData.dataTypeLvl1}}"></voucher-select>
</view>
</view>
<view class="inspect_info_list" >
<view class="inspect_info_title">类型分类</view>
<view class="inspect_info_content">
<voucher-select columns="{{dataTypeLvl2List}}" placeholder="请选择类型分类" bindchange="onSelectTypeLvl2" selectValue="{{infoData.dataTypeLvl2}}"></voucher-select>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">质量专员</view>
<view class="inspect_info_content">

3
miniprogram/pageage/project_checking/info/index.js
View File

@ -117,8 +117,9 @@ Page({
//跳转修改页面
onUpdate:function(){
let id = this.data.id;
let dt1= this.data.dataTypeLvl1
wx.redirectTo({
url: `../edit/index?id=${id}`,
url: `../edit/index?id=${id}&dt1=${dt1}`,
})
},

12
miniprogram/pageage/project_checking/info/index.wxml
View File

@ -63,6 +63,18 @@
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">验收类型</text></van-col>
<van-col span="18" class="color_blue">{{infoData.dataTypeLvl1Name}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">类型分类</text></van-col>
<van-col span="18" class="color_blue">{{infoData.dataTypeLvl2Name}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">质量专员</text></van-col>

5
miniprogram/pageage/project_checking/list/index.wxml
View File

@ -23,7 +23,9 @@
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.checkWorkingPosition}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.dataTypeLvl2Name}}</view>
<text class="timeline_for_state_1" wx:if="{{item.dataTypeLvl1=='a'}}">{{item.dataTypeLvl1Name}}</text>
<text class="timeline_for_state_2" wx:if="{{item.dataTypeLvl1=='b'}}">{{item.dataTypeLvl1Name}}</text>
</view>
</view>
<view class="inspect_list_info">
@ -35,6 +37,7 @@
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop">工具部位：<text>{{item.checkWorkingPosition}}</text></view>
<view class="inspect_list_info_data_prop">质量专员：<text>{{item.qualityUserName}}</text></view>
<view class="inspect_list_info_data_prop">监理专员：<text>{{item.superviseUserName}}</text></view>
<view class="inspect_list_info_data_prop">验收时间：<text class="color_blue">{{item.checkingDate}}</text></view>

49
miniprogram/pageage/project_train/add/index.js
View File

@ -26,6 +26,8 @@ Page({
projectDeptList:[],
navs:[],
deptNames:"",
dataType:"",
trainDataTypeList:[],
fileType:["doc","docx","xls","xlsx","ppt","pptx","txt","pdf","png","jpg","jpeg","mp4"]
},
@ -41,7 +43,7 @@ Page({
let title="";
let minTitle="";
if(trainType=="0"){
title="专项培训";
title="教育培训";
minTitle="培训";
}else{
title="应急演练";
@ -58,6 +60,7 @@ Page({
userName:res.data.nickName
})
this.getProjectDeptList(projectId,res.data.deptId,res.data.minRoleId);
this.getTrainDataType();
}
})
},
@ -98,6 +101,31 @@ Page({
})
},
//演训数据类型
getTrainDataType(){
let that = this
wx.request({
url: app.globalData.reqUrl+'/wechat/projectTrain/queryTrainDataType',
method:"get",
data:{},
success(res){
res = res.data
if(res.code == 200){
let tempData=[];
res.data.forEach((item)=>{
if(item.remark==that.data.trainType){
tempData.push({"id":item.dictValue,"text":item.dictLabel});
}
})
that.setData({
trainDataTypeList:tempData,
dataType:tempData[0].id,
})
}
}
})
},
//取消页面
cancelSaveView(){
/*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/
@ -112,7 +140,7 @@ Page({
loadShow:true
})
let that = this
let {projectId,projectName,loginName,imageInfoData,trainType,trainTitle,trainParticipants,beginDate,trainContent,trainFileData,minTitle,deptId} = that.data;
let {projectId,projectName,loginName,imageInfoData,trainType,trainTitle,trainParticipants,beginDate,trainContent,trainFileData,minTitle,deptId,dataType} = that.data;
//数据效验
if(projectId==""||loginName==""){
app.toast("数据异常，请刷新页面重试!")
@ -135,6 +163,13 @@ Page({
})
return;
}
if(dataType==""){
app.toast("请选择"+minTitle+"类型!")
that.setData({
loadShow:false
})
return;
}
if(beginDate==""){
app.toast("请选择"+minTitle+"时间!")
that.setData({
@ -200,7 +235,8 @@ Page({
trainFile:obj.data.fileName,
deptId,
workTrainDeptList:depts,
createBy:loginName
createBy:loginName,
dataType,
}
let url="";
if(trainType=="0"){
@ -268,7 +304,12 @@ Page({
});
})
},
//演训类型
onSelectTrainDataType(e){
this.setData({
dataType:e.detail.id
})
},
trainTitleAction: function (options) {
this.data.trainTitle = options.detail.value;
},

6
miniprogram/pageage/project_train/add/index.wxml
View File

@ -28,6 +28,12 @@
<input placeholder="请填写{{minTitle}}标题" placeholder-style="color:#6777aa;" class="inspect_input_fill_in" bindinput="trainTitleAction" maxlength="30"/>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">{{minTitle}}类型</view>
<view class="inspect_info_content">
<voucher-select columns="{{trainDataTypeList}}" placeholder="请选择{{minTitle}}类型" bindchange="onSelectTrainDataType"></voucher-select>
</view>
</view>
<view class="inspect_info_list">
<view class="inspect_info_title" style="padding: 20rpx 0 10rpx;">{{minTitle}}时间</view>
<view class="inspect_info_content">

2
miniprogram/pageage/project_train/info/index.js
View File

@ -35,7 +35,7 @@ Page({
let title="";
let minTitle="";
if(trainType==0){
title="专项培训详情";
title="教育培训详情";
minTitle="培训";
}else{
title="应急演练详情";

6
miniprogram/pageage/project_train/info/index.wxml
View File

@ -34,6 +34,12 @@
<van-col span="18" class="color_blue">{{infoData.trainTitle}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">{{minTitle}}类型</text></van-col>
<van-col span="18">{{infoData.dataTypeName}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_orange">{{minTitle}}时间</text></van-col>

2
miniprogram/pageage/project_train/list/index.js
View File

@ -53,7 +53,7 @@ Page({
let title="";
let minTitle="";
if(trainType==0){
title="专项培训管理";
title="教育培训管理";
minTitle="培训";
}else{
title="应急演练管理";

7
miniprogram/pageage/project_train/list/index.wxml
View File

@ -19,7 +19,7 @@
<view class="inspect_list_title">
<view class="inspect_list_title_label inspect_list_title_width">
<view class="inspect_list_title_number">{{index < 9 ?'0'+(index+1):(index+1)}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.trainTitle}}</view>
<view class="module_title module_title_flex inspect_list_title_text">{{item.dataTypeName}}</view>
</view>
</view>
<view class="inspect_list_info">
@ -28,8 +28,9 @@
<van-image width="120rpx" height="120rpx" fit="cover" src="{{request+item.mainImage+'.min.jpg'}}"/>
</view>
<view class="inspect_list_info_data">
<view class="inspect_list_info_data_prop color_blue">{{minTitle}}时间：<text class="color_blue">{{item.beginDate}}</text></view>
<view class="inspect_list_info_data_prop color_blue safety_issue_number">参与人数：<text class="color_purple">{{item.trainParticipants}} 人</text></view>
<view class="inspect_list_info_data_prop color_blue">{{minTitle}}标题：<text class="color_blue">{{item.trainTitle}}</text></view>
<view class="inspect_list_info_data_prop">{{minTitle}}时间：<text>{{item.beginDate}}</text></view>
<view class="inspect_list_info_data_prop safety_issue_number">参与人数：<text class="color_purple">{{item.trainParticipants}} 人</text></view>
<view class="inspect_list_info_data_prop color_orange">协同单位：<text class="color_orange">{{item.trainDeptNames}}</text></view>
</view>
</view>

3
miniprogram/pages/gengduogongneng/gengduogongneng.js
View File

@ -79,7 +79,8 @@ Page({
wx.request({
url: app.globalData.reqUrl+'/wechat/selectRoleMenuList',
data:{
username:loginName
username:loginName,
type:"gdgn"
},
method:"get",
success:function(res){

2
miniprogram/pages/login/login.wxml
View File

@ -5,7 +5,7 @@
<view class="login_bg">
<view class="login_title">
<text>北跨泾河-产发工程数字管理平台</text>
<text>产发工程数字管理平台</text>
</view>
<view class="login_ex">请使用手机号登录</view>

12
miniprogram/pages/project_approve/approveChecking/index.wxml
View File

@ -63,6 +63,18 @@
</view>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">验收类型</text></van-col>
<van-col span="18" class="color_blue">{{infoData.dataTypeLvl1Name}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">类型分类</text></van-col>
<van-col span="18" class="color_blue">{{infoData.dataTypeLvl2Name}}</van-col>
</van-row>
</view>
<view class="inspect_overview_list">
<van-row>
<van-col span="6"><text class="color_purple">质量专员</text></van-col>

2
miniprogram/pages/safety_manage/index.wxml
View File

@ -67,7 +67,7 @@
<view class="module_max" >
<view class="module_min" style="padding: 30rpx 20rpx 20rpx 20rpx;">
<view class="module_title module_title_flex">
<view>专项培训（{{trainTotal}}）</view>
<view>教育培训（{{trainTotal}}）</view>
<view class="module_see_info" bindtap="goZXPX">查看详情<van-icon name="arrow" /></view>
</view>
<view class="safety_highlights">