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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-23 17:18:53 +08:00
parent 59058f0a63 312e42b649
commit 32a6da2b7e
13 changed files with 150 additions and 80 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()
}
},
// 验证输入数字和英文
testNumberCode (rule, value, callback) {
let reg = /[0-9\-]/
if (value !== '' && !value.match(reg)) {
return callback(new Error('只能输入数字'))
} else {
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
if (!value.match(reg)) {
src/components/CustomFormComponents/DatePicker.vue
+6
View File
@@ -11,6 +11,8 @@
:class="{'form-item-disabled': disabled}"
>
<el-date-picker
:value-format="valueFormat"
format="yyyy-MM-dd"
:value="value"
type="date"
:editable="true"
@@ -38,6 +40,10 @@ export default {
type: Boolean,
default: false
},
valueFormat: {
type: String,
default: 'yyyy-MM-dd'
},
// 栅格比例
span: {
type: Number,
src/components/CustomFormComponents/InputForStandards.vue
+2 -2
View File
@@ -120,7 +120,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<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>
</div>
</el-dialog>
@@ -336,7 +336,7 @@ export default {
standNum = item.standSort + ' ' + item.standNumber
}
// 验证标准号在系统中是否存在
this.$http.post('lawss/sarTestItem/validateStandNumber', {
this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', {
standnumber: standNum
}, {
_this: this
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.standName || '-' }}</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>
<label style=" margin-right: 132px;"
title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -246,7 +246,7 @@
v-for="(file, fileIndex) in child.value"
: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'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
@@ -1250,6 +1250,7 @@ export default {
itemsText: '',
itemsTextDialogs: false,
textStatusMap: {},
standMap: {}
}
},
props: {
@@ -1260,8 +1261,10 @@ export default {
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.standMap, item.value, item.label)
})
console.log(this.textStatusMap, '文本状态的值')
console.log(this.standMap, '标准性质')
},
statusClick () {
let routeUrl = this.$router.resolve({
@@ -2630,6 +2633,7 @@ export default {
this.requestOptions = res.data.REQUESTTYPE
this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
this.setMap(res.data.WBZTCLASS) // 文本状态
this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => {
})
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 :span="6">
<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>
<div v-else>
<div class="left-contents">标题：{{ item.collectTitle }}</div>
<div class="left-contents" @click="getDetail(item)">标题：{{ item.collectTitle }}</div>
</div>
</el-col>
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
@@ -103,6 +103,16 @@ export default {
}
},
methods: {
getDetail(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.collectResId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 重置
resetSelect () {
this.search.name = ''
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -2
View File
@@ -940,7 +940,7 @@
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<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>
</div>
</el-dialog>
@@ -987,7 +987,7 @@
v-model="standardSearchForm.standType"
placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option>
<el-option value="FOREIGN" label="国外标准库"></el-option>
<el-option value="FOREIGN" label="海外标准库"></el-option>
</el-select>
</el-formItem>
<el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+3 -1
View File
@@ -927,7 +927,9 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.$message.success('保存成功')
},
handleSubmit() {
this.isSubmit = true
this.form.commentText = this.commentText
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+25 -47
View File
@@ -452,14 +452,14 @@
<el-option label="采标程度2" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.xglc"
placeholder="请输入相关流程"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.xglc"-->
<!-- placeholder="请输入相关流程"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName">
{{ form.glwjName }}
@@ -486,22 +486,22 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.byybj"
placeholder="请输入被引用标准"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.chjl"
placeholder="请输入参会记录"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.byybj"-->
<!-- placeholder="请输入被引用标准"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.chjl"-->
<!-- placeholder="请输入参会记录"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
</el-col>
</el-row>
</div>
@@ -921,29 +921,7 @@ export default {
this.active = name
},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// 流程保存之后，应该流转至草稿页面
this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
// this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
this.$message.success('保存成功')
},
handleSubmit() {
this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+2
View File
@@ -1651,6 +1651,8 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else {
this.$message.success(res.message)
}
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+2
View File
@@ -868,6 +868,8 @@
console.log(res);
if (res.success) {
this.processCreateStand(json)
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}
})
},
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+68 -22
View File
@@ -804,6 +804,9 @@
label="标准号"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"
@@ -1433,10 +1436,10 @@ export default {
assemClassOptions: [], // 总成分类下拉框
qcdwOptions: [], // 起草单位
nylxOptions: [], // 能源类型
sycpxOptions: [], // 适用产品线
// sycpxOptions: [], // 适用产品线
syzrOptions: [], // 适用认证
zrbmOptions: [], // 责任部门
zrgcsOptions: [], // 责任工程师
// zrbmOptions: [], // 责任部门
// zrgcsOptions: [], // 责任工程师
standAttributeList: [],
sarStandardsSearch: {
page: 1,
@@ -1466,7 +1469,7 @@ export default {
standNature: '', // 标准性质
putTime: '', // 实施日期
isRelateAccess: '', // 是否纳入标准清单
nameShow: '', // 我司参与深度
// nameShow: '', // 我司参与深度
qcdw: '', // 起草单位
nameShow: '', // 归口管理部门
ZCCTime: '', // 在产车实施日期
@@ -1765,17 +1768,17 @@ export default {
],
standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'},
{validator: this.verify.testItemCode, trigger: 'change'},
{type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'}
{validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
],
standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
],
// standEnName: [
// {required: true, message: '英文名称不能为空', trigger: 'change'},
// {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
// ],
standEnName: [
{required: false, message: '英文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
],
// isRelateAccess: [
// { required: true, message: '重要度不能为空', trigger: 'change' }
// ],
@@ -1793,7 +1796,7 @@ export default {
standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', 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: [
{required: true, message: '标准年份不能为空', trigger: 'change'},
@@ -1805,7 +1808,7 @@ export default {
{type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
],
standEnName: [
{type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
{type: 'string', max: 500, message: '标准英文名称不能超过500个字符', trigger: 'change'},
{validator: this.verify.valiateEnName, trigger: 'blur'}
],
synopsis: [
@@ -2266,6 +2269,7 @@ export default {
this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values
console.log(this.formFieldList, 'assssssssssss')
const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
if(this.sarStandardsInfoEO.standSystem){
@@ -2707,19 +2711,35 @@ export default {
switch (sortObj.prop) {
case 'issueTime' :
// 后台联调
this.nowOrderBy = '1'
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '1'
}
break;
case 'xcxssrq' :
// 后台联调
this.nowOrderBy = '2'
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '2'
}
break;
case 'zccssrq' :
// 后台联调
this.nowOrderBy = '3'
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '3'
}
break;
case 'textStatus' :
// 后台联调
this.nowOrderBy = '4'
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '4'
}
break;
}
switch (sortObj.order) {
@@ -2729,6 +2749,9 @@ export default {
case 'descending' :
this.nowOrder = '1'
break;
default:
this.nowOrder = ''
break;
}
}
this.getDomesticStandardTable(this.tableFlag)
@@ -3855,19 +3878,35 @@ export default {
switch (sortObj.prop) {
case 'issueTime' :
// 后台联调
this.sarConfigStandSearch.nowOrderBy = '1'
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '1'
}
break;
case 'xcxssrq' :
// 后台联调
this.sarConfigStandSearch.nowOrderBy = '2'
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '2'
}
break;
case 'zccssrq' :
// 后台联调
this.sarConfigStandSearch.nowOrderBy = '3'
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '3'
}
break;
case 'textStatus' :
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '4'
}
// 后台联调
this.sarConfigStandSearch.nowOrderBy = '4'
break;
}
switch (sortObj.order) {
@@ -3877,6 +3916,9 @@ export default {
case 'descending' :
this.sarConfigStandSearch.nowOrder = '1'
break;
default:
this.sarConfigStandSearch.nowOrder = ''
break;
}
}
this.selectConfiguraStand()
@@ -4110,10 +4152,14 @@ export default {
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') {
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') {
rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'})
rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'})
}
if (rule.length > 0) {
rules[item.attrField] = rule
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1
View File
@@ -499,6 +499,7 @@
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
:data-source-from="field.attrField === 'CBBH' ? 'ALL' : 'INLAND'"
:data-source="field.attrField === 'CBBH'"
></custom-input-for-standards>
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+12 -2
View File
@@ -107,6 +107,13 @@
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
@@ -290,7 +297,8 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: {
productName: ''
productName: '',
standId: ''
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
@@ -338,7 +346,7 @@ export default {
}, // 查看项目符合性
querySarProStateZero () {
var form = this.sarProStateEO
form.standId = this.standId
// form.standId = this.standId
form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize
this.$http.get('sarStandardComplianceAssessResult/product', form, {
@@ -354,11 +362,13 @@ export default {
}, // 查询项目数据
clearSearchProState () {
this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.sarProStateTotalPage = 1
this.querySarProStateZero()
}, // 清空条件查询
clearSearchPro () {
this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.showSarProStateModal = false
this.standId = ''
}, // 关闭查看事件