Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
super_liu
2022-01-05 17:54:25 +08:00
10 changed files with 1134 additions and 976 deletions
@@ -164,6 +164,9 @@
labelWidth: {
type: String,
default: '150px'
},
placeholderText: {
type: String
}
},
data () {
@@ -193,7 +196,7 @@
},
computed: {
placeholder () {
return `请输入${this.config.attrName}`
return `${this.placeholderText}`
},
showMessage () {
return `${this.config.attrName}不能为空`
File diff suppressed because it is too large Load Diff
@@ -24,28 +24,20 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
disabled
v-model="form.cid"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
disabled
v-model="form.endTime"
type="date"
placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
@@ -54,7 +46,34 @@
style="display: none;"
></el-input>
<div>
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
<div class="fileClass"
style="margin-right: 15px;padding-left: 10px"
v-for="(item, index) in form.fjList"
:key="index">
<span @click="fileLook(item)">{{ item.fileName }}</span>
<el-button
size="small"
@click="filesUpload(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
@click="filesUpload(item)"
icon="el-icon-download"
style="height: 32px; margin-left: 5px;"
></el-button>
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
@@ -67,12 +86,14 @@
<div class="button-list">
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button>
@click="upload(oldData, '汇总单.xls')"
size="mini">生成汇总单
</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="upload(oldData, '征求意见.xls')"
size="mini">导出征求意见搞</el-button>
@click="upload(data, '上报意见.xls')"
size="mini">生成上报意见
</el-button>
</div>
<el-table
ref="multipleTable"
@@ -109,6 +130,9 @@
prop="oldText"
align="center"
label="修改前">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column>
<el-table-column
prop="newText"
@@ -211,6 +235,15 @@
</el-table-column>
</el-table>
</div>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -224,6 +257,8 @@ export default {
name: "bzzqyjStep1-9",
data() {
return {
itermsConditionsFlag: false,
itermsConditionsTitle: '',
histortData: [],
oldData: [],
data: [],
@@ -246,9 +281,14 @@ export default {
isSubmit: false,
saveLoading: false,
form: {
cid: '', // 编号
endTime: '', // 结束日期
cname: '', // 名称
cid: "", // 编号
endTime: "", // 结束日期
cname: "", // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
},
formRules: {
responUserList: [
@@ -264,6 +304,25 @@ export default {
ProcessTitle
},
methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
fileLook(file) { // 预览
const attId = file.attId
this.$preview(attId)
},
filesUpload (file) { // 下载
const attId = file.attId
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
},
updataFj (item) {
let id
let type = item.fileName.split('.')
@@ -281,29 +340,39 @@ export default {
this.histortData = res
}, e => {})
},
upload (row, title) {
var params = {
columnName: {
chapterNumber : '章条编号',
chapterName : '章节名称',
commentText: '修改意见内容(包括理由或依据)',
department: '提出部门',
responUserName: '提出人',
stateText: '处理意见'
},
dataList: []
}
params.dataList = JSON.parse(JSON.stringify(row))
params.dataList.forEach(item => {
if (item.state === '1') {
item.stateText = '上报'
} else if (item.state === '2') {
item.stateText = '处理后上报'
} else {
item.stateText = '不上报'
upload(row, title) {
if (row.length > 0) {
var params = {
columnName: {
chapterNumber: "章条编号",
chapterName: "章节名称",
commentText: "修改意见内容(包括理由或依据)",
oldText: "修改前",
newText: "修改后",
reason: "修改理由",
department: "提出部门",
responUserName: "提出人",
},
dataList: []
};
if (title === '上报意见.xls') {
params.columnName.stateText = "处理意见"
}
})
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {})
params.dataList = JSON.parse(JSON.stringify(row));
params.dataList.forEach(item => {
if (item.state === "1") {
item.stateText = "上报";
} else if (item.state === "2") {
item.stateText = "处理后上报";
} else {
item.stateText = "不上报";
}
});
this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
});
} else {
this.$message.warning('无上报数据')
}
},
stateText (row) {
if (row === '1') {
@@ -343,23 +412,55 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText9 = data.commentText9 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.summaryList.forEach( item => {
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {
})
})
});
});
// return new Promise((resolve, reject) => {
// inboundLiaisonDetail({
// taskIds: this.taskIds,
// pId: this.pId
// }).then(res => {
// let data = JSON.parse(res.mesg)
// console.log(data);
// this.form.cid = data.cid
// this.form.endTime = data.endTime
// this.form.cname = data.cname
// this.form.fjList = data.fjList
// this.form.fjListId = data.fjListId
// var arr = []
// data.summaryList.forEach( item => {
// if (item.state != '3') {
// arr.push(item)
// }
// })
// this.json = data
// this.data = arr
// this.oldData = data.oldinfo
// }).catch(e => {
// })
// })
},
},
mounted () {
@@ -632,6 +632,7 @@ export default {
// 新增、编辑 数据搜索字段
sarAccessInfoSearch: {
id: '',
standType: 'INLAND',
standNumber: '',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
@@ -645,6 +646,7 @@ export default {
id: '',
standNumber: '',
standName: '',
standType: 'INLAND',
askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源
pageNo: 1,
@@ -1009,6 +1011,8 @@ export default {
this.sarAccessInfoSearch.advanceSearchVOStr = ''
// 国内标准法规可查字段
if (val === 'INLAND_STAND') {
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
this.selectLawsStands()
this.twoOptions = [
{
label: '适用车辆类型',
@@ -1050,6 +1054,8 @@ export default {
]
// 海外标准法规可查字段
} else if (val === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.dataSource = 'FOREIGN_STAND'
this.selectLawsStands()
this.twoOptions = [
{
label: '适用车辆类型',
@@ -1096,6 +1102,8 @@ export default {
]
// 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.sarAccessInfoSearch.dataSource = 'FOREIGN_LAWS'
this.selectLawsStands()
this.twoOptions=[
{
label: '适用车辆类型',
@@ -1142,6 +1150,8 @@ export default {
]
// 标准法规清单可查字段
}else {
this.sarAccessInfoSearch.dataSource = 'BUSINESS'
this.selectLawsStands()
this.twoOptions=[
{
label: '清单名称',
@@ -1350,7 +1360,7 @@ export default {
sarAccessInfoSelect(selectData) {
this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id);
this.sarAccessInfoListArry.push(selectData[i]);
}
},
// 点击取消按钮 返回事件
@@ -1473,7 +1483,6 @@ export default {
this.sarAccessInfoSearch.page = 1
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
console.log('1476',res.data.list)
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
@@ -1501,7 +1510,6 @@ export default {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
this.drawerTotal = res.data.count
}, e => {
@@ -1543,17 +1551,17 @@ export default {
},
selectBtn() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.sarAccessInfo.standType = 'INLAND'
this.selectPage()
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
this.sarAccessInfo.standType = 'FOREIGN'
this.selectPage()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
this.sarAccessInfo.standType = 'LAWS'
this.selectPage()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
this.sarAccessInfo.standType = 'BUSINESS'
this.selectPage()
}
},
// 数据搜索table判断checked状态
@@ -1652,7 +1660,7 @@ export default {
let accIdAndrestype = []
let accessInfo = 1
for (accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo])
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?' + '&exportType=apart' + '&ids=' + accIdAndrestype.join(',') + '&exportName=' + this.exportName
window.open(exportURL)
@@ -61,19 +61,11 @@
clearable></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item" prop="responseUnit">
<el-select
v-model="standardForm.zrbm"
placeholder="请选择"
filterable
size="small"
<el-input
v-model="standardForm.responseUnit"
placeholder="请输入责任部门"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-input>
</el-form-item>
<el-form-item label="" class="search-item btn-box">
<el-button v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary"
@@ -483,6 +475,15 @@ export default {
if(item.zrbm === "[]"){
item.zrbm = null
}
if (item.zccssrqgj === "undefined") {
item.zccssrqgj = '-'
}
if (item.xcxssrqgj === "undefined") {
item.xcxssrqgj = '-'
}
if (item.ssrq === "undefined") {
item.ssrq = '-'
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
@@ -1122,7 +1122,7 @@ export default {
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id);
this.sarAccessInfoListArry.push(selectData[i]);
}
},
// 点击取消按钮 返回事件
@@ -1117,7 +1117,7 @@ export default {
sarAccessInfoSelect(selectData) {
this.sarAccessInfoListArry = []
for (let i = 0; i < selectData.length; i++) {
this.sarAccessInfoListArry.push(selectData[i].id);
this.sarAccessInfoListArry.push(selectData[i]);
}
},
// 点击取消按钮 返回事件
@@ -1306,7 +1306,6 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
console.log('1476',res.data.list)
//为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空
@@ -1441,7 +1440,6 @@ export default {
},
// 导出确定功能
exportTestItem() {
let exportNames = this.exportName
let exportList = []
if (this.sarAccessInfoListArry.length > 0) {
exportList = this.sarAccessInfoListArry
@@ -4278,7 +4278,8 @@ export default {
this.sarStandardsSearch.page = page
}
this.standCommonlySearch.page = page
if (this.sarStandardsSearch) {
this.standCommonlySearch.pageNo = 1
if (this.sarStandardsSearch.standNumber !== '' || this.sarStandardsSearch.standName !== '') {
this.getDomesticStandardTable(this.sarStandardsSearch)
} else {
this.getDomesticStandardTable(this.standCommonlySearch)
@@ -4294,7 +4295,6 @@ export default {
},
// 分页查询国内标准
getDomesticStandardTable(item) {
console.log('4292',item)
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
@@ -4305,7 +4305,6 @@ export default {
}
// this.sarStandardsSearch.menuId = this.selectSarMenu.id
const formData = {...data}
console.log(formData)
if (!item) {
formData.menuId = this.sarStandardsSearch.menuId
} else {
@@ -4335,11 +4334,8 @@ export default {
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
console.log('4333',this.advanceSearchMapping)
for (let key in this.advanceSearchMapping) {
console.log('key',key)
const value = this.advanceSearchMapping[key];
console.log('value',value)
if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
advanceSearchVOList.push({
connect: "and",
@@ -675,7 +675,7 @@
></el-input>
</el-form-item>
</template>
<template v-else-if="field.attrField === 'DTQBBHBUSS'">
<template v-else-if="field.attrField === 'DTQBBHBUSS' || field.attrField === 'CYBZ' || field.attrField === 'YYBZ'">
<custom-input-for-standards
:config="field"
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
@@ -222,6 +222,18 @@
placeholder="请输入企标名称"
:maxlength="500"/>
</el-form-item>
<el-form-item label="适用车型" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
<el-option label="未开始" value="0"></el-option>
@@ -237,6 +249,51 @@
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="addForm.reviseStatus === '1'" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item v-else label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.unit">
</el-input>
<el-input
clearable
v-model="addForm.unitName"
placeholder="请选择起草责任单位"
readonly
@click.native="choiceZRBM(addForm.unit)">
</el-input>
</div>
</el-form-item>
<el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-input
style="display: none;"
@@ -276,36 +333,6 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.unit">
</el-input>
<el-input
clearable
v-model="addForm.unitName"
placeholder="请选择起草责任单位"
readonly
@click.native="choiceZRBM(addForm.unit)">
</el-input>
</div>
</el-form-item>
<el-form-item label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="rqbJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
style="display: none;"
v-model="addForm.rqbJson">
</el-input>
<el-input
clearable
v-model="addForm.rqbName"
placeholder="请选择企业标准"
readonly
@click.native="choiceQYBZ(addForm.rqbJson)">
</el-input>
</div>
</el-form-item>
<el-form-item label="体系结构" style="width: 100%; margin-right:10px" class="add-form-item" prop="tsJson" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-input
@@ -321,19 +348,7 @@
</el-input>
</div>
</el-form-item>
<el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
<el-option
v-for="item in BZList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
<el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<el-form-item label="是否采用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
<el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
<el-radio label="是" value="是"></el-radio>
@@ -371,8 +386,9 @@
<template>
<custom-input-for-all-standards2
class="classDisplay"
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
:disabled="DrawerType === 'see'"
:config="{attrName: '配套标准'}"
:config="{attrName: '引用标准'}"
:labelWidth="'180px'"
v-model="addForm.esMatingRelations"
></custom-input-for-all-standards2>
@@ -672,6 +688,9 @@
drafter: [
{required: true, message: '请选择起草人', trigger: 'change'},
],
rqbJson: [
{required: true, message: '请选择代替企标编号', trigger: 'change'},
]
},
form: {
page: 1,
@@ -1073,6 +1092,7 @@
this.standSystemOptions = res.data.TXLBBUSS //
this.standSortOptions = res.data.BUSSSTANDCLASS //
this.BZList = res.data.ENERGYTYPES
console.log(res.data);
}, e => {
})
},