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

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

Browse Source
This commit is contained in:
zqx0221
2021-07-23 16:07:56 +08:00
parent 6a41f1035f 0a9b585887
commit b283e53aa5
10 changed files with 500 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/verify/index.js
+9
View File
@@ -457,6 +457,15 @@ export default {
callback() callback()
} }
}, },
// 验证输入数字和英文
testNumberCode (rule, value, callback) {
let reg = /[0-9\-]/
if (value !== '' && !value.match(reg)) {
return callback(new Error('只能输入数字'))
} else {
callback()
}
},
validUrl (rule, value, callback) { validUrl (rule, value, callback) {
let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm
if (!value.match(reg)) { if (!value.match(reg)) {
src/components/CustomFormComponents/DatePicker.vue
+6
View File
@@ -11,6 +11,8 @@
:class="{'form-item-disabled': disabled}" :class="{'form-item-disabled': disabled}"
> >
<el-date-picker <el-date-picker
:value-format="valueFormat"
format="yyyy-MM-dd"
:value="value" :value="value"
type="date" type="date"
:editable="true" :editable="true"
@@ -38,6 +40,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
valueFormat: {
type: String,
default: 'yyyy-MM-dd'
},
// 栅格比例 // 栅格比例
span: { span: {
type: Number, type: Number,
src/components/CustomFormComponents/InputForStandards.vue
+2 -2
View File
@@ -120,7 +120,7 @@
@pageChange="pageChangeReplace" @pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination> @pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button> <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button> <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -336,7 +336,7 @@ export default {
standNum = item.standSort + ' ' + item.standNumber standNum = item.standSort + ' ' + item.standNumber
} }
// 验证标准号在系统中是否存在 // 验证标准号在系统中是否存在
this.$http.post('lawss/sarTestItem/validateStandNumber', { this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', {
standnumber: standNum standnumber: standNum
}, { }, {
_this: this _this: this
src/pages/config/pages/linkManage/index.vue
+333 -319
View File
@@ -1,342 +1,356 @@
<!-- 配置管理 - 链接管理 --> <!-- 配置管理 - 链接管理 -->
<template> <template>
<div id="post-manage"> <div id="post-manage">
<!-- 头部操作按钮--> <!-- 头部操作按钮-->
<div class="action-bar"> <div class="action-bar">
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="addLink" @click="addLink"
v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'" v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'"
size="mini">新增</el-button> size="mini">新增</el-button>
<el-button type="primary" <!-- <el-button type="primary"-->
class="common-button-primary add-button" <!-- class="common-button-primary add-button"-->
@click="linkOrder" <!-- @click="linkOrder"-->
v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'" <!-- v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"-->
size="mini">顺序调整</el-button> <!-- size="mini">顺序调整</el-button>-->
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="deleteAllLink" @click="deleteAllLink"
v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'" v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
size="mini">删除</el-button> size="mini">删除</el-button>
</div> </div>
<!-- 表格--> <!-- 表格-->
<div class="content"> <div class="content">
<el-table <el-table
:data="linkList" :data="linkList"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
class="drag-table" class="drag-table"
height="100%" height="100%"
: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'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="name" prop="orderBy"
label="链接名称" label="序号"
width="220px"> align="center"
</el-table-column> width="50px">
<el-table-column </el-table-column>
prop="url" <el-table-column
label="链接"> prop="name"
</el-table-column> label="链接名称"
<!-- <el-table-column--> width="220px">
<!-- prop="orderBy"--> </el-table-column>
<!-- label="序号"--> <el-table-column
<!-- sortable--> prop="url"
<!-- width="170px">--> label="链接">
<!-- </el-table-column>--> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="50px"> width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">编辑</el-dropdown-item> <el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<loading :loading="Loading">加载中...</loading> <loading :loading="Loading">加载中...</loading>
<!-- 新增链接弹窗--> <!-- 新增链接弹窗-->
<el-dialog <el-dialog
:title="dialogTitle" :title="dialogTitle"
:visible.sync="modalshowflag" :visible.sync="modalshowflag"
:wrapperClosable="false" :wrapperClosable="false"
size="800px" size="800px"
@close="resetForm" @close="resetForm"
> >
<el-form <el-form
ref="sarStandardsInfoForm" ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO" :model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules" :rules="sarStandardsInfoRules"
class="label-input-form" class="label-input-form"
> >
<el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item"> <el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item">
<el-input v-model="sarStandardsInfoEO.name" <el-input v-model="sarStandardsInfoEO.name"
placeholder="请输入链接名称" placeholder="请输入链接名称"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="链接" prop="url" label-width="150px" class="add-form-item"> <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
<el-input v-model="sarStandardsInfoEO.url" <el-input v-model="sarStandardsInfoEO.url"
placeholder="请输入链接" placeholder="请输入链接"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="demo-drawer-footer"> <span slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button>
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button> <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import Sortable from 'sortablejs' import Sortable from 'sortablejs'
export default { export default {
name: "linkManage", name: "linkManage",
data () { data () {
return { return {
editId: '', editId: '',
type: '', // 1为新增 2为编辑 type: '', // 1为新增 2为编辑
dialogTitle: '', dialogTitle: '',
submitLoading: false, submitLoading: false,
// 向后台传参使用 // 向后台传参使用
data: [], data: [],
Loading: false, Loading: false,
modalshowflag: false, modalshowflag: false,
// 排序 // 排序
order:[], order:[],
// 表格选取的 // 表格选取的
selectList:[], selectList:[],
selectId:[], selectId:[],
ids:'', ids:'',
// 向后台传参使用 // 向后台传参使用
sarStandardsInfoEO: { sarStandardsInfoEO: {
name: '', name: '',
url: '', url: '',
// sortId: '' // sortId: ''
}, },
//新增链接未输入时提示 //新增链接未输入时提示
sarStandardsInfoRules: { sarStandardsInfoRules: {
name: [ name: [
{ required: true, message: '请输入链接名称', trigger: 'blur' } { required: true, message: '请输入链接名称', trigger: 'blur' }
], ],
url: [ url: [
{ required: true, message: '请输入链接', trigger: 'blur' } { required: true, message: '请输入链接', trigger: 'blur' }
] ]
}, },
modalRole: false, modalRole: false,
props: { props: {
label: 'name', label: 'name',
children: 'children' children: 'children'
}, },
linkList: [], linkList: [],
sortData: [], sortData: [],
}
},
methods: {
//头部新增按钮
addLink () {
this.type = 1
this.dialogTitle = '新增链接'
this.modalshowflag = true
},
//头部顺序调整按钮
linkOrder () {
this.order=[]
for (var i=0;i<this.linkList.length;i++){
this.order.push({
urlId:this.linkList[i].id,
sortId:this.linkList[i].sortId
})
}
this.$http.postData('sarUrl/tsUrl/order',this.order, {}, res => {
if (res.ok) {
}else {
this.$message.warning(res.message)
}
})
},
//头部删除按钮
deleteAllLink() {
this.selectId=[]
for (var i=0;i<this.selectList.length;i++){
this.selectId.push(this.selectList[i].id)
}
this.ids=this.selectId.join(",")
if (this.selectList.length === 0) {
this.$message.warning('请选择要删除的链接')
} else {
this.modalRole = true
// this.nodeList = this.selectList[0].idList
this.$http.delete('sarUrl/tsUrl/deleteBatch', {
ids: this.ids
}, {}, res => {
if (res.ok) {
this.$message.success('删除成功')
this.getLink()
}else {
this.$message.warning(res.message)
} }
}) },
} methods: {
}, //头部新增按钮
addLink () {
//弹窗关闭操作 this.type = 1
resetForm () { this.dialogTitle = '新增链接'
this.$refs['sarStandardsInfoForm'].resetFields(); this.modalshowflag = true
this.modalshowflag = false },
}, //表格中操作列删除操作弹窗
deleteLink (row) {
//弹窗确认操作 this.$http.delete('sarUrl/tsUrl/delete', {
submit () { id: row.id
this.$refs['sarStandardsInfoForm'].validate((valid) => { }, {
if (valid) { _this: this,
if (this.type === 1) { loading: 'Loading'
this.$http.postData('/sarUrl/tsUrl/add', { }, res => {
...this.sarStandardsInfoEO, if (res.ok) {
}, { this.$message.success('删除成功')
_this: this, let arr = []
loading: 'Loading' for (let a = 0; a < this.linkList.length; a++) {
}, res=> { if (this.linkList[a].id === row.id) {
if (res.ok) { this.linkList.splice(a, 1)
this.$message.success('新增成功') }
this.modalshowflag = false }
this.getLink() this.linkList.forEach((item, index) => {
} else { let json = {}
this.$message.warning(res.message) json.id = item.id
json.orderBy = index + 1
arr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
this.getLink()
})
}else {
this.$message.warning(res.message)
}
})
},
//头部删除按钮
deleteAllLink() {
this.selectId=[]
for (var i=0;i<this.selectList.length;i++){
this.selectId.push(this.selectList[i].id)
} }
}) this.ids = this.selectId.join(",")
} else { if (this.selectList.length === 0) {
// 编辑 this.$message.warning('请选择要删除的链接')
this.$http.putData('/sarUrl/tsUrl/edit', {
id: this.editId,
name: this.sarStandardsInfoEO.name,
url: this.sarStandardsInfoEO.url,
}, {
_this: this,
loading: 'Loading'
}, res=> {
if (res.ok) {
this.$message.success('修改成功')
this.modalshowflag = false
this.getLink()
} else { } else {
this.$message.warning(res.message) this.modalRole = true
} this.$http.delete('sarUrl/tsUrl/deleteBatch', {
}) ids: this.ids
} }, {}, res => {
} else { if (res.ok) {
return false; this.$message.success('删除成功')
} let arr = this.linkList.filter(items => {
}); if (!this.ids.includes(items.id)) return items;
}, })
let newArr = []
//表格中操作列 arr.forEach((item, index) => {
handleCommand (command) { let json = {}
switch (command[1]) { json.id = item.id
case '删除': json.orderBy = index + 1
this.deleteLink(command[0]) newArr.push(json)
break })
case '编辑': this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
this.editLink(command[0]) this.getLink()
break })
} }else {
}, this.$message.warning(res.message)
}
//表格中操作列删除操作弹窗
deleteLink (row) {
this.$http.delete('sarUrl/tsUrl/delete', {
id: row.id
}, {
_this: this,
loading: 'Loading'
}, res => {
if (res.ok) {
this.$message.success('删除成功')
this.getLink()
}else {
this.$message.warning(res.message)
}
})
},
//表格中操作列编辑操作弹窗
editLink (row) {
this.type = 2
this.editId = row.id
this.sarStandardsInfoEO.name = row.name
this.sarStandardsInfoEO.url = row.url
this.sarStandardsInfoEO.sortId = row.sortId
this.dialogTitle = '修改链接'
this.modalshowflag = true
},
//多选框选择
handleSelectionChange (val) {
this.selectList = val
},
// 获取链接数据
getLink () {
this.$http.get('sarUrl/tsUrl', {
}, {
_this: this,
loading: 'Loading'
}, res=> {
this.linkList = res.data
this.initSortable()
})
},
initSortable () {
this.sortData = [...this.linkList]
const el = document.querySelector('.el-table__body-wrapper tbody')
//创建拖拽对象
this.sortable = Sortable.create(el, {
sort: true, //是否可进行拖拽排序
animation: 150,
onEnd: ({newIndex, oldIndex}) => {
const val = this.sortData[oldIndex]
this.sortData.splice(oldIndex, 1)
this.sortData.splice(newIndex, 0, val)
this.sortData.forEach((item, index) => {
item.orderBy = index + 1
}) })
} }
}) },
//弹窗关闭操作
resetForm () {
this.$refs['sarStandardsInfoForm'].resetFields();
this.modalshowflag = false
},
//弹窗确认操作
submit () {
this.$refs['sarStandardsInfoForm'].validate((valid) => {
if (valid) {
if (this.type === 1) {
this.$http.postData('/sarUrl/tsUrl/add', {
...this.sarStandardsInfoEO,
}, {
_this: this,
loading: 'Loading'
}, res=> {
if (res.ok) {
this.$message.success('新增成功')
this.modalshowflag = false
this.getLink()
} else {
this.$message.warning(res.message)
}
})
} else {
// 编辑
this.$http.putData('/sarUrl/tsUrl/edit', {
id: this.editId,
name: this.sarStandardsInfoEO.name,
url: this.sarStandardsInfoEO.url,
}, {
_this: this,
loading: 'Loading'
}, res=> {
if (res.ok) {
this.$message.success('修改成功')
this.modalshowflag = false
this.getLink()
} else {
this.$message.warning(res.message)
}
})
}
} else {
return false;
}
});
},
//表格中操作列
handleCommand (command) {
switch (command[1]) {
case '删除':
this.deleteLink(command[0])
break
case '编辑':
this.editLink(command[0])
break
}
},
//表格中操作列编辑操作弹窗
editLink (row) {
this.type = 2
this.editId = row.id
this.sarStandardsInfoEO.name = row.name
this.sarStandardsInfoEO.url = row.url
this.sarStandardsInfoEO.sortId = row.sortId
this.dialogTitle = '修改链接'
this.modalshowflag = true
},
//多选框选择
handleSelectionChange (val) {
this.selectList = val
},
// 获取链接数据
getLink () {
this.$http.get('sarUrl/tsUrl', {
}, {
_this: this,
loading: 'Loading'
}, res=> {
this.linkList = res.data
this.initSortable()
})
},
initSortable () {
this.sortData = [...this.linkList]
const el = document.querySelector('.el-table__body-wrapper tbody')
//创建拖拽对象
this.sortable = Sortable.create(el, {
sort: true, //是否可进行拖拽排序
animation: 150,
onEnd: ({newIndex, oldIndex}) => {
const val = this.sortData[oldIndex]
this.sortData.splice(oldIndex, 1)
this.sortData.splice(newIndex, 0, val)
this.sortData.forEach((item, index) => {
item.orderBy = index + 1
})
let arr = []
this.sortData.forEach(item => {
let json = {}
json.id = item.id
json.orderBy = item.orderBy
arr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
if (res.ok) {
this.$message.success('保存成功')
} else {
this.$message.warning('保存失败!')
}
})
}
})
},
}, },
}, mounted() {
mounted() { this.getLink();
this.getLink(); }
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#post-manage { #post-manage {
height: 100%; height: 100%;
.content { .content {
height: calc(~'100% - 53px') height: calc(~'100% - 53px')
}
.filter-tree {
height: calc(~'100% - 50px')
}
} }
.filter-tree {
height: calc(~'100% - 50px')
}
}
</style> </style>
src/pages/details/otherStandardDetails/index.vue
+6 -2
View File
@@ -47,7 +47,7 @@
<p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p> <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
<p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p> <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p> <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">标准性质</label><span>{{ sarStandardsInfoEO.standNature || '-' }}</span></p> <p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>
<p> <p>
<label style=" margin-right: 132px;" <label style=" margin-right: 132px;"
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -246,7 +246,7 @@
v-for="(file, fileIndex) in child.value" v-for="(file, fileIndex) in child.value"
:key="fileIndex" :key="fileIndex"
> >
<span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span> <!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限--> <!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG' <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA' || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
@@ -1250,6 +1250,7 @@ export default {
itemsText: '', itemsText: '',
itemsTextDialogs: false, itemsTextDialogs: false,
textStatusMap: {}, textStatusMap: {},
standMap: {}
} }
}, },
props: { props: {
@@ -1260,8 +1261,10 @@ export default {
setMap(data){ setMap(data){
data.forEach(item => { data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.standMap, item.value, item.label)
}) })
console.log(this.textStatusMap, '文本状态的值') console.log(this.textStatusMap, '文本状态的值')
console.log(this.standMap, '标准性质')
}, },
statusClick () { statusClick () {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -2630,6 +2633,7 @@ export default {
this.requestOptions = res.data.REQUESTTYPE this.requestOptions = res.data.REQUESTTYPE
this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系 this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
this.setMap(res.data.WBZTCLASS) // 文本状态 this.setMap(res.data.WBZTCLASS) // 文本状态
this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => { }, e => {
}) })
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+12 -2
View File
@@ -53,10 +53,10 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle"> <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
<div class="left-contents">标题：{{ item.collectTitle }}</div> <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
</el-tooltip> </el-tooltip>
<div v-else> <div v-else>
<div class="left-contents">标题：{{ item.collectTitle }}</div> <div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
@@ -103,6 +103,16 @@ export default {
} }
}, },
methods: { methods: {
getDetail(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.collectResId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 重置 // 重置
resetSelect () { resetSelect () {
this.search.name = '' this.search.name = ''
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+45 -40
View File
@@ -177,7 +177,7 @@
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人" <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)"> @click.native="choiceZRRS">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
@@ -664,36 +664,19 @@
> >
</ProcessFooter> </ProcessFooter>
<!-- 选择责任人--> <!-- 选择责任人-->
<el-drawer <Role-tree
:title="drawerTitle" is-title="选择责任部门对接人"
:visible.sync="modalshowflag" :is-visible.sync="modalshowflag2"
:wrapperClosable="false" @checkedRole="checkedRole2"
size="800px"> :nodeList="nodeList2"
<el-tree ></Role-tree>
v-if="modalshowflag" <Role-tree
style="height: 100%; overflow: auto;" check-box
node-key="id" :is-title="drawerTitle"
class="filter-tree" :is-visible.sync="modalshowflag"
:data="treeData" @checkedRole="checkedRole"
:props="defaultProps" :nodeList="nodeList"
:default-checked-keys="nodeList" ></Role-tree>
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
@click="saveUserInfo">
确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消
</el-button>
</div>
</el-drawer>
<el-dialog width="400px" :visible.sync="fileMadel" title="上传文件"> <el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
<el-upload <el-upload
multiple multiple
@@ -738,8 +721,6 @@ export default {
sarSarAccessEOSearch: { sarSarAccessEOSearch: {
countryArea: "", countryArea: "",
detailedListName: "", detailedListName: "",
page: 1,
pageSize: this.$store.getters.userInfo.configContent
}, },
//查询添加标准相关数据 //查询添加标准相关数据
standardSearch: { standardSearch: {
@@ -750,6 +731,8 @@ export default {
}, },
standList: [], //新添加的标准 standList: [], //新添加的标准
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
drawerTitle: "", //drawer标题 drawerTitle: "", //drawer标题
nodeList: [], nodeList: [],
defaultProps: { defaultProps: {
@@ -858,22 +841,36 @@ export default {
}; };
}, },
methods: { methods: {
saveUserInfo() { checkedRole(data) {
if (this.type === "dockUser") { if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id; this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name; this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "ministerUser") { } else if (this.type === "ministerUser") {
this.roleForm.ministerUser = this.roleRow.id; this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = this.roleRow.name; this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "directorUser") { } else if (this.type === "directorUser") {
this.roleForm.directorUser = this.roleRow.id; this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = this.roleRow.name; this.roleForm.directorUserName = data[0].name;
} else if (this.type === "presidentUser") { } else if (this.type === "presidentUser") {
this.roleForm.presidentUser = this.roleRow.id; this.roleForm.presidentUser = data[0].id;
this.roleForm.presidentUserName = this.roleRow.name; this.roleForm.presidentUserName = data[0].name;
} }
this.modalshowflag = false; this.modalshowflag = false;
}, },
checkedRole2(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
this.roleForm.dockUser = idList;
this.roleForm.dockUserName = nameList;
},
cancleUserInfo() { cancleUserInfo() {
this.modalshowflag = false; this.modalshowflag = false;
}, },
@@ -1306,12 +1303,20 @@ export default {
this.drawerTitle = title; this.drawerTitle = title;
this.modalshowflag = true; this.modalshowflag = true;
}, },
choiceZRRS() {
this.nodeList2 = [];
if (this.roleForm.dockUser.length > 0) {
this.nodeList2 = this.roleForm.dockUser.split(",");
}
this.modalshowflag2 = true;
},
getTree() { getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data; this.treeData = res.data;
}); });
}, },
pageChange(page) { pageChange(page) {
console.log(page);
this.page = page; this.page = page;
this.selectionList(); this.selectionList();
}, },
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -2
View File
@@ -940,7 +940,7 @@
@pageChange="pageChangeReplace" @pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination> @pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button> <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button> <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -987,7 +987,7 @@
v-model="standardSearchForm.standType" v-model="standardSearchForm.standType"
placeholder="请选择标准来源"> placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option> <el-option value="INLAND" label="国内标准库"></el-option>
<el-option value="FOREIGN" label="国外标准库"></el-option> <el-option value="FOREIGN" label="海外标准库"></el-option>
</el-select> </el-select>
</el-formItem> </el-formItem>
<el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" > <el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+17 -38
View File
@@ -336,34 +336,13 @@
> >
</ProcessFooter> </ProcessFooter>
<!-- 选择责任人--> <!-- 选择责任人-->
<el-drawer <Role-tree
:title="drawerTitle" check-box
:visible.sync="modalshowflag" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag"
size="800px"> @checkedRole="checkedRole"
<el-tree :nodeList="nodeList"
v-if="modalshowflag" ></Role-tree>
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -507,25 +486,25 @@ export default {
}; };
}, },
methods: { methods: {
saveUserInfo() { checkedRole(data) {
if (this.type === "dockUser") { if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id; this.roleForm.dockUser = data[0].id;
this.roleForm.dockUserName = this.roleRow.name; this.roleForm.dockUserName = data[0].name;
} else if (this.type === "ministerUser") { } else if (this.type === "ministerUser") {
this.roleForm.ministerUser = this.roleRow.id; this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = this.roleRow.name; this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "qualityEngineer") { } else if (this.type === "qualityEngineer") {
this.roleForm.qualityEngineer = this.roleRow.id; this.roleForm.qualityEngineer = data[0].id;
this.roleForm.qualityEngineerName = this.roleRow.name; this.roleForm.qualityEngineerName = data[0].name;
this.listForm.qualityEngineer = this.roleForm.qualityEngineer; this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
} else if (this.type === "certifiedEngineer") { } else if (this.type === "certifiedEngineer") {
this.roleForm.certifiedEngineer = this.roleRow.id; this.roleForm.certifiedEngineer = data[0].id;
this.roleForm.certifiedEngineerName = this.roleRow.name; this.roleForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
} else if (this.type === "distributePerson") { } else if (this.type === "distributePerson") {
this.listForm.distributePerson = this.roleRow.name; this.listForm.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
this.showColumn = false; this.showColumn = false;
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+68 -22
View File
@@ -804,6 +804,9 @@
label="标准号" label="标准号"
align="center" align="center"
> >
<template slot-scope="scope">
<span>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
@@ -1433,10 +1436,10 @@ export default {
assemClassOptions: [], // 总成分类下拉框 assemClassOptions: [], // 总成分类下拉框
qcdwOptions: [], // 起草单位 qcdwOptions: [], // 起草单位
nylxOptions: [], // 能源类型 nylxOptions: [], // 能源类型
sycpxOptions: [], // 适用产品线 // sycpxOptions: [], // 适用产品线
syzrOptions: [], // 适用认证 syzrOptions: [], // 适用认证
zrbmOptions: [], // 责任部门 // zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师 // zrgcsOptions: [], // 责任工程师
standAttributeList: [], standAttributeList: [],
sarStandardsSearch: { sarStandardsSearch: {
page: 1, page: 1,
@@ -1466,7 +1469,7 @@ export default {
standNature: '', // 标准性质 standNature: '', // 标准性质
putTime: '', // 实施日期 putTime: '', // 实施日期
isRelateAccess: '', // 是否纳入标准清单 isRelateAccess: '', // 是否纳入标准清单
nameShow: '', // 我司参与深度 // nameShow: '', // 我司参与深度
qcdw: '', // 起草单位 qcdw: '', // 起草单位
nameShow: '', // 归口管理部门 nameShow: '', // 归口管理部门
ZCCTime: '', // 在产车实施日期 ZCCTime: '', // 在产车实施日期
@@ -1765,17 +1768,17 @@ export default {
], ],
standYear: [ standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'}, {required: true, message: '标准年份不能为空', trigger: 'change'},
{validator: this.verify.testItemCode, trigger: 'change'}, {validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'} {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
], ],
standName: [ standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'}, {required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
], ],
// standEnName: [ standEnName: [
// {required: true, message: '英文名称不能为空', trigger: 'change'}, {required: false, message: '英文名称不能为空', trigger: 'change'},
// {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'} {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// ], ],
// isRelateAccess: [ // isRelateAccess: [
// { required: true, message: '重要度不能为空', trigger: 'change' } // { required: true, message: '重要度不能为空', trigger: 'change' }
// ], // ],
@@ -1793,7 +1796,7 @@ export default {
standNumber: [ standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'} { validator: this.verify.validateStandardItem, trigger: 'change'}
], ],
standYear: [ standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'}, {required: true, message: '标准年份不能为空', trigger: 'change'},
@@ -1805,7 +1808,7 @@ export default {
{type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
], ],
standEnName: [ standEnName: [
{type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'}, {type: 'string', max: 500, message: '标准英文名称不能超过500个字符', trigger: 'change'},
{validator: this.verify.valiateEnName, trigger: 'blur'} {validator: this.verify.valiateEnName, trigger: 'blur'}
], ],
synopsis: [ synopsis: [
@@ -2266,6 +2269,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values const [displayLocation] = values
console.log(this.formFieldList, 'assssssssssss')
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
if(this.sarStandardsInfoEO.standSystem){ if(this.sarStandardsInfoEO.standSystem){
@@ -2707,19 +2711,35 @@ export default {
switch (sortObj.prop) { switch (sortObj.prop) {
case 'issueTime' : case 'issueTime' :
// 后台联调 // 后台联调
this.nowOrderBy = '1' if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '1'
}
break; break;
case 'xcxssrq' : case 'xcxssrq' :
// 后台联调 // 后台联调
this.nowOrderBy = '2' if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '2'
}
break; break;
case 'zccssrq' : case 'zccssrq' :
// 后台联调 // 后台联调
this.nowOrderBy = '3' if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '3'
}
break; break;
case 'textStatus' : case 'textStatus' :
// 后台联调 // 后台联调
this.nowOrderBy = '4' if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '4'
}
break; break;
} }
switch (sortObj.order) { switch (sortObj.order) {
@@ -2729,6 +2749,9 @@ export default {
case 'descending' : case 'descending' :
this.nowOrder = '1' this.nowOrder = '1'
break; break;
default:
this.nowOrder = ''
break;
} }
} }
this.getDomesticStandardTable(this.tableFlag) this.getDomesticStandardTable(this.tableFlag)
@@ -3855,19 +3878,35 @@ export default {
switch (sortObj.prop) { switch (sortObj.prop) {
case 'issueTime' : case 'issueTime' :
// 后台联调 // 后台联调
this.sarConfigStandSearch.nowOrderBy = '1' if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '1'
}
break; break;
case 'xcxssrq' : case 'xcxssrq' :
// 后台联调 // 后台联调
this.sarConfigStandSearch.nowOrderBy = '2' if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '2'
}
break; break;
case 'zccssrq' : case 'zccssrq' :
// 后台联调 // 后台联调
this.sarConfigStandSearch.nowOrderBy = '3' if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '3'
}
break; break;
case 'textStatus' : case 'textStatus' :
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '4'
}
// 后台联调 // 后台联调
this.sarConfigStandSearch.nowOrderBy = '4'
break; break;
} }
switch (sortObj.order) { switch (sortObj.order) {
@@ -3877,6 +3916,9 @@ export default {
case 'descending' : case 'descending' :
this.sarConfigStandSearch.nowOrder = '1' this.sarConfigStandSearch.nowOrder = '1'
break; break;
default:
this.sarConfigStandSearch.nowOrder = ''
break;
} }
} }
this.selectConfiguraStand() this.selectConfiguraStand()
@@ -4110,10 +4152,14 @@ export default {
rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}] rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
} }
if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'}) if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
} else {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
}
} }
if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') { if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}) rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'})
} }
if (rule.length > 0) { if (rule.length > 0) {
rules[item.attrField] = rule rules[item.attrField] = rule