guoyuepeng
/
qa-prevention-gwj-first-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

所有节点修改只能看到当前节点及前节点打回的数据 

修改检查项确认人列表没有做权限控制
所有节点打回时添加Loading加载效果，修改所有的打回弹窗提示框样式
bug优化0603
WenShiJun 2024-06-25 17:46:55 +08:00
parent 8e7367cdd3
commit cd5ce6eddc
13 changed files with 242 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
View File

@ -422,11 +422,11 @@
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'8')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-8')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>

5
pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-list.vue
View File

@ -560,11 +560,12 @@
uni.hideLoading();//结束加载中动画
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
let filteredList = res.data.varList.filter(item => item.APPLY_STATUS != '-1.5' && item.APPLY_STATUS != '-2' && item.APPLY_STATUS != '-4' && item.APPLY_STATUS != '-5' && item.APPLY_STATUS != '-6' && item.APPLY_STATUS != '-7');
if(_this.list.length == 0){
_this.list = res.data.varList;
_this.list = filteredList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list2 = filteredList;
_this.list = _this.list.concat(_this.list2);
}
}

19
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-detail.vue
View File

@ -370,11 +370,11 @@
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'6')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-6')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>
@ -585,6 +585,15 @@
return;
}
this.showRejectionConfirm = true;
},
handleRejectionConfirm() {
this.showRejectionConfirm = false;
uni.showLoading({
title: '加载中'
});
this.goSubmit('-6').finally(() => {
uni.hideLoading();
});
},
goSubmit(STATUS){
var _this = this;

5
pages/application/hotwork_cfd/hotwork-approve/hotwork-approve-list.vue
View File

@ -561,11 +561,12 @@
uni.hideLoading();//结束加载中动画
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
let filteredList = res.data.varList.filter(item => item.APPLY_STATUS != '-1.5' && item.APPLY_STATUS != '-2' && item.APPLY_STATUS != '-4' && item.APPLY_STATUS != '-5');
if(_this.list.length == 0){
_this.list = res.data.varList;
_this.list = filteredList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list2 = filteredList;
_this.list = _this.list.concat(_this.list2);
}
}

19
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-detail.vue
View File

@ -409,11 +409,11 @@
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'5')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-5')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>
@ -621,6 +621,15 @@
return;
}
this.showRejectionConfirm = true;
},
handleRejectionConfirm() {
this.showRejectionConfirm = false;
uni.showLoading({
title: '加载中'
});
this.goSubmit('-5').finally(() => {
uni.hideLoading();
});
},
goSubmit(STATUS){
var _this = this;

5
pages/application/hotwork_cfd/hotwork-audit/hotwork-audit-list.vue
View File

@ -561,11 +561,12 @@
uni.hideLoading();//结束加载中动画
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
let filteredList = res.data.varList.filter(item => item.APPLY_STATUS != '-1.5' && item.APPLY_STATUS != '-2' && item.APPLY_STATUS != '-4');
if(_this.list.length == 0){
_this.list = res.data.varList;
_this.list = filteredList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list2 = filteredList;
_this.list = _this.list.concat(_this.list2);
}
}

252
pages/application/hotwork_cfd/hotwork-confirm/hotwork-confirm-detail.vue
View File

@ -300,16 +300,16 @@
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-1.5')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1.5')">通 过</button>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(confirmRejection,'-1.5')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1.5')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-1.5')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>
@ -337,6 +337,7 @@
data() {
return {
showRejectionConfirm: false,
loadingRejection: false,
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
@ -495,123 +496,144 @@
}
this.showRejectionConfirm = true;
},
goSubmit(STATUS) {
var _this = this;
handleRejectionConfirm() {
this.showRejectionConfirm = false;
uni.showLoading({
title: '请稍候'
title: '加载中'
});
if (STATUS === '1.5') {
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
}
const formData = {};
Object.keys(this.pd).map(key => {
formData[key] = this.pd[key];
this.goSubmit('-1.5').finally(() => {
uni.hideLoading();
});
formData.CORPINFO_ID = corpinfoId;
formData.CREATOR = loginUser.USER_ID;
formData.OPERATOR = loginUser.USER_ID;
formData.ACTION_USER = loginUser.NAME;
formData.APPLY_STATUS = STATUS;
},
if (STATUS === '1.5') {
uni.request({
url: basePath + '/app/hotwork/cfd/check',
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
HOTWORK_ID: _this.pd.HOTWORK_ID
},
success: (res) => {
if (res.data.result === 'success') {
uni.hideLoading();
if (res.data.passFlag === '0') {
uni.showModal({
title: '',
content: res.data.message,
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
this.buttonloading = false;
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
});
}
} else if (res.data.result === 'exception') {
uni.showToast({
title: '错误',
duration: 2000
});
}
}
goSubmit(STATUS) {
return new Promise((resolve, reject) => {
var _this = this;
uni.showLoading({
title: '请稍候'
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
if (STATUS === '1.5') {
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
title: '请签字',
duration: 1500
});
_this.goback();
this.buttonloading = false;
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
reject();
return;
}
}
const formData = {};
Object.keys(this.pd).map(key => {
formData[key] = this.pd[key];
});
}
formData.CORPINFO_ID = corpinfoId;
formData.CREATOR = loginUser.USER_ID;
formData.OPERATOR = loginUser.USER_ID;
formData.ACTION_USER = loginUser.NAME;
formData.APPLY_STATUS = STATUS;
if (STATUS === '1.5') {
uni.request({
url: basePath + '/app/hotwork/cfd/check',
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
HOTWORK_ID: _this.pd.HOTWORK_ID
},
success: (res) => {
if (res.data.result === 'success') {
uni.hideLoading();
if (res.data.passFlag === '0') {
uni.showModal({
title: '',
content: res.data.message,
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
this.buttonloading = false;
resolve();
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback();
this.buttonloading = false;
resolve();
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
reject();
}
});
}
} else if (res.data.result === 'exception') {
uni.showToast({
title: '错误',
duration: 2000
});
reject();
}
}
});
} else {
formData.STATUS = STATUS;
formData.measuresList = JSON.stringify(this.measuresList);
formData.CORPINFO_ID = loginUser.CORPINFO_ID;
formData.USER_ID = loginUser.USER_ID;
this.buttonloading = true;
uni.uploadFile({
url: basePath + '/app/hotwork/cfd/editStatus',
filePath: _this.imgList[0].filePath,
name: 'FFILE',
formData: formData,
success: (res) => {
uni.showToast({
icon: 'none',
title: '保存成功',
duration: 2000
});
_this.goback();
this.buttonloading = false;
resolve();
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
reject();
}
});
}
});
},
// 获取动火列表
getLimitSpace(){

19
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-detail.vue
View File

@ -348,11 +348,11 @@
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'4')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-4')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>
@ -558,6 +558,15 @@
}
this.showRejectionConfirm = true;
},
handleRejectionConfirm() {
this.showRejectionConfirm = false;
uni.showLoading({
title: '加载中'
});
this.goSubmit('-4').finally(() => {
uni.hideLoading();
});
},
goSubmit(STATUS) {
var _this = this;
uni.showLoading({

7
pages/application/hotwork_cfd/hotwork-leader/hotwork-leader-list.vue
View File

@ -561,12 +561,13 @@
uni.hideLoading();//结束加载中动画
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
let filteredList = res.data.varList.filter(item => item.APPLY_STATUS != '-1.5' && item.APPLY_STATUS != '-2');
if(_this.list.length == 0){
_this.list = res.data.varList;
_this.list = filteredList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list = _this.list.concat(_this.list2);
_this.list2 = filteredList;
_this.list = _this.list.concat(_this.list2);
}
}
}

19
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-detail.vue
View File

@ -388,11 +388,11 @@
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'7')">通 过</button>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-7')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>
@ -602,6 +602,15 @@
return;
}
this.showRejectionConfirm = true;
},
handleRejectionConfirm() {
this.showRejectionConfirm = false;
uni.showLoading({
title: '加载中'
});
this.goSubmit('-7').finally(() => {
uni.hideLoading();
});
},
goSubmit(STATUS) {
var _this = this;

5
pages/application/hotwork_cfd/hotwork-monitor/hotwork-monitor-list.vue
View File

@ -578,11 +578,12 @@
uni.hideLoading();//结束加载中动画
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
let filteredList = res.data.varList.filter(item => item.APPLY_STATUS != '-1.5' && item.APPLY_STATUS != '-2' && item.APPLY_STATUS != '-4' && item.APPLY_STATUS != '-5' && item.APPLY_STATUS != '-6');
if(_this.list.length == 0){
_this.list = res.data.varList;
_this.list = filteredList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list2 = filteredList;
_this.list = _this.list.concat(_this.list2);
}
}

37
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-detail.vue
View File

@ -337,21 +337,21 @@
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')">通 过
</button>
</view>
<!-- <view class="cu-modal" :class="{'show': showRejectionConfirm}">-->
<!-- <view class="cu-dialog">-->
<!-- <view class="cu-dialog-content">是否确定打回？</view>-->
<!-- <view class="cu-dialog-btns">-->
<!-- <button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>-->
<!-- <button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-2')">确定</button>-->
<!-- </view>-->
<!-- </view>-->
<!-- </view>-->
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-2')">确定</button>
</view>
</view>
</view>
<view class="cu-modal" :class="{'show': showRejectionConfirm}">
<view class="cu-dialog">
<view class="cu-dialog-content">是否确定打回？</view>
<view class="cu-dialog-btns">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false">取消</button>
<button class="cu-btn bg-red sm" @click="$noMultipleClicks(goSubmit,'-2')">确定</button>
<view class="cu-dialog" style="width: 80%; padding: 30upx;">
<view class="cu-dialog-content" style="font-size: 36upx; padding: 20upx;">是否确定打回？</view>
<view class="cu-dialog-btns" style="display: flex; justify-content: space-around; margin-top: 20upx;">
<button class="cu-btn bg-gray sm" @click="showRejectionConfirm = false" style="width: 40%; font-size: 30upx;">取消</button>
<button class="cu-btn bg-red sm" @click="handleRejectionConfirm" style="width: 40%; font-size: 30upx;">确定</button>
</view>
</view>
</view>
@ -555,6 +555,15 @@ export default {
}
this.showRejectionConfirm = true;
},
handleRejectionConfirm() {
this.showRejectionConfirm = false;
uni.showLoading({
title: '加载中'
});
this.goSubmit('-2').finally(() => {
uni.hideLoading();
});
},
goSubmit(STATUS) {
var _this = this;
uni.showLoading({

9
pages/application/hotwork_cfd/hotwork-xiang-mu/hotwork-xiang-list.vue
View File

@ -559,12 +559,13 @@
uni.hideLoading();//结束加载中动画
if (res.data != null) {
_this.totalPage = res.data.page.totalPage;
let filteredList = res.data.varList.filter(item => item.APPLY_STATUS != '-1.5');
if(_this.list.length == 0){
_this.list = res.data.varList;
_this.list = filteredList;
}else{
if(res.data.varList != null){
_this.list2 = res.data.varList;
_this.list = _this.list.concat(_this.list2);
if(filteredList != null){
_this.list2 = filteredList;
_this.list = _this.list.concat(_this.list2);
}
}
}