admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-09 00:59:04 +08:00
parent e415816007
commit 4eb29cfc97
12 changed files with 4079 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hbuilderx/launch.json
View File

@ -19,7 +19,7 @@
"type" : "uniCloud"
},
{
"playground" : "custom",
"playground" : "standard",
"type" : "uni-app:app-android"
}
]

2
components/dateTimePicker/index.vue
View File

@ -378,7 +378,7 @@ export default {
* @param {Number} hour 时
* @param {Number} minute 分
*/
setSecondData(year, month, day, hour) {
setSecondData(year, month, day, hour, minute) {
// 有效日期
let yearStart = this.dtStart.getFullYear();
let monthStart = this.dtStart.getMonth() + 1;

14
main.js
View File

@ -37,7 +37,7 @@ if (process.env.NODE_ENV === 'development') {
console.log('开发环境')
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢正式地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢正式地址
// Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
Vue.prototype.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
@ -45,8 +45,10 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
// Vue.prototype.url_config = 'http://139.9.66.234:8/'
// Vue.prototype.url_config = 'http://139.9.66.234:5173/'
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
// Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通
// Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局
@ -83,13 +85,13 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南

4
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "智慧安全", //中建四局
"appid" : "__UNI__4AA4101",
"description" : "",
"versionName" : "1.4.4",
"versionCode" : 144,
"versionName" : "1.5.0",
"versionCode" : 150,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {

14
pages.json
View File

@ -539,6 +539,13 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/projectEnd/qualityManage/editIssue",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/projectEnd/safeSame/addIssue",
"style": {
@ -546,6 +553,13 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/projectEnd/safeSame/editIssue",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/projectEnd/carWashManage/index",
"style": {

8
pages/messageCenter/messageCenter.vue
View File

@ -79,9 +79,9 @@
},
method: "POST",
success(res) {
if (res.result.status == 6) {
if (!res.result || res.result.status == 6) {
uni.showToast({
title: '通知消息已撤回',
title: '检查单已撤回',
icon: "none"
})
return;
@ -101,9 +101,9 @@
method: "POST",
success(res) {
console.log(res)
if (res.result.status == 6) {
if (!res.result || res.result.status == 6) {
uni.showToast({
title: '通知消息已撤回',
title: '检查单已撤回',
icon: "none"
})
return;

2
pages/projectEnd/qualityManage/addIssue.vue
View File

@ -991,7 +991,7 @@
this.$nextTick(() => {
this.isShowPicker = true;
});
this.getPersonUpdateList();
// this.getPersonUpdateList();
// } else {
// this.form.enterpriseSn = val.enterpriseSn;
// this.form.enterpriseName = val.enterpriseName;

122
pages/projectEnd/qualityManage/details.vue
View File

@ -9,7 +9,7 @@
<view class="tabType" @click="changeTab(1)" :class="checkedTab==1?'checkedTab':'noCheckTab'">检查详细</view>
<view class="tabType" @click="changeTab(2)" :class="checkedTab==2?'checkedTab':'noCheckTab'">审批流程</view>
</view>
<view class="content" v-if="checkedTab==1">
<view class="content record" v-if="checkedTab==1">
<view class="type flex2">
<view class="textColor">检查部位</view>
<view class="textRight">{{basicInfo.regionName}}</view>
@ -108,7 +108,7 @@
<view class="type flex2" v-if="recordType == 1">
<view class="textColor">现场整改</view>
<view class="textRight">
{{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4?'未完成':basicInfo.status==5?'已完成':''}}
{{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4||basicInfo.status==6?'未完成':basicInfo.status==5?'已完成':''}}
</view>
</view>
<view class="type">
@ -127,6 +127,15 @@
{{item.split('*')[0]}}
</view>
</view>
<view class="backBtn" v-if="basicInfo.status == 2 && issueInfoList.length == 0 &&
basicInfo.inspectManId == userInfo.userId">
<view class="btn-option" @click="backCheckRecord">撤回</view>
</view>
<view class="editBtn" v-if="basicInfo.status == 6 &&
basicInfo.inspectManId == userInfo.userId">
<view class="btn-delete" @click="deleteCheckRecord">删除检查</view>
<view class="btn-resubmit" @click="resubmitCheckRecord">重新提交</view>
</view>
</view>
@ -224,6 +233,70 @@
this.getIssueInfo();
},
methods: {
// 重新提交
resubmitCheckRecord(){
uni.navigateTo({
url: '/pages/projectEnd/qualityManage/editIssue?id=' + this.id
})
},
// 删除检查单
deleteCheckRecord() {
let that = this;
uni.showModal({
title: '提示',
content: '您确定要删除吗？',
success: async (res) => {
if (res.confirm) {
this.sendRequest({
url: 'xmgl/qualityInspectionRecord/delete',
method: 'post',
data: {
id: that.id
},
success: res => {
uni.showToast({
title: res.message
})
setTimeout(function() {
uni.redirectTo({
url: '/pages/projectEnd/qualityManage/list?type=1'
})
}, 500)
}
})
}
}
});
},
// 撤回检查单
backCheckRecord() {
let that = this;
uni.showModal({
title: '提示',
content: '您确定要撤回吗？',
success: async (res) => {
if (res.confirm) {
this.sendRequest({
url: 'xmgl/qualityInspectionRecord/revocation',
method: 'post',
data: {
id: that.id
},
success: res => {
uni.showToast({
title: res.message
})
setTimeout(function() {
uni.redirectTo({
url: '/pages/projectEnd/qualityManage/list?type=1'
})
}, 500)
}
})
}
}
});
},
handleShowItem(index) {
this.issueInfoList[index].isShow = !this.issueInfoList[index].isShow
console.log(this.issueInfoList)
@ -529,6 +602,51 @@
background-color: rgba(65, 129, 254, 0.8);
}
.backBtn {
position: fixed;
bottom: 0px;
left: 0px;
width: 100%;
box-sizing: border-box;
z-index: 99;
}
.backBtn .btn-option {
width: 100%;
line-height: 40px;
background-color: #4181FE;
color: #fff;
text-align: center;
}
.backBtn .btn-option:active {
background-color: rgba(65, 129, 254, 0.8);
}
.editBtn {
position: fixed;
bottom: 0px;
left: 0px;
width: 100%;
display: flex;
align-items: center;
box-sizing: border-box;
z-index: 99;
}
.editBtn .btn-delete {
width: 50%;
line-height: 40px;
background-color: #D51C1C;
color: #fff;
text-align: center;
}
.editBtn .btn-resubmit{
width: 50%;
line-height: 40px;
background-color: #5382F6;
color: #fff;
text-align: center;
}
.pass_wrap {
position: absolute;
top: 100px;

1904
pages/projectEnd/qualityManage/editIssue.vue Normal file
View File

File diff suppressed because it is too large Load Diff

2
pages/projectEnd/safeSame/addIssue.vue
View File

@ -991,7 +991,7 @@
this.$nextTick(() => {
this.isShowPicker = true;
});
this.getPersonUpdateList();
// this.getPersonUpdateList();
// } else {
// this.form.enterpriseSn = val.enterpriseSn;
// this.form.enterpriseName = val.enterpriseName;

124
pages/projectEnd/safeSame/details.vue
View File

@ -9,7 +9,7 @@
<view class="tabType" @click="changeTab(1)" :class="checkedTab==1?'checkedTab':'noCheckTab'">检查详细</view>
<view class="tabType" @click="changeTab(2)" :class="checkedTab==2?'checkedTab':'noCheckTab'">审批流程</view>
</view>
<view class="content" v-if="checkedTab==1">
<view class="content record" v-if="checkedTab==1">
<view class="type flex2">
<view class="textColor">检查部位</view>
<view class="textRight">{{basicInfo.regionName}}</view>
@ -108,7 +108,7 @@
<view class="type flex2" v-if="recordType == 1">
<view class="textColor">现场整改</view>
<view class="textRight">
{{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4?'未完成':basicInfo.status==5?'已完成':''}}
{{basicInfo.status==2||basicInfo.status==3||basicInfo.status==4||basicInfo.status==6?'未完成':basicInfo.status==5?'已完成':''}}
</view>
</view>
<view class="type">
@ -127,6 +127,15 @@
{{item.split('*')[0]}}
</view>
</view>
<view class="backBtn" v-if="basicInfo.status == 2 && issueInfoList.length == 0 &&
basicInfo.inspectManId == userInfo.userId">
<view class="btn-option" @click="backCheckRecord">撤回</view>
</view>
<view class="editBtn" v-if="basicInfo.status == 6 &&
basicInfo.inspectManId == userInfo.userId">
<view class="btn-delete" @click="deleteCheckRecord">删除检查</view>
<view class="btn-resubmit" @click="resubmitCheckRecord">重新提交</view>
</view>
</view>
@ -224,6 +233,70 @@
this.getIssueInfo();
},
methods: {
// 重新提交
resubmitCheckRecord(){
uni.navigateTo({
url: '/pages/projectEnd/safeSame/editIssue?id=' + this.id
})
},
// 删除检查单
deleteCheckRecord() {
let that = this;
uni.showModal({
title: '提示',
content: '您确定要删除吗？',
success: async (res) => {
if (res.confirm) {
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/delete',
method: 'post',
data: {
id: that.id
},
success: res => {
uni.showToast({
title: res.message
})
setTimeout(function() {
uni.redirectTo({
url: '/pages/projectEnd/safeSame/list?type=1'
})
}, 500)
}
})
}
}
});
},
// 撤回检查单
backCheckRecord() {
let that = this;
uni.showModal({
title: '提示',
content: '您确定要撤回吗？',
success: async (res) => {
if (res.confirm) {
this.sendRequest({
url: 'xmgl/xzSecurityQualityInspectionRecord/revocation',
method: 'post',
data: {
id: that.id
},
success: res => {
uni.showToast({
title: res.message
})
setTimeout(function() {
uni.redirectTo({
url: '/pages/projectEnd/safeSame/list?type=1'
})
}, 500)
}
})
}
}
});
},
handleShowItem(index) {
this.issueInfoList[index].isShow = !this.issueInfoList[index].isShow
let newObj = this.issueInfoList[index]
@ -526,7 +599,52 @@
.approveBtn .btn:active {
background-color: rgba(65, 129, 254, 0.8);
}
.backBtn {
position: fixed;
bottom: 0px;
left: 0px;
width: 100%;
box-sizing: border-box;
z-index: 99;
}
.backBtn .btn-option {
width: 100%;
line-height: 40px;
background-color: #4181FE;
color: #fff;
text-align: center;
}
.backBtn .btn-option:active {
background-color: rgba(65, 129, 254, 0.8);
}
.editBtn {
position: fixed;
bottom: 0px;
left: 0px;
width: 100%;
display: flex;
align-items: center;
box-sizing: border-box;
z-index: 99;
}
.editBtn .btn-delete {
width: 50%;
line-height: 40px;
background-color: #D51C1C;
color: #fff;
text-align: center;
}
.editBtn .btn-resubmit{
width: 50%;
line-height: 40px;
background-color: #5382F6;
color: #fff;
text-align: center;
}
.pass_wrap {
position: absolute;
top: 100px;

1902
pages/projectEnd/safeSame/editIssue.vue Normal file
View File

File diff suppressed because it is too large Load Diff