sx_yjb
/
sx_yjb_app
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

搬运龙钢修复的bug

dev
wangyan 2025-10-16 16:32:42 +08:00
parent 4f6d93b3e3
commit d536a0a834
16 changed files with 277 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
components/hidden_add/index.vue
View File

@ -1185,7 +1185,7 @@ export default {
goSubmitQdList(){
},
goSubmit() {
async goSubmit() {
var _this = this;
if (_this.imgList.length <= 0) {
uni.showToast({
@ -1318,53 +1318,50 @@ export default {
}
}
}
new Promise((resolve, reject) => {
_this.submit().then(() => {
resolve();
})
}).then(() => {
var i = 0;
_this.uploadImg(fileList, i).then(() => {
resolve();
})
}).then(() => {
this.buttonloading = false
uni.$emit('submitByHiddenSource', {
info: "success",
initflag: true,
});
uni.showLoading({
title: '数据提交中'
})
this.buttonloading = true
const FILE_IDS = []
await _this.uploadPromise(fileList, FILE_IDS)
await _this.submit(FILE_IDS)
uni.$emit('submitByHiddenSource', {
info: "success",
initflag: true,
});
},
uploadImg(tempFilePaths, i) {
async uploadPromise(tempFilePaths,FILE_IDS){
if (tempFilePaths.length == 0) {
uni.hideLoading();
this.buttonloading = false
return
}
for (let i = 0; i < tempFilePaths.length; i++) {
await this.uploadImg(tempFilePaths[i],FILE_IDS)
}
},
uploadImg(file,FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
if (tempFilePaths.length == 0) {
resolve();
}
uni.showLoading({
title: '上传中'
})
uni.uploadFile({
url: basePath + '/app/imgfiles/add',
filePath: tempFilePaths[i].filePath,
url: basePath+'/app/imgfiles/add',
filePath: file.filePath,
name: 'FFILE',
formData: {
'TYPE': tempFilePaths[i].type,
'FOREIGN_KEY': _this.pd.HIDDEN_ID,
'TYPE': file.type,
// 'FOREIGN_KEY': _this.pd.HIDDEN_ID,
'FOREIGN_KEY': '',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
i++;
if (tempFilePaths.length > i) {
_this.uploadImg(tempFilePaths, i);
} else {
uni.hideLoading();
resolve();
}
res.data = JSON.parse(res.data)
FILE_IDS.push(res.data.pd.IMGFILES_ID)
resolve();
},
fail: (err) => {
uni.hideLoading();
this.buttonloading = false
uni.showModal({
content: err.errMsg,
showCancel: false
@ -1373,9 +1370,8 @@ export default {
})
})
},
submit() {
submit(FILE_IDS) {
return new Promise((resolve, reject) => {
this.buttonloading = true
var _this = this;
// var pages = getCurrentPages(); // 获取当前页面栈
// var prePage = pages[pages.length - 2]; // 上一个页面
@ -1430,9 +1426,9 @@ export default {
HIDDENTYPE3: _this.pd.HIDDENTYPE[2] || '',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
FILE_IDS:FILE_IDS.join(',')
},
success: (res) => {
this.buttonloading = false
if ("success" == res.data.result) {
_this.pd.HIDDEN_ID = res.data.pd.HIDDEN_ID;
resolve();
@ -1442,11 +1438,14 @@ export default {
duration: 2000
});
}
uni.hideLoading();
this.buttonloading = false
}
});
},
fail: function (res) {
uni.hideLoading();
this.buttonloading = false
uni.showToast({
title: "获取位置失败",
duration: 2000

120
pages/application/hidden-danger-management/hidden-danger-check/hidden-danger-check-detail.vue
View File

@ -233,7 +233,7 @@
textareaAInputREPULSE_CAUSE(e) {
this.REPULSE_CAUSE = e.detail.value
},
goSubmit() {
async goSubmit() {
var _this = this;
if (_this.ISQUALIFIED == '1') {
if (!_this.CHECKDESCR) {
@ -272,21 +272,26 @@
}
}
new Promise((resolve, reject) => {
_this.submit().then(() => {
resolve();
})
}).then(() => {
var i = 0;
_this.uploadImg(_this.imgList, i).then(() => {
resolve();
})
}).then(() => {
uni.showToast({
icon: 'none',
title: '提交成功',
duration: 1500
});
var fileList = [];
for (var i = 0; i < _this.imgList.length; i++) {
var file = {};
file.type = 5;
file.filePath = _this.imgList[i];
file.FOREIGN_KEY = _this.id;
fileList.push(file);
}
uni.showLoading({
title: '数据提交中'
})
this.buttonloading = true
const FILE_IDS = []
await _this.uploadPromise(fileList,FILE_IDS)
await _this.submit(FILE_IDS)
uni.showToast({
icon: 'none',
title: '提交成功',
duration: 1500
});
setTimeout(function() {
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
@ -294,53 +299,49 @@
uni.navigateBack({});
uni.hideLoading();
}, 1500);
})
},
uploadImg(tempFilePaths, i) {
return new Promise((resolve, reject) => {
var _this = this;
if (tempFilePaths.length == 0) {
resolve();
}
uni.showLoading({
title: '上传中'
})
uni.uploadFile({
url: basePath + '/app/imgfiles/add',
filePath: tempFilePaths[i],
name: 'FFILE',
formData: {
'FOREIGN_KEY': _this.check.HIDDENCHECK_ID,
'TYPE': '5',
async uploadPromise(tempFilePaths,FILE_IDS) {
if (tempFilePaths.length == 0) {
uni.hideLoading();
this.buttonloading = false
return
}
for (let i = 0; i < tempFilePaths.length; i++) {
await this.uploadImg(tempFilePaths[i],FILE_IDS)
}
},
uploadImg(file,FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
uni.uploadFile({
url: basePath + '/app/imgfiles/add',
filePath: file.filePath,
name: 'FFILE',
formData: {
'TYPE': file.type,
'FOREIGN_KEY':'',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
i++;
if (tempFilePaths.length > i) {
_this.uploadImg(tempFilePaths, i);
} else {
uni.hideLoading();
resolve();
}
},
fail: (err) => {
uni.hideLoading();
console.log('uploadImage fail', err);
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
})
},
success: (res) => {
res.data = JSON.parse(res.data)
FILE_IDS.push(res.data.pd.IMGFILES_ID)
resolve();
},
fail: (err) => {
uni.hideLoading();
this.buttonloading = false
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
})
},
submit() {
submit(FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
this.buttonloading = true
uni.request({
url: basePath + "/app/hidden/check", //提交接口
method: 'POST',
@ -357,10 +358,9 @@
CHECKOR: loginUserId,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
FILE_IDS:FILE_IDS.join(',')
},
success: (res) => {
uni.hideLoading();
this.buttonloading = false
if ("success" == res.data.result) {
_this.check = res.data.check;
resolve();
@ -370,6 +370,8 @@
duration: 2000
});
}
uni.hideLoading();
this.buttonloading = false
}
});

74
pages/application/hidden-danger-management/hidden-danger-edit/hidden-danger-edit-detail.vue
View File

@ -1170,7 +1170,7 @@ export default {
textareaCInput(e){
this.pd.RECTIFYDESCR= e.detail.value
},
goSubmit() {
async goSubmit() {
var _this = this;
if (_this.imgList.length <= 0) {
uni.showToast({
@ -1319,51 +1319,53 @@ export default {
}
}
}
new Promise((resolve, reject) => {
_this.submit().then(() => {resolve();})
}).then(() => {
var i=0;
_this.uploadImg(fileList,i).then(() => {resolve();})
}).then(() => {
setTimeout(function () {
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
prePage.$vm.initflag = true; // A 页面 init方法 为true
uni.navigateBack({});
uni.hideLoading();
}, 1500);
uni.showLoading({
title: '数据提交中'
})
this.buttonloading = true
const FILE_IDS = []
await _this.uploadPromise(fileList, FILE_IDS)
await _this.submit(FILE_IDS)
setTimeout(function () {
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
prePage.$vm.initflag = true; // A 页面 init方法 为true
uni.navigateBack({});
uni.hideLoading();
}, 1500);
},
uploadImg(tempFilePaths,i){
async uploadPromise(tempFilePaths,FILE_IDS){
if (tempFilePaths.length == 0) {
uni.hideLoading();
this.buttonloading = false
return
}
for (let i = 0; i < tempFilePaths.length; i++) {
await this.uploadImg(tempFilePaths[i],FILE_IDS)
}
},
uploadImg(file,FILE_IDS){
return new Promise((resolve, reject) => {
var _this = this;
if(tempFilePaths.length==0){
resolve();
}
uni.showLoading({
title: '上传中'
})
uni.uploadFile({
url: basePath+'/app/imgfiles/add',
filePath: tempFilePaths[i].filePath,
filePath: file.filePath,
name: 'FFILE',
formData: {
'TYPE': tempFilePaths[i].type,
'FOREIGN_KEY': _this.pd.HIDDEN_ID,
'TYPE': file.type,
// 'FOREIGN_KEY': _this.pd.HIDDEN_ID,
'FOREIGN_KEY': '',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
i++;
if (tempFilePaths.length > i) {
_this.uploadImg(tempFilePaths, i);
} else {
uni.hideLoading();
resolve();
}
res.data = JSON.parse(res.data)
FILE_IDS.push(res.data.pd.IMGFILES_ID)
resolve();
},
fail: (err) => {
uni.hideLoading();
this.buttonloading = false
uni.showModal({
content: err.errMsg,
showCancel: false
@ -1372,7 +1374,7 @@ export default {
})
})
},
submit(){
submit(FILE_IDS){
return new Promise((resolve, reject) => {
var _this = this;
// var pages = getCurrentPages(); // 获取当前页面栈
@ -1393,7 +1395,7 @@ export default {
longitude = result[0];
latitude = result[1];
//发送 post 请求提交保存
this.buttonloading = true
// this.buttonloading = true
uni.request({
url: basePath+'/app/hidden/editHidden',
method: 'POST',
@ -1433,9 +1435,10 @@ export default {
USER_ID:loginUser.USER_ID,
// RECORDITEM_ID:_this.itemId,
// RISKITEM_ID:_this.riskId,
FILE_IDS:FILE_IDS.join(','),
},
success: (res) => {
this.buttonloading = false
// this.buttonloading = false
if ("success" == res.data.result) {
_this.pd.HIDDEN_ID= res.data.pd.HIDDEN_ID;
resolve();
@ -1450,11 +1453,14 @@ export default {
duration: 2000
});
}
uni.hideLoading();
this.buttonloading = false
}
});
},
fail: function(res){
uni.hideLoading();
this.buttonloading = false
uni.showToast({
title: "获取位置失败",
duration: 2000

3
pages/application/hidden-danger-management/hidden-danger-finish/hidden-danger-finish.vue
View File

@ -217,6 +217,7 @@
},
//跳转事件
gotRectify(e) {
console.log(e)
if (e.SOURCE === '4' || e.SOURCE === '5' || e.SOURCE === '1') {
uni.navigateTo({
url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-detail?id='+e.HIDDEN_ID,
@ -225,7 +226,7 @@
uni.navigateTo({
url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail?id='+e.HIDDEN_ID,
});
} else if (e.SOURCE === '2') {
} else if (e.SOURCE === '2' || e.SOURCE === '3') {
uni.navigateTo({
url: '/pages/application/hidden-danger-management/hidden-danger-record/hidden-danger-record-risk-detail?id='+e.HIDDEN_ID,
});

97
pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change-detail.vue
View File

@ -715,11 +715,6 @@ export default {
return;
}
}
new Promise((resolve, reject) => {
_this.submit().then(() => {
resolve();
})
}).then(() => {
var fileList = [];
for (var i = 0; i < _this.imgList.length; i++) {
var file = {};
@ -747,25 +742,25 @@ export default {
fileList.push(file);
}
}
var m = 0;
_this.uploadImg(fileList, m).then(() => {
resolve();
})
}).then(() => {
uni.showToast({
icon: 'none',
title: '提交成功',
duration: 1500
});
setTimeout(function () {
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
prePage.$vm.initflag = true; // A 页面 init方法 为true
uni.navigateBack({});
uni.hideLoading();
}, 1500);
uni.showLoading({
title: '数据提交中'
})
this.buttonloading = true
const RFILE_IDS = [],PFILE_IDS = [],SFILE_IDS = [];
await _this.uploadPromise(fileList,RFILE_IDS,PFILE_IDS,SFILE_IDS)
await _this.submit(RFILE_IDS,PFILE_IDS,SFILE_IDS)
uni.showToast({
icon: 'none',
title: '提交成功',
duration: 1500
});
setTimeout(function () {
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
prePage.$vm.initflag = true; // A 页面 init方法 为true
uni.navigateBack({});
uni.hideLoading();
}, 1500);
} else {
if (!_this.pd.REPULSE_CAUSE) {
uni.showToast({
@ -831,39 +826,43 @@ export default {
});
}
},
uploadImg(tempFilePaths, i) {
async uploadPromise(tempFilePaths,RFILE_IDS,PFILE_IDS,SFILE_IDS) {
if (tempFilePaths.length == 0) {
uni.hideLoading();
this.buttonloading = false
return
}
for (let i = 0; i < tempFilePaths.length; i++) {
if (tempFilePaths[i].type == 22){
await this.uploadImg(tempFilePaths[i],PFILE_IDS)
}else if (tempFilePaths[i].type == 4){
await this.uploadImg(tempFilePaths[i],RFILE_IDS)
}else if (tempFilePaths[i].type == 8){
await this.uploadImg(tempFilePaths[i],SFILE_IDS)
}
}
},
uploadImg(file,FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
if (tempFilePaths.length == 0) {
resolve();
}
uni.showLoading({
title: '上传中'
})
uni.uploadFile({
url: basePath + '/app/imgfiles/add',
filePath: tempFilePaths[i].filePath,
filePath: file.filePath,
name: 'FFILE',
formData: {
'FOREIGN_KEY': tempFilePaths[i].FOREIGN_KEY,
'TYPE': tempFilePaths[i].type,
'TYPE': file.type,
'FOREIGN_KEY':'',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
i++;
if (tempFilePaths.length > i) {
_this.uploadImg(tempFilePaths, i);
} else {
console.info("提交成功")
uni.hideLoading();
console.info("提交成功123")
resolve();
}
res.data = JSON.parse(res.data)
FILE_IDS.push(res.data.pd.IMGFILES_ID)
resolve();
},
fail: (err) => {
uni.hideLoading();
this.buttonloading = false
uni.showModal({
content: err.errMsg,
showCancel: false
@ -924,10 +923,9 @@ export default {
}
})
},
submit() {
submit(RFILE_IDS,PFILE_IDS,SFILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
this.buttonloading = true
uni.request({
url: basePath + "/app/hidden/rectify", //提交接口
method: 'POST',
@ -953,10 +951,11 @@ export default {
// OTHER: JSON.stringify(_this.other),
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
RFILE_IDS:RFILE_IDS.join(','),
PFILE_IDS:PFILE_IDS.join(','),
SFILE_IDS:SFILE_IDS.join(','),
},
success: (res) => {
uni.hideLoading();
this.buttonloading = false
if ("success" == res.data.result) {
_this.HIDDENSCHEME_ID = res.data.HIDDENSCHEME_ID
resolve();
@ -965,9 +964,9 @@ export default {
title: '错误',
duration: 2000
});
reject();
}
uni.hideLoading();
this.buttonloading = false
}
});
})

21
pages/application/hidden-trouble-investigation/hidden-trouble-app/exclude-form.vue
View File

@ -1397,9 +1397,9 @@ export default {
}
}
}
await _this.submit()
var i = 0;
await _this.uploadPromise(fileList)
const FILE_IDS = []
await _this.uploadPromise(fileList,FILE_IDS)
await _this.submit(FILE_IDS)
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
// var task = prePage.$vm.list[_this.index];
@ -1411,7 +1411,7 @@ export default {
uni.navigateBack({});
uni.hideLoading();
},
async uploadPromise(tempFilePaths) {
async uploadPromise(tempFilePaths,FILE_IDS) {
if (tempFilePaths.length == 0) {
return
}
@ -1419,10 +1419,10 @@ export default {
title: '上传中'
})
for (let i = 0; i < tempFilePaths.length; i++) {
await this.uploadImg(tempFilePaths[i])
await this.uploadImg(tempFilePaths[i],FILE_IDS)
}
},
uploadImg(file) {
uploadImg(file,FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
uni.uploadFile({
@ -1431,11 +1431,13 @@ export default {
name: 'FFILE',
formData: {
'TYPE': file.type,
'FOREIGN_KEY': _this.pd.HIDDEN_ID,
'FOREIGN_KEY':'',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
res.data = JSON.parse(res.data)
FILE_IDS.push(res.data.pd.IMGFILES_ID)
resolve();
},
fail: (err) => {
@ -1448,7 +1450,7 @@ export default {
})
})
},
submit() {
submit(FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
let longitude;
@ -1509,7 +1511,8 @@ export default {
HIDDENTYPE3: _this.pd.HIDDENTYPE[2] || '',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
HIDDEN_CATEGORY: _this.pd.HIDDEN_CATEGORY ? _this.pd.HIDDEN_CATEGORY : ''
HIDDEN_CATEGORY: _this.pd.HIDDEN_CATEGORY ? _this.pd.HIDDEN_CATEGORY : '',
FILE_IDS:FILE_IDS.join(',')
},
success: (res) => {
this.buttonloading = false

91
pages/application/hidden-trouble-investigation/hidden-trouble-app/other-hidden-add.vue
View File

@ -965,8 +965,9 @@
//图片上传
ChooseImage(e) {
var _this = this;
var ss=4-this.imgList.length;
uni.chooseImage({
count: e==0 ? 4-this.imgList.length : 4-this.imgList1.length, //默认9
count: ss, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['camera','album'], //从相册选择
success: (res) => {
@ -1182,7 +1183,7 @@
textareaCInput(e){
this.pd.RECTIFYDESCR= e.detail.value
},
goSubmit() {
async goSubmit() {
var _this = this;
if (_this.imgList.length <= 0) {
uni.showToast({
@ -1331,12 +1332,9 @@
}
}
}
new Promise((resolve, reject) => {
_this.submit().then(() => {resolve();})
}).then(() => {
var i=0;
_this.uploadImg(fileList,i).then(() => {resolve();})
}).then(() => {
const FILE_IDS = []
await _this.uploadPromise(fileList,FILE_IDS)
await _this.submit(FILE_IDS)
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上一个页面
// var task = prePage.$vm.list[_this.index];
@ -1347,47 +1345,47 @@
}
uni.navigateBack({});
uni.hideLoading();
})
},
uploadImg(tempFilePaths,i){
return new Promise((resolve, reject) => {
var _this = this;
if(tempFilePaths.length==0){
resolve();
}
uni.showLoading({
title: '上传中'
})
uni.uploadFile({
url: basePath+'/app/imgfiles/add',
filePath: tempFilePaths[i].filePath,
name: 'FFILE',
formData: {
'TYPE': tempFilePaths[i].type,
'FOREIGN_KEY': _this.pd.HIDDEN_ID,
async uploadPromise(tempFilePaths,FILE_IDS) {
if (tempFilePaths.length == 0) {
return
}
uni.showLoading({
title: '上传中'
})
for (let i = 0; i < tempFilePaths.length; i++) {
await this.uploadImg(tempFilePaths[i],FILE_IDS)
}
},
uploadImg(file,FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
uni.uploadFile({
url: basePath + '/app/imgfiles/add',
filePath: file.filePath,
name: 'FFILE',
formData: {
'TYPE': file.type,
'FOREIGN_KEY':'',
CORPINFO_ID: loginUser.CORPINFO_ID,
USER_ID: loginUser.USER_ID,
},
success: (res) => {
i++;
if (tempFilePaths.length > i) {
_this.uploadImg(tempFilePaths, i);
} else {
uni.hideLoading();
resolve();
}
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
})
},
submit(){
},
success: (res) => {
res.data = JSON.parse(res.data)
FILE_IDS.push(res.data.pd.IMGFILES_ID)
resolve();
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
})
},
submit(FILE_IDS) {
return new Promise((resolve, reject) => {
var _this = this;
// var pages = getCurrentPages(); // 获取当前页面栈
@ -1451,6 +1449,7 @@
USER_ID:loginUser.USER_ID,
// RECORDITEM_ID:_this.itemId,
// RISKITEM_ID:_this.riskId,
FILE_IDS:FILE_IDS.join(',')
},
success: (res) => {
this.buttonloading = false

32
pages/application/highwork/highwork-apply/highwork-apply-detail.vue
View File

@ -88,7 +88,7 @@
<input name="input" ref="WORK_HIGH" :disabled="forbidEdit" type="number" v-model="pd.WORK_HIGH"
placeholder="请输入作业高度"></input>
</view>
<view class="cu-form-textarea">
<view class="cu-form-title">作业内容：</view>
<textarea maxlength="255" :disabled="forbidEdit" v-model="pd.WORK_CONTENT"
@ -697,7 +697,7 @@
</view>
<view class="wui-form-list" v-if="!forbidEdit && pd.WORK_LEVEL !== '1' && pd.WORK_LEVEL !== '2' && pd.WORK_LEVEL !== '3'">
<!-- <view class="cu-form-group">-->
<!-- <view class="title">安全部</view>-->
<!-- <view class="title">生产部</view>-->
<!-- <view class="picker-tree-box">-->
<!-- <view class="picker-tree" @tap="showSafetyTree">-->
<!-- {{ pd.SAFETY_DEPARTMENT_NAME ? pd.SAFETY_DEPARTMENT_NAME : '请选择' }}-->
@ -712,14 +712,14 @@
<!-- @cancel="safetytreeCancel"></tki-tree>-->
<!-- </view>-->
<!-- <view class="cu-form-group" v-if="pd.DISABLED!=='1'">-->
<!-- <view class="title">安全部负责人</view>-->
<!-- <view class="title">生产部负责人</view>-->
<!-- <view style="position: relative">-->
<!-- <view class="search-input">-->
<!-- <input-->
<!-- type="text"-->
<!-- style="text-align: right"-->
<!-- v-model="searchSafety"-->
<!-- placeholder="请输入安全部负责人"-->
<!-- placeholder="请输入生产部负责人"-->
<!-- @input="filterSafetyUsers"-->
<!-- @click="toggleSafetyDropdown"-->
<!-- >-->
@ -739,7 +739,7 @@
<!-- </view>-->
<!-- </view>-->
<!-- <view class="cu-form-group" v-if="pd.DISABLED==='1'">-->
<!-- <view class="title">安全部负责人</view>-->
<!-- <view class="title">生产部负责人</view>-->
<!-- <picker @change="PickerSafety" :value="safetyindex" :range="safetyUserList" range-key="NAME"-->
<!-- :disabled="safetyUserList.length == 0" @click="isBlankList('safety')">-->
<!-- <view class="picker">-->
@ -749,22 +749,22 @@
<!-- </view>-->
<view class="cu-form-group">
<view class="title">安全部</view>
<view class="title">生产部</view>
<view class="earch-input">
<input type="text" style="text-align: right" v-model="pd.SAFETY_DEPARTMENT_NAME" disabled>
</view>
</view>
<view class="cu-form-group" v-if="!forbidEdit">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
<view>
<input type="text" style="text-align: right" v-model="pd.SAFETY_USER_NAME" disabled>
</view>
</view>
<!-- <view class="cu-form-group">-->
<!-- <view class="title">请选择安全部负责人</view>-->
<!-- <view class="title">请选择生产部负责人</view>-->
<!-- <view class="picker" @click="openPersonPopup('safety')" style="font-size: 28upx; flex: 1; display: flex; align-items: center; justify-content: flex-end; padding-right: 20upx;">-->
<!-- {{ searchSafetyPerson || '请选择安全部负责人' }}-->
<!-- {{ searchSafetyPerson || '请选择生产部负责人' }}-->
<!-- <text class="cuIcon-right" style="margin-left: 10upx;"></text>-->
<!-- </view>-->
<!-- </view>-->
@ -1130,12 +1130,12 @@
<view v-if="signs.SAFETY">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全部负责人意见</view>
<view class="cu-form-title">生产部负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.SAFETY[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
{{ pd.SAFETY_USER_NAME }}
</view>
<view class="cu-item" v-for="(item,index) in signs.SAFETY[0].SIGN_TIME" :key="index"
@ -1393,7 +1393,7 @@ export default {
// {name: 'ACCEPT_CONFESS_USER_ID', message: '请选择接受交底人'},
// {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
// {name:'APPROVE_USER_ID',message:'请选择安全处负责人'},
// {name:'SAFETY_USER_ID',message:'请选择安全部负责人'},
// {name:'SAFETY_USER_ID',message:'请选择生产部负责人'},
// {name:'PLS_ID',message:'请选择作业区域'},
],
@ -1419,7 +1419,7 @@ export default {
leader: '分厂贯标中心负责',
audit: '分厂负责',
approve: '安全处负责',
safety: '安全部负责',
safety: '生产部负责',
workstart: '作业开始负责',
workend: '作业结束负责',
accept: '验收部门负责'
@ -1949,7 +1949,7 @@ export default {
if (!this.safetyUserList.length) {
uni.showToast({
icon: 'none',
title: '请先选择安全部',
title: '请先选择生产部',
duration: 1500
});
return;
@ -2440,7 +2440,7 @@ export default {
// if (!this.pd.SAFETY_USER_ID) {
// uni.showToast({
// icon: 'none',
// title: '请选择安全部负责人',
// title: '请选择生产部负责人',
// duration: 1500
// });
// required = false
@ -2783,7 +2783,7 @@ export default {
if (this.safetyUserList.length == 0) {
uni.showToast({
icon: 'none',
title: '请先选择安全部',
title: '请先选择生产部',
duration: 1500
})
}

4
pages/application/highwork/highwork-detail/index.vue
View File

@ -349,12 +349,12 @@
</view>
<view v-if="signs.SAFETY">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全部负责人意见</view>
<view class="cu-form-title">生产部负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.SAFETY[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
{{ pd.SAFETY_USER_NAME }}
</view>
<view class="cu-item" v-for="(item,index) in signs.SAFETY[0].SIGN_TIME" :key="index"

4
pages/application/highwork/highwork-list/index.vue
View File

@ -62,7 +62,7 @@
<text v-if="item.APPROVE_USER_NAME">安全处负责人：{{ item.APPROVE_USER_NAME }}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text v-if="item.SAFETY_USER_NAME">安全部负责人：{{ item.SAFETY_USER_NAME }}</text>
<text v-if="item.SAFETY_USER_NAME">生产部负责人：{{ item.SAFETY_USER_NAME }}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>验收部门负责人：{{ item.ACCEPT_USER_NAME }}</text>
@ -267,7 +267,7 @@ export default {
uni.navigateTo({
url: '/pages/application/highwork/highwork-approve/highwork-approve-detail?HIGHWORK_ID=' + e
});
}else if (this.flow === '安全部签字') {
}else if (this.flow === '生产部签字') {
uni.navigateTo({
url: '/pages/application/highwork/highwork-safety/highwork-safety-detail?HIGHWORK_ID=' + e
});

6
pages/application/highwork/highwork-safety/highwork-safety-detail.vue
View File

@ -2,18 +2,18 @@
<view>
<cu-custom bgColor="bg-gradual-blueness" :isBack="true">
<block slot="backText">返回</block>
<block slot="content">安全部意见</block>
<block slot="content">生产部意见</block>
</cu-custom>
<scroll-view scroll-y="false">
<view class="form">
<detail v-if="pd.HIGHWORK_ID" :highworkId="pd.HIGHWORK_ID"></detail>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">安全部负责人意见</view>
<view class="cu-form-title">生产部负责人意见</view>
<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
</view>
<view class="wui-sign" v-if="!files.length">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
<view>
<view>
<button class="cu-btn bg-green shadow" @tap="showModal">新增手写签字</button>

4
pages/application/highwork/home.vue
View File

@ -136,13 +136,13 @@
</view>
</navigator>
<navigator class="apps-item" hover-class="none"
url="/pages/application/highwork/highwork-list/index?flow=安全部签字">
url="/pages/application/highwork/highwork-list/index?flow=生产部签字">
<view class="imgs action">
<image src="../../../static/icon-apps/icon-aq-1.png" mode=""></image>
<view v-if="count.SAFETY" class="cu-tag badge">{{ count.SAFETY }}</view>
</view>
<view class="text-semi" style="text-align: center;">
<view>安全部意见</view>
<view>生产部意见</view>
</view>
</navigator>
<navigator class="apps-item" hover-class="none"

8
pages/application/hoisting/hoisting-apply/hoisting-apply-detail.vue
View File

@ -696,13 +696,13 @@
<view class="cu-form-group">
<view class="title">安全部</view>
<view class="title">生产部</view>
<view class="earch-input">
<input type="text" style="text-align: right" v-model="pd.SAFETY_DEPARTMENT_NAME" disabled>
</view>
</view>
<view class="cu-form-group" v-if="!forbidEdit">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
<view>
<input type="text" style="text-align: right" v-model="pd.SAFETY_USER_NAME" disabled>
</view>
@ -1041,12 +1041,12 @@
<view v-if="signs.SAFETY">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全部负责人意见</view>
<view class="cu-form-title">生产部负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.SAFETY[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
{{ pd.SAFETY_USER_NAME }}
</view>
<view class="cu-item" v-for="(item,index) in signs.SAFETY[0].SIGN_TIME" :key="index"

4
pages/application/hoisting/hoisting-detail/index.vue
View File

@ -299,12 +299,12 @@
<view v-if="signs.SAFETY">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">安全部负责人意见</view>
<view class="cu-form-title">生产部负责人意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.SAFETY[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group">
<view class="title">安全部负责人</view>
<view class="title">生产部负责人</view>
{{ pd.SAFETY_USER_NAME }}
</view>
<view class="cu-item" v-for="(item,index) in signs.SAFETY[0].SIGN_TIME" :key="index"

2
pages/application/hoisting/hoisting-list/index.vue
View File

@ -60,7 +60,7 @@
<text v-if="item.APPROVE_USER_NAME">安全处负责人：{{ item.APPROVE_USER_NAME }}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text v-if="item.SAFETY_USER_NAME">安全部负责人：{{ item.SAFETY_USER_NAME }}</text>
<text v-if="item.SAFETY_USER_NAME">生产部负责人：{{ item.SAFETY_USER_NAME }}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item)">
<text>验收部门负责人：{{ item.ACCEPT_USER_NAME }}</text>

2
pages/application/hoisting/home.vue
View File

@ -130,7 +130,7 @@
<view v-if="count.SAFETY" class="cu-tag badge">{{ count.SAFETY }}</view>
</view>
<view class="text-semi" style="text-align: center;">
<view>安全部意见</view>
<view>生产部意见</view>
</view>
</navigator>