Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -50,7 +50,10 @@
|
||||
<el-table-column
|
||||
label="链接">
|
||||
<template slot-scope="scope" >
|
||||
<span @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
|
||||
<span v-if="scope.row.url.slice(0,7) === 'http://'" @click="linkto(scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">
|
||||
{{ scope.row.url }}
|
||||
</span>
|
||||
<span v-else @click="linkto('http://' + scope.row.url)" style="color: #0c91e5;cursor: pointer;text-decoration: underline">{{ scope.row.url }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -92,8 +95,8 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
|
||||
<el-input v-model="sarStandardsInfoEO.url"
|
||||
placeholder="请输入链接"
|
||||
clearable></el-input>
|
||||
placeholder="请输入链接">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="demo-drawer-footer">
|
||||
|
||||
@@ -51,12 +51,20 @@
|
||||
prop="showNumber"
|
||||
label="标准号/政策号"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<a class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="standName"
|
||||
label="标准名称/政策名称"
|
||||
show-overflow-tooltip
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<a class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="fileTypeShow"
|
||||
@@ -800,6 +808,17 @@ export default {
|
||||
this.conditionForm.pageSize = pageSize
|
||||
this.getSearch()
|
||||
},
|
||||
//点击查看详情
|
||||
handlePreview(item) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: 'OtherStandardDetails',
|
||||
params: {
|
||||
id: item.standId,
|
||||
pageType: 'INLAND_STAND'
|
||||
}
|
||||
})
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
// 查询政策和标准
|
||||
getSearch () {
|
||||
if (this.conditionForm.standType === 'FOREIGN2') {
|
||||
|
||||
@@ -57,8 +57,8 @@
|
||||
label="标准号/政策号"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.showNumber}}</div>
|
||||
<div v-else>{{scope.row.standNumSplit}}</div>
|
||||
<a class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -66,8 +66,8 @@
|
||||
label="标准名称/政策名称"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.standName}}</div>
|
||||
<div v-else>{{scope.row.standNameSplit}}</div>
|
||||
<a class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -146,8 +146,8 @@
|
||||
label="标准号/政策号"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.showNumber}}</div>
|
||||
<div v-else>{{scope.row.standNumSplit}}</div>
|
||||
<a class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.showNumber }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -155,8 +155,8 @@
|
||||
label="标准名称/政策名称"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.standId != null && scope.row.standId !== ''">{{scope.row.standName}}</div>
|
||||
<div v-else>{{scope.row.standNameSplit}}</div>
|
||||
<a class="table-jump"
|
||||
@click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
@@ -266,6 +266,17 @@ export default {
|
||||
// this.selectedSplitStandList2 = []
|
||||
// this.selectedSplitStandList2.push(this.addSpiltStandList2[0])
|
||||
},
|
||||
//点击查看详情
|
||||
handlePreview(item) {
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: 'OtherStandardDetails',
|
||||
params: {
|
||||
id: item.standId,
|
||||
pageType: 'INLAND_STAND'
|
||||
}
|
||||
})
|
||||
window.open(routeUrl.href, '_blank')
|
||||
},
|
||||
// 条款比对
|
||||
addStandCompareHis () {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
@@ -45,23 +45,23 @@
|
||||
v-model="form.modelName"
|
||||
clearable
|
||||
></el-input>
|
||||
<!-- <div v-if="form.modelName" @click="fileUpload" class="fileClass">-->
|
||||
<!-- {{ form.modelName }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div v-else>-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- class="common-button-primary"-->
|
||||
<!-- @click="fileUpload"-->
|
||||
<!-- size="mini">-->
|
||||
<!-- 点击上传-->
|
||||
<!-- </el-button>-->
|
||||
|
||||
<el-button type="primary" @click="fileUpload">
|
||||
<i class="el-icon-upload el-icon--right"></i>
|
||||
{{isFileUploadStr}}
|
||||
<div v-if="form.modelName" @click="fileUpload" class="fileClass">
|
||||
{{ form.modelName }}
|
||||
</div>
|
||||
<div v-else>
|
||||
<el-button
|
||||
type="primary"
|
||||
class="common-button-primary"
|
||||
@click="fileUpload"
|
||||
size="mini">
|
||||
点击上传
|
||||
</el-button>
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- <el-button type="primary" @click="fileUpload">-->
|
||||
<!-- <i class="el-icon-upload el-icon--right"></i>-->
|
||||
<!-- {{isFileUploadStr}}-->
|
||||
<!-- </el-button>-->
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -175,7 +175,6 @@
|
||||
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
|
||||
<el-upload
|
||||
class="upload-demo"
|
||||
multiple
|
||||
drag
|
||||
:action="fileUrl"
|
||||
ref="importfile"
|
||||
@@ -206,7 +205,7 @@ export default {
|
||||
name: "bzdyStep1",
|
||||
data() {
|
||||
return {
|
||||
isFileUploadStr:'点击上传',
|
||||
// isFileUploadStr:'点击上传',
|
||||
progressType: false,
|
||||
loadProgress: 0,
|
||||
commentText: '',
|
||||
@@ -356,8 +355,8 @@ export default {
|
||||
// 导入标准数据成功后执行
|
||||
importFileSuccess (response, file) {
|
||||
if (response.ok) {
|
||||
this.isFileUploadStr='点击查看已上传文件';
|
||||
this.fileMadel = true;
|
||||
// this.isFileUploadStr='点击查看已上传文件';
|
||||
this.fileMadel = false;
|
||||
this.loadProgress = 0
|
||||
this.progressType = false
|
||||
this.form.model = response.data.id
|
||||
|
||||
@@ -37,18 +37,40 @@
|
||||
clearable
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
|
||||
<div class="file-box" v-if="listForm.model">
|
||||
<p> {{ listForm.modelName }}
|
||||
<!-- <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
|
||||
<!-- <div class="file-box" v-if="listForm.model">-->
|
||||
<!-- <p> {{ listForm.modelName }}-->
|
||||
<!-- <i-->
|
||||
<!-- title="下载"-->
|
||||
<!-- @click="downloadFile(listForm.model)"-->
|
||||
<!-- class="icon-download"-->
|
||||
<!-- v-btn-permission="''"-->
|
||||
<!-- />-->
|
||||
<!-- <i-->
|
||||
<!-- title="下载带水印"-->
|
||||
<!-- @click="downloadFileByWater(listForm.model,listForm.modelName)"-->
|
||||
<!-- class="icon-download2"-->
|
||||
<!-- v-btn-permission="''"-->
|
||||
<!-- />-->
|
||||
<!-- </p>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div v-else>-->
|
||||
<!-- 暂无数据-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
|
||||
<div class="file-box" v-if="fileList.length > 0">
|
||||
<p v-for="item in fileList"
|
||||
:key="item.id"> {{ item.name }}
|
||||
<i
|
||||
title="下载"
|
||||
@click="downloadFile(listForm.model)"
|
||||
@click="downloadFile(item.id)"
|
||||
class="icon-download"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
<i
|
||||
title="下载带水印"
|
||||
@click="downloadFileByWater(listForm.model,listForm.modelName)"
|
||||
@click="downloadFileByWater(item.id, item.name)"
|
||||
class="icon-download2"
|
||||
v-btn-permission="''"
|
||||
/>
|
||||
@@ -255,6 +277,7 @@ export default {
|
||||
selectList: [], //选择标准的选择框
|
||||
bringData: [],
|
||||
commentText: "", //填写会签意见
|
||||
fileList:[],
|
||||
page: 1,
|
||||
total: 0,
|
||||
pageSize: this.$store.getters.userInfo.configContent,
|
||||
@@ -356,6 +379,9 @@ export default {
|
||||
this.listForm.applyUpdUserId = item.applyUpdUserId;
|
||||
this.listForm.jlUserId = item.jlUserId;
|
||||
this.listForm.zrUserId = item.zrUserId;
|
||||
this.fileIds = item.fileId;
|
||||
console.log(this.fileIds);
|
||||
this.getFileInfo();
|
||||
});
|
||||
},
|
||||
// 请求上传的文件信息
|
||||
@@ -365,11 +391,15 @@ export default {
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
console.log(res);
|
||||
this.$nextTick(() => {
|
||||
res.data.map(item => {
|
||||
this.listForm.modelName = item.oldFileName;
|
||||
this.listForm.model = item.id;
|
||||
// 赋值要回显的上传文件内容
|
||||
this.fileList.push({
|
||||
name: item.oldFileName,
|
||||
uid: item.uid,
|
||||
status: item.status,
|
||||
id: item.id
|
||||
});
|
||||
});
|
||||
});
|
||||
}, e => {
|
||||
@@ -399,8 +429,27 @@ export default {
|
||||
},
|
||||
//驳回事件
|
||||
beforeBack() {
|
||||
this.listForm.approvalOpinion = "1";
|
||||
this.handleSubmit();
|
||||
if(!this.commentText){
|
||||
this.$message.warning('请填写审批意见')
|
||||
}else{
|
||||
this.listForm.approvalOpinion = "1";
|
||||
this.saveLoading = true
|
||||
this.listForm.commentText = this.commentText;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
json: json
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.saveLoading = false
|
||||
});
|
||||
}/**/
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
@@ -480,6 +529,31 @@ export default {
|
||||
padding: 0 20px 0;
|
||||
}
|
||||
}
|
||||
p {
|
||||
& > a {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
& > i {
|
||||
display: inline-block;
|
||||
margin-left: 3px;
|
||||
width: 18px;
|
||||
height: 16px;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
background-position: center center;
|
||||
vertical-align: sub;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.icon-download {
|
||||
background-image: url("~assets/images/shangqi/img/download.png");
|
||||
}
|
||||
|
||||
.icon-download2 {
|
||||
background-image: url("~assets/images/shangqi/img/download2.png");
|
||||
}
|
||||
}
|
||||
|
||||
.choiceBtn {
|
||||
.el-button--primary {
|
||||
|
||||
@@ -810,7 +810,7 @@
|
||||
</el-form-item>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="修订申请人" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
|
||||
<el-timeline-item timestamp="修订申请人" v-if="form.signFlag === '1'" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
|
||||
<el-card>
|
||||
<el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
|
||||
<h4>修订申请人</h4>
|
||||
|
||||
@@ -282,7 +282,7 @@ export default {
|
||||
},
|
||||
// 点击查看
|
||||
handlePreview(item) {
|
||||
console.log(item)
|
||||
console.log(item);
|
||||
let routeUrl = this.$router.resolve({
|
||||
name: "OtherStandardDetails",
|
||||
params: {
|
||||
@@ -304,14 +304,14 @@ export default {
|
||||
}, res => {
|
||||
this.standardData = res.data.list;
|
||||
this.standardData.forEach(item => {
|
||||
if(item.attrInfoMap === null){
|
||||
this.$set(item, "ZCCSSRQ", '');
|
||||
this.$set(item, "XCXSSRQ", '');
|
||||
}else{
|
||||
if (item.attrInfoMap === null) {
|
||||
this.$set(item, "ZCCSSRQ", "");
|
||||
this.$set(item, "XCXSSRQ", "");
|
||||
} else {
|
||||
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
|
||||
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
|
||||
}
|
||||
})
|
||||
});
|
||||
this.totalNo = res.data.count;
|
||||
}, e => {
|
||||
});
|
||||
@@ -354,7 +354,10 @@ export default {
|
||||
},
|
||||
//提交事件
|
||||
handleSubmit() {
|
||||
this.isSubmit = true
|
||||
if (!this.listForm.jgUser) {
|
||||
this.$message.warning("请选择架构经理");
|
||||
} else {
|
||||
this.isSubmit = true;
|
||||
this.listForm.commentText = this.commentText;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
@@ -368,9 +371,10 @@ export default {
|
||||
this.$message.success(res.message);
|
||||
this.$router.push("/processCenter");
|
||||
}
|
||||
this.isSubmit = false
|
||||
this.isSubmit = false;
|
||||
}, e => {
|
||||
});
|
||||
}
|
||||
},
|
||||
choiceZRR(scope, type, title, id) {
|
||||
if (scope != null) {
|
||||
|
||||
@@ -108,12 +108,12 @@
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="责任人"
|
||||
label="分发责任人"
|
||||
width="170"
|
||||
align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.liablePeopleId" style="display: none;"/>
|
||||
<el-input v-model="scope.row.liablePeople" placeholder="请选择落实人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
|
||||
<el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -370,6 +370,7 @@ export default {
|
||||
if(this.peopleFlag === true){
|
||||
this.listForm.commentText = this.commentText;
|
||||
const json = JSON.stringify(this.listForm);
|
||||
console.log(json)
|
||||
this.$http.post("lawss/activiti/completeTask", {
|
||||
taskIds: this.taskIds,
|
||||
userId: this.userId,
|
||||
@@ -430,6 +431,7 @@ export default {
|
||||
if (this.type === 1) {
|
||||
this.dataList[this.zrIndex].liablePeopleId = data[0].id
|
||||
this.dataList[this.zrIndex].liablePeople = data[0].name
|
||||
this.$forceUpdate()
|
||||
} else if(this.type === 2) {
|
||||
this.dataList.forEach( item => {
|
||||
this.selectList.forEach( items => {
|
||||
@@ -437,6 +439,7 @@ export default {
|
||||
item.liablePeopleId = data[0].id
|
||||
item.liablePeople = data[0].name
|
||||
}
|
||||
this.$forceUpdate()
|
||||
})
|
||||
})
|
||||
}
|
||||
@@ -451,6 +454,14 @@ export default {
|
||||
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// dataList: {
|
||||
// deep: true,
|
||||
// handler (val) {
|
||||
// console.log('dataList update', val)
|
||||
// }
|
||||
// }
|
||||
},
|
||||
mounted() {
|
||||
this.processTable();
|
||||
this.getData();
|
||||
|
||||
@@ -315,6 +315,7 @@ export default {
|
||||
taskIds: this.taskIds,
|
||||
pId: this.pId
|
||||
}).then(res => {
|
||||
console.log(res.mesg)
|
||||
if (res) {
|
||||
const processForm = JSON.parse(res.mesg);
|
||||
this.getFormFieldList(processForm);
|
||||
|
||||
@@ -119,13 +119,15 @@
|
||||
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
|
||||
<el-form-item label="标准号" class="labelBox">
|
||||
<el-input
|
||||
style="width: 165px"
|
||||
v-model="sarAccessInfo.standNumber"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" class="labelBox">
|
||||
<el-form-item label="标准名称" class="labelBox1">
|
||||
<el-input
|
||||
style="width: 165px"
|
||||
v-model="sarAccessInfo.standName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
@@ -2175,7 +2177,12 @@ export default {
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
padding-left: 10px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
}
|
||||
.labelBox1 {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
.un-select {
|
||||
|
||||
@@ -57,7 +57,6 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" class="search-item" prop="responseUnit">
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardForm.zrbm"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
@@ -86,102 +85,11 @@
|
||||
icon="export"
|
||||
>导出
|
||||
</el-button>
|
||||
<el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||
<i class="iconfont"></i>
|
||||
高级查询
|
||||
</el-button>
|
||||
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
|
||||
<i class="iconfont"></i>
|
||||
高级查询
|
||||
</el-button>
|
||||
</el-form>
|
||||
<div v-if="!showSelectBox">
|
||||
<el-form :model="standardFormList" class="label-input-form" label-width="108px" inline>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="中文名称" class="search-item">
|
||||
<el-input
|
||||
v-model="standardFormList.standName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
size="small"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车型" class="labelBox" label-width="61px">
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.typeApplicable"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in applyArcticOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="能源类型" label-width="68px" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.nylx"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in categoryOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="责任部门" class="labelBox" label-width="108px" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.zrbm"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in zrbmOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用产品线" label-width="86px" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.sycpx"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in sycpxOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div style="padding-left: 110px">
|
||||
<el-form-item>
|
||||
<el-button type="primary" size="small" style="width: 100px" @click="selectSuper">确认</el-button>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container" style="position:relative;">
|
||||
@@ -358,6 +266,101 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-drawer
|
||||
title="高级搜索"
|
||||
size="700px"
|
||||
:wrapperClosable="false"
|
||||
:visible.sync="isAdvancedSearch">
|
||||
<div class="demo-drawer-content">
|
||||
<el-form :model="standardFormList" class="labelForm" label-position="right" label-width="100px">
|
||||
<el-form-item label="中文名称" >
|
||||
<el-input
|
||||
class="showBox"
|
||||
v-model="standardFormList.standName"
|
||||
placeholder="请输入"
|
||||
:maxlength="100"
|
||||
size="small"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用车型" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.typeApplicable"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in applyArcticOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="能源类型" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.nylx"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in categoryOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任部门" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.zrbm"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in zrbmOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="适用产品线" >
|
||||
<el-select
|
||||
class="showBox"
|
||||
v-model="standardFormList.sycpx"
|
||||
placeholder="请选择"
|
||||
filterable
|
||||
size="small"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in sycpxOptions"
|
||||
:value="item.value"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="demo-drawer-footer">
|
||||
<el-button
|
||||
size="small"
|
||||
icon="el-icon-check"
|
||||
type="primary"
|
||||
@click="queryInfo">搜索</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
icon="el-icon-close"
|
||||
@click="backInfo">取消</el-button>
|
||||
</div>
|
||||
</el-drawer>
|
||||
|
||||
<loading :loading="dataLoading">{{ $t("m.dataAcquisition") }}</loading>
|
||||
</div>
|
||||
</template>
|
||||
@@ -368,6 +371,7 @@ export default {
|
||||
name: "AccessStandardDetails",
|
||||
data() {
|
||||
return {
|
||||
isAdvancedSearch: false,
|
||||
// 高级检索状态
|
||||
showSelectBox: true,
|
||||
textStatusMap: {},
|
||||
@@ -519,11 +523,6 @@ export default {
|
||||
// this.$router.push(this.$store.state.detailMap)
|
||||
// this.$store.commit('setDetailMap', '')
|
||||
},
|
||||
selectSuper() {
|
||||
this.page = 1;
|
||||
this.standardForm.page = 1;
|
||||
this.selectInfoMore();
|
||||
},
|
||||
// 搜索
|
||||
selectProductBtn() {
|
||||
this.page = 1;
|
||||
@@ -535,11 +534,6 @@ export default {
|
||||
this.standardForm.zrbm = ''
|
||||
this.standardForm.standName = ''
|
||||
this.standardForm.responseUnit = ''
|
||||
this.standardFormList.standName = ''
|
||||
this.standardFormList.typeApplicable = ''
|
||||
this.standardFormList.nylx = ''
|
||||
this.standardFormList.zrbm = ''
|
||||
this.standardFormList.sycpx = ''
|
||||
this.selectInfobyAccid()
|
||||
this.selectInfoMore()
|
||||
},
|
||||
@@ -701,18 +695,31 @@ export default {
|
||||
* 高级检索
|
||||
*/
|
||||
selectMoreBtn() {
|
||||
this.showSelectBox = !this.showSelectBox
|
||||
this.isAdvancedSearch = true
|
||||
this.standardFormList.standName = ''
|
||||
this.standardFormList.typeApplicable = ''
|
||||
this.standardFormList.nylx = ''
|
||||
this.standardFormList.zrbm = ''
|
||||
this.standardFormList.sycpx = ''
|
||||
this.showTableFlag = false
|
||||
if (!this.showSelectBox) {
|
||||
// this.standardForm = {}
|
||||
// this.standardForm.issueTime = ''
|
||||
// this.standardForm.textStatus = ''
|
||||
// this.standardForm.modifyTime = ''
|
||||
}
|
||||
this.page = 1
|
||||
this.standardForm.page = 1
|
||||
this.selectInfoMore()
|
||||
},
|
||||
queryInfo() {
|
||||
this.page = 1;
|
||||
this.standardForm.page = 1;
|
||||
this.selectInfoMore();
|
||||
this.isAdvancedSearch = false
|
||||
},
|
||||
backInfo() {
|
||||
this.standardFormList.standName = ''
|
||||
this.standardFormList.typeApplicable = ''
|
||||
this.standardFormList.nylx = ''
|
||||
this.standardFormList.zrbm = ''
|
||||
this.standardFormList.sycpx = ''
|
||||
this.isAdvancedSearch = false
|
||||
},
|
||||
// 获取工作组信息下拉框信息
|
||||
getGzzOption() {
|
||||
this.$http.get("lawss/sarGroupMenu/queryGroup", "", {
|
||||
@@ -927,10 +934,8 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
}
|
||||
.labelForm {
|
||||
margin-top: 20px;
|
||||
}
|
||||
/deep/ .relateClass {
|
||||
& > button {
|
||||
@@ -964,7 +969,7 @@ export default {
|
||||
}
|
||||
|
||||
/deep/.showBox{
|
||||
width: 165px;
|
||||
width: 300px;
|
||||
}
|
||||
.iconClass {
|
||||
width: 18px;
|
||||
@@ -989,7 +994,6 @@ export default {
|
||||
cursor: pointer
|
||||
}
|
||||
}
|
||||
|
||||
.relateClass {
|
||||
.el-dialog__body {
|
||||
max-height: 460px;
|
||||
|
||||
@@ -104,13 +104,15 @@
|
||||
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
|
||||
<el-form-item label="标准号" class="labelBox">
|
||||
<el-input
|
||||
style="width: 165px"
|
||||
v-model="sarAccessInfo.standNumber"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" class="labelBox">
|
||||
<el-form-item label="标准名称" class="labelBox1">
|
||||
<el-input
|
||||
style="width: 165px"
|
||||
v-model="sarAccessInfo.standName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
@@ -2155,7 +2157,12 @@ export default {
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
padding-left: 10px;
|
||||
padding-left: 23px;
|
||||
}
|
||||
}
|
||||
.labelBox1 {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
.un-select {
|
||||
|
||||
+9
-2
@@ -104,13 +104,15 @@
|
||||
<el-form :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
|
||||
<el-form-item label="标准号" class="labelBox">
|
||||
<el-input
|
||||
style="width: 165px;"
|
||||
v-model="sarAccessInfo.standNumber"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="标准名称" class="labelBox">
|
||||
<el-form-item label="标准名称" class="labelBox1">
|
||||
<el-input
|
||||
style="width: 165px"
|
||||
v-model="sarAccessInfo.standName"
|
||||
placeholder="请输入"
|
||||
size="small"
|
||||
@@ -2158,7 +2160,12 @@ export default {
|
||||
.labelBox {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
padding-left: 10px;
|
||||
padding-left: 23px;
|
||||
}
|
||||
}
|
||||
.labelBox1 {
|
||||
/deep/ .el-form-item__label {
|
||||
padding-right: 5px;
|
||||
}
|
||||
}
|
||||
.un-select {
|
||||
|
||||
@@ -189,7 +189,7 @@
|
||||
align="center"
|
||||
label="项目经理">
|
||||
</el-table-column>
|
||||
<el-table-column label="" fixed="right" width="50" :resizable="false">
|
||||
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
|
||||
<template slot-scope="scope">
|
||||
<div @click.stop style="display: inline-block">
|
||||
<el-dropdown trigger="click" @command="handleCommand">
|
||||
|
||||
+1
-1
@@ -188,7 +188,7 @@
|
||||
label="相对于国行标差异点">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="carModel"
|
||||
prop="complianceState"
|
||||
label="合规性分析">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
|
||||
@@ -203,6 +203,7 @@
|
||||
<el-dropdown trigger="click" @command="handleCommand">
|
||||
<i class="iconfont"></i>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<!--未符合项整改库-查看-->
|
||||
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
@@ -224,7 +225,7 @@
|
||||
destroy-on-close
|
||||
:wrapperClosable="false"
|
||||
class="seeHisToryDraw"
|
||||
size="1000px"
|
||||
size="600px"
|
||||
>
|
||||
<div class="demo-drawer-content">
|
||||
<div class="el-drawer-form" style="height: auto">
|
||||
|
||||
Reference in New Issue
Block a user