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-05 17:31:47 +08:00
parent 050a3a30a5
commit 2e3232ade2
9 changed files with 74 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessFooter.vue
+6 -1
View File
@@ -53,7 +53,7 @@
size="small" size="small"
class="common-button-danger" class="common-button-danger"
@click="beforeBack" @click="beforeBack"
:loading="isSubmit" :loading="isSubmitBack"
v-if="showBack"> v-if="showBack">
<i class="iconfont" style="font-size: 12px;">&#xe615;</i> <i class="iconfont" style="font-size: 12px;">&#xe615;</i>
{{ backBTNText }}</el-button> {{ backBTNText }}</el-button>
@@ -151,6 +151,11 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
// 保存按钮loading
isSubmitBack: {
type: Boolean,
default: false
},
// 是否默认委托事件 // 是否默认委托事件
defaultEntrust: { defaultEntrust: {
type: Boolean, type: Boolean,
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+8 -7
View File
@@ -31,7 +31,7 @@
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center"> <el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -102,7 +102,7 @@
<h4>确认+选择责任人</h4> <h4>确认+选择责任人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dutyUser" style="display: none;"></el-input> <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 v-model="roleForm.dutyUserName" :disabled="true" placeholder="确认+选择责任人">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -114,7 +114,7 @@
<h4>负责人</h4> <h4>负责人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.uploadUser" style="display: none;"></el-input> <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 v-model="roleForm.uploadUserName" :disabled="true" placeholder="负责人">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -126,7 +126,7 @@
<h4>分发负责人</h4> <h4>分发负责人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.checkUser" style="display: none;"></el-input> <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 v-model="roleForm.checkUserName" :disabled="true" placeholder="分发负责人">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -148,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.standSerialNumber" v-model="queryUnqualidiedData.standId"
placeholder="请输入" placeholder="请输入"
clearable clearable
:maxlength="100"></el-input> :maxlength="100"></el-input>
@@ -210,9 +210,9 @@
@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="standSerialNumber" align="center" show-overflow-tooltip label="标准号"> <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -291,6 +291,7 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
closeState: '1', closeState: '1',
standId: '',
standSerialNumber: '', // 标准号/名称 standSerialNumber: '', // 标准号/名称
productName: '', // 项目名称 productName: '', // 项目名称
responsibleUnit: '' // 责任部门 responsibleUnit: '' // 责任部门
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -2
View File
@@ -97,9 +97,9 @@
: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="standSerialNumber" show-overflow-tooltip label="标准号" align="center"> <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -2
View File
@@ -99,9 +99,9 @@
: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="standSerialNumber" show-overflow-tooltip label="标准号" align="center"> <el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+23 -16
View File
@@ -87,9 +87,9 @@
: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="standSerialNumber" align="center" show-overflow-tooltip label="标准号"> <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -118,6 +118,7 @@
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx" accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="handleBeforeUpload" :before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove" :before-remove="handleBeforeRemove"
:on-remove="handleONRemove"
:on-success="handleOnsuccess" :on-success="handleOnsuccess"
> >
<el-button <el-button
@@ -314,12 +315,7 @@ export default {
} }
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.fileText.length !== 0) { if (item.fileText.length !== 0) {
item.fileText.forEach(item1 => { this.fileTextList = item.fileText
this.fileTextList.push({
id: item1.id,
name: item1.name
})
})
} }
}) })
}) })
@@ -335,10 +331,18 @@ export default {
// 文件上传成功 // 文件上传成功
handleOnsuccess(res, file, fileList) { handleOnsuccess(res, file, fileList) {
if (res.ok) { if (res.ok) {
this.newDataList.push({ if (this.fileTextList !== null) {
id: res.data.attId, this.newDataList = this.fileTextList
name: res.data.standName this.newDataList.push({
}) id: res.data.attId,
name: res.data.standName
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
})
}
this.fileListData.fileText = this.newDataList this.fileListData.fileText = this.newDataList
this.$message({ this.$message({
showClose: true, showClose: true,
@@ -377,14 +381,17 @@ export default {
}, },
// 移除上传的文件 // 移除上传的文件
handleBeforeRemove(file, fileList) { handleBeforeRemove(file, fileList) {
this.fileListData.fileText = fileList
this.fileTextList = fileList this.fileTextList = fileList
this.newDataList.forEach((item, index) => { /* this.newDataList.forEach((item, index) => {
if (file.name === item.name || file.id === item.id) { if (file.name === item.name || file.id === item.id) {
this.newDataList.splice(index, 1) this.newDataList.splice(index, 1)
} console.log(this.dataList)
})
},
}
})*/
},
handleONRemove() {},
/************ ********* *****************/ /************ ********* *****************/
// 点击查看 // 点击查看
handlePreview (item) { handlePreview (item) {
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+6 -4
View File
@@ -87,9 +87,9 @@
: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="standSerialNumber" align="center" show-overflow-tooltip label="标准号"> <el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -201,7 +201,7 @@
approval approval
@back="handleSubmitNo" @back="handleSubmitNo"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :isSubmitBack="backLoading"
@submit="handleSubmit" @submit="handleSubmit"
submitBTNText="同意" submitBTNText="同意"
> >
@@ -357,6 +357,7 @@ export default {
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
this.backLoading = true
if (this.commentText) { if (this.commentText) {
var json = { var json = {
responUserInfo: { responUserInfo: {
@@ -372,12 +373,13 @@ export default {
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('驳回成功') this.$message.success('驳回成功')
this.fileTextList = []
this.$router.push('/processCenter') this.$router.push('/processCenter')
this.backLoading = false
} }
}) })
} else { } else {
this.$message.warning('请输入反馈意见') this.$message.warning('请输入反馈意见')
this.backLoading = false
} }
}, },
//未整改项抽屉中的查询按钮 //未整改项抽屉中的查询按钮
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+9
View File
@@ -185,6 +185,9 @@
prop="standName" prop="standName"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope">
<span @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="issueTime" prop="issueTime"
@@ -273,12 +276,18 @@
label="标准名称" label="标准名称"
width="260px" width="260px"
> >
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
align="center" align="center"
width="180px" width="180px"
label="英文名称"> label="英文名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standEnName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="typeApplicable" prop="typeApplicable"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+9
View File
@@ -170,6 +170,9 @@
prop="standName" prop="standName"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="issueTime" prop="issueTime"
@@ -257,12 +260,18 @@
label="标准名称" label="标准名称"
width="260px" width="260px"
> >
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
align="center" align="center"
width="180px" width="180px"
label="英文名称"> label="英文名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="typeApplicable" prop="typeApplicable"
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+9
View File
@@ -170,6 +170,9 @@
prop="standName" prop="standName"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="issueTime" prop="issueTime"
@@ -257,12 +260,18 @@
label="标准名称" label="标准名称"
width="260px" width="260px"
> >
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
align="center" align="center"
width="180px" width="180px"
label="英文名称"> label="英文名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="typeApplicable" prop="typeApplicable"