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

Merge remote-tracking branch 'remotes/origin/pet' into dev 

# Conflicts:
#	pages/mine/promise/promise.vue
dev
water_xu 2024-05-10 19:12:44 +08:00
parent 90ac4f66de 848987aad3
commit 93666ae7e7
7 changed files with 131 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/index.js
View File

@ -102,8 +102,8 @@ export const getkeyprojectcount = (params) => post("/app/keyprojectcheck/keyProj
export const getPromiseUnsigned = (params) => post("/app/corppromise/ISSIGN", params); // 获取是否有需要签字的承诺书
export const getPromiseInfo = (params) => post("/app/corppromise/promise", params); // 获取需要签字的承诺书信息
export const setPromiseSign = (params) => upload("/app/corppromise/editpeople", params); // 承诺书提交签字
export const getMyPromiseList = (params) => post("/app/corppromise/promiselist", params); // 获取我的承诺列表
export const getReceivePromiseList = (params) => post("/app/corppromise/receivePromiseList", params); // 获取接收承诺列表
export const getMyPromiseList = (params) => post("/app/corppromise/promiseV2list", params); // 获取我的承诺列表
export const getReceivePromiseList = (params) => post("/app/corppromise/receiveV2PromiseList", params); // 获取接收承诺列表
export const getPromiseView = (params) => post("/app/corppromise/goEdit", params); // 查看承诺书
export const setPromiseIsRead = (params) => post("/app/corppromise/editIsRead", params); // 承诺书设置阅读状态
export const editHiddenIspunish = (params) => post("/app/keyprojectcheck/editHiddenIspunish", params); // 修改隐患信息

6
pages/key-project-management/safety-environmental-inspection/detail-list.vue
View File

@ -52,6 +52,7 @@ export default {
data() {
return {
KEYWORDS: '',
CORPINFO_ID: '',
OUTSOURCED_ID: '',
pageSize: 10,
currentPage: 1,
@ -71,7 +72,8 @@ export default {
}
},
onLoad(e) {
this.OUTSOURCED_ID = e.OUTSOURCED_ID
this.OUTSOURCED_ID = e.OUTSOURCED_ID,
this.CORPINFO_ID = this.$route.query.CORPINFO_ID
},
onShow(){
this.resetList()
@ -81,6 +83,7 @@ export default {
let resData = await getKeyProjectsCheckList({
KEYWORDS: this.KEYWORDS,
OUTSOURCED_ID: this.OUTSOURCED_ID,
CORPINFO_ID: this.CORPINFO_ID,
showCount: this.pageSize,
currentPage: this.currentPage,
});
@ -99,6 +102,7 @@ export default {
params: {
KEYPROJECTCHECK_ID,
type,
CORPINFO_ID:this.CORPINFO_ID,
OUTSOURCED_ID:this.OUTSOURCED_ID
}
})

13
pages/key-project-management/safety-environmental-inspection/detail.vue
View File

@ -356,6 +356,8 @@ export default {
HIDDENLEVEL: '',
HIDDENTYPE_NAME: '',
HIDDENTYPE: '',
HIDDENTYPE2_NAME: '',
HIDDENTYPE2: '',
SOURCE: '4',
CORPINFO_ID: '',
HIDDENFINDDEPT: '',
@ -396,6 +398,7 @@ export default {
async onLoad(event) {
this.KEYPROJECTCHECK_ID = event.KEYPROJECTCHECK_ID
this.OUTSOURCED_ID = event.OUTSOURCED_ID
this.disabled = !(event.type === 'add' || event.type === 'edit');
if (this.KEYPROJECTCHECK_ID) {
await this.fnGetKeyProjectsCheckView()
@ -492,6 +495,14 @@ export default {
if (list === 'hiddenTypeTreeList') {
this.hiddenForm.HIDDENTYPE = e[0].id
this.hiddenForm.HIDDENTYPE_NAME = e[0].name
// 获取根节点元素名
this.hiddenTypeTreeList.forEach((enode) => {
if (JSON.stringify(enode).includes(e[0].id) && JSON.stringify(enode).includes(e[0].name)){
// CORPINFO_ID = this.$route.query.CORPINFO_ID,
this.hiddenForm.HIDDENTYPE2 = enode.id
this.hiddenForm.HIDDENTYPE2_NAME = enode.name
}
})
}
if (list === 'rectificationSiteuserColumns') {
this.hiddenForm.RECTIFICATIONDEPT = e[0].UNITS_ID
@ -636,6 +647,8 @@ export default {
FOREIGN_KEY,
TYPE: 102,
CORPINFO_ID: this.userInfo.CORPINFO_ID,
// CORPINFO_ID: this.CORPINFO_ID,
},
loading:false
})

1
pages/key-project-management/safety-environmental-inspection/list.vue
View File

@ -101,6 +101,7 @@ export default {
url: '/pages/key-project-management/safety-environmental-inspection/detail-list',
params: {
OUTSOURCED_ID,
CORPINFO_ID: this.CORPINFO_ID
}
})
},

29
pages/mine/promise/detail.vue
View File

@ -13,23 +13,23 @@
<view v-if="info.TYPE === '0'">
若违反上述承诺和未履行安全生产职责，或发生责任事故的，接受政府或公司事故调查组做出的处罚决定。
</view>
<view v-if="info.TYPE === '0'">
承诺期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。
</view>
<!-- <view v-if="info.TYPE === '0'">-->
<!-- 承诺期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。-->
<!-- </view>-->
<view v-if="info.TYPE === '1'">
若未履行安全生产职责，或发生生产安全事故的，接受公司或政府事故调查组做出的处罚。
</view>
<view v-if="info.TYPE === '1'">
责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。
</view>
<!-- <view v-if="info.TYPE === '1'">-->
<!-- 责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。-->
<!-- </view>-->
</view>
<view class="footer">
<view v-if="info.TYPE === '0'" class="hairdresser">承诺单位(盖章)：</view>
<!-- <view v-if="info.TYPE === '0'" class="hairdresser">承诺单位(盖章)：</view>-->
<view v-if="info.TYPE === '1'" class="hairdresser">
<view class="promiser">发状人：{{ info.COVERPEOPLE }}</view>
<view class="time">{{ info.CREATTIME.substring(0,10) }}</view>
<!-- <view class="time">{{ info.CREATTIME.substring(0,10) }}</view>-->
</view>
<view class="respondent">
<view v-if="info.SIGNTIME != null" class="respondent">
<view class="promiser">
<text>
{{ info.TYPE === '0' ? '主要负责人签字' : '受状人' }}：
@ -37,8 +37,15 @@
<u--image :showLoading="true" :src="$store.state.filePath + info.FILEPATH"
width="200upx" height="100px" mode="scaleToFill"></u--image>
</view>
<view class="time">
{{ info.SIGNTIME && info.SIGNTIME.substring(0,10) }}
<!-- <view class="time">-->
<!-- {{ info.SIGNTIME && info.SIGNTIME.substring(0,10) }}-->
<!-- </view>-->
</view>
<view v-else class="respondent">
<view class="promiser">
<text>
{{ info.TYPE === '0' ? '主要负责人未签字' : '受状人未签字' }}
</text>
</view>
</view>
</view>

79
pages/mine/promise/promise.vue
View File

@ -6,6 +6,7 @@
itemStyle="height:80upx;padding-bottom:10upx;background-color: #fff;"
@click="tabsClick"
></u-tabs>
<<<<<<< HEAD
<view class="container">
<u-sticky offset-top="200">
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
@ -54,14 +55,73 @@
</view>
</u-popup>
=======
<view class="container">
<u-sticky offset-top="200">
<u-button type="primary" text="高级搜索" @click="popupOpen" style="height: 30px;"></u-button>
</u-sticky>
</view>
<u-popup :show="popupShow" mode="right" :overlay="true" customStyle='width: 300px;' :safeAreaInsetTop="true" @close="popupClose" @open="popupOpen">
<view>
<u-datetime-picker
:show="addStartPickBarShow"
v-model="addTimeStart"
mode="date"
@close="addPickBarOnClose('start')"
@cancel="addPickBarOnCancel('start')"
@confirm="addPickBarOnConfirm"
></u-datetime-picker>
<u-button @click="addStartPickBarShow = true">起始时间：{{ addTimeStartStr == '' ? '请选择起始时间...' : addTimeStartStr }}</u-button>
<u-datetime-picker
:show="addEndPickBarShow"
v-model="addTimeEnd"
mode="date"
@close="addPickBarOnClose('end')"
@cancel="addPickBarOnCancel('end')"
@confirm="addPickBarOnConfirm"
></u-datetime-picker>
<u-button @click="addEndPickBarShow = true">结束时间：{{ addTimeEndStr == '' ? '请选择结束时间...' : addTimeEndStr }}</u-button>
<u-toast ref="uToast"></u-toast>
<view class="u-page">
<view class="u-demo-block">
<view class="u-demo-block__content">
<u-row customStyle="margin-bottom: 10px">
<u-col span="6">
<view class="demo-layout bg-purple-light">
<u-button @click="resetAdvancedParam">重置</u-button>
</view>
</u-col>
<u-col span="6">
<view class="demo-layout bg-purple">
<u-button @click="advancedSearch">搜索</u-button>
</view>
</u-col>
</u-row>
</view>
</view>
</view>
</view>
</u-popup>
>>>>>>> remotes/origin/pet
<view class="message_list">
<u-list @scrolltolower="scrolltolower" v-if="list.length > 0">
<u-list-item v-for="(item, index) in list" :key="index">
<view class="message_item arrow" @click="fnNavigator(item)">
<view class="message_flex">
<view>
<template v-if="item.corppromisType ==='1'"> <!-- 0承诺书1责任状 -->
<view class="fontstyle">发状人：{{ item.coverpeople }}</view>
<view class="fontstyle">受状人：{{ item.NAME }}</view>
</template>
<template v-else>
<view class="fontstyle">被承诺人：{{ item.coverpeople }}</view>
<view class="fontstyle">承诺人：{{ item.NAME }}</view>
</template>
<view v-if="item.SIGNTIME != null" class="fontstyle">已签字</view>
<view v-else class="fontstyle_red">未签字</view>
<view class="message_time">{{ item.SIGNTIME }}</view>
</view>
<view class="font0" v-if="TYPE === '2'">{{ item.ISREAD == '0' ? '待阅' : '已阅' }}</view>
@ -81,7 +141,8 @@ export default {
data() {
return {
tabsList: [
{name: '我的承诺', id: '1'},
// {name: '我的承诺', id: '1'},
{name: '发出承诺', id: '1'},
{name: '接收承诺', id: '2'}
],
TYPE: '1',
@ -116,6 +177,7 @@ export default {
ADDEND: this.addTimeEndStr
})
this.list = [...this.list, ...resData.varList]
this.totalPage = resData.page.totalPage
},
async fnGetReceivePromiseList() {
let resData = await getReceivePromiseList({
@ -162,10 +224,17 @@ export default {
},
// 高级搜索弹窗关闭函数
<<<<<<< HEAD
popupClose() {
this.popupShow = false
},
=======
popupClose() {
this.popupShow = false
},
>>>>>>> remotes/origin/pet
// 高级搜索日期选择器关闭回调
addPickBarOnClose(type) {
switch (type) {
@ -201,7 +270,11 @@ export default {
this.$refs.uToast.show({message:'日期选择参数错误',duration:1000})
}
},
<<<<<<< HEAD
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
=======
// 清除高级搜索内的起始日期、结束日期组件绑定的时间属性（时间戳类型）；清除根据时间戳格式化的文本日期
>>>>>>> remotes/origin/pet
resetAllAddTime() {
this.addTimeStart = Number(new Date())
this.addTimeEnd = Number(new Date())
@ -218,7 +291,11 @@ export default {
const toast = uni.$u.toast
// 日期合法判定
if (this.addTimeStartStr > this.addTimeEndStr){
<<<<<<< HEAD
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
=======
// 包含两种case：case1 开始时间 > 结束时间；case2 开始时间有值，结束时间为空
>>>>>>> remotes/origin/pet
this.$refs.uToast.show({message:'日期不合法',duration:1000})
return
}

22
pages/mine/promise/sign.vue
View File

@ -13,21 +13,21 @@
<view v-if="info.TYPE === '0'">
若违反上述承诺和未履行安全生产职责，或发生责任事故的，接受政府或公司事故调查组做出的处罚决定。
</view>
<view v-if="info.TYPE === '0'">
承诺期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。
</view>
<!-- <view v-if="info.TYPE === '0'">-->
<!-- 承诺期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。-->
<!-- </view>-->
<view v-if="info.TYPE === '1'">
若未履行安全生产职责，或发生生产安全事故的，接受公司或政府事故调查组做出的处罚。
</view>
<view v-if="info.TYPE === '1'">
责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。
</view>
<!-- <view v-if="info.TYPE === '1'">-->
<!-- 责任期限自{{ info.PROMISE_TERM_START }}至{{ info.PROMISE_TERM_END }}。-->
<!-- </view>-->
</view>
<view class="footer">
<view v-if="info.TYPE === '0'" class="hairdresser">承诺单位(盖章)：</view>
<!-- <view v-if="info.TYPE === '0'" class="hairdresser">承诺单位(盖章)：</view>-->
<view v-if="info.TYPE === '1'" class="hairdresser">
<view class="promiser">发状人：{{ info.COVERPEOPLE }}</view>
<view class="time">{{ info.CREATTIME.substring(0,10) }}</view>
<!-- <view class="time">{{ info.CREATTIME.substring(0,10) }}</view>-->
</view>
<view class="respondent">
<view class="promiser">
@ -38,9 +38,9 @@
width="200upx" height="100px" mode="scaleToFill"></u--image>
<u-button type="primary" :text="info.FILEPATH ? '重签' : '手写签字'" size="mini" class="bth-mini" @click="signShow = true"></u-button>
</view>
<view class="time">
{{ info.SIGNTIME }}
</view>
<!-- <view class="time">-->
<!-- {{ info.SIGNTIME }}-->
<!-- </view>-->
</view>
</view>
<sign v-if="signShow" :signShow.sync="signShow" @confirm="signConfirm"></sign>