Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop
This commit is contained in:
@@ -264,6 +264,7 @@ export default {
|
||||
item.NameList = NameList
|
||||
})
|
||||
this.data = res.data
|
||||
this.total = res.data.length
|
||||
})
|
||||
},
|
||||
pageChange (page) {
|
||||
|
||||
@@ -71,6 +71,9 @@
|
||||
prop="useFlag"
|
||||
label="角色状态"
|
||||
width="170px">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.useFlag===0?'禁用':'启用' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="operator"
|
||||
@@ -184,9 +187,20 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="角色描述" prop="remarks" label-width="80px" class="add-form-item">
|
||||
<el-input v-model="addForm.remarks"
|
||||
placeholder="请输入上级描述"
|
||||
placeholder="请输入角色描述"
|
||||
clearable></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="角色状态" prop="useFlag" label-width="145px">
|
||||
<el-select class="bead-input" v-model="addForm.useFlag">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div slot="footer">
|
||||
@@ -243,7 +257,8 @@ export default {
|
||||
SuperiorRoleModel: false,
|
||||
addFormRules: {
|
||||
name: [
|
||||
{ required: true, message: '请输入角色名称', trigger: 'blur' }
|
||||
{ required: true, message: '请输入角色名称', trigger: 'blur' },
|
||||
{type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'}
|
||||
]
|
||||
},
|
||||
addForm: {
|
||||
@@ -251,8 +266,19 @@ export default {
|
||||
parentId: '', // 上级ID
|
||||
remarks: '', // 角色描述
|
||||
parent: '',
|
||||
useFlag: '',
|
||||
id: ''
|
||||
},
|
||||
options: [
|
||||
{
|
||||
value: "0",
|
||||
label: "禁用",
|
||||
},
|
||||
{
|
||||
value: "1",
|
||||
label: "启用",
|
||||
}
|
||||
],
|
||||
addModel: false,
|
||||
treeData3: [],
|
||||
defaultProps3: {
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
<label style=" margin-right: 132px;"
|
||||
title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
|
||||
>文本状态<i class="el-icon-warning-outline"></i></label>
|
||||
<span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
|
||||
<span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
|
||||
</p>
|
||||
<p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
|
||||
<p><label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
|
||||
@@ -136,6 +136,13 @@
|
||||
{{ '-' }}
|
||||
</template>
|
||||
</span>
|
||||
<span
|
||||
v-else-if="child.attrType === 'DATE_PICKER'"
|
||||
class="modular-content-p-val"
|
||||
:title="child.value || '-'"
|
||||
>
|
||||
{{ child.value ? child.value.substring(0,10) : '-' }}
|
||||
</span>
|
||||
<span
|
||||
v-else-if="child.attrType !== 'FILE'"
|
||||
class="modular-content-p-val"
|
||||
@@ -1241,13 +1248,21 @@ export default {
|
||||
content: ''
|
||||
},
|
||||
itemsText: '',
|
||||
itemsTextDialogs: false
|
||||
itemsTextDialogs: false,
|
||||
textStatusMap: {},
|
||||
}
|
||||
},
|
||||
props: {
|
||||
},
|
||||
watch: {},
|
||||
methods: {
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
})
|
||||
console.log(this.textStatusMap, '文本状态的值')
|
||||
},
|
||||
statusClick () {
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: 'standInvolveProjectTwo',
|
||||
@@ -2614,6 +2629,7 @@ export default {
|
||||
this.emergyKindOptions = res.data.ENERGYTYPES
|
||||
this.requestOptions = res.data.REQUESTTYPE
|
||||
this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
|
||||
this.setMap(res.data.WBZTCLASS) // 文本状态
|
||||
}, e => {
|
||||
})
|
||||
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
|
||||
|
||||
@@ -259,10 +259,10 @@ export default {
|
||||
},
|
||||
],
|
||||
fileType: [
|
||||
{ required: true, message: "文本状态称不能为空", trigger: "blur" },
|
||||
{ required: true, message: "文本状态称不能为空", trigger: "change" },
|
||||
],
|
||||
fileName: [
|
||||
{ required: true, message: '文件不能为空', trigger: 'blur' }
|
||||
{ required: true, message: '文件不能为空', trigger: 'change' }
|
||||
]
|
||||
},
|
||||
options: [
|
||||
@@ -515,7 +515,8 @@ export default {
|
||||
message: "文件上传成功",
|
||||
type: "success",
|
||||
});
|
||||
// this.$refs['uploadFilesdfEo'].resetFields()
|
||||
this.$refs['uploadFilesdfEo'].clearValidate('fileName')
|
||||
this.$refs['uploadFilesdfEo'].clearValidate('standName')
|
||||
} else {
|
||||
this.defaultFileList = [];
|
||||
this.uploadFilesdfEo.attId = "";
|
||||
|
||||
@@ -532,15 +532,15 @@
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
|
||||
<el-option
|
||||
v-for="item in qcdwOptions"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
|
||||
<el-option
|
||||
v-for="item in qcdwOption"
|
||||
placeholder="请选择"
|
||||
:key="item.value"
|
||||
:value="item.value"
|
||||
:label="item.label"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
|
||||
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple>
|
||||
@@ -1248,15 +1248,15 @@
|
||||
// 适用范围
|
||||
txlb: '', // 体系类别
|
||||
gkdw: '', // 归口管理部门
|
||||
qcdw: '', // 起草单位
|
||||
wssmr: '', // 我司署名人
|
||||
qcdw: [], // 起草单位
|
||||
wssmr: [], // 我司署名人
|
||||
cysd: '', // 我司参与深度
|
||||
cllx: '', // 适用车型
|
||||
nylx: '',// 能源类型
|
||||
sycpx: '',// 适用产品线
|
||||
syrz: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
zrgcs: '', // 责任工程师
|
||||
cllx: [], // 适用车型
|
||||
nylx: [],// 能源类型
|
||||
sycpx: [],// 适用产品线
|
||||
syrz: [], // 适用认证
|
||||
zrbm: [], // 责任部门
|
||||
zrgcs: [], // 责任工程师
|
||||
cycvppsbm: '', // 关联模块--乘用车VPPS编码
|
||||
cycvppscn: '', // 关联模块--乘用车vpps中文名称
|
||||
kccvppsbm: '', // 关联模块--卡车VPPS编码
|
||||
@@ -1336,10 +1336,10 @@
|
||||
applyAuthOptions: [], // 适用认证
|
||||
cysdOptions: [], // 我司参与深度
|
||||
wssmrOptions: [], // 我司署名人
|
||||
qcdwOptions: [], // 起草单位
|
||||
sycpxOptions: [], // 适用产品线
|
||||
zrbmOptions: [], // 责任部门
|
||||
zrgcsOptions: [], // 责任工程师
|
||||
qcdwOption: [], // 起草单位
|
||||
txlbOptions: [], // 体系类别
|
||||
data: [], // 标准列表数据
|
||||
ListForm: {}, // 新增数据
|
||||
@@ -1452,15 +1452,15 @@
|
||||
// 适用范围
|
||||
txlb: '', // 体系类别
|
||||
gkdw: '', // 归口管理部门
|
||||
qcdw: '', // 起草单位
|
||||
wssmr: '', // 我司署名人
|
||||
qcdw: [], // 起草单位
|
||||
wssmr: [], // 我司署名人
|
||||
cysd: '', // 我司参与深度
|
||||
cllx: '', // 适用车型
|
||||
nylx: '',// 能源类型
|
||||
sycpx: '',// 适用产品线
|
||||
syrz: '', // 适用认证
|
||||
zrbm: '', // 责任部门
|
||||
zrgcs: '', // 责任工程师
|
||||
cllx: [], // 适用车型
|
||||
nylx: [],// 能源类型
|
||||
sycpx: [],// 适用产品线
|
||||
syrz: [], // 适用认证
|
||||
zrbm: [], // 责任部门
|
||||
zrgcs: [], // 责任工程师
|
||||
cycvppsbm: '', // 关联模块--乘用车VPPS编码
|
||||
cycvppscn: '', // 关联模块--乘用车vpps中文名称
|
||||
kccvppsbm: '', // 关联模块--卡车VPPS编码
|
||||
@@ -1497,6 +1497,14 @@
|
||||
console.log(bringData)
|
||||
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
|
||||
this.form = JSON.parse(JSON.stringify(json))
|
||||
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw.split(',')
|
||||
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr.split(',')
|
||||
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs.split(',')
|
||||
this.form.zrbm = JSON.parse(JSON.stringify(json)).zrbm.split(',')
|
||||
this.form.syrz = JSON.parse(JSON.stringify(json)).syrz.split(',')
|
||||
this.form.sycpx = JSON.parse(JSON.stringify(json)).sycpx.split(',')
|
||||
this.form.nylx = JSON.parse(JSON.stringify(json)).nylx.split(',')
|
||||
this.form.cllx = JSON.parse(JSON.stringify(json)).cllx.split(',')
|
||||
this.defaultCheckedKeys = [this.form.standSystem];
|
||||
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
|
||||
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
|
||||
@@ -2018,11 +2026,10 @@
|
||||
this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
|
||||
this.cysdOptions = res.data.WSCYSD // 我司参与深度
|
||||
this.wssmrOptions = res.data.WSSMR // 我司署名人
|
||||
this.qcdwOptions = res.data.QCDW // 我司署名人
|
||||
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
|
||||
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
|
||||
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
|
||||
this.txlbOptions = res.data.TXLBCLASS // 体系类别
|
||||
this.qcdwOption = res.data.QCDW // 体系类别
|
||||
})
|
||||
this.busVsFunc()
|
||||
this.modelFunc()
|
||||
|
||||
+3
-6
@@ -130,7 +130,6 @@
|
||||
<el-table-column
|
||||
prop="updateTime"
|
||||
label="更新时间"
|
||||
sortable
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD hh:mm:ss') : scope.row.updateTime }}</div>
|
||||
@@ -268,10 +267,7 @@ export default {
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
this.sarAccessListDatas = res.data.records;
|
||||
this.sarAccessListDatas.forEach(item => {
|
||||
this.$set(item,'relateFile','')
|
||||
})
|
||||
this.sarAccessListDatas = res.data.records
|
||||
this.sarAccessListTotal = res.data.total
|
||||
}, e => {
|
||||
|
||||
@@ -349,7 +345,8 @@ export default {
|
||||
this.$router.push({
|
||||
name: "ListOfStandardsAndRegulationsDetails",
|
||||
query: {
|
||||
id: item.id
|
||||
id: item.id,
|
||||
fileIds: item.fileIds
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -121,7 +121,6 @@
|
||||
<el-table-column
|
||||
prop="updateTime"
|
||||
label="更新时间"
|
||||
sortable
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div>
|
||||
|
||||
@@ -122,7 +122,6 @@
|
||||
<el-table-column
|
||||
prop="updateTime"
|
||||
label="更新时间"
|
||||
sortable
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}</div>
|
||||
|
||||
@@ -421,6 +421,7 @@
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
type="danger"
|
||||
style="margin-left: 0px"
|
||||
size="small" @click="moveDown(scope.$index, scope.row)"
|
||||
v-if="!disabledFlag"
|
||||
>下移</el-button>
|
||||
@@ -532,6 +533,7 @@ export default {
|
||||
id: '',
|
||||
sortKey: 1,
|
||||
countryArea: '',
|
||||
fileIds: '',
|
||||
detailedListName: '',
|
||||
energyKind: '',
|
||||
type: '',
|
||||
@@ -843,7 +845,6 @@ export default {
|
||||
uploadBackSuccess (res, file, fileList) {
|
||||
if (res.ok) {
|
||||
this.fileInfoList = fileList
|
||||
console.log(this.fileInfoList)
|
||||
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
|
||||
this.$message.success('上传成功')
|
||||
} else {
|
||||
@@ -1183,8 +1184,7 @@ export default {
|
||||
this.fileInfoList.map(item => {
|
||||
relateFile.push(item.id)
|
||||
})
|
||||
sarAccessEO.relateFile = relateFile.join(',')
|
||||
console.log(sarAccessEO.relateFile)
|
||||
sarAccessEO.fileIds = relateFile.join(',')
|
||||
}
|
||||
if (!sarAccessEO.id) {
|
||||
// 新增
|
||||
@@ -1198,12 +1198,8 @@ export default {
|
||||
this.$message.success('新增成功')
|
||||
this.isNext = true
|
||||
this.$router.push({
|
||||
name: 'AccessStandardsAndRegulations',
|
||||
query: {
|
||||
relateFile: sarAccessEO.relateFile
|
||||
}
|
||||
name: 'AccessStandardsAndRegulations'
|
||||
})
|
||||
console.log(sarAccessEO)
|
||||
}
|
||||
}, e => {
|
||||
})
|
||||
@@ -1601,7 +1597,7 @@ export default {
|
||||
// 请求上传的文件信息
|
||||
getFileInfo () {
|
||||
this.$http.get('att/attFile/getMultiFileInfos', {
|
||||
fileIds: this.sarAccessEO.relateFile
|
||||
fileIds: this.$route.query.fileIds
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<label class="transition-box-label">附件:</label>
|
||||
<div class="file-box" v-if="fileInfoList.length > 0">
|
||||
<p v-for="item in fileInfoList"
|
||||
:key="item.id">
|
||||
:key="item.id"> {{ item.name }}
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(item.id)"
|
||||
@@ -251,6 +251,7 @@
|
||||
|
||||
<script>
|
||||
import { interfaceUrl } from "@/sysConfig";
|
||||
import { exportFile } from '@/api/unqualProcess'
|
||||
|
||||
export default {
|
||||
name: "AccessStandardDetails",
|
||||
@@ -452,9 +453,8 @@ export default {
|
||||
},
|
||||
// 请求上传的文件信息
|
||||
getFileInfo() {
|
||||
console.log(this.sarAccessEO)
|
||||
this.$http.get("att/attFile/getMultiFileInfos", {
|
||||
fileIds: this.sarAccessEO.relateFile
|
||||
fileIds: this.sarAccessEO.fileIds
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
@@ -474,7 +474,7 @@ export default {
|
||||
},
|
||||
// 附件下载事件
|
||||
fileDownLoad(attId) {
|
||||
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId;
|
||||
window.location.href = "/api/att/attFile/downloadFile?fileId=" + attId
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
|
||||
+2
-2
@@ -532,7 +532,8 @@ export default {
|
||||
{required: true, message: '国内/海外不能为空', trigger: 'change'}
|
||||
],
|
||||
projectName: [
|
||||
{required: true, message: '项目名称不能为空', trigger: 'change'}
|
||||
{required: true, message: '项目名称不能为空', trigger: 'blur'},
|
||||
{type: 'string', max: 100, message: '表单名称不能超过100个字符', trigger: 'blur'}
|
||||
],
|
||||
detailedListName: [
|
||||
{required: true, message: '清单名称不能为空', trigger: 'blur'},
|
||||
@@ -1150,7 +1151,6 @@ export default {
|
||||
},
|
||||
// 提交按钮 事件
|
||||
saveSarAccess () {
|
||||
alert()
|
||||
this.$refs['sarAccessForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
let rowlist = []
|
||||
|
||||
@@ -206,10 +206,13 @@
|
||||
sortable="custom"
|
||||
width="120px"
|
||||
label="文本状态">
|
||||
<template slot="header" slot-scope="scope">
|
||||
<el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">
|
||||
<span>文本状态<i class="el-icon-warning-outline"></i></span>
|
||||
</el-tooltip>
|
||||
<!-- <template slot="header" slot-scope="scope">-->
|
||||
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
|
||||
<!-- <span>文本状态<i class="el-icon-warning-outline"></i></span>-->
|
||||
<!-- </el-tooltip>-->
|
||||
<!-- </template>-->
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="50" fixed="right">
|
||||
@@ -353,7 +356,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
|
||||
prop="standState" label-width="150px" class="add-form-item">
|
||||
prop="textStatus" label-width="150px" class="add-form-item">
|
||||
<template slot="label">文本状态<i class="el-icon-warning-outline"></i></template>
|
||||
<el-select v-model="sarStandardsInfoEO.textStatus"
|
||||
placeholder="请选择文本状态"
|
||||
@@ -489,7 +492,7 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
<template v-else-if="field.attrField === 'CYCVPPSCN'">
|
||||
<el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="cycvppscn" class="add-form-item">
|
||||
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" label-width="150px" prop="cycvppscn" class="add-form-item">
|
||||
<el-input
|
||||
v-model="sarStandardsInfoEO.CYCVPPSCN" disabled
|
||||
clearable
|
||||
@@ -497,7 +500,7 @@
|
||||
</el-form-item>
|
||||
</template>
|
||||
<template v-else-if="field.attrField === 'KCCVPPSCN'">
|
||||
<el-form-item label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn" class="add-form-item">
|
||||
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" label-width="150px" prop="kccvppscn" class="add-form-item">
|
||||
<el-input
|
||||
v-model="sarStandardsInfoEO.KCCVPPSCN" disabled
|
||||
clearable
|
||||
@@ -536,7 +539,7 @@
|
||||
:key="field.attrField"
|
||||
:config="field"
|
||||
v-model="sarStandardsInfoEO[field.attrField]"
|
||||
:disabled="formdisableflag"
|
||||
:disabled="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' || formdisableflag"
|
||||
></custom-date-pick>
|
||||
</template>
|
||||
<template v-else-if="field.attrType === 'FILE'">
|
||||
@@ -648,6 +651,9 @@
|
||||
label="文本状态"
|
||||
width="130"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页-->
|
||||
@@ -847,6 +853,9 @@
|
||||
label="文本状态"
|
||||
width="200"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
@@ -1542,6 +1551,12 @@ export default {
|
||||
standSort: [
|
||||
{required: true, message: '标准类别不能为空', trigger: 'change'}
|
||||
],
|
||||
standNature: [
|
||||
{required: true, message: '标准性质不能为空', trigger: 'change'}
|
||||
],
|
||||
textStatus: [
|
||||
{required: true, message: '文本状态不能为空', trigger: 'change'}
|
||||
],
|
||||
standNumber: [
|
||||
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
|
||||
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
|
||||
@@ -1717,7 +1732,8 @@ export default {
|
||||
orgData: [],
|
||||
delLoading: false,
|
||||
standState: '',
|
||||
orderBy :''
|
||||
orderBy :'',
|
||||
textStatusMap: {} // 文本状态id与name对应
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -2123,7 +2139,8 @@ export default {
|
||||
},
|
||||
|
||||
remove(node, data) {
|
||||
this.$confirm('是否删除菜单?', '提示', {
|
||||
//通过 stahndinfoList 是否有数据进行判断
|
||||
this.$confirm(this.stahndinfoList.length > 0 ? '该节点下有记录,是否删除?' : '是否删除菜单', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
confirmButtonClass: 'common-button-primary',
|
||||
cancelButtonText: '取消',
|
||||
@@ -4012,6 +4029,13 @@ export default {
|
||||
break
|
||||
}
|
||||
}
|
||||
},
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
})
|
||||
console.log(this.textStatusMap, '文本状态的值')
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -4062,6 +4086,8 @@ export default {
|
||||
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
|
||||
this.txlbOptions = res.data.TXLBCLASS // 体系类别
|
||||
this.getGzzOption()
|
||||
this.setMap(this.standStateOptions)
|
||||
console.log(this.standStateOptions, '文本状态')
|
||||
}, e => {
|
||||
})
|
||||
this.getDomesticStandardTable(this.tableFlag)
|
||||
|
||||
@@ -77,19 +77,18 @@
|
||||
<el-form-item class="search-item btn-box">
|
||||
<el-button
|
||||
:loading="searching"
|
||||
icon="el-icon-search"
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
size="mini"
|
||||
v-btn-permission="'366c89d1c54465faca96aaed26a158b1'"
|
||||
@click="searchBtnClick(standCommonlySearch)">
|
||||
查询
|
||||
</el-button>
|
||||
<el-button
|
||||
class="common-button-default"
|
||||
icon="el-icon-refresh-left"
|
||||
size="mini"
|
||||
v-btn-permission="'31ac9f600d8a3072ba088f1c106df359'"
|
||||
@click="clearAllSearch('standCommonlySearch')"></el-button>
|
||||
@click="clearAllSearch('standCommonlySearch')">清空</el-button>
|
||||
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i class="iconfont" v-btn-permission="'c9390928e5a3107956c7d43d8bde5cba'"></i>高级查询</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -198,14 +197,17 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standStateShow"
|
||||
prop="textStatus"
|
||||
sortable="custom"
|
||||
width="120px"
|
||||
label="标准状态">
|
||||
<template slot="header" slot-scope="scope">
|
||||
<el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">
|
||||
<span>标准状态 <i class="el-icon-warning-outline"></i></span>
|
||||
</el-tooltip>
|
||||
label="文本状态">
|
||||
<!-- <template slot="header" slot-scope="scope">-->
|
||||
<!-- <el-tooltip class="item" effect="dark" content="计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" placement="bottom">-->
|
||||
<!-- <span>文本状态 <i class="el-icon-warning-outline"></i></span>-->
|
||||
<!-- </el-tooltip>-->
|
||||
<!-- </template>-->
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="50" fixed="right">
|
||||
@@ -697,10 +699,13 @@
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standStateShow"
|
||||
label="标准状态"
|
||||
prop="textStatus"
|
||||
label="文本状态"
|
||||
width="130"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--分页-->
|
||||
@@ -895,10 +900,13 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standStateShow"
|
||||
label="标准状态"
|
||||
prop="textStatus"
|
||||
label="文本状态"
|
||||
width="200"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
@@ -1094,6 +1102,7 @@ export default {
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
textStatusMap: {}, // 文本状态id与name对应
|
||||
treeList: [],
|
||||
props: {
|
||||
label: 'menuName',
|
||||
@@ -1713,6 +1722,13 @@ export default {
|
||||
watch: {
|
||||
},
|
||||
methods: {
|
||||
// 将文本状态的id与name对应
|
||||
setMap(data){
|
||||
data.forEach(item => {
|
||||
this.$set(this.textStatusMap, item.value, item.label)
|
||||
})
|
||||
console.log(this.textStatusMap, '文本状态的值')
|
||||
},
|
||||
popoverHideBusVs (checkedIds, checkedData) {
|
||||
if(checkedData){
|
||||
this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
|
||||
@@ -3945,6 +3961,7 @@ export default {
|
||||
this.categoryConfigOptions = res.data.CATEGORY
|
||||
this.standAttributeList = res.data.RULETYPE
|
||||
this.getGzzOption()
|
||||
this.setMap(this.standStateOptions)
|
||||
}, e => {
|
||||
})
|
||||
this.getDomesticStandardTable()
|
||||
|
||||
+1
@@ -293,6 +293,7 @@ export default {
|
||||
this.sarProject.country = ''
|
||||
this.sarProject.standCode=''
|
||||
this.sarProject.standName = ''
|
||||
this.sarProject.standNumber=''
|
||||
this.queryStandAndLaws()
|
||||
}, // 外层清空条件查询
|
||||
handleProjectCompliance (row) {
|
||||
|
||||
+1
@@ -264,6 +264,7 @@ name: "technologyInvolveProject",
|
||||
this.sarProject.country = ''
|
||||
this.sarProject.standCode=''
|
||||
this.sarProject.standName = ''
|
||||
this.sarProject.standNumber=''
|
||||
this.queryStandAndLaws()
|
||||
}, // 外层清空条件查询
|
||||
handleProjectCompliance (row) {
|
||||
|
||||
Reference in New Issue
Block a user