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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!159
This commit is contained in:
王夏晖
2021-09-23 16:05:39 +08:00
parent 478ac8caa6 f25aaca1c4
commit 3bce3f2108
30 changed files with 2700 additions and 2512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherBussStandardDetails/index.vue
+1 -1
View File
@@ -41,7 +41,7 @@
>文本状态</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
</p>
<p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
<p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
<p style="border: none;"><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
</div>
</div>
</template>
src/pages/details/otherStandardDetails/index.vue
+2430 -2419
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+6 -4
View File
@@ -93,7 +93,7 @@
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData=='1'"label="国家/地区" prop="" label-width="150px" class="add-form-item">
<el-form-item label="国家/地区" prop="" label-width="150px" class="add-form-item">
<el-select v-model="form.country" multiple filterable clearable>
<el-option
v-for="item in countryOptions"
@@ -1375,6 +1375,7 @@
countryArr:'',
form: {
// 基础信息
country:[],
textStatus: '', // 文本状态
standYear: '', // 标准年份
standInData: '0', // 标准类型
@@ -1530,7 +1531,7 @@
watch:{
'form.country': {
handler (val) {
console.log("val")
console.log(val)
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.countryArr = val.join(",");
@@ -2322,12 +2323,13 @@
})
},
handleSubmit() {
this.form.country=this.countryArr;
// this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['userForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm)
json.zrUserId = this.form.zrUserId
json.jlUserId = this.form.jlUserId
@@ -2395,7 +2397,7 @@
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.countryOptions=res.data.COUNTRY//国家地区
this.countryOptions=res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -266,6 +267,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -306,6 +307,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -290,6 +291,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+4
View File
@@ -48,6 +48,7 @@
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
@@ -287,6 +288,9 @@ export default {
ProcessTitle
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
handleTransfer() {
this.drawerModal = true
},
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+120 -52
View File
@@ -15,7 +15,7 @@
<template slot="title">基础信息</template>
</process-title>
<el-form
v-if="foldFormFlag === false"
v-if="foldFormFlag === false"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
@@ -58,42 +58,42 @@
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-form
v-if="foldFormFlag === true"
style="display: none"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
v-if="foldFormFlag === true"
style="display: none"
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
v-model="listForm.standNumber"
placeholder="请输入标准编号"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
v-model="listForm.standName"
placeholder="请输入标准名称"
readonly
@click.native="handlePreview(listForm)"
></el-input>
</el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师"
readonly
></el-input>
</el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师"
readonly
></el-input>
</el-form-item>
</el-col>
@@ -111,9 +111,9 @@
style="width: 100%"
border
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -353,6 +353,27 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- <ProcessFooter-->
<!-- show-submit-->
<!-- show-transfer-->
<!-- :submitLoading="isSubmit"-->
<!-- :transfer-loading="isTransfer"-->
<!-- :saveLoading="saveLoading"-->
<!-- :approval="true"-->
<!-- @back="beforeBack"-->
<!-- @transfer="handleTransfer"-->
<!-- @submit="handleSubmit"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
@@ -360,7 +381,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import { inboundLiaisonDetail, queryDetail ,changeAssigneeNew } from "api/process";
export default {
name: "xmpgStep1-7",
@@ -373,6 +394,11 @@ export default {
return {
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -451,6 +477,47 @@ export default {
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
//确认转办
checkedTransferRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
@@ -517,35 +584,31 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
} else {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.fenFlag = "1";
this.listForm.dataList = this.dataList
const json = JSON.stringify(this.listForm);
this.isSubmit = true
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
this.isSubmit = false
}, e => {
});
}
});
},
//标准表格选择框改变
selectStandChange(data) {
@@ -580,7 +643,6 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg-step7 {
/deep/ .el-drawer__container {
.prc-content-border {
@@ -651,6 +713,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+7 -2
View File
@@ -113,7 +113,7 @@
@selection-change="selectStandChange"
height="56%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -781,9 +781,14 @@ export default {
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+7 -1
View File
@@ -113,7 +113,7 @@
@selection-change="selectStandChange"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -727,5 +727,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+7 -1
View File
@@ -113,7 +113,7 @@
@selection-change="selectStandChange"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -717,5 +717,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+8 -2
View File
@@ -111,9 +111,9 @@
style="width: 100%"
border
@selection-change="selectStandChange"
height="55%"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
@@ -713,6 +713,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -529,5 +529,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -598,5 +598,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -574,5 +574,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -597,5 +597,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+7 -1
View File
@@ -56,7 +56,7 @@
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -874,6 +874,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -598,5 +598,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -595,5 +595,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+7 -1
View File
@@ -49,7 +49,7 @@
height="70%"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
fontWeight: 'bold'}"
>
<el-table-column
type="selection"
@@ -597,5 +597,11 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
/deep/.el-table th > .cell{
font-size: 12px;
}
/deep/.el-table thead.is-group th{
padding: 0px;
}
}
</style>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -2
View File
@@ -117,7 +117,7 @@
<span>{{ scope.row.creatTime ? $moment(scope.row.creatTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="overTime"
label="完成日期"
align="center"
@@ -126,7 +126,7 @@
<template slot-scope="scope">
<span>{{ scope.row.overTime ? $moment(scope.row.overTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('m.operation')" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -267,7 +267,7 @@
<span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -275,7 +275,7 @@
<span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="50" >
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+5 -5
View File
@@ -87,9 +87,9 @@
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%"
style="width: 100%;height: inherit"
border
:height="400"
:max-height="400"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
@@ -192,7 +192,7 @@
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<el-dropdown trigger="click" @command="handleCommand(scope.$index, localProTableList)">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'633e82816590af9027dc2fddc562d046'">
@@ -883,7 +883,7 @@ export default {
});
},
// 更多
handleCommand(command) {
handleCommand(command,index, rows) {
switch (command[1]) {
case "删除":
this.handleDelete(command[0]);
@@ -1677,7 +1677,7 @@ export default {
.local-products-or-project-library {
//position: relative;
height: 100%;
height: calc(100% - 100px);
.container {
height: calc(~'100% - 55px');
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+14 -8
View File
@@ -28,14 +28,17 @@
<p class="transition-box-p">
<label class="transition-box-label">附件：</label>
<span class="file-box" v-if="fileInfoList.length > 0">
<span v-for="(file,item) in fileInfoList"
target="_blank"
class="transition-box-span table-jump"
@click="handleQueryPdf(file)"
:key="item">
{{ file.name }}
</span>
</span>
<div style="display: flex;">
<div v-for="(file,item) in fileInfoList"
target="_blank"
class="transition-box-span table-jump"
@click="handleQueryPdf(file)"
:key="item">
{{ file.name }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(file.attId)">下载</el-button>
</div>
</div>
</span>
<span class="transition-box-span" v-else>-</span>
</p>
<p class="transition-box-p">
@@ -222,6 +225,9 @@ export default {
}
},
methods: {
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
src/pages/searchCenter/pages/advancedSearch.vue
+3 -1
View File
@@ -1751,6 +1751,7 @@ export default {
this.searchSarBykey();
},
judgeRolePermiOnSar(item, type) {
debugger
let pagetype;
if (type !== 5 && item.type === "msgdyinfo") {
if (type === 2) {
@@ -1986,6 +1987,7 @@ export default {
},
// 查看 查看跳转详情页
detailsStandardLaws(item) {
debugger
let routername = "";
let pagetype = "";
if (item.type === "stand") {
@@ -1993,7 +1995,7 @@ export default {
routername = "OtherStandardDetails";
pagetype = "INLAND_STAND";
} else {
routername = "OtherForeignDetails";
routername = "OtherStandardDetails";
pagetype = "FOREIGN_STAND";
}
} else if (item.type === "laws") {
src/pages/searchCenter/pages/standardSearch.vue
+4 -4
View File
@@ -719,10 +719,10 @@
label: '海外标准法规',
value: 'bussstand'
},
{
label: '国内外政策',
value: 'laws'
},
// {
// label: '国内外政策',
// value: 'laws'
// },
{
label: '企业标准',
value: 'enterprise'