FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

未符合项修改

Browse Source
This commit is contained in:
shen_yan_pu
2021-08-03 11:24:52 +08:00
parent d7dd4a9649
commit 7f69ee42ec
3 changed files with 176 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+103 -23
View File
@@ -29,7 +29,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standName" label="标准号/标准名称" align="center"/> <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/> <el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -87,6 +96,42 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="确认+选择责任人" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>确认+选择责任人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dutyUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="上传佐证材料填选择写信息" placement="top" :color="roleForm.uploadUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.uploadUser" style="display: none;"></el-input>
<el-input v-model="roleForm.uploadUserName" :disabled="true" placeholder="选择负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.checkUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>分发负责人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.checkUser" style="display: none;"></el-input>
<el-input v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人" @click.native="choiceZRR('dockUser', '选择标准法规工程师', roleForm.dockUser)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
</el-form> </el-form>
</el-timeline> </el-timeline>
</div> </div>
@@ -103,7 +148,7 @@
<el-form :modal="queryUnqualidiedData" inline class="label-input-form"> <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
v-model="queryUnqualidiedData.standId" v-model="queryUnqualidiedData.standSerialNumber"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -154,25 +199,44 @@
</div> </div>
</div> </div>
<el-table <el-table
ref="searchTable" ref="searchTable"
:data="unqualidiedData" :data="unqualidiedData"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="selectedChange" @selection-change="selectedChange"
> >
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称"/> <el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="productName" label="项目名称"/> <template slot-scope="scope">
<el-table-column prop="itemsNum" label="条款号"/> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<el-table-column prop="itemsName" label="条款名称"/> </template>
<el-table-column prop="planCloseTime" label="整改完成时间"/> </el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门"/> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<el-table-column prop="dutyEngineer" label="责任工程师"/> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" align="center" show-overflow-tooltip label="项目名称"/>
<el-table-column prop="itemsNum" align="center" label="条款号"/>
<el-table-column prop="itemsName" align="center" label="条款名称"/>
<el-table-column prop="planCloseTime" align="center" label="整改完成时间">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" align="center" label="责任部门"/>
<el-table-column prop="dutyEngineer" align="center" label="责任工程师"/>
</el-table> </el-table>
<pagination
style="position: relative;"
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"/>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button> <el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button> <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
@@ -217,13 +281,17 @@ export default {
// 责任部门 // 责任部门
zrbmOptions: [], zrbmOptions: [],
standModel: false, standModel: false,
// 总数
total: 0,
// 当前页数
pageNo: 1,
// 查询未符合项整改数据库数据 // 查询未符合项整改数据库数据
queryUnqualidiedData: { queryUnqualidiedData: {
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0,
closeState: '1', closeState: '1',
standId: '', // 标准号/名称 standSerialNumber: '', // 标准号/名称
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
}, },
@@ -269,9 +337,9 @@ export default {
this.$set(item,'dutyPeople','') this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','') this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','') this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText','') this.$set(item,'fileText',[])
this.$set(item,'fileTextId','') this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath','') this.$set(item,'fileTextPath',[])
}) })
this.total = res.data.total this.total = res.data.total
}) })
@@ -308,6 +376,18 @@ export default {
}); });
} }
}, },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
//选择标准取消事件 //选择标准取消事件
closeDrawer() { closeDrawer() {
this.standModel = false this.standModel = false
@@ -432,7 +512,7 @@ export default {
// 清空 查询条件 // 清空 查询条件
clearAllSearch (search = true) { clearAllSearch (search = true) {
this.queryUnqualidiedData = { this.queryUnqualidiedData = {
standId: '', standSerialNumber: '',
productName: '', productName: '',
responsibleUnit: '' responsibleUnit: ''
} }
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+28 -7
View File
@@ -13,7 +13,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form"> <!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input v-model="nonSearch.standId" <el-input v-model="nonSearch.standId"
size="small" size="small"
@@ -76,7 +76,7 @@
清空 清空
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>-->
<div class="content-center"> <div class="content-center">
<el-button <el-button
style="text-align: end" style="text-align: end"
@@ -97,7 +97,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称" align="center"/> <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/> <el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -119,7 +128,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
@@ -316,9 +324,9 @@ export default {
const params = { const params = {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId, pId: this.pId,
standId: '', // 标准号/名称 // standId: '', // 标准号/名称
productName: '', // 项目名称 // productName: '', // 项目名称
responsibleUnit: '' // 责任部门 // responsibleUnit: '' // 责任部门
} }
inboundLiaisonDetail(params).then(res => { inboundLiaisonDetail(params).then(res => {
const processForm = JSON.parse(res.mesg) const processForm = JSON.parse(res.mesg)
@@ -328,6 +336,7 @@ export default {
getFormFieldList (item) { getFormFieldList (item) {
this.$nextTick(() => { this.$nextTick(() => {
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
}) })
}, },
// 批量选择分发责任人 // 批量选择分发责任人
@@ -455,6 +464,18 @@ export default {
}) })
this.dataList = this.realList this.dataList = this.realList
}, },
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 清空 查询条件 // 清空 查询条件
clearAllSearch () { clearAllSearch () {
this.nonSearch = { this.nonSearch = {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+45 -8
View File
@@ -13,7 +13,7 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-form :modal="nonSearch" inline class="label-input-form"> <!-- <el-form :modal="nonSearch" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item"> <el-form-item label="标准号/标准名称" class="search-item">
<el-input <el-input
size="small" size="small"
@@ -78,7 +78,7 @@
清空 清空
</el-button> </el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>-->
<div class="content-center"> <div class="content-center">
<el-button <el-button
style="text-align: end" style="text-align: end"
@@ -99,7 +99,16 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" label="标准号/标准名称" align="center"/> <el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" label="条款名称" align="center"/> <el-table-column prop="itemsName" label="条款名称" align="center"/>
@@ -125,7 +134,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"/>-->
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="意见填写"> <el-collapse-item title="意见填写">
@@ -316,6 +324,7 @@ export default {
for (let i = 0; i<fileData.length; i++) { for (let i = 0; i<fileData.length; i++) {
if (fileData[i].name === this.$store.getters.userInfo.userName) { if (fileData[i].name === this.$store.getters.userInfo.userName) {
this.dataList = fileData[i].standardInfoList this.dataList = fileData[i].standardInfoList
this.standardInfoList = this.dataList
} }
} }
}) })
@@ -344,15 +353,31 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
// 退回按钮
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.commentText) {
var json = { var json = {
actionFlag: 1, actionFlag: 1,
commentText: this.commentText commentText: this.commentText,
standardInfoList: this.standardInfoList,
} }
this.isSubmit = true this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', { const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskIds)
completeTask(params).then(res => {
if (res.success) {
this.$message.success('驳回成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请输入反馈意见')
}
/* this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
userId: this.$store.getters.userInfo.userId userId: this.$store.getters.userInfo.userId
@@ -365,7 +390,19 @@ export default {
}) })
} else { } else {
this.$message.warning('请输入反馈意见') this.$message.warning('请输入反馈意见')
} }*/
},
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.standId,
pageType: 'FOREIGN_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
}, },
// 保存按钮 // 保存按钮
handleSave() {}, handleSave() {},