Merge branch 'develop' into FOTON
This commit is contained in:
@@ -36,15 +36,18 @@
|
|||||||
<div class="search-area">
|
<div class="search-area">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
|
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
|
||||||
<el-form-item label="编号/名称" class="search-item">
|
<el-form-item label="标准编号" class="search-item">
|
||||||
<el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据编号/名称查找" clearable :maxlength="100"></el-input>
|
<el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据标准编号查找" clearable :maxlength="100"></el-input>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="标准名称" class="search-item">
|
||||||
|
<el-input v-model="replaceLawsNumForm.standName" placeholder="根据标准名称查找" clearable :maxlength="100"></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="国内/海外" class="search-item">
|
<el-form-item label="国内/海外" class="search-item">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="replaceLawsNumForm.standType"
|
v-model="replaceLawsNumForm.standType"
|
||||||
placeholder="请选择"
|
placeholder="请选择"
|
||||||
>
|
>
|
||||||
<el-option value="1" label="企标"></el-option>
|
<el-option v-if="enterpriseStandard" value="1" label="企标"></el-option>
|
||||||
<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>
|
||||||
@@ -86,36 +89,44 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
label="标准编号"
|
label="标准编号"
|
||||||
|
show-overflow-tooltip
|
||||||
width="130">
|
width="130">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a v-if="scope.row.standYear" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
|
<a class="table-jump" v-if="scope.row.standYear" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
|
||||||
<a v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
|
<a class="table-jump" v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="standName"
|
prop="standName"
|
||||||
label="标准名称"
|
show-overflow-tooltip
|
||||||
width="130">
|
label="标准名称">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="issueTime"
|
prop="issueTime"
|
||||||
|
show-overflow-tooltip
|
||||||
label="发布日期"
|
label="发布日期"
|
||||||
width="130">
|
width="130">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="putTime"
|
|
||||||
label="实施日期"
|
label="实施日期"
|
||||||
|
show-overflow-tooltip
|
||||||
width="130">
|
width="130">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span v-if="scope.row.standType === 'INLAND' || scope.row.standType === 'FOREIGN'">{{ scope.row.ssrq }}</span>
|
||||||
|
<span v-else>{{ scope.row.putTime }}</span>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="standNatureShow"
|
label="文本状态"
|
||||||
label="标准性质"
|
show-overflow-tooltip
|
||||||
width="130">
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
prop="standStateShow"
|
|
||||||
label="标准状态"
|
|
||||||
width="130">
|
width="130">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<span v-if="scope.row.standType === 'INLAND' || scope.row.standType === 'FOREIGN'">{{ textStatusMap[scope.row.textStatus] }}</span>
|
||||||
|
<span v-else>{{ scope.row.standStatusShow }}</span>
|
||||||
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
|
<loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
|
||||||
@@ -167,10 +178,15 @@
|
|||||||
},
|
},
|
||||||
placeholderText: {
|
placeholderText: {
|
||||||
type: String
|
type: String
|
||||||
|
},
|
||||||
|
enterpriseStandard: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
textStatusMap: {},
|
||||||
replaceLawsNumModel: false,
|
replaceLawsNumModel: false,
|
||||||
sarBussionessLawsEO: {
|
sarBussionessLawsEO: {
|
||||||
replaceLawsNum: ''
|
replaceLawsNum: ''
|
||||||
@@ -178,6 +194,7 @@
|
|||||||
// 代替标准号
|
// 代替标准号
|
||||||
replaceLawsNumForm: {
|
replaceLawsNumForm: {
|
||||||
standNumber: '', // 政策编号
|
standNumber: '', // 政策编号
|
||||||
|
standName: '',
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: this.$store.getters.userInfo.configContent,
|
pageSize: this.$store.getters.userInfo.configContent,
|
||||||
total: 0,
|
total: 0,
|
||||||
@@ -210,6 +227,11 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
setMap(data) {
|
||||||
|
data.forEach(item => {
|
||||||
|
this.$set(this.textStatusMap, item.value, item.label)
|
||||||
|
})
|
||||||
|
},
|
||||||
handleChange (event) {
|
handleChange (event) {
|
||||||
const value = event
|
const value = event
|
||||||
this.$emit('input', value)
|
this.$emit('input', value)
|
||||||
@@ -234,15 +256,6 @@
|
|||||||
}, res => {
|
}, res => {
|
||||||
this.replaceLawsNumRow = res.data.list
|
this.replaceLawsNumRow = res.data.list
|
||||||
this.replaceTotal = res.data.count
|
this.replaceTotal = res.data.count
|
||||||
// if (this.selectedListRep.length !== 0) {
|
|
||||||
// this.selectedListRep.map((list) => {
|
|
||||||
// this.replaceLawsNumRow.map((item) => {
|
|
||||||
// if (list.id === item.id) {
|
|
||||||
// item._checked = true
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// })
|
|
||||||
// }
|
|
||||||
}, e => {
|
}, e => {
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
@@ -258,15 +271,6 @@
|
|||||||
}, res => {
|
}, res => {
|
||||||
this.replaceLawsNumRow = res.data.list
|
this.replaceLawsNumRow = res.data.list
|
||||||
this.replaceTotal = res.data.count
|
this.replaceTotal = res.data.count
|
||||||
// if (this.selectedListRep.length !== 0) {
|
|
||||||
// this.selectedListRep.map((list) => {
|
|
||||||
// this.replaceLawsNumRow.map((item) => {
|
|
||||||
// if (list.id === item.id) {
|
|
||||||
// item._checked = true
|
|
||||||
// }
|
|
||||||
// })
|
|
||||||
// })
|
|
||||||
// }
|
|
||||||
}, e => {
|
}, e => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -327,14 +331,26 @@
|
|||||||
},
|
},
|
||||||
// 点击查看
|
// 点击查看
|
||||||
handlePreview (item) {
|
handlePreview (item) {
|
||||||
let routeUrl = this.$router.resolve({
|
if (item.standType === 'INLAND' || item.standType === 'FOREIGN') {
|
||||||
name: 'OtherBussStandardDetails',
|
let pageType = item.standType === 'INLAND' ? 'INLAND_STAND' : 'FOREIGN_STAND'
|
||||||
params: {
|
let routeUrl = this.$router.resolve({
|
||||||
id: item.id,
|
name: 'OtherStandardDetails',
|
||||||
pageType: 'BUSINESS_STAND'
|
params: {
|
||||||
}
|
id: item.id,
|
||||||
})
|
pageType: pageType
|
||||||
window.open(routeUrl.href, '_blank')
|
}
|
||||||
|
})
|
||||||
|
window.open(routeUrl.href, '_blank')
|
||||||
|
} else {
|
||||||
|
let routeUrl = this.$router.resolve({
|
||||||
|
name: 'OtherBussStandardDetails',
|
||||||
|
params: {
|
||||||
|
id: item.id,
|
||||||
|
pageType: 'BUSINESS_STAND'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
window.open(routeUrl.href, '_blank')
|
||||||
|
}
|
||||||
},
|
},
|
||||||
getResetLawsNumRow () {
|
getResetLawsNumRow () {
|
||||||
this.replaceLawsNumForm = {
|
this.replaceLawsNumForm = {
|
||||||
@@ -348,6 +364,14 @@
|
|||||||
}
|
}
|
||||||
this.getReplaceLawsNumRow()
|
this.getReplaceLawsNumRow()
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.setMap(res.data.WBZTCLASS)
|
||||||
|
}, e => {
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
height="100%"
|
height="100%"
|
||||||
@selection-change="standSelectChange"
|
@selection-change="standSelectChange"
|
||||||
|
@sort-change="sortChange"
|
||||||
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
|
:header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }"
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" align="center" width="50">
|
<el-table-column type="selection" align="center" width="50">
|
||||||
@@ -97,13 +98,13 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="spendTime"
|
prop="spendTime"
|
||||||
:label="this.$t('m.timeConsuming')"
|
label="消耗时间(秒)"
|
||||||
align="center"
|
align="center"
|
||||||
sortable
|
sortable="custom"
|
||||||
width="120"
|
width="140"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="150" fixed="right">
|
<el-table-column label="操作" align="center" width="150" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div @click.stop style="display: inline-block">
|
<div @click.stop style="display: inline-block">
|
||||||
<el-button
|
<el-button
|
||||||
@@ -795,6 +796,8 @@ export default {
|
|||||||
isSubmit: false,
|
isSubmit: false,
|
||||||
showUploadlist: true, // 导入过程中新增数据时,如果数据报错,不出现导入列表
|
showUploadlist: true, // 导入过程中新增数据时,如果数据报错,不出现导入列表
|
||||||
collect: "收藏",
|
collect: "收藏",
|
||||||
|
paixu: '',
|
||||||
|
shunxu: ''
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
props: {},
|
props: {},
|
||||||
@@ -1052,6 +1055,26 @@ export default {
|
|||||||
break;*/
|
break;*/
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// 表格排序
|
||||||
|
sortChange (sortObj) {
|
||||||
|
if (sortObj.column.order !== 'normal') {
|
||||||
|
this.shunxu = ''
|
||||||
|
this.paixu = ''
|
||||||
|
let order = sortObj.column.order
|
||||||
|
switch (sortObj.column.property) {
|
||||||
|
case 'spendTime' :
|
||||||
|
// 后台联调
|
||||||
|
this.paixu = 'spendTime'
|
||||||
|
if (order === 'ascending'){
|
||||||
|
this.shunxu = 'asc'
|
||||||
|
} else if (order === 'descending') {
|
||||||
|
this.shunxu = 'desc'
|
||||||
|
}
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.getTableData()
|
||||||
|
},
|
||||||
// 修改成表格样式后,选择项勾选改变
|
// 修改成表格样式后,选择项勾选改变
|
||||||
standSelectChange(data) {
|
standSelectChange(data) {
|
||||||
this.selectTableData = [];
|
this.selectTableData = [];
|
||||||
@@ -1336,6 +1359,8 @@ export default {
|
|||||||
{
|
{
|
||||||
page: this.page,
|
page: this.page,
|
||||||
pageSize: this.pageSize,
|
pageSize: this.pageSize,
|
||||||
|
paixu: this.shunxu ? this.paixu : '',
|
||||||
|
shunxu: this.shunxu
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
_this: this,
|
_this: this,
|
||||||
@@ -1344,6 +1369,7 @@ export default {
|
|||||||
(res) => {
|
(res) => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
this.standRecoList = res.data.list;
|
this.standRecoList = res.data.list;
|
||||||
|
console.log(this.standRecoList);
|
||||||
this.total = res.data.count
|
this.total = res.data.count
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -127,14 +127,22 @@
|
|||||||
placeholder="请输入指标依据"
|
placeholder="请输入指标依据"
|
||||||
:maxlength="500"/>
|
:maxlength="500"/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<template v-if="qbfsForm.isRelate === '是'">
|
<!-- <template v-if="qbfsForm.isRelate === '是'">-->
|
||||||
<custom-input-for-all-standards
|
<!-- <custom-input-for-all-standards-->
|
||||||
class="classDisplay"
|
<!-- class="classDisplay"-->
|
||||||
:config="{attrName: '采用标准'}"
|
<!-- :config="{attrName: '采用标准'}"-->
|
||||||
:labelWidth="'180px'"
|
<!-- :labelWidth="'180px'"-->
|
||||||
v-model="qbfsForm.esStandRelations"
|
<!-- v-model="qbfsForm.esStandRelations"-->
|
||||||
></custom-input-for-all-standards>
|
<!-- ></custom-input-for-all-standards>-->
|
||||||
</template>
|
<!-- </template>-->
|
||||||
|
<template v-if="qbfsForm.isRelate === '是'">
|
||||||
|
<custom-input-for-all-standards2
|
||||||
|
class="classDisplay"
|
||||||
|
:config="{attrName: '采用标准'}"
|
||||||
|
:labelWidth="'180px'"
|
||||||
|
v-model="qbfsForm.esStandRelations"
|
||||||
|
></custom-input-for-all-standards2>
|
||||||
|
</template>
|
||||||
<el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
|
<el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item form-item-disabled">
|
class="add-form-item form-item-disabled">
|
||||||
<el-select v-model="qbfsForm.useLevel" filterable placeholder="请选择采标程度" style="width: 100%;">
|
<el-select v-model="qbfsForm.useLevel" filterable placeholder="请选择采标程度" style="width: 100%;">
|
||||||
@@ -149,6 +157,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<custom-input-for-all-standards2
|
<custom-input-for-all-standards2
|
||||||
class="classDisplay"
|
class="classDisplay"
|
||||||
|
:enterpriseStandard="true"
|
||||||
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
|
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
|
||||||
:config="{attrName: '引用标准'}"
|
:config="{attrName: '引用标准'}"
|
||||||
:labelWidth="'180px'"
|
:labelWidth="'180px'"
|
||||||
|
|||||||
@@ -100,6 +100,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<custom-input-for-all-standards2
|
<custom-input-for-all-standards2
|
||||||
class="classDisplay"
|
class="classDisplay"
|
||||||
|
:enterpriseStandard="true"
|
||||||
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
|
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
|
||||||
:config="{attrName: '引用标准'}"
|
:config="{attrName: '引用标准'}"
|
||||||
:labelWidth="'180px'"
|
:labelWidth="'180px'"
|
||||||
@@ -192,12 +193,12 @@
|
|||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<template v-if="qbfsForm.isRelate === '是'">
|
<template v-if="qbfsForm.isRelate === '是'">
|
||||||
<custom-input-for-all-standards
|
<custom-input-for-all-standards2
|
||||||
class="classDisplay"
|
class="classDisplay"
|
||||||
:config="{attrName: '采用标准'}"
|
:config="{attrName: '采用标准'}"
|
||||||
:labelWidth="'180px'"
|
:labelWidth="'180px'"
|
||||||
v-model="qbfsForm.esStandRelations"
|
v-model="qbfsForm.esStandRelations"
|
||||||
></custom-input-for-all-standards>
|
></custom-input-for-all-standards2>
|
||||||
</template>
|
</template>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
prop="reviseStatus"
|
prop="reviseStatus"
|
||||||
width="150"
|
width="150"
|
||||||
align="center"
|
align="center"
|
||||||
label="制修订状态">
|
label="制修订类型">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
|
<div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -235,7 +235,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||||
<el-select :disabled="DrawerType === 'see'" v-model="addForm.planStatus" placeholder="请选择计划状态">
|
<el-select :disabled="DrawerType === 'see' || DrawerType === 'add' " v-model="addForm.planStatus" placeholder="请选择计划状态">
|
||||||
<el-option label="未开始" value="0"></el-option>
|
<el-option label="未开始" value="0"></el-option>
|
||||||
<el-option label="制定中" value="1"></el-option>
|
<el-option label="制定中" value="1"></el-option>
|
||||||
<el-option label="修订中" value="2"></el-option>
|
<el-option label="修订中" value="2"></el-option>
|
||||||
@@ -243,7 +243,7 @@
|
|||||||
<el-option label="已完成" value="4"></el-option>
|
<el-option label="已完成" value="4"></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||||
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
|
<el-select :disabled="DrawerType === 'see'" v-model="addForm.reviseStatus" placeholder="请选择制修订状态">
|
||||||
<el-option label="制定" value="1"></el-option>
|
<el-option label="制定" value="1"></el-option>
|
||||||
<el-option label="修订" value="2"></el-option>
|
<el-option label="修订" value="2"></el-option>
|
||||||
@@ -357,13 +357,13 @@
|
|||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<template v-if="addForm.isRelate === '是'">
|
<template v-if="addForm.isRelate === '是'">
|
||||||
<custom-input-for-all-standards
|
<custom-input-for-all-standards2
|
||||||
class="classDisplay"
|
class="classDisplay"
|
||||||
:config="{attrName: '采用标准'}"
|
:config="{attrName: '采用标准'}"
|
||||||
:disabled="DrawerType === 'see'"
|
:disabled="DrawerType === 'see'"
|
||||||
:labelWidth="'180px'"
|
:labelWidth="'180px'"
|
||||||
v-model="addForm.esStandRelations"
|
v-model="addForm.esStandRelations"
|
||||||
></custom-input-for-all-standards>
|
></custom-input-for-all-standards2>
|
||||||
</template>
|
</template>
|
||||||
<el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
<el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
|
||||||
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
|
<div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
|
||||||
@@ -389,6 +389,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<custom-input-for-all-standards2
|
<custom-input-for-all-standards2
|
||||||
class="classDisplay"
|
class="classDisplay"
|
||||||
|
:enterpriseStandard="true"
|
||||||
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
|
:placeholderText="'包括已有、应有的关联标准,如企业标准、行业标准、国家标准'"
|
||||||
:disabled="DrawerType === 'see'"
|
:disabled="DrawerType === 'see'"
|
||||||
:config="{attrName: '引用标准'}"
|
:config="{attrName: '引用标准'}"
|
||||||
@@ -584,7 +585,6 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import CustomInputForAllStandards from '@/components/CustomFormComponents/InputForAllStandards'
|
|
||||||
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
|
import CustomInputForAllStandards2 from '@/components/CustomFormComponents/InputForAllStandards2'
|
||||||
export default {
|
export default {
|
||||||
name: "enterpriseStandardPlan",
|
name: "enterpriseStandardPlan",
|
||||||
@@ -938,6 +938,7 @@
|
|||||||
this.addDrawerTitle = '新增'
|
this.addDrawerTitle = '新增'
|
||||||
this.addForm = {}
|
this.addForm = {}
|
||||||
this.DrawerType = 'add'
|
this.DrawerType = 'add'
|
||||||
|
this.addForm.planStatus = '0'
|
||||||
this.addDrawer = true
|
this.addDrawer = true
|
||||||
}, // 新增数据
|
}, // 新增数据
|
||||||
deleteList () {
|
deleteList () {
|
||||||
|
|||||||
@@ -154,9 +154,12 @@
|
|||||||
<el-form-item label="实施日期" prop="ssrq">
|
<el-form-item label="实施日期" prop="ssrq">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="standForm.ssrq"
|
v-model="standForm.ssrq"
|
||||||
type="date"
|
type="daterange"
|
||||||
placeholder="请选择标准实施日期(标准文本)"
|
range-separator="-"
|
||||||
value-format="yyyy-MM-dd">
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
placeholder="请选择标准实施日期(标准文本)">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -166,9 +169,12 @@
|
|||||||
<el-form-item label="新车型实施日期" prop="xcxssrq">
|
<el-form-item label="新车型实施日期" prop="xcxssrq">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="standForm.xcxssrq"
|
v-model="standForm.xcxssrq"
|
||||||
type="date"
|
type="daterange"
|
||||||
placeholder="请选择新车型实施日期(标准文本"
|
range-separator="-"
|
||||||
value-format="yyyy-MM-dd">
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
placeholder="请选择新车型实施日期(标准文本)">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -176,9 +182,12 @@
|
|||||||
<el-form-item label="在产车实施日期" prop="zccssrq">
|
<el-form-item label="在产车实施日期" prop="zccssrq">
|
||||||
<el-date-picker
|
<el-date-picker
|
||||||
v-model="standForm.zccssrq"
|
v-model="standForm.zccssrq"
|
||||||
type="date"
|
type="daterange"
|
||||||
placeholder="请选择在产车实施日期(标准文本)"
|
range-separator="-"
|
||||||
value-format="yyyy-MM-dd">
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
value-format="yyyy-MM-dd"
|
||||||
|
placeholder="请选择在产车实施日期(标准文本)">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
@@ -1067,8 +1076,8 @@
|
|||||||
:label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')"
|
:label="selectIndex === 'INLAND_LAWS' ? '新车实施日期' :$t('m.putTime')"
|
||||||
width="130">
|
width="130">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')">
|
<div v-if="selectIndex === 'INLAND_STAND' ? (scope.row.SSRQ !== null && scope.row.SSRQ !== undefined && scope.row.SSRQ !== '') : (scope.row.putTime !== null && scope.row.putTime !== undefined && scope.row.putTime !== '')" :title="dateFormat2(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime))">
|
||||||
{{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)), "yyyy-MM-dd") }}
|
{{ dateFormat2(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : (selectIndex === 'INLAND_LAWS' ? scope.row.XCXSSRQLAWS : scope.row.putTime)) | ellipsis }}
|
||||||
</div>
|
</div>
|
||||||
<div v-else></div>
|
<div v-else></div>
|
||||||
</template>
|
</template>
|
||||||
@@ -1213,12 +1222,22 @@
|
|||||||
import "../../../assets/zTree/js/jquery.ztree.excheck.js";
|
import "../../../assets/zTree/js/jquery.ztree.excheck.js";
|
||||||
import "../../../assets/zTree/js/jquery.ztree.exedit.js";
|
import "../../../assets/zTree/js/jquery.ztree.exedit.js";
|
||||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
||||||
|
import {dateFormat} from '@/common/date'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "advancedSearch",
|
name: "advancedSearch",
|
||||||
components: {
|
components: {
|
||||||
TreeSelectNew
|
TreeSelectNew
|
||||||
},
|
},
|
||||||
|
filters: {
|
||||||
|
ellipsis (value) {
|
||||||
|
if (!value) return ''
|
||||||
|
if (value.length > 10) {
|
||||||
|
return value.slice(0,11) + '...'
|
||||||
|
}
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
pickerOptions: {
|
pickerOptions: {
|
||||||
@@ -1570,6 +1589,23 @@
|
|||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
//时间处理
|
||||||
|
dateFormat2(str){
|
||||||
|
if(str === undefined || str === null || str === ''){
|
||||||
|
return ""
|
||||||
|
}else {
|
||||||
|
if(str.indexOf(",") !== -1){
|
||||||
|
const arr = str.split(",")
|
||||||
|
const arr1 = str.split(",")
|
||||||
|
arr.forEach( date =>{
|
||||||
|
arr1.push(dateFormat(date.trim()))
|
||||||
|
})
|
||||||
|
return arr1.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
return dateFormat(str)
|
||||||
|
},
|
||||||
getAddFormFieldList (isEdit) {
|
getAddFormFieldList (isEdit) {
|
||||||
this.$http.get('lawss/sarStandAttrDetails/list', {}, {
|
this.$http.get('lawss/sarStandAttrDetails/list', {}, {
|
||||||
_this: this
|
_this: this
|
||||||
|
|||||||
Reference in New Issue
Block a user