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:
super_liu
2021-07-19 16:28:27 +08:00
parent 41cd49ee03 59c3c162f2
commit b9cb1d30b3
16 changed files with 104 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+12 -36
View File
@@ -37,10 +37,10 @@
<div class="content">
<div class="action-bar">
<el-button v-btn-permission="'SRE2ZRX3MJSSH5YYLRGH'" size="mini" @click="importItemInfo" ><i class="iconfont">&#xe6de;</i>导入</el-button>
<el-button v-btn-permission="'KPEQQ6YM53S98RKUC9GZ'" size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
<el-button v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
<el-button v-btn-permission="''" size="mini" @click="exportItemInfo"><i class="iconfont">&#xe6e9;</i>导出</el-button>
<el-button v-btn-permission="''" size="mini" @click="judgebatchDeleteItem"><i class="iconfont">&#xe61b;</i>删除</el-button>
<el-button v-btn-permission="'QULWGFSB3NMP84REU7BP'" size="mini" @click="uploadImportModal"><i class="iconfont">&#xe825;</i>模板下载</el-button>
<el-button v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="''" size="mini" @click="batchCopy">批量复制</el-button>
<el-button v-btn-permission="'TE39XUT4KRTPZGQH5KLF'" size="mini" @click="combineItems">合并条款</el-button>
<el-button v-btn-permission="'P5NLYUS4XTP9P676XDEW'" size="mini" @click="openSubmitAndExamine" v-if="this.$route.query.result === '1'">提交</el-button>
<el-button v-if="auditFlag==='1'" size="mini" @click="splitCheckBtn">审核</el-button>
@@ -64,6 +64,7 @@
<el-table-column
prop="itemsNum"
label="条款号"
width="150"
fixed="left"
:resizable="false"
align="center">
@@ -80,7 +81,6 @@
<el-table-column
prop="itermsConditions"
label="条款内容"
width="250"
fixed="left"
show-overflow-tooltip
:resizable="false"
@@ -89,40 +89,16 @@
<div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
</template>
</el-table-column>
<el-table-column
prop="dutyEngineerShow"
label="解读内容"
width="150">
</el-table-column>
<el-table-column
prop="foShow"
label="实施日期">
</el-table-column>
<el-table-column
label="适用车型"
width="150">
<template slot-scope="scope">{{ getDicTypeName('applyArcticOptions', scope.row.applyArctic) }}</template>
</el-table-column>
<el-table-column
prop="responsibleUnitShow"
label="责任部门"
width="150">
</el-table-column>
<el-table-column
prop="svppsShow"
label="责任工程师"
width="150">
</el-table-column>
<el-table-column :label="$t('m.operation')" align="center" width="50" :resizable="false" fixed="right">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="'TMB2N38FC7NSKSLUBYLV'">属性</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="'EYLPEA9EG9XTTAJV2LJ2'">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="'8WS6LEYJSYNQU9YCS7U2'">复制</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'V4YJY54NVWSYHA2EF3PQ'">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -216,7 +192,7 @@
<el-form-item label="条款名称" prop="itemsName" class="add-form-item">
<el-input v-model="standItemEO.itemsName" placeholder="请输入内容"></el-input>
</el-form-item>
<custom-org
<!-- <custom-org
key="责任部门"
:config="{
attrName: '责任部门',
@@ -290,7 +266,7 @@
:value="item.value"
:label="item.label"></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-divider content-position="left">内容简介</el-divider>
<div style="border:1px dashed #999;margin-bottom:20px;padding:10px">
<el-row type="flex" class="row-bg" justify="space-between">
@@ -354,7 +330,7 @@
<label class="see-drawer-name" title="内容简介">内容简介</label>
<span class="see-drawer-val" :title="showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : ''">{{ showItemInfoEO.itermsConditions ? showItemInfoEO.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</span>
</div>
<div class="see-drawer-div">
<!-- <div class="see-drawer-div">
<label class="see-drawer-name" title="责任部门">责任部门</label>
<span class="see-drawer-val" :title="showItemInfoEO.responsibleUnitShow">{{ showItemInfoEO.responsibleUnitShow }}</span>
</div>
@@ -381,7 +357,7 @@
<div class="see-drawer-div">
<label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
<span class="see-drawer-val" :title="getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover)">{{ getDicTypeName('BZFGGXOUIUJ', showItemInfoEO.busStandCover) }}</span>
</div>
</div>-->
</div>
</el-drawer>
<!--编辑条款内容-->
src/pages/processCenter/pages/components/ProcessMixin.vue
+25 -5
View File
@@ -9,13 +9,33 @@ export default {
return {
processTypeList: [
{
label: '标准入库流程',
label: '标准调研流程',
value: '2'
},
{
label:'标准入库流程',
value: '1'
},
{
label:'标准清单发布流程',
value: '3'
},
{
label:'标准征求意见流程',
value: '3'
},
{
label:'标准清单发布/更新流程',
value: '6'
},
{
label: '项目合规评估流程',
value: '7'
},
{
label: '未符合项整改流程',
value: '8'
},
{
label: '标准解读流程',
value: '9'
},
],
formDisableFlag: false,
pickerOptions: {
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+4 -3
View File
@@ -343,11 +343,11 @@ export default {
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
@@ -441,11 +441,12 @@ export default {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.isSubmit = false
this.$message.warning('流程启动失败')
}
this.isSubmit = false
})
} else {
return this.$message.warning('请完善人员信息')
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+2 -2
View File
@@ -169,11 +169,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+2 -2
View File
@@ -193,11 +193,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+2 -2
View File
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+2 -2
View File
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+2 -2
View File
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+2 -2
View File
@@ -191,11 +191,11 @@
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
return false
}
// 判断文件上传大小
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+44 -39
View File
@@ -26,7 +26,7 @@
<el-col :span="24">
<el-form-item label="选择征求意见" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
</div>
</el-form-item>
<el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
@@ -164,46 +164,46 @@
>
</ProcessFooter>
<el-drawer
title="标准征求意见数据库"
title="标准库"
:visible.sync="listModel"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content">
<!-- 顶部工具栏 -->
<table-tools-bar>
<div slot="left">
<div class="search-area">
<!-- <el-form :model="standCommonlySearch" inline class="label-input-form">-->
<!--&lt;!&ndash; <el-formItem label="类别" class="search-item">&ndash;&gt;-->
<!--&lt;!&ndash; <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>&ndash;&gt;-->
<!--&lt;!&ndash; </el-formItem>&ndash;&gt;-->
<!--&lt;!&ndash; <el-formItem label="关键字" class="search-item">&ndash;&gt;-->
<!--&lt;!&ndash; <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>&ndash;&gt;-->
<!--&lt;!&ndash; </el-formItem>&ndash;&gt;-->
<!--&lt;!&ndash; <el-formItem label="开始日期" class="search-item">&ndash;&gt;-->
<!--&lt;!&ndash; <el-datePicker v-model="standCommonlySearch.start" :editable="false"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请选择开始日期"></el-datePicker>&ndash;&gt;-->
<!--&lt;!&ndash; </el-formItem>&ndash;&gt;-->
<!--&lt;!&ndash; <el-formItem label="结束日期" class="search-item">&ndash;&gt;-->
<!--&lt;!&ndash; <el-datePicker v-model="standCommonlySearch.end" :editable="false"&ndash;&gt;-->
<!--&lt;!&ndash; placeholder="请选择结束日期"></el-datePicker>&ndash;&gt;-->
<!--&lt;!&ndash; </el-formItem>&ndash;&gt;-->
<!-- <el-formItem class="search-item btn-box">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- size="mini"-->
<!-- class="common-button-primary"-->
<el-form :model="standCommonlySearch" inline class="label-input-form">
<el-formItem label="标准号/名称" prop="standNumber" class="search-item">
<el-input v-model="standCommonlySearch.standNumber" placeholder="根据标准号/名称查找" clearable/>
</el-formItem>
<el-formItem label="标准类别" prop="standSort" class="search-item">
<el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
<el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-formItem>
<el-formItem label="标准来源" prop="standType" class="search-item">
<el-select v-model="standCommonlySearch.standType" placeholder="根据标准来源查找" clearable>
<el-option value="INLAND" key="1" label="国内标准"></el-option>
<el-option value="FOREIGN" key="2" label="海外标准"></el-option>
</el-select>
</el-formItem>
<el-formItem class="search-item btn-box">
<el-button
type="primary"
size="mini"
class="common-button-primary"
<!-- @click="sarStandCompareHisInfo">查询</el-button>-->
<!-- <el-button-->
<!-- class="common-button-default"-->
<!-- size="mini"-->
<!-- @click="clearSearchStand">清空</el-button>-->
<!-- </el-formItem>-->
<!-- </el-form>-->
@click="sarStandCompareHisInfo">查询</el-button>
<el-button
class="common-button-default"
size="mini"
@click="clearSearchStand">清空</el-button>
</el-formItem>
</el-form>
</div>
</div>
</table-tools-bar>
@@ -332,10 +332,9 @@ export default {
},
// 标准征求意见数据可库
standCommonlySearch: {
// categorg: '',
// cname: '',
// start: '',
// end: '',
standSort: '',
standNumber: '',
standType: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
@@ -383,6 +382,7 @@ export default {
label: 'name'
},
roleRow: {},
standSortOptions: [],
}
},
components: {
@@ -393,6 +393,12 @@ export default {
mounted () {
this.getTree()
this.sarStandCompareHis()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
}, e => {
})
this.tableHeight = $('.content').height() - 44
window.onresize = () => {
this.tableHeight = $('.content').height() - 44
@@ -408,15 +414,14 @@ export default {
// 清空
clearSearchStand () {
this.standCommonlySearch.page = 1
this.standCommonlySearch.start = ''
this.standCommonlySearch.end = ''
this.standCommonlySearch.categorg = ''
this.standCommonlySearch.cname = ''
this.standCommonlySearch.standSort = ''
this.standCommonlySearch.standNumber = ''
this.standCommonlySearch.standType = ''
this.sarStandCompareHis()
},
// 搜索
sarStandCompareHisInfo() {
this.splitInfoPage = 1
this.standCommonlySearch.page = 1
this.sarStandCompareHis()
},
// 查询表格
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1 -1
View File
@@ -234,7 +234,7 @@
handleSave() {},
handleSubmit() {
if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞')
this.$message.warning('请输入征求意见')
} else {
var a = 0
var b = 0
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
-3
View File
@@ -209,9 +209,6 @@
return '处理后上报'
}
},
upload (row) {
console.log(row);
},
handleTabs(name) {
this.active = name
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
-3
View File
@@ -209,9 +209,6 @@
return '处理后上报'
}
},
upload (row) {
console.log(row);
},
handleTabs(name) {
this.active = name
},
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
-3
View File
@@ -209,9 +209,6 @@
return '处理后上报'
}
},
upload (row) {
console.log(row);
},
handleTabs(name) {
this.active = name
},
src/pages/processCenter/pages/newProcess/index.vue
+2 -2
View File
@@ -7,8 +7,8 @@
<div class="process-name" @click="handleCreateProcess('2')">标准调研流程</div>
<div class="process-name" @click="handleCreateProcess('1')">标准入库流程</div>
<div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
<div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>
<div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
<!-- <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>-->
<!-- <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>-->
<div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
<div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
<div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+4
View File
@@ -42,20 +42,24 @@
<el-table-column
prop="partCode"
label="章节编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="content"
align="center"
label="修改意见内容(包括理由或依据)"
>
</el-table-column>
<el-table-column
prop="deptName"
align="center"
label="提出部门"
>
</el-table-column>
<el-table-column
prop="userName"
align="center"
label="提出人"
>
</el-table-column>