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

This commit is contained in:
zhangjun
2022-09-09 09:03:41 +08:00
13 changed files with 250 additions and 98 deletions
@@ -388,6 +388,8 @@ export default {
})
},
postsConfigure(row) {
this.configOrgManage = false
this.drawerTitle = '配置岗位'
var arr = []
this.userId = row.userId
row.positions.forEach((item) => {
@@ -7,7 +7,7 @@
{{ sarStandardsInfoEO.standSortShow || '' }} {{sarStandardsInfoEO.standNumber }} {{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}
</span>
<span v-else>
{{ sarStandardsInfoEO.standSortShow || '' }} {{sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} {{ sarStandardsInfoEO.standName }}
{{ sarStandardsInfoEO.standSortShow || '' }} {{sarStandardsInfoEO.standNumber }}-{{ sarStandardsInfoEO.standYear }} {{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}
</span>
</div>
<!--主体内容-->
@@ -56,7 +56,7 @@
<p><label style=" margin-right: 150px;">中文名称</label><span>{{sarStandardsInfoEO.standName || '-' }}</span></p>
<p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{sarStandardsInfoEO.standEnName || '-' }}</span></p>
<!--发布稿必读-->
<template v-for="(child, childIndex) in item.child1" v-if="child.value && child.value.length > 0">
<template v-for="(child, childIndex) in item.child1" >
<p class="files-titles" style="border-bottom: 1px solid #E5E5E5">
<label style="float: left">{{ child.attrName }}</label>
<template v-if="child.value && child.value.length > 0" >
@@ -412,6 +412,10 @@
<div v-else style="height: 100%;">
<div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
<div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
<div style="height: 40px;overflow: auto;display: flex;">
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
</div>
<div style="overflow: auto;display: flex;" class="BDclass">
<div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -490,6 +494,10 @@
size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 40px;overflow: auto;display: flex;">
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -419,6 +419,10 @@
<div v-else style="height: 100%;">
<div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>
<div style="margin: 10px 5px 5px;">相似度: {{ similarityDegree }}</div>
<div style="height: 40px;overflow: auto;display: flex;">
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
</div>
<div style="overflow: auto;display: flex;" class="BDclass">
<div v-html="leftData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px;margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -499,6 +503,10 @@
size="1100px">
<div>比对条款: {{ itemsNum }}</div>
<div>相似度: {{ similarityDegree }}</div>
<div style="height: 40px;overflow: auto;display: flex;">
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>旧标准</span></div>
<div style="line-height: 20px; margin: 5px; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"><span>新标准</span></div>
</div>
<div style="height: 600px;overflow: auto;display: flex;">
<div v-html="leftData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
<div v-html="rightData" style="line-height: 20px; margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
@@ -25,20 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -358,6 +348,32 @@
}
})
},
// 点击跳转标准详情
handlePreview (item) {
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
_this: this
}, res => {
if (res.data != null) {
let dataType ='INLAND_STAND'
if(res.data.standType ==='FOREIGN'){
dataType ='FOREIGN_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: res.data.id,
pageType:dataType
}
})
window.open(routeUrl.href, '_blank')
} else {
this.$message.error('标准号不存在!')
}
}, e => {
})
},
// 请求转换流程图
processNum (row) {
axios.request({
@@ -566,6 +582,13 @@
.fileClass:hover{
color: #0c91e5;
}
.file-box-span{
color: #4498f0;
cursor: pointer;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
position: relative;
height: 100%;
.headerTabs {
@@ -25,20 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -743,6 +733,32 @@
this.processStep = window.URL.createObjectURL(res.data)
})
},
// 点击跳转标准详情
handlePreview (item) {
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
_this: this
}, res => {
if (res.data != null) {
let dataType ='INLAND_STAND'
if(res.data.standType ==='FOREIGN'){
dataType ='FOREIGN_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: res.data.id,
pageType:dataType
}
})
window.open(routeUrl.href, '_blank')
} else {
this.$message.error('标准号不存在!')
}
}, e => {
})
},
//折叠/展开基础信息方法
foldForm() {
this.foldFormFlag = !this.foldFormFlag
@@ -1050,6 +1066,13 @@
.fileClass:hover{
color: #0c91e5;
}
.file-box-span{
color: #4498f0;
cursor: pointer;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
position: relative;
height: 100%;
.headerTabs {
@@ -25,20 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -406,6 +396,32 @@
}
})
},
// 点击跳转标准详情
handlePreview (item) {
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
_this: this
}, res => {
if (res.data != null) {
let dataType ='INLAND_STAND'
if(res.data.standType ==='FOREIGN'){
dataType ='FOREIGN_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: res.data.id,
pageType:dataType
}
})
window.open(routeUrl.href, '_blank')
} else {
this.$message.error('标准号不存在!')
}
}, e => {
})
},
// 请求转换流程图
processNum (row) {
axios.request({
@@ -537,6 +553,13 @@
.fileClass:hover{
color: #0c91e5;
}
.file-box-span{
color: #4498f0;
cursor: pointer;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
position: relative;
height: 100%;
.headerTabs {
@@ -25,20 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -403,6 +393,32 @@
}
})
},
// 点击跳转标准详情
handlePreview (item) {
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
_this: this
}, res => {
if (res.data != null) {
let dataType ='INLAND_STAND'
if(res.data.standType ==='FOREIGN'){
dataType ='FOREIGN_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: res.data.id,
pageType:dataType
}
})
window.open(routeUrl.href, '_blank')
} else {
this.$message.error('标准号不存在!')
}
}, e => {
})
},
// 请求转换流程图
processNum (row) {
axios.request({
@@ -536,6 +552,13 @@
.fileClass:hover{
color: #0c91e5;
}
.file-box-span{
color: #4498f0;
cursor: pointer;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
position: relative;
height: 100%;
.headerTabs {
@@ -25,20 +25,10 @@
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsNum">{{ form.itemsNum }}</span>
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
<span class="file-box-span" @click="handlePreview(form.itemsNum)" :title="form.itemsName">{{ form.itemsName }}</span>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input
@@ -404,6 +394,32 @@
}
})
},
// 点击跳转标准详情
handlePreview (item) {
let replaceStandInfoEO ={}
replaceStandInfoEO.standNumber = item
this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', replaceStandInfoEO, {
_this: this
}, res => {
if (res.data != null) {
let dataType ='INLAND_STAND'
if(res.data.standType ==='FOREIGN'){
dataType ='FOREIGN_STAND'
}
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: res.data.id,
pageType:dataType
}
})
window.open(routeUrl.href, '_blank')
} else {
this.$message.error('标准号不存在!')
}
}, e => {
})
},
// 请求转换流程图
processNum (row) {
axios.request({
@@ -535,6 +551,13 @@
.fileClass:hover{
color: #0c91e5;
}
.file-box-span{
color: #4498f0;
cursor: pointer;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
position: relative;
height: 100%;
.headerTabs {
@@ -575,7 +575,7 @@ export default {
},
typeList(row){
this.decomposeOptions = []
this.$http.get("SarStandItems/sar-stand-items/getFileType", {
this.$http.get("lawss/sarStandAttrDetails/getListData1", {
standId: row.standId
}, {}, res => {
this.decomposeOptions.push(
@@ -585,7 +585,9 @@ export default {
}
)
res.data.forEach(item => {
this.decomposeOptions.push(item)
if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND') {
this.decomposeOptions.push(item)
}
})
});
},
@@ -72,6 +72,7 @@
align="center">
</el-table-column>
<el-table-column
show-overflow-tooltip
align="center"
label="标准号"
>
@@ -83,6 +84,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standName"
align="center"
label="中文名称"
@@ -92,6 +94,7 @@
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="standEnName"
label="英文名称"
align="center"
@@ -176,52 +179,52 @@
<el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="startUserName" style="margin-bottom: 0">
<h4>流程发起人</h4>
<h4>标准法规工程师</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.startUserName" placeholder="标准法规工程师" disabled></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择标准法规业务经理" placement="top" :color="roleForm.serviceManager ? '#66b1ff' : ''">
<el-timeline-item timestamp="选择产品工程经理分发" placement="top" :color="roleForm.serviceManager ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="serviceManagerName" style="margin-bottom: 0">
<h4>审批责任人</h4>
<h4>产品工程经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.serviceManager" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.serviceManagerName" placeholder="标准法规业务经理"
@click.native="choiceZRR('serviceManager', '选择业务经理', roleForm.serviceManager)">
<el-input :disabled="disabledXX" v-model="roleForm.serviceManagerName" placeholder="产品工程经理"
@click.native="choiceZRR('serviceManager', '产品工程经理', roleForm.serviceManager)">
</el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="选择工程经理进行转办" placement="top"
:color="roleForm.engineeringManager ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="engineeringManagerName" style="margin-bottom: 0">
<h4>工程经理</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.engineeringManager" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.engineeringManagerName" placeholder="选择工程经理"
@click.native="choiceZRR('engineeringManager', '选择工程经理', roleForm.engineeringManager)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<el-timeline-item timestamp="标准法规部部长审批" placement="top" :color="roleForm.statuteMinister ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="statuteMinisterName" style="margin-bottom: 0">
<h4>标准法规部部长</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input :disabled="disabledXX" v-model="roleForm.statuteMinister" style="display: none;"></el-input>
<el-input :disabled="disabledXX" v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"
@click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)"></el-input>
</div>
</el-form-item>
</el-card>
</el-timeline-item>
<!-- <el-timeline-item timestamp="选择工程经理进行转办" placement="top"-->
<!-- :color="roleForm.engineeringManager ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="engineeringManagerName" style="margin-bottom: 0">-->
<!-- <h4>工程经理</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineeringManager" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.engineeringManagerName" placeholder="选择工程经理"-->
<!-- @click.native="choiceZRR('engineeringManager', '选择工程经理', roleForm.engineeringManager)"></el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
<!-- <el-timeline-item timestamp="标准法规部部长审批" placement="top" :color="roleForm.statuteMinister ? '#66b1ff' : ''">-->
<!-- <el-card>-->
<!-- <el-form-item prop="statuteMinisterName" style="margin-bottom: 0">-->
<!-- <h4>标准法规部部长</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.statuteMinister" style="display: none;"></el-input>-->
<!-- <el-input :disabled="disabledXX" v-model="roleForm.statuteMinisterName" placeholder="选择标准法规部部长"-->
<!-- @click.native="choiceZRR('statuteMinister', '选择标准法规部部长', roleForm.statuteMinister)"></el-input>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </el-card>-->
<!-- </el-timeline-item>-->
</el-form>
</el-timeline>
</div>
@@ -965,6 +965,10 @@ export default {
if(addIndex > -1){
this.$message.warning('请勿重复添加数据')
}else{
if(this.handleSelectForm.dataSource === 'BUSINESS_STAND'){
item["textStatus"]=item.textStatusBuss
item["ssrq"]=item.issueTime
}
this.dataList.push(item)
}
})
@@ -1440,7 +1444,9 @@ export default {
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES; //适用车型
this.setMap(res.data.WBZTCLASS);// 文本状态
this.setMap(res.data.TEXTSTATUSBUSS);//企标文本状态
this.textState = res.data.WBZTCLASS // 文本状态
this.textState.push(res.data.TEXTSTATUSBUSS) //
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: 1,
pageSize: this.pageSize,
@@ -845,10 +845,18 @@ export default {
this.standardFormTotal = res.data.total;
this.total = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
if (item.standYear === null || item.standYear ==='') {
if(item.standSortShow!= null){
item.standNumber = item.standSortShow + " " + item.standNumber;
}else{
item.standNumber = item.standNumber;
}
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
if(item.standSortShow!= null){
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}else{
item.standNumber = item.standNumber + "-" + item.standYear;
}
}
});
this.standInfoTableLoading = false