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

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

Browse Source
This commit is contained in:
zhutianqi
2021-08-16 17:59:57 +08:00
parent 7561656166 279c07ff97
commit a6ab3c7964
12 changed files with 2487 additions and 2153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -538,7 +538,7 @@
</template>
</el-table-column>
<el-table-column
prop="interpretationContent"
prop="readContent"
label="解读内容"
show-overflow-tooltip
>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+17 -2
View File
@@ -26,7 +26,7 @@
<el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
<el-radio-group v-model="listType" @change="selectionList">
<el-radio label="country">国家/地区清单</el-radio>
<el-radio label="project">项目清单</el-radio>
<el-radio label="project">车型类别清单</el-radio>
<el-radio label="other">其他清单</el-radio>
</el-radio-group>
<el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
@@ -377,7 +377,7 @@
align="center">
</el-table-column>
<el-table-column
prop="projectName"
prop="carType"
label="项目名称"
align="center">
</el-table-column>
@@ -947,6 +947,20 @@ export default {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
}
}
}
})
this.total = res.data.total;
}, e => {
});
@@ -1384,6 +1398,7 @@ export default {
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+18 -3
View File
@@ -26,7 +26,7 @@
<el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
<el-radio-group v-model="listType" @change="selectionList">
<el-radio label="country">国家/地区清单</el-radio>
<el-radio label="project">项目清单</el-radio>
<el-radio label="project">车型类别清单</el-radio>
<el-radio label="other">其他清单</el-radio>
</el-radio-group>
<el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
@@ -380,8 +380,8 @@
align="center">
</el-table-column>
<el-table-column
prop="projectName"
label="项目名称"
prop="carType"
label="车型类别"
align="center">
</el-table-column>
<el-table-column
@@ -913,6 +913,20 @@ export default {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
}
}
}
})
this.total = res.data.total;
}, e => {
});
@@ -1359,6 +1373,7 @@ export default {
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+69 -67
View File
@@ -30,7 +30,6 @@
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
disabled
clearable
></el-input>
</el-form-item>
@@ -38,7 +37,6 @@
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
disabled
clearable
></el-input>
</el-form-item>
@@ -68,8 +66,10 @@
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -265,14 +265,12 @@
<el-input
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
disabled
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
disabled
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
@@ -368,13 +366,13 @@ export default {
active: "1", //当前选中的type
isSubmit: false,
saveLoading: false,
commentText: '',
commentText: "",
//表单的数据
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
breakdownList: [], //标准下的分解单数据
breakdownList: [] //标准下的分解单数据
},
dataList: [], //下面标准的数据
breakdownList: [], //标准下的条款数据
@@ -461,8 +459,8 @@ export default {
_this: this
}, res => {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total
});
},
//点击清空按钮事件
clearSearch() {
@@ -514,7 +512,7 @@ export default {
{
_this: this
}, res => {
this.listForm.breakdownList = res.data
this.listForm.breakdownList = res.data;
});
},
//标准的多选框改变
@@ -528,79 +526,83 @@ export default {
},
// 点击查看
handlePreview (item) {
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
name: "OtherStandardDetails",
params: {
id: item.standId,
pageType: 'INLAND_STAND'
pageType: "INLAND_STAND"
}
})
window.open(routeUrl.href, '_blank')
});
window.open(routeUrl.href, "_blank");
},
pageSizeChange(pageSize) {
},
//流程保存事件
handleSave(){
this.saveLoading = true
let _formData = new FormData()
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '6')
_formData.append('json', JSON.stringify({
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
_formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "6");
_formData.append("json", JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
}))
}));
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
this.saveLoading = false;
this.$message.success("保存成功");
this.bpnId = res.result;
}).catch(e => {
this.saveLoading = false
})
this.saveLoading = false;
});
},
//流程提交事件
handleSubmit(){
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs['listForm'].validate((valid) => {
if (valid) {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
handleSubmit() {
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
choiceZRR(type, title, id) {
this.nodeList = [];
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+46 -43
View File
@@ -450,10 +450,10 @@ export default {
}, {
_this: this
}, res => {
if(res.data === null){
this.ProjectDatas = ''
this.total = 0
}else{
if (res.data === null) {
this.ProjectDatas = "";
this.total = 0;
} else {
this.ProjectDatas = res.data.Maintenance.records;
this.total = res.data.Maintenance.total;
}
@@ -491,7 +491,6 @@ export default {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
_this: this
}, res => {
console.log(res.data.records);
this.listForm.dataList = res.data.records;
this.dataList = res.data.records;
this.listForm.dataList.forEach(item => {
@@ -525,7 +524,7 @@ export default {
{
_this: this
}, res => {
this.listForm.breakdownList = res.data;
this.listForm.breakdownList = res.data;
});
},
//标准的多选框改变
@@ -564,43 +563,47 @@ export default {
},
//流程提交事件
handleSubmit() {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+36 -33
View File
@@ -44,7 +44,8 @@
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button>
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
</el-button>
</div>
</div>
<el-table
@@ -99,11 +100,11 @@
<el-input v-model="scope.row.workPeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
<!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
<!-- {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
<!-- </div>-->
<!-- </template>-->
<!-- <template slot-scope="scope">-->
<!-- <div :class="{'fileClass': !scope.row.workPeople}">-->
<!-- {{ scope.row.workPeople ? scope.row.workPeople : "" }}-->
<!-- </div>-->
<!-- </template>-->
</el-table-column>
</el-table>
</div>
@@ -259,7 +260,7 @@ export default {
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
selectedId:'',
selectedId: ""
};
},
methods: {
@@ -322,6 +323,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);
@@ -413,9 +415,9 @@ export default {
}, e => {
});
},
//批量分发按钮
//批量分发按钮
choiceZRRS(row, type, index) {
this.selectedId=row.id
this.selectedId = row.id;
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
@@ -458,36 +460,37 @@ export default {
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.children){
if (item.children) {
item.children.forEach(items => {
if(items.id === this.selectedId){
items.workPeople = data[0].name
items.workPeopleId = data[0].id
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
})
if (items.id === this.selectedId) {
items.workPeople = data[0].name;
items.workPeopleId = data[0].id;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
});
}
})
this.dataList = JSON.parse(JSON.stringify(this.dataList))
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 2) {
this.selectList.forEach(item =>{
this.dataList.map(items=>{
if(item.id==items.id){
items.workPeople = data[0].name
items.workPeopleId = data[0].id
this.selectList.forEach(item => {
this.dataList.map(items => {
if (item.id == items.id) {
items.workPeople = "";
items.workPeopleId = "";
this.$message.warning('您只能针对条款进行分发')
}
if(items.children.length){
items.children.map(childrenItem=>{
if(childrenItem.id==item.id){
childrenItem.workPeople = data[0].name
childrenItem.workPeopleId = data[0].id
if (items.children.length) {
items.children.map(childrenItem => {
if (childrenItem.id == item.id) {
childrenItem.workPeople = data[0].name;
childrenItem.workPeopleId = data[0].id;
}
})
});
}
})
})
this.dataList = JSON.parse(JSON.stringify(this.dataList))
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
}
this.modalshowflag = false;
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+1 -1
View File
@@ -64,7 +64,7 @@ export default {
continue;
} else if (entity.id === "63e05705d0c8013162caa34f9fe52865") {
list.push({
label: "车辆类型清单",
label: "车型类别清单",
name: "listProject"
});
continue;
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+2047 -1865
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+229 -133
View File
@@ -341,24 +341,28 @@
:wrapperClosable="false"
:visible.sync="isAdvancedSearch">
<div class="demo-drawer-content">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
<el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice"
style="display: flex;flex-wrap: wrap">
<!-- 标准号-->
<el-form-item :label="$t('m.standardNo')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
<el-form-item :label="$t('m.standardNo')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable
:maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准名称-->
<el-form-item :label="$t('m.standName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
<el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable
:maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准英文名称-->
<el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
<el-input v-model="sarStandardsSearch.standEnName"
:placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 标准类别-->
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<el-form-item :label="$t('m.standardCategory')" class="serch-form-item">
<search-select
v-model="sarStandardsSearch.standSort"
:placeholder="$t('m.standardCategoryTips')"
@@ -366,59 +370,88 @@
:options="standSortOptions"
clearable/>
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 代替标准号-->
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
<el-form-item :label="$t('m.substituteStandardNumber')" class="serch-form-item">
<el-input v-model="sarStandardsSearch.replaceStandNum" :placeholder="$t('m.lookUpByAlternativeCriteria')"
clearable :maxlength="100"
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
</el-form-item>
<!-- 被代替标准号-->
<el-form-item label="被代替标准号">
<el-input v-model="sarStandardsSearch.replacedStandNum" clearable placeholder="根据被代替标准号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 标准年份-->
<el-form-item :label="$t('m.standardYear')" class="serch-form-item">
<el-form-item :label="$t('m.standardYear')" class="serch-form-item">
<el-input
v-model="sarStandardsSearch.standYear"
placeholder="根据标准年份查找">
</el-input>
</el-form-item>
<!-- 标准发布日期-->
<el-form-item label="标准发布日期" class="serch-form-item">
<el-form-item label="标准发布日期" class="serch-form-item">
<el-date-picker
v-model="sarStandardsSearch.issueTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据标准发布日期查找">
</el-date-picker>
</el-form-item>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.applyArctic"
:placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item label="是否纳入标准清单" class="serch-form-item">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
<el-option value="1" label="是"></el-option>
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
<!-- 文本状态-->
<el-form-item :label="$t('m.standStateShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 标准性质-->
<el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 是否纳入标准清单-->
<el-form-item label="是否纳入标准清单" class="serch-form-item">
<el-select v-model="sarStandardsSearch.isRelateAccess" placeholder="根据是否纳入标准清单查找">
<el-option value="yes" label="是"></el-option>
<el-option value="no" label="否"></el-option>
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 自定义属性-->
<!-- 实施日期-->
<el-form-item label="实施日期">
<el-date-picker
v-model="sarStandardsSearch.ssrq"
v-model="advanceSearchMapping.SSRQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 新车型实施日期-->
<el-form-item title="新车型实施日期" label="新车型实施日期">
<el-date-picker
v-model="sarStandardsSearch.xcxssrq"
value-format="yyyy-MM-dd"
v-model="advanceSearchMapping.XCXSSRQ"
type="date"
placeholder="根据新车型实施日期查找">
</el-date-picker>
@@ -426,139 +459,153 @@
<!-- 在产车实施日期-->
<el-form-item title="在产车实施日期" label="在产车实施日期">
<el-date-picker
v-model="sarStandardsSearch.zccssrq"
v-model="advanceSearchMapping.ZCCSSRQ"
type="date"
value-format="yyyy-MM-dd"
placeholder="根据在产车实施日期查找">
</el-date-picker>
</el-form-item>
<!-- 归口管理部门-->
<el-form-item label="归口管理部门">
<el-select v-model="sarStandardsSearch.gkglbm" placeholder="归口管理部门" clearable
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
:key="opt.value" :label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 起草单位-->
<el-form-item label="起草单位">
<el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
<el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 我司参与深度-->
<el-form-item label="我司参与深度">
<el-select v-model="sarStandardsSearch.wscysd" placeholder="请选择我司参与深度" clearable
<el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 能源类型-->
<el-form-item label="能源类型">
<el-select v-model="sarStandardsSearch.nylx" placeholder="请选择能源类型" clearable
<el-select v-model="advanceSearchMapping.NYLX" placeholder="请选择能源类型" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
</el-select>
</el-form-item>
<!-- 适用车型-->
<el-form-item :label="$t('m.applicableModels')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 适用产品线（新增字段）-->
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
<el-form-item :label="$t('m.applicableProductLine')" class="serch-form-item">
<el-select v-model="advanceSearchMapping.SYCPX" :placeholder="$t('m.searchByApplicableProductLine')"
clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 适用认证-->
<el-form-item label="适用认证">
<el-select v-model="sarStandardsSearch.syrz" placeholder="根据适用认证查找" clearable
<el-select v-model="advanceSearchMapping.SYRZ" placeholder="根据适用认证查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in syrzOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 责任部门-->
<el-form-item label="责任部门">
<el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
<el-select v-model="advanceSearchMapping.ZRBM" placeholder="根据责任部门查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 责任工程师-->
<el-form-item label="责任工程师">
<el-select v-model="sarStandardsSearch.zrgcs" placeholder="根据责任工程师查找" clearable
<el-select v-model="advanceSearchMapping.ZRGCS" placeholder="根据责任工程师查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 关联模块-VPPS编码-->
<el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
<el-input v-model="sarStandardsSearch.svpps" clearable
placeholder="根据关联模块-VPPS编码查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 代替标准号-->
<el-form-item label="代替标准号">
<el-input v-model="sarStandardsSearch.dtbjh" clearable placeholder="根据代替标准号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块-中文名称-->
<el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
<el-input v-model="sarStandardsSearch.standNumber" clearable
placeholder="根据关联模块-中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow">
<el-input v-model="sarStandardsSearch.cbbh" clearable placeholder="根据采标编号查找"
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 采标程度-->
<el-form-item label="采标程度" prop="standNumber">
<el-input v-model="sarStandardsSearch.cbcd" clearable
<el-input v-model="advanceSearchMapping.CBCD" clearable
placeholder="根据采标程度查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 引用标准-->
<el-form-item label="引用标准">
<el-input v-model="sarStandardsSearch.yybj" clearable placeholder="根据引用标准查找"
<el-input v-model="advanceSearchMapping.YYBJ" clearable placeholder="根据引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 被引用标准-->
<el-form-item label="被引用标准">
<el-input v-model="sarStandardsSearch.byybj" clearable
<el-input v-model="advanceSearchMapping.BYYBJ" clearable
placeholder="根据被引用标准查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块（新增字段）-->
<el-form-item :label="$t('m.associatedModule')" class="serch-form-item">
<el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}
</el-option>
</el-select>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签">
<el-input v-model="sarStandardsSearch.gxhbq" clearable
placeholder="根据被标签查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 体系类别-->
<el-form-item label="体系类别">
<el-select v-model="sarStandardsSearch.txlb" placeholder="根据体系类别查找" clearable
<el-select v-model="advanceSearchMapping.TXLB" placeholder="根据体系类别查找" clearable
@keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
<el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value"
:label="opt.label">{{ opt.label }}
</el-option>
</el-select>
</el-form-item>
<!-- 关联模块--乘用车VPPS编码-->
<el-form-item title=" 关联模块--乘用车VPPS编码" label=" 关联模块--乘用车VPPS编码" prop="standNumber">
<el-input v-model="advanceSearchMapping.CYCVPPSBM" clearable
placeholder=" 关联模块--乘用车VPPS编码"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 关联模块--乘用车vpps中文名称-->
<el-form-item title="关联模块--乘用车vpps中文名称" label="关联模块--乘用车vpps中文名称" prop="standNumber">
<el-input v-model="advanceSearchMapping.CYCVPPSCN" clearable
placeholder="关联模块--乘用车vpps中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!--关联模块--卡车VPPS编码-->
<el-form-item title="关联模块--卡车VPPS编码" label="关联模块--卡车VPPS编码" prop="standNumber">
<el-input v-model="advanceSearchMapping.KCCVPPSBM" clearable
placeholder="关联模块--卡车VPPS编码"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!--关联模块--卡车vpps中文名称-->
<el-form-item title="关联模块--卡车vpps中文名称" label="关联模块--卡车vpps中文名称" prop="standNumber">
<el-input v-model="advanceSearchMapping.KCCVPPSCN" clearable
placeholder="关联模块--卡车vpps中文名称"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
<!-- 标记-->
<!-- 标签-->
<el-form-item label="标签">
<el-input v-model="advanceSearchMapping.GXHBQ" clearable
placeholder="根据被标签查找"
@keyup.enter.native="btnSearch"></el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -566,11 +613,13 @@
class="common-button-primary"
icon="el-icon-check"
type="primary"
@click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
@click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索
</el-button>
<el-button
class="common-button-default"
icon="el-icon-close"
@click="clearAllSearch('sarStandardsSearch')">取消</el-button>
@click="clearAllSearch('sarStandardsSearch')">取消
</el-button>
</div>
</el-drawer>
<!-- 新增海外标准 -->
@@ -1460,38 +1509,41 @@ export default {
validFlag: '0',
menuId: '',
country: '',
standNumber: '',//标准编号
standNumber: '',//标准号
standName: '',//标准名称
standEnName: '',//标准英文名称
standSort: '', // 标准类别
replaceStandNum: '',//代替标准号
replacedStandNum: '',// 被代替标准号
standYear: '',//标准年份
issueTime: '',//标准发布时间
applyArctic: '',//适用车型
standState: '',
standNature: '',//标准性质
issueTime: '',//标准发布时间
// applyArctic: '',
dtbjh: '',//代替标准号
// replaceStandNumCope: '',
// replaceStandNumList: [],
replacedStandNum: '',
synopsis: '', // 内容摘要
// category: '', // 所属类别
standSort: '', // 标准类别
txlbOption:'', //标准体系
gxhbq:'', //标签
wscysd:'', //我司参与深度
gkglbm:'', //归口管理部门
ssrq:'',//实施日期
scxssrq:''//新车型实施日期
,zccssrq:''//在产车实施日期
,qcdw:''//起草单位
,nylx:''//能源类型
,cllx:''//适用车型
,syrz:''//适用认证
,zrgcs:''//责任工程师
,cbbh:''//采标编号
,cbcd:''//采标程度
,yybj:''//引用标准
,byybj:''//被引用标准
,txlb:''//体系类别
textStatus:''//文本状态
},
//高级搜索映射
advanceSearchMapping: {
txlbOption: '', //标准体系
GXHBQ: '', //标签
CYSD: '', //我司参与深度
GKDW: '', //归口管理部门
SSRQ: '',//实施日期
XCXSSRQ: ''//新车型实施日期
, ZCCSSRQ: ''//在产车实施日期
, QCDW: ''//起草单位
, NYLX: ''//能源类型
, SYRZ: ''//适用认证
, ZRGCS: ''//责任工程师
, CBBH: ''//采标编号
, CBCD: ''//采标程度
, YYBJ: ''//引用标准
, BYYBJ: ''//被引用标准
, TXLB: ''//体系类别
},
}, // 分页查询过程中用到的对象
// 分页查询过程中用到的对象
loading: false,
isCollapse: true,
sideClose: false, // 边栏收展状态
@@ -2532,17 +2584,19 @@ export default {
this.getDomesticStandardTable()
},
// 搜索
getDomesticStandardTableBtn (sarStandardsSearch) {
getDomesticStandardTableBtn (item) {
item.page = 1
this.standCommonlySearch.page = 1
this.standCommonlySearch.sarStandardsSearch = JSON.stringify(sarStandardsSearch) || ''
this.getDomesticStandardTable(2)
this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
this.getDomesticStandardTable(item)
},
// 清空搜索框
clearAllSearch (flag) {
if (flag === 'standCommonlySearch') {
this.standCommonlySearch.standSort = ''
this.standCommonlySearch.standNumber = ''
this.standCommonlySearch.page = 1
if (flag === 'sarStandardsSearch') {
this.sarStandardsSearch.standSort = ''
this.sarStandardsSearch.standNumber = ''
this.sarStandardsSearch.page = 1
this.getDomesticStandardTable()
} else if (flag === 2) {
// 标准条目搜索
@@ -3167,12 +3221,22 @@ export default {
* 1、空：普通检索 2：高级检索
* */
getDomesticStandardTable (item) {
let data = this.standCommonlySearch
if (item === 2) {
data.standSort = ''
data.standNumber = ''
} else {
data.sarStandardsSearch = ''
// if (item === 2) {
// data.standSort = ''
// data.standNumber = ''
// } else {
// data.sarStandardsSearch = ''
// }
if (item !== '' && item !== null && item !== undefined) {
item.pageSize = this.$store.getters.userInfo.configContent
}
this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
const data = item || this.standCommonlySearch || this.advanceSearchMapping
if (item) {
this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr
}
const formData = {...data}
if (!item) {
@@ -3197,6 +3261,29 @@ export default {
}
formData.standType = 'FOREIGN'
formData.userId = this.$store.getters.userInfo.userId
// // 自定义属性字段高级搜索处理
//advanceSearchVOStr
const advanceSearchVOList = [];
for (let key in this.advanceSearchMapping) {
const value = this.advanceSearchMapping[key];
if (value !== null && value !== '') {
advanceSearchVOList.push({
connect: "and",
field: key || '',
type: 'like',
value: value
});
}
}
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
console.log("======")
console.log(formData.advanceSearchVOStr);
this.SarExportSearchEo = formData
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
_this: this, loading: 'loading'
@@ -3233,6 +3320,15 @@ export default {
this.stahndinfoList = []
this.total = 0
})
//清空自定义字段
for (let key in this.advanceSearchMapping) {
this.advanceSearchMapping[key] = ''
}
//情况基本字段
for (let key in this.sarStandardsSearch) {
this.sarStandardsSearch[key] = ''
}
},
// 查询处于游离态的标准
selectConfiguraStand () {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+19 -4
View File
@@ -188,7 +188,7 @@
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form">
<el-form-item label="车型类别" class="search-item search-item-last">
<el-input
v-model="sarSarAccessEOSearch.projectName"
v-model="sarSarAccessEOSearch.carType"
placeholder="请输入车型类别"
></el-input>
</el-form-item>
@@ -236,7 +236,7 @@
align="center">
</el-table-column>
<el-table-column
prop="projectName"
prop="carType"
label="车型类别"
align="center">
</el-table-column>
@@ -497,7 +497,7 @@ export default {
localProLib: {},
// 查询相关参数
sarSarAccessEOSearch: {
projectName: "",
carType: "",
detailedListName: "",
},
takeingFlag: false,
@@ -525,7 +525,7 @@ export default {
this.getStand()
},
clearSearchAccess(){
this.sarSarAccessEOSearch.projectName = ''
this.sarSarAccessEOSearch.carType = ''
this.sarSarAccessEOSearch.detailedListName = ''
this.transfer()
},
@@ -593,6 +593,20 @@ export default {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
}
}
}
})
this.sarSarAccessEOSearch.page = 1
this.totalNo = res.data.total
this.detailedListModel = true
@@ -937,6 +951,7 @@ export default {
_this: this,
loading: 'loading'
}, res => {
this.energyKindOptions = res.data.ENERGYTYPES //适用车型
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.setMap(this.zrbmMap, res.data.ZRBMCLASS)
this.setMap(this.textStatusMap, res.data.WBZTCLASS)
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+3 -1
View File
@@ -327,7 +327,8 @@ export default {
pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: {
productName: "",
standId: ""
standId: "",
type: ""
},
sarProStateTotal: 0,
sarProStateTotalPage: 1,
@@ -382,6 +383,7 @@ export default {
this.queryStandAndLaws();
}, // 外层清空条件查询
handleProjectCompliance(row) {
this.sarProStateEO.type = row.type
this.standId = row.standId;
this.querySarProStateZero();
}, // 查看项目符合性
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1
View File
@@ -459,6 +459,7 @@ export default {
}, res => {
this.myLoading.loadData = false
this.total = res.data.total
this.pageNo = 1
this.nonList = res.data.records
this.nonList.forEach(item => {
// 责任部门转换