diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index a3ae69e2f..ca5c83a58 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -538,7 +538,7 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index f914cb989..161d06192 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -26,7 +26,7 @@ 国家/地区清单 - 项目清单 + 车型类别清单 其他清单 @@ -377,7 +377,7 @@ align="center"> @@ -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); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index b30151c13..29e7e318c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -26,7 +26,7 @@ 国家/地区清单 - 项目清单 + 车型类别清单 其他清单 @@ -380,8 +380,8 @@ align="center"> { 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); diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue index 6f7d8b764..8359b012e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue @@ -30,7 +30,6 @@ @@ -38,7 +37,6 @@ @@ -68,8 +66,10 @@ label="标准号" > @@ -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 = []; diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 93412800f..f5c6021b1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -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) { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue index 2828bd0e0..421f5c544 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue @@ -44,7 +44,8 @@
- 批量分发责任人 + 批量分发责任人 +
- - - - - + + + + + @@ -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; }, diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue index bdcf60207..b9ebac65a 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue @@ -64,7 +64,7 @@ export default { continue; } else if (entity.id === "63e05705d0c8013162caa34f9fe52865") { list.push({ - label: "车辆类型清单", + label: "车型类别清单", name: "listProject" }); continue; diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index d04d3de6c..7698de5a5 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -8,40 +8,42 @@ v-model="filterText"> - - {{ node.label}} + ref="tree" + node-key="id" + class="tree-line" + icon-class="icon-tree" + :indent="0" + :props="props" + :data="treeList" + highlight-current + @node-click="treeClick" + :filter-node-method="filterNode" + default-expand-all + :expand-on-click-node="false"> + + {{ node.label }} + type="text" + size="mini" + v-show="data.show" + @click="() => append(data)"> 新增 + type="text" + size="mini" + v-show="data.show" + @click="() => update(data)"> 编辑 + type="text" + size="mini" + v-show="data.showDel" + @click="() => remove(node, data)"> 删除 @@ -57,21 +59,22 @@
+ @search="getDomesticStandardTableBtn(sarStandardsSearch)" + @reset="clearAllSearch('sarStandardsSearch')">
- + @@ -85,21 +88,24 @@ + :loading="searching" + type="primary" + size="mini" + class="common-button-primary" + v-btn-permission="'967c8b1402459951b5f75fcd1c548665'" + @click="searchBtnClick(standCommonlySearch)"> 查询 清空 + size="mini" + class="common-button-default" + v-btn-permission="'d38fea2d0d992615f9e1c4dfb6dc76f3'" + @click="clearAllSearch('standCommonlySearch')">清空 + 高级检索 + v-btn-permission="'c9cb749aacefc52347f1250d0f98272a'" @click="selectMoreBtn">高级检索 +
@@ -109,82 +115,91 @@
- - - - - - + + + + + + 导入 + v-btn-permission="'417c6562dd08f1c98c681a40fbf94e31'">导入 + 导出 + title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项">导出 + 批量删除 + v-btn-permission="'c09dc12531085e30e39bbdc6cb6116ba'">批量删除 + 移除标准 - - - - - + v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'">移除标准 + + + + + + 配置标准 + v-btn-permission="'8158aefd62cda676a6baf179532328c6'">配置标准 +
+ @selection-change="standSelectChange"> + type="selection" + width="55" + align="center"> + prop="issueTime" + sortable="custom" + width="110px" + label="发布日期"> @@ -195,40 +210,40 @@ width="150px" label="实施日期"> + prop="XCXSSRQ" + sortable="custom" + width="150px" + label="新车型实施日期"> + prop="ZCCSSRQ" + sortable="custom" + width="150px" + label="在产车实施日期"> - - - - - + prop="textStatus" + sortable="custom" + width="120px" + label="文本状态"> + + + + + @@ -240,20 +255,24 @@ 收藏 - 取消收藏 - 编辑 - - 删除 + 编辑 + + + 删除 +
@@ -273,302 +292,311 @@ - 取消 - 提交 + 取消 + 提交
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +
- 保存 - 提交 + 保存 + + 提交 + 取消
- + + :loading="searching" + icon="el-icon-search" + type="primary" + size="mini" + class="newSearchBtn" + @click="getLawsExplainQuoteRow(1,lawsExplainQuoteForm.pageSize, 'search')"> + + 清空查询 - 清空查询 + ref="selections" + :data="lawsExplainQuoteRow" + :loading="lawsExplainQuoteFormLoading" + tooltip-effect="dark" + style="width: 100%;height:300px; overflow-y: auto;overflow-x: hidden;" + border + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" + @selection-change="selectLawsExplainQuoteRowChange" + @select="(selection, row) =>selectLawsExplainQuoteRowSelect(selection,'select', row )" + @select-all="(selection) =>selectLawsExplainQuoteRowSelect(selection, 'all')"> + type="selection" + width="55" + align="center"> + prop="standNumber" + label="标准号" + width="130" + align="center"> + prop="standName" + label="标准名称" + width="130" + align="center"> + prop="issueTime" + label="发布日期" + width="130" + align="center"> + prop="putTime" + label="实施日期" + width="130" + align="center"> + prop="textStatus" + label="文本状态" + width="130" + align="center"> @@ -670,123 +703,128 @@ + :page="page" + :total="total" + @pageChange="pageChangeLaws" + @pageSizeChange="pageSizeChangeLaws">
取消 确定
- - + + - - + + + ref="selections" + :data="testItemTableList" + :loading="testItemSearching" + tooltip-effect="dark" + style="width: 100%;height:300px; overflow-y: auto;overflow-x: hidden;" + border + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" + @selection-change="selectTestItemRowChange" + @select="(selection, row) =>selectTestItemRowSelect(selection,'select', row )" + @select-all="(selection) =>selectTestItemRowSelect(selection, 'all')"> + type="selection" + width="55" + align="center"> + prop="testItemCode" + label="项目代码" + width="130" + align="center"> + prop="testObj" + label="试验对象" + width="130" + align="center"> + prop="testItemName" + label="试验项目名称" + width="130" + align="center"> + prop="authTypeShow" + label="适用认证" + width="130" + align="center"> + prop="standCode" + label="标准号" + width="130" + align="center"> + prop="standName" + label="标准名称" + width="130" + align="center"> + prop="creationUser" + label="创建人" + width="130" + align="center"> + prop="creationTime" + label="创建日期" + width="130" + align="center"> + :page="pageItems" + :total="totalItems" + @pageChange="pageChangeItems" + @pageSizeChange="pageSizeChangeItems">
- 取消 - 提交 + 取消 + + 提交 +
+ multiple + drag + :action="importExcelUrl" + ref="importfile" + name="file" + accept=".ZIP, .zip" + :on-progress="onProgress" + :before-upload="beforeUploadTop" + :on-success="importFileSuccess" + :show-file-list="false">
点击或拖拽上传文件
@@ -795,7 +833,8 @@ - {{ opt.label }} + {{ opt.label }} @@ -804,70 +843,72 @@ placeholder="根据标准号/名称查找" clearable/> - + - +
+ @sort-change="sortChangeConfig" + @selection-change="selectConfigStandChange"> + type="selection" + width="55" + align="center"> + prop="standName" + label="标准名称" + width="200" + align="center"> + prop="issueTime" + label="发布日期" + sortable="custom" + width="200" + align="center"> + prop="XCXSSRQ" + label="实施日期" + sortable="custom" + width="200" + align="center"> + prop="textStatus" + label="文本状态" + width="200" + align="center"> @@ -876,11 +917,11 @@
加载中... + style="position: static;" + :page="configPage" + :total="configTotal" + @pageChange="configuraPageChange" + @pageSizeChange="configuraPageSizeChange">
提交 - 取消 + >提交 + + 取消 +
@@ -915,8 +958,11 @@
- 提交 - 取消 + 提交 + + 取消 +
@@ -933,111 +979,115 @@
- 提交 + 提交 + 取消
- - -
- - - - - - - - - - - - - - - - - - - - - - - - -
-
- 提交 - 取消 -
- + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+ 提交 + + 取消 + +
+ - - - - + + + +

@@ -1047,240 +1097,246 @@

- 确认 + 确认 +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + - - + - - - + - - - - {{ opt.label}} - - - - + + + + + - + + - + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + {{ opt.label }} + + + - {{ opt.label}} - - - - - - - + {{ opt.label }} + + + @@ -1348,139 +1433,153 @@ - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} - - - - - - {{ opt.label}} + {{ opt.label }} + - - + - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - - - - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - - {{ opt.label}} + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -1488,15 +1587,17 @@ class="common-button-primary" icon="el-icon-check" type="primary" - @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索 + @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索 + 清空 + @click="clearAllSearch('sarStandardsSearch')">取消 +
- + 0){ - this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",") - }else { - this.sarStandardsInfoEO.standSystem = checkedData.menuName - } - } - this.modalShowFlag1 = false - this.$forceUpdate() - }, - popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",") - this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",") - }else { - this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code - this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName - } - } - this.modalShowFlag2 = false - this.$forceUpdate() - }, - popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",") - this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",") - }else { - this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code - this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName - } - } - this.modalShowFlag3 = false - this.$forceUpdate() - }, - popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ - this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",") - this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",") - }else { - this.sarStandardsInfoEO.DYBXH = checkedData.model - this.sarStandardsInfoEO.DYMC = checkedData.name - } - } - this.modalShowFlag4 = false - this.$forceUpdate() - }, - busVsFunc(){ - this.$http.get('sarVppsTree/list', '', { + choiceZRR1(type, title, id) { + this.drawerTitle = title + this.modalShowFlag1 = true + }, + choiceZRR2(type, title, id) { + this.drawerTitle = title + this.modalShowFlag2 = true + this.url = '' + this.urlChild = '' + this.url = "sarVppsTree/list" + this.urlChild = "sarVppsTree/childByList" + }, + choiceZRR3(type, title, id) { + this.drawerTitle = title + this.modalShowFlag3 = true + this.url = '' + this.urlChild = '' + this.url = "sarVppsTree/list" + this.urlChild = "sarVppsTree/childByList" + }, + choiceZRR4(type, title, id) { + this.drawerTitle = title + this.modalShowFlag4 = true + this.url = '' + this.urlChild = '' + this.url = "sarModelTree/list" + this.urlChild = "sarModelTree/childByList" + }, + popoverHideQuery(ids, attrField) { + console.log(ids) + console.log("-----------------------------") + console.log(attrField) + }, + popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData) { + if (checkedData.length > 0) { + this.sarStandardsInfoEO.standSystem = checkedData.map(item => item.menuName).join(",") + } else { + this.sarStandardsInfoEO.standSystem = checkedData.menuName + } + } + this.modalShowFlag1 = false + this.$forceUpdate() + }, + popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData) { + if (checkedData.length > 0) { + this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",") + this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",") + } else { + this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code + this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName + } + } + this.modalShowFlag2 = false + this.$forceUpdate() + }, + popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData) { + if (checkedData.length > 0) { + this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",") + this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",") + } else { + this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code + this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName + } + } + this.modalShowFlag3 = false + this.$forceUpdate() + }, + popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { + if (checkedData) { + if (checkedData.length > 0) { + this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",") + this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",") + } else { + this.sarStandardsInfoEO.DYBXH = checkedData.model + this.sarStandardsInfoEO.DYMC = checkedData.name + } + } + this.modalShowFlag4 = false + this.$forceUpdate() + }, + busVsFunc() { + this.$http.get('sarVppsTree/list', '', { + _this: this + }, res => { + this.busVppsOptions = res.data + }) + }, + modelFunc() { + this.$http.get('sarModelTree/list', '', { + _this: this + }, res => { + this.modelOptions = res.data + }) + }, + closeModal() { + this.productModal = false + this.closeDrawer() + }, + // 提交新增/修改 + saveProduct(name) { + this.$refs[name].validate((valid) => { + if (valid) { + if (this.modalType === 1) { + this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { _this: this - }, res => { - this.busVppsOptions = res.data - }) - }, - modelFunc(){ - this.$http.get('sarModelTree/list', '', { - _this: this - }, res => { - this.modelOptions = res.data - }) - }, - closeModal () { - this.productModal = false - this.closeDrawer() - }, - // 提交新增/修改 - saveProduct (name) { - this.$refs[name].validate((valid) => { - if (valid) { - if (this.modalType === 1) { - this.$http.postData('sarResource/ts-resource/add', this.productModelAdd, { - _this: this - }, res => { - if (res.ok) { - this.selectMenu() - this.productModal = false - this.productModelAdd = { - // 模态框信息 - dicTypeName: '', - showIndex: '', - // 描述 - describes: '', - // 唯一辨识 - dicId: this.$route.params.id - } - } else { - this.productModal = true - } - }, e => {}) - } else if (this.modalType === 2) { - this.$http.putData('sarResource/ts-resource', this.productModelAdd, { - _this: this - }, res => { - this.selectMenu() - this.productModal = false - this.productModelAdd = { - // 模态框信息 - dicTypeName: '', - showIndex: '', - // 描述 - describes: '', - // 唯一辨识 - dicId: this.$route.params.id - } - }, e => { - }) - } - } else { - } - }) - }, - closeDrawer () { - this.$nextTick(() => { - this.$refs['productModelAdd'].resetFields() - this.productModelAdd = { + }, res => { + if (res.ok) { + this.selectMenu() + this.productModal = false + this.productModelAdd = { // 模态框信息 dicTypeName: '', showIndex: '', @@ -2398,12 +2466,51 @@ export default { describes: '', // 唯一辨识 dicId: this.$route.params.id + } + } else { + this.productModal = true } - }) - this.productModal = false - }, + }, e => { + }) + } else if (this.modalType === 2) { + this.$http.putData('sarResource/ts-resource', this.productModelAdd, { + _this: this + }, res => { + this.selectMenu() + this.productModal = false + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }, e => { + }) + } + } else { + } + }) + }, + closeDrawer() { + this.$nextTick(() => { + this.$refs['productModelAdd'].resetFields() + this.productModelAdd = { + // 模态框信息 + dicTypeName: '', + showIndex: '', + // 描述 + describes: '', + // 唯一辨识 + dicId: this.$route.params.id + } + }) + this.productModal = false + }, // 树点击 - isTreeOk (checkedList) { + isTreeOk(checkedList) { this.shareStandardSelect = [] checkedList.map((item, index) => { if (!item.isParent) { @@ -2446,7 +2553,7 @@ export default { /** * 应该是为了匹配对应的下拉菜单的 */ - twoSelectChange (val, obj) { + twoSelectChange(val, obj) { if (val === 'country') { this.threeOptions = this.countryOptions } else if (val === 'stand_sort') { @@ -2476,7 +2583,7 @@ export default { } }, // 更多 - handleCommand (command) { + handleCommand(command) { switch (command[1]) { case '收藏': this.collectStandard(command[0]) @@ -2502,7 +2609,7 @@ export default { break } }, - collectStandard (item) { + collectStandard(item) { item.isSubmit = true this.personCollect.collectResId = item.id if (item.standYear != null && item.standYear !== '') { @@ -2525,7 +2632,7 @@ export default { }) }, // 取消收藏法规 - cancelCollectStandard (item) { + cancelCollectStandard(item) { item.isSubmit = true this.$http.put('person/personCollect/updateByUserId', { id: item.collectId @@ -2543,7 +2650,7 @@ export default { }) }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -2553,7 +2660,7 @@ export default { }) window.open(routeUrl.href, '_blank') }, - clickRow (row, event, column) { + clickRow(row, event, column) { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { @@ -2564,7 +2671,7 @@ export default { window.open(routeUrl.href, '_blank') }, // 编辑标准属性 - selectStandardPro (item, state) { + selectStandardPro(item, state) { this.id = item.id this.collectId = item.collectId this.addOrUPdateFlag = 2 @@ -2577,9 +2684,9 @@ export default { console.log(this.formFieldList, 'assssssssssss') console.log(item, 'itemitemitemitem') const formFieldList = this.formFieldList - this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) - if(this.sarStandardsInfoEO.standSystem){ - this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; + this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) + if (this.sarStandardsInfoEO.standSystem) { + this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; } this.sarStandardsInfoEO.standSort = item.standSort if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') { @@ -2602,14 +2709,14 @@ export default { if (value && field.attrType === 'DATE_PICKER') { value = this.$moment(value).format('YYYY-MM-DD') } - if(field.attrField === 'CYCVPPSBM'){ - this.defaultCheckedKeys1 = [value] + if (field.attrField === 'CYCVPPSBM') { + this.defaultCheckedKeys1 = [value] } - if(field.attrField === 'KCCVPPSBM'){ - this.defaultCheckedKeys2 = [value] + if (field.attrField === 'KCCVPPSBM') { + this.defaultCheckedKeys2 = [value] } - if(field.attrField === 'DYBXH'){ - this.defaultCheckedKeys3 = [value] + if (field.attrField === 'DYBXH') { + this.defaultCheckedKeys3 = [value] } field['value'] = value // 追加用户名称和部门名称和SVPPS名称 @@ -2627,13 +2734,13 @@ export default { }) }) this.dynamicFormField = displayLocation - console.log(this.dynamicFormField) + console.log(this.dynamicFormField) this.loading = false }) }) }, // 修改过程中，将resId 修改成 attid - updateResidToAttid (filetype) { + updateResidToAttid(filetype) { if (this.sarStandardsInfoEO[filetype] !== null && this.sarStandardsInfoEO[filetype] !== '') { this.$http.get('lawss/attFile/getMultiFileInfosByResid', { fileIds: this.sarStandardsInfoEO[filetype], fileType: 'stand' @@ -2645,113 +2752,113 @@ export default { }) } }, - // 查询二级菜单 - selectChildMenu (row) { - this.$http.get('sarResource/ts-resource/getMenuById', { - menuId: row.id - }, {}, res => { - if (res.ok) { - if(this.modalType === 1){ - let idsName = "" - if(row.parentIds !== null){ - if(row.parentIds.indexOf(res.data.id) != -1){ - this.productModelAdd.parentIds = row.parentIds - }else { - this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id - idsName = row.parentIdsName + ',' + res.data.menuName - } - }else { - this.productModelAdd.parentIds = res.data.id - idsName = res.data.menuName; - } - this.productModelAdd.parentId = res.data.id - this.productModelAdd.parentIdsName = idsName - this.$forceUpdate() - }else { - this.productModelAdd = res.data - } - } - }) - }, - update(data) { - this.modalType = 2 - this.selectChildMenu(data) - this.productModal = true - // 取消所有的选中效果 - this.productTitle = '编辑信息' - // const newChild = { id: this.id++, label: 'testtest', children: [] }; - // if (!data.children) { - // this.$set(data, 'children', []); - // } - // data.children.push(newChild); - }, - - append(data) { - this.modalType = 1 - this.selectChildMenu(data) - this.productModal = true - // 取消所有的选中效果 - this.productTitle = '新增下级菜单信息' - this.productModelAdd.dicTypeCode = '' - // const newChild = { id: this.id++, label: 'testtest', children: [] }; - // if (!data.children) { - // this.$set(data, 'children', []); - // } - // data.children.push(newChild); - }, - - remove(node, data) { - //通过 stahndinfoList 是否有数据进行判断 - this.$confirm(this.stahndinfoList.length > 0 ? '该节点下有记录，是否删除？' : '是否删除菜单', '提示', { - confirmButtonText: '确定', - confirmButtonClass: 'common-button-primary', - cancelButtonText: '取消', - roundButton: true, - type: 'warning' - }).then(() => { - this.$http.delete("sarResource/ts-resource", { - resourceId: data.id - }, res => { - }, e => { - if(e.ok){ - this.$message({ - type: 'success', - message: "删除成功" - }) - this.selectMenu() - }else { - this.$message({ - type: 'warning', - message: e.message - }) - } - }) - }).catch(() => { - this.$refs.selections.clearSelection() - this.$message({ - type: 'info', - message: '已取消删除' - }) - }) - // const parent = node.parent; - // const children = parent.data.children || parent.data; - // const index = children.findIndex(d => d.id === data.id); - // children.splice(index, 1); - }, - // 树节点鼠标移入移出 - mouseenter(data){ - if(data.menuName !== '我的收藏'){ - this.$set(data, 'show', true) - if(data.parentId !== null){ - this.$set(data, 'showDel', true) + // 查询二级菜单 + selectChildMenu(row) { + this.$http.get('sarResource/ts-resource/getMenuById', { + menuId: row.id + }, {}, res => { + if (res.ok) { + if (this.modalType === 1) { + let idsName = "" + if (row.parentIds !== null) { + if (row.parentIds.indexOf(res.data.id) != -1) { + this.productModelAdd.parentIds = row.parentIds + } else { + this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id + idsName = row.parentIdsName + ',' + res.data.menuName } + } else { + this.productModelAdd.parentIds = res.data.id + idsName = res.data.menuName; + } + this.productModelAdd.parentId = res.data.id + this.productModelAdd.parentIdsName = idsName + this.$forceUpdate() + } else { + this.productModelAdd = res.data } - }, - mouseleave(data){ - this.$set(data, 'show', false) - this.$set(data, 'showDel', false) - }, - treeClick (treeNode) { + } + }) + }, + update(data) { + this.modalType = 2 + this.selectChildMenu(data) + this.productModal = true + // 取消所有的选中效果 + this.productTitle = '编辑信息' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + append(data) { + this.modalType = 1 + this.selectChildMenu(data) + this.productModal = true + // 取消所有的选中效果 + this.productTitle = '新增下级菜单信息' + this.productModelAdd.dicTypeCode = '' + // const newChild = { id: this.id++, label: 'testtest', children: [] }; + // if (!data.children) { + // this.$set(data, 'children', []); + // } + // data.children.push(newChild); + }, + + remove(node, data) { + //通过 stahndinfoList 是否有数据进行判断 + this.$confirm(this.stahndinfoList.length > 0 ? '该节点下有记录，是否删除？' : '是否删除菜单', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + roundButton: true, + type: 'warning' + }).then(() => { + this.$http.delete("sarResource/ts-resource", { + resourceId: data.id + }, res => { + }, e => { + if (e.ok) { + this.$message({ + type: 'success', + message: "删除成功" + }) + this.selectMenu() + } else { + this.$message({ + type: 'warning', + message: e.message + }) + } + }) + }).catch(() => { + this.$refs.selections.clearSelection() + this.$message({ + type: 'info', + message: '已取消删除' + }) + }) + // const parent = node.parent; + // const children = parent.data.children || parent.data; + // const index = children.findIndex(d => d.id === data.id); + // children.splice(index, 1); + }, + // 树节点鼠标移入移出 + mouseenter(data) { + if (data.menuName !== '我的收藏') { + this.$set(data, 'show', true) + if (data.parentId !== null) { + this.$set(data, 'showDel', true) + } + } + }, + mouseleave(data) { + this.$set(data, 'show', false) + this.$set(data, 'showDel', false) + }, + treeClick(treeNode) { this.selectSarMenu = treeNode this.standCommonlySearch.menuId = treeNode.id this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询 @@ -2760,16 +2867,16 @@ export default { this.getDomesticStandardTable(this.tableFlag) }, // 点击搜索按钮 - searchBtnClick (standCommonlySearch) { + searchBtnClick(standCommonlySearch) { let item = this.standCommonlySearch this.getDomesticStandardTable(item) }, // 搜索 - getDomesticStandardTableBtn (item) { - this.tableFlag = item - item.page = 1 - item.sarStandardsSearch = '' - this.getDomesticStandardTable(item) + getDomesticStandardTableBtn(item) { + this.tableFlag = item + item.page = 1 + item.sarStandardsSearch = '' + this.getDomesticStandardTable(item) }, // getDomesticStandardTableBtn (advancedSearch) { // let item = {} @@ -2779,7 +2886,7 @@ export default { // this.getDomesticStandardTable(item) // }, // 清空搜索框 - clearAllSearch (flag) { + clearAllSearch(flag) { if (flag === 'sarStandardsSearch') { // 标准搜索 this.sarStandardsSearch.country = '' @@ -2822,24 +2929,24 @@ export default { } }, // 高级检索 - selectMoreBtn () { + selectMoreBtn() { this.isAdvancedSearch = true - // this.sarStandardsSearch = [] + this.sarStandardsSearch = [] }, - treeCollapse () { + treeCollapse() { this.sideClose = !this.sideClose }, // 收展按钮 - collapseIcon () { + collapseIcon() { return this.sideClose ? 'el-icon-arrow-left' : 'el-icon-arrow-right' // return 'el-icon-arrow-left' }, - resetTreeDialog () { + resetTreeDialog() { this.menuModalFlag = false this.$refs['addMenuForm'].resetFields() }, // 点击二级菜单新增模态框中的保存 - newMenu () { + newMenu() { this.isSubmit = true this.$refs['addMenuForm'].validate((valid) => { if (valid) { @@ -2874,7 +2981,7 @@ export default { }) }, // 查询二级菜单 - selectMenu () { + selectMenu() { this.$http.get('sarResource/ts-resource', { sorDivide: 'INLAND_STAND' }, {}, res => { @@ -2883,18 +2990,18 @@ export default { } }) }, - // 查询所有菜单 - selectStandardMenu () { - this.$http.get('lawss/sarMenuStandard', { - dicId: this.dictionaryId - }, {}, res => { - if (res.ok) { - this.data = res.data - } - }) - }, + // 查询所有菜单 + selectStandardMenu() { + this.$http.get('lawss/sarMenuStandard', { + dicId: this.dictionaryId + }, {}, res => { + if (res.ok) { + this.data = res.data + } + }) + }, // 树-删除 - sureDeleteSarMenu () { + sureDeleteSarMenu() { this.$confirm('是否删除?', '提示', { confirmButtonText: '确定', confirmButtonClass: 'common-button-primary', @@ -2925,7 +3032,7 @@ export default { }) }, // 树点击 - treeOnCheck (checkedList) { + treeOnCheck(checkedList) { this.shareStandardSelect = [] checkedList.map((item, index) => { if (!item.isParent) { @@ -2934,12 +3041,12 @@ export default { }) }, // 取消 - treeCancel () { + treeCancel() { this.drawerModal = false this.$refs.drawerModalTree.treeReload() }, // 消息推送 - shareStandardBt () { + shareStandardBt() { if (this.shareStandardSelect.length === 0) { this.$message({ message: '请选择要分享的人！', @@ -2971,7 +3078,7 @@ export default { } }, // 导出选中的标准 此处因为复选框没有设置好，所以先设置导出所有数据 - exportStandard () { + exportStandard() { // 区别是选择导出还是全部导出 // this.exportModelFlag = true if (this.selectedList.length > 0) { @@ -2983,11 +3090,11 @@ export default { this.exportModelFlag = true }, // 获取拖拽行的id - dragRowClassName (row, index) { + dragRowClassName(row, index) { return 'drag-row' + ' ' + 'id=' + row.row.id }, // 拖拽事件 - drag (treeNode, dragId) { + drag(treeNode, dragId) { if (treeNode !== null) { let search = { menuId: treeNode.id, @@ -3013,8 +3120,8 @@ export default { } }, // 表格排序 - sortChange (sortObj) { - console.log(sortObj.column.order+"======"+sortObj.column.property) + sortChange(sortObj) { + console.log(sortObj.column.order + "======" + sortObj.column.property) console.log(sortObj, '升降序') if (sortObj.column.order !== 'normal') { this.nowOrder = '' @@ -3072,77 +3179,77 @@ export default { this.getDomesticStandardTable(this.tableFlag) }, // 修改成表格样式后，选择项勾选改变 - standSelectChange (data) { + standSelectChange(data) { this.selectedList = [] for (let i = 0; i < data.length; i++) { this.selectedList.push(data[i].id) } }, // 导出确定功能 - exportTestItem () { - this.exportLoading = true + exportTestItem() { + this.exportLoading = true - if (this.saveExportType === 'apart') { - // const param = { - // exportType : this.saveExportType, - // exportContent : this.selectedList.join(','), - // exportName : this.exportName, - // standType : this.standType - // } + if (this.saveExportType === 'apart') { + // const param = { + // exportType : this.saveExportType, + // exportContent : this.selectedList.join(','), + // exportName : this.exportName, + // standType : this.standType + // } if (this.selectedList != null && this.selectedList !== '') { - // - // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', param, { - // _this: this - // }, res => { - // }, e => { - // }) - // this.$message.success('导出信息成功') + // + // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', param, { + // _this: this + // }, res => { + // }, e => { + // }) + // this.$message.success('导出信息成功') - const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType - window.open(exportURL) - this.$message.success('导出信息成功') + const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + + 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + window.open(exportURL) + this.$message.success('导出信息成功') this.exportLoading = false } } else if (this.saveExportType === 'all') { let exportEOStr = JSON.stringify(this.SarExportSearchEo) - // const paramAll = { - // exportType : this.saveExportType, - // exportContent : exportEOStr, - // exportName : this.exportName, - // standType : this.standType - // } - // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', paramAll, { - // _this: this,responseType: 'blob', - // }, res => { - // console.log(res) - // this.exportLoading = false - // let url = window.URL.createObjectURL(new Blob([res])) - // let link = document.createElement('a') - // link.style.display = 'none' - // link.href = url - // link.setAttribute('download', 'excel.xlsx') - // document.body.appendChild(link) - // link.click() - // }, e => { - // }) - // this.$message.success('导出信息成功') + // const paramAll = { + // exportType : this.saveExportType, + // exportContent : exportEOStr, + // exportName : this.exportName, + // standType : this.standType + // } + // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', paramAll, { + // _this: this,responseType: 'blob', + // }, res => { + // console.log(res) + // this.exportLoading = false + // let url = window.URL.createObjectURL(new Blob([res])) + // let link = document.createElement('a') + // link.style.display = 'none' + // link.href = url + // link.setAttribute('download', 'excel.xlsx') + // document.body.appendChild(link) + // link.click() + // }, e => { + // }) + // this.$message.success('导出信息成功') // window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + - 'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) + 'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) this.$message.success('导出信息成功') - this.exportLoading = false - } + this.exportLoading = false + } this.exportModelFlag = false }, // 导出取消按钮关闭模态、置空 - cancal () { + cancal() { this.exportModelFlag = false }, // 点击新增按钮弹出新增模态框 - addModal () { + addModal() { this.getMenu().then(boolean => { if (boolean) { // 判断是否有缓存的数据 @@ -3194,7 +3301,7 @@ export default { } }) }, - testItemsClick () { + testItemsClick() { // if (this.testItemsModel) { // return false // } @@ -3205,7 +3312,7 @@ export default { this.testItemsForm.testItemName = '' this.getTestItemRow('') }, - beforeUploadTop (file) { + beforeUploadTop(file) { var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length @@ -3223,7 +3330,7 @@ export default { return true }, // 删除数组中的某个对象 - removeAaary (_arr, _obj) { + removeAaary(_arr, _obj) { var length = _arr.length for (var i = 0; i < length; i++) { if (_arr[i] === _obj) { @@ -3240,7 +3347,7 @@ export default { } } }, - handleAddFormatError (file) { + handleAddFormatError(file) { // this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx文件') this.$message({ showClose: true, @@ -3249,7 +3356,7 @@ export default { }) }, // 导入文件大小超出范围 - handleSizeError (file) { + handleSizeError(file) { this.$message({ showClose: true, message: '文件' + file.name + '大小不超过200M', @@ -3257,30 +3364,30 @@ export default { }) }, // 删除标准 - deleteStand (flag, itemid) { + deleteStand(flag, itemid) { if (flag === 1) { ( - this.$confirm('确认删除这些数据?', '提示', { - confirmButtonText: '确定', - confirmButtonClass: 'common-button-primary', - cancelButtonText: '取消', - type: 'warning', - roundButton: false - }).then(() => { - this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: itemid}, { - _this: this, - loading: 'delLoading' - }, res => { - if (res.ok) { - this.getDomesticStandardTable(this.tableFlag) - this.selectedList = [] - } - }, e => { + this.$confirm('确认删除这些数据?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + type: 'warning', + roundButton: false + }).then(() => { + this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: itemid}, { + _this: this, + loading: 'delLoading' + }, res => { + if (res.ok) { + this.getDomesticStandardTable(this.tableFlag) + this.selectedList = [] + } + }, e => { + }) + }).catch(() => { + // 取消删除，清空选择 + this.$refs.multipleTable.clearSelection() }) - }).catch(() => { - // 取消删除，清空选择 - this.$refs.multipleTable.clearSelection() - }) ) } else { if (this.selectedList.length === 0) { @@ -3294,32 +3401,32 @@ export default { }) } else { ( - this.$confirm('确认删除这些数据?', '提示', { - confirmButtonText: '确定', - confirmButtonClass: 'common-button-primary', - cancelButtonText: '取消', - roundButton: false, - type: 'warning' - }).then(() => { - this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: this.selectedList.join(',')}, { - _this: this - }, res => { - if (res.ok) { - this.getDomesticStandardTable(this.tableFlag) - this.selectedList = [] - } - }, e => { + this.$confirm('确认删除这些数据?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonText: '取消', + roundButton: false, + type: 'warning' + }).then(() => { + this.$http.post('sarStandardsInfo/sar-standards-info/deleteSarStandards', {ids: this.selectedList.join(',')}, { + _this: this + }, res => { + if (res.ok) { + this.getDomesticStandardTable(this.tableFlag) + this.selectedList = [] + } + }, e => { + }) + }).catch(() => { + // 取消删除，清空选择 + this.$refs.multipleTable.clearSelection() }) - }).catch(() => { - // 取消删除，清空选择 - this.$refs.multipleTable.clearSelection() - }) ) } } }, // 模板下载 - uploadImportModal (flag) { + uploadImportModal(flag) { window.open('/api/sarStandardsInfo/sar-standards-info/exportTemplate') // if (flag === 1) { // } else { @@ -3327,7 +3434,7 @@ export default { // } }, // 点击导入标准 - addImportModal (flag) { + addImportModal(flag) { this.getMenu().then(boolean => { if (boolean) { // this.$refs.importfile.clearFiles() @@ -3351,20 +3458,21 @@ export default { } }) }, - handleClose (done) { + handleClose(done) { this.$confirm('确认关闭？') - .then(_ => { - done() - }) - .catch(_ => {}) + .then(_ => { + done() + }) + .catch(_ => { + }) }, // 表单清空 - resetForm () { + resetForm() { this.modalshowflag = false this.$refs['sarStandardsInfoForm'].resetFields() }, // 标准号验证 - validateStandNumber (standinfo) { + validateStandNumber(standinfo) { return new Promise((resolve, reject) => { let obj = JSON.parse(JSON.stringify(standinfo)) this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', obj, { @@ -3383,12 +3491,12 @@ export default { /** * 保存新增标准数据召浏览器缓存 * */ - saveBt () { + saveBt() { sessionStorage.setItem('STAND_INLAND', JSON.stringify(this.sarStandardsInfoEO)) this.$message.success('保存成功') }, // 保存或修改标准 - saveOrUpdateStands () { + saveOrUpdateStands() { this.isSubmit = true this.$refs['sarStandardsInfoForm'].validate((valid) => { if (valid) { @@ -3435,13 +3543,14 @@ export default { this.personCollect.collectType = 'INLAND_STAND' this.personCollect.id = this.collectId this.personCollect.collectResId = this.id - this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')' + this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:' + this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear + ')' this.personCollect.userId = this.$store.getters.userInfo.userId this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, { _this: this, loading: 'loading' }, res => { - }, e => {}) + }, e => { + }) this.getDomesticStandardTable(this.tableFlag) this.resetForm() if (this.addOrUPdateFlag === 1) { @@ -3454,7 +3563,8 @@ export default { } else { this.isSubmit = false } - }, e => {}) + }, e => { + }) } else { this.isSubmit = false this.$message({ @@ -3465,7 +3575,7 @@ export default { }) }, // 分页点击后方法 - pageChange (page) { + pageChange(page) { if (this.tableFlag !== '') { this.tableFlag.page = page } else { @@ -3474,21 +3584,21 @@ export default { this.getDomesticStandardTable(this.tableFlag) }, // 分页每页显示数改变后方法 - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent this.getDomesticStandardTable(this.tableFlag) this.selectConfiguraStand() // 此处需要调用接口，修改个人配置 }, // 分页查询国内标准 - getDomesticStandardTable (item) { + getDomesticStandardTable(item) { 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.sarStandardsSearch + const data = item || this.sarStandardsSearch || this.advanceSearchMapping if (item) { - this.sarStandardsSearch.advanceSearchVOStr = item.advanceSearchVOStr + this.sarStandardsSearch.advanceSearchStr = item.advanceSearchStr } // this.sarStandardsSearch.menuId = this.selectSarMenu.id const formData = {...data} @@ -3502,7 +3612,7 @@ export default { formData.nowOrderBy = this.nowOrder ? this.orderBy : '' formData.nowOrder = this.nowOrder // formData.orderBy = this.orderBy - console.log(this.selectSarMenu.id) + console.log(this.selectSarMenu.id) // 处理我的收藏和个性化标签传参 if (this.selectSarMenu.menuName === '我的收藏') { formData.menuId = undefined @@ -3518,6 +3628,23 @@ export default { } formData.standType = 'INLAND' 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); this.SarExportSearchEo = formData this.loading = true this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { @@ -3560,9 +3687,15 @@ export default { this.stahndinfoList = [] this.total = 0 }) + + + //清空高级搜索字段 + for (let key in this.advanceSearchMapping) { + this.advanceSearchMapping[key] = '' + } }, // 查询处于游离态的标准 - selectConfiguraStand (resetPage) { + selectConfiguraStand(resetPage) { if (resetPage) { this.configPage = 1 } @@ -3586,41 +3719,42 @@ export default { }) }, // 获取组织机构数据 - getOrgTreeSource () { + getOrgTreeSource() { this.$http.get('sys/org/getTree', {}, { - _this: this - }, - res => { - if (res.ok) { - let treeNode = [] - res.data.map((item, index) => { - let treeItem = {} - for (let key in item) { - if (key === 'orgName') { - treeItem.name = item[key] - } else { - treeItem[key] = item[key] + _this: this + }, + res => { + if (res.ok) { + let treeNode = [] + res.data.map((item, index) => { + let treeItem = {} + for (let key in item) { + if (key === 'orgName') { + treeItem.name = item[key] + } else { + treeItem[key] = item[key] + } } - } - treeNode[index] = treeItem - }) - this.zNodesS = JSON.parse(JSON.stringify(treeNode)) - this.zNodesSItem = JSON.parse(JSON.stringify(treeNode)) - this.searchInlandNodes = JSON.parse(JSON.stringify(treeNode)) - } - }, e => {}) + treeNode[index] = treeItem + }) + this.zNodesS = JSON.parse(JSON.stringify(treeNode)) + this.zNodesSItem = JSON.parse(JSON.stringify(treeNode)) + this.searchInlandNodes = JSON.parse(JSON.stringify(treeNode)) + } + }, e => { + }) }, // 所属部门选取 - treeDblClick (treeId, treeNode) { + treeDblClick(treeId, treeNode) { this.sarStandardsInfoEO.responsibleUnit = treeNode.id this.sarStandardsInfoEO.orgName = treeNode.name $('#deptBtn').click() }, - inputChange () { + inputChange() { this.modalshowflag = true }, // 代替标准号搜索 - selectStands () { + selectStands() { // if (this.standNumFlag === 1) { // this.$refs.selections.selectAll(false) // } @@ -3628,17 +3762,17 @@ export default { this.replaceStandNumModel = true this.getReplaceStandNumRow('') }, - selectReplaceStandNumRowChange (row) { + selectReplaceStandNumRowChange(row) { this.replaceStandNumModelNum = row }, - selectLawsExplainQuoteRowChange (row) { + selectLawsExplainQuoteRowChange(row) { this.lawsExplainQuoteModelNum = row }, // 试验项目 - selectTestItemRowChange (row) { + selectTestItemRowChange(row) { this.testItemModelNum = row }, - selectTestItemRowSelect (selection, flag, row) { + selectTestItemRowSelect(selection, flag, row) { let index = '' if (row) { this.selectedList2.map((item, rowIndex) => { @@ -3678,7 +3812,7 @@ export default { }) } }, - selectLawsExplainQuoteRowSelect (selection, flag, row) { + selectLawsExplainQuoteRowSelect(selection, flag, row) { let index = '' if (row) { this.selectedList1.map((item, rowIndex) => { @@ -3719,7 +3853,7 @@ export default { } }, // 代替标准号 - getReplaceStandNumRow (page = 1, pageSize = this.$store.getters.userInfo.configContent) { + getReplaceStandNumRow(page = 1, pageSize = this.$store.getters.userInfo.configContent) { this.replaceStandNumForm.page = this.replacePage this.replaceStandNumForm.pageSize = this.$store.getters.userInfo.configContent if (page === '') { @@ -3761,7 +3895,7 @@ export default { *@author: zhangRui *@time: 2020/08/25 11:52:47 */ - selectReplaceStandNumRowSelect (selection, flag, row) { + selectReplaceStandNumRowSelect(selection, flag, row) { let index = '' if (row) { this.selectedListRep.map((item, rowIndex) => { @@ -3802,13 +3936,13 @@ export default { } }, // 代替标准-取消 - replaceStandNumModelCancel () { + replaceStandNumModelCancel() { this.replaceStandNumModel = false this.$refs.selections.selectAll(false) this.sarStandardsInfoEO.replaceStandNum = this.saveStandNum }, // 代替标准确定 - replaceStandNumModelBt () { + replaceStandNumModelBt() { if (typeof this.sarStandardsInfoEO.replaceStandNum === 'string') { this.sarStandardsInfoEO.replaceStandNum = this.sarStandardsInfoEO.replaceStandNum.split('') } @@ -3844,7 +3978,7 @@ export default { this.quoteIdList1 = idArr.toString() // this.$refs.selections.selectAll(false) }, - lawsExplainQuoteModelBt () { + lawsExplainQuoteModelBt() { if (typeof this.sarStandardsInfoEO.lawsExplainQuote === 'string') { this.sarStandardsInfoEO.lawsExplainQuote = this.sarStandardsInfoEO.lawsExplainQuote.split('') } @@ -3885,11 +4019,11 @@ export default { this.lawsExplainQuoteModel = false }) }, - canle () { + canle() { this.lawsExplainQuoteModel = false }, // 法规解读标准引用 - lawsExplainQuoteClick () { + lawsExplainQuoteClick() { this.getLawsExplainQuoteRow('') this.lawsExplainQuoteModel = true if (this.lawsExplainQuoteModel) { @@ -3901,33 +4035,33 @@ export default { // this.$refs.selection.selectAll(false) this.testItemsForm.standNumber = '' }, - pageChangeLaws (page) { + pageChangeLaws(page) { this.page = page this.getLawsExplainQuoteRow() }, - pageSizeChangeLaws (pageSize) { + pageSizeChangeLaws(pageSize) { this.rows = pageSize this.getLawsExplainQuoteRow() }, // 法规分页 - pageChangeReplace (page) { + pageChangeReplace(page) { this.replacePage = page this.getReplaceStandNumRow() }, - pageSizeChangeReplace (pageSize) { + pageSizeChangeReplace(pageSize) { this.replaceRows = pageSize this.getReplaceStandNumRow() }, // 试验项目分页 - pageChangeItems (page) { + pageChangeItems(page) { this.pageItems = page this.getTestItemRow() }, - pageSizeChangeItems (pageSize) { + pageSizeChangeItems(pageSize) { this.itemsRows = pageSize this.getTestItemRow() }, - testItemsModellBt () { + testItemsModellBt() { if (this.selectedList2.length === 0) { return this.$message({ message: '请先选择数据', @@ -3960,7 +4094,7 @@ export default { this.testItemsModel = false }) }, - getLawsExplainQuoteRow (page = 1, pageSize = this.$store.getters.userInfo.configContent) { + getLawsExplainQuoteRow(page = 1, pageSize = this.$store.getters.userInfo.configContent) { this.lawsExplainQuoteForm.page = this.page this.lawsExplainQuoteForm.pageSize = this.$store.getters.userInfo.configContent if (page === '') { @@ -3989,7 +4123,7 @@ export default { }, e => { }) }, - getTestItemRow (page = 1, pageSize = this.$store.getters.userInfo.configContent) { + getTestItemRow(page = 1, pageSize = this.$store.getters.userInfo.configContent) { this.testItemsForm.page = this.pageItems this.testItemsForm.pageSize = this.$store.getters.userInfo.configContent if (page === '') { @@ -4018,12 +4152,12 @@ export default { }) }, // 文件上传时的钩子函数 - onProgress (event, file, fileList) { + onProgress(event, file, fileList) { this.exportLoading = true this.importModalshowflag = false }, // 导入标准数据成功后执行 - importFileSuccess (response, file, fileList) { + importFileSuccess(response, file, fileList) { this.exportLoading = false if (response.ok) { @@ -4049,7 +4183,7 @@ export default { } }, // 查看标准条目 - selectSarStandItems (standid) { + selectSarStandItems(standid) { this.modalStandItemflag = true this.standItemSearch.standId = standid this.$http.get('lawss/sarStandItems/getSarStandItemsList', this.standItemSearch, { @@ -4061,7 +4195,7 @@ export default { }) }, // 点击配置标准弹出相应模态框 - configurationStandard () { + configurationStandard() { this.getMenu().then(boolean => { if (boolean) { const winWidth = window.screen.width @@ -4106,7 +4240,7 @@ export default { }) }, // 判断当前左侧树节点是否是我的收藏和个性化标签 - getMenu () { + getMenu() { return new Promise((resolve, reject) => { let menu = this.selectSarMenu if (menu.id === 'gxhbq' || menu.pId === 'gxhbq' || menu.id === 'wdsc' || menu.pId === 'wdsc') { @@ -4117,12 +4251,12 @@ export default { }) }, // 取消配置标准 - cancelConfigStand () { + cancelConfigStand() { this.configStandFlag = false this.selectConfigStand = [] }, // 表对应标准移除分类到 - deleteStandFromKind (flag, item) { + deleteStandFromKind(flag, item) { this.getMenu().then(boolean => { if (boolean) { if (this.selectSarMenu.parentId == null || this.selectSarMenu.parentId === '') { @@ -4188,80 +4322,80 @@ export default { }) }, // 分页点击后方法 - configuraPageChange (page) { + configuraPageChange(page) { this.configPage = page this.selectConfiguraStand() }, // 分页每页显示数改变后方法 - configuraPageSizeChange (pageSize) { + configuraPageSizeChange(pageSize) { this.configRows = pageSize this.selectConfiguraStand() this.getDomesticStandardTable(this.tableFlag) // 此处需要调用接口，修改个人配置 }, - searchConfiguraStand () { + searchConfiguraStand() { this.sarConfigStandSearch.page = 1 this.selectConfiguraStand() }, - selectConfigStandChange (alldata) { + selectConfigStandChange(alldata) { this.selectConfigStand = [] for (let i = 0; i < alldata.length; i++) { this.selectConfigStand.push(alldata[i].id) } }, // 配置标准-表格排序 - sortChangeConfig (sortObj) { - if (sortObj.column.order !== 'normal') { - switch (sortObj.prop) { - case 'issueTime' : - // 后台联调 - if(sortObj.order === null) { - this.sarConfigStandSearch.nowOrderBy = '' - } else { - this.sarConfigStandSearch.nowOrderBy = '1' - } - break; - case 'xcxssrq' : - // 后台联调 - if(sortObj.order === null) { - this.sarConfigStandSearch.nowOrderBy = '' - } else { - this.sarConfigStandSearch.nowOrderBy = '2' - } - break; - case 'zccssrq' : - // 后台联调 - if(sortObj.order === null) { - this.sarConfigStandSearch.nowOrderBy = '' - } else { - this.sarConfigStandSearch.nowOrderBy = '3' - } - break; - case 'textStatus' : - if(sortObj.order === null) { - this.sarConfigStandSearch.nowOrderBy = '' - } else { - this.sarConfigStandSearch.nowOrderBy = '4' - } - // 后台联调 - break; - } - switch (sortObj.order) { - case 'ascending' : - this.sarConfigStandSearch.nowOrder = '2' - break; - case 'descending' : - this.sarConfigStandSearch.nowOrder = '1' - break; - default: - this.sarConfigStandSearch.nowOrder = '' - break; - } + sortChangeConfig(sortObj) { + if (sortObj.column.order !== 'normal') { + switch (sortObj.prop) { + case 'issueTime' : + // 后台联调 + if (sortObj.order === null) { + this.sarConfigStandSearch.nowOrderBy = '' + } else { + this.sarConfigStandSearch.nowOrderBy = '1' + } + break; + case 'xcxssrq' : + // 后台联调 + if (sortObj.order === null) { + this.sarConfigStandSearch.nowOrderBy = '' + } else { + this.sarConfigStandSearch.nowOrderBy = '2' + } + break; + case 'zccssrq' : + // 后台联调 + if (sortObj.order === null) { + this.sarConfigStandSearch.nowOrderBy = '' + } else { + this.sarConfigStandSearch.nowOrderBy = '3' + } + break; + case 'textStatus' : + if (sortObj.order === null) { + this.sarConfigStandSearch.nowOrderBy = '' + } else { + this.sarConfigStandSearch.nowOrderBy = '4' + } + // 后台联调 + break; } + switch (sortObj.order) { + case 'ascending' : + this.sarConfigStandSearch.nowOrder = '2' + break; + case 'descending' : + this.sarConfigStandSearch.nowOrder = '1' + break; + default: + this.sarConfigStandSearch.nowOrder = '' + break; + } + } this.selectConfiguraStand() }, // 提交配置搜索项 - saveConfigStand () { + saveConfigStand() { let search = {} search.menuId = this.selectSarMenu.id if (this.selectConfigStand.length === 0) { @@ -4292,97 +4426,98 @@ export default { /** * 获取新增弹框的表单 */ - getAddFormFieldList (isEdit) { + getAddFormFieldList(isEdit) { this.$http.get('lawss/sarStandAttrDetails/list', {}, { - _this: this - }, - res => { - if (res.ok) { - const { data = {} } = res - this.formFieldListData = data['INLAND_STAND'] || [] - // 追加高级查询动态下拉框数据s - this.twoOptions = [ - { - label: '标准类别', - value: 'stand_sort', - type: 'SEL_OPTION', - disabled: false - }, - { - label: '文本状态', - value: 'stand_state_show', - type: 'SEL_OPTION', - disabled: false - }, - // { - // label: '适用区域', - // value: 'country', - // type: 'SEL_OPTION', - // disabled: false - // }, - { - label: '重要度', - value: 'is_relate_access', - type: 'SEL_OPTION', - disabled: false - }, - { - label: '标准编号', - value: 'stand_number', - type: 'INPUT', - disabled: false - }, - { - label: '标准年份', - value: 'stand_year', - type: 'INPUT', - disabled: false - }, - { - label: '中文名称', - value: 'stand_name', - type: 'INPUT', - disabled: false - }, - { - label: '英文名称', - value: 'stand_en_name', - type: 'INPUT', - disabled: false - }, - { - label: '发布日期', - value: 'issue_time', - type: 'DATE_PIC_OPTS', - disabled: false - }, - { - label: '文本说明', - value: 'synopsis', - type: 'INPUT', - disabled: false - } - ] - this.formFieldListData.map(item => { - if (item.attrType !== 'FILE' && item.attrField !== 'ZRLX') { - this.twoOptions.push({ - value: item.attrField, - label: item.attrName, - selVal: item.selVal, - type: item.attrType, - disabled: false, - __wx__: item - }) - } - }) - // this.resolveFormFieldList() - } - }, e => {}) + _this: this + }, + res => { + if (res.ok) { + const {data = {}} = res + this.formFieldListData = data['INLAND_STAND'] || [] + // 追加高级查询动态下拉框数据s + this.twoOptions = [ + { + label: '标准类别', + value: 'stand_sort', + type: 'SEL_OPTION', + disabled: false + }, + { + label: '文本状态', + value: 'stand_state_show', + type: 'SEL_OPTION', + disabled: false + }, + // { + // label: '适用区域', + // value: 'country', + // type: 'SEL_OPTION', + // disabled: false + // }, + { + label: '重要度', + value: 'is_relate_access', + type: 'SEL_OPTION', + disabled: false + }, + { + label: '标准编号', + value: 'stand_number', + type: 'INPUT', + disabled: false + }, + { + label: '标准年份', + value: 'stand_year', + type: 'INPUT', + disabled: false + }, + { + label: '中文名称', + value: 'stand_name', + type: 'INPUT', + disabled: false + }, + { + label: '英文名称', + value: 'stand_en_name', + type: 'INPUT', + disabled: false + }, + { + label: '发布日期', + value: 'issue_time', + type: 'DATE_PIC_OPTS', + disabled: false + }, + { + label: '文本说明', + value: 'synopsis', + type: 'INPUT', + disabled: false + } + ] + this.formFieldListData.map(item => { + if (item.attrType !== 'FILE' && item.attrField !== 'ZRLX') { + this.twoOptions.push({ + value: item.attrField, + label: item.attrName, + selVal: item.selVal, + type: item.attrType, + disabled: false, + __wx__: item + }) + } + }) + // this.resolveFormFieldList() + } + }, e => { + }) }, /** * 展示位置 */ - queryDisplayLocation () { + queryDisplayLocation() { return new Promise((resolve, reject) => { this.$http.get('lawssBase/utArea/getAreaList', { sarType: this.sarType @@ -4395,55 +4530,55 @@ export default { }) }) }, - resolveFormFieldList (isEdit) { + resolveFormFieldList(isEdit) { const data = this.formFieldListData this.formFieldList = data.map((item) => { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { - if(item.attrField === 'WSSMR'){ - return Object.assign({}, item, { - options: this.allSelectOptions["WSSMR"] - }) - }else if(item.attrField === 'QCDW'){ - return Object.assign({}, item, { - options: this.allSelectOptions["QCDW"] - }) - }else if(item.attrField === 'CYSD'){ - return Object.assign({}, item, { - options: this.allSelectOptions["WSCYSD"] - }) - }else if(item.attrField === 'CLLX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ENERGYTYPES"] - }) - }else if(item.attrField === 'NYLX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["NYLXCLASS"] - }) - }else if(item.attrField === 'SYCPX'){ - return Object.assign({}, item, { - options: this.allSelectOptions["SYCPXCLASS"] - }) - }else if(item.attrField === 'SYRZ'){ - return Object.assign({}, item, { - options: this.allSelectOptions["SYRZCLASS"] - }) - }else if(item.attrField === 'ZRBM'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ZRBMCLASS"] - }) - }else if(item.attrField === 'ZRGCS'){ - return Object.assign({}, item, { - options: this.allSelectOptions["ZRGCSCLASS"] - }) - }else if(item.attrField === 'TXLB'){ - return Object.assign({}, item, { - options: this.allSelectOptions["TXLBCLASS"] - }) - }else { - return Object.assign({}, item, { - options: this.allSelectOptions[item.selVal] - }) - } + if (item.attrField === 'WSSMR') { + return Object.assign({}, item, { + options: this.allSelectOptions["WSSMR"] + }) + } else if (item.attrField === 'QCDW') { + return Object.assign({}, item, { + options: this.allSelectOptions["QCDW"] + }) + } else if (item.attrField === 'CYSD') { + return Object.assign({}, item, { + options: this.allSelectOptions["WSCYSD"] + }) + } else if (item.attrField === 'CLLX') { + return Object.assign({}, item, { + options: this.allSelectOptions["ENERGYTYPES"] + }) + } else if (item.attrField === 'NYLX') { + return Object.assign({}, item, { + options: this.allSelectOptions["NYLXCLASS"] + }) + } else if (item.attrField === 'SYCPX') { + return Object.assign({}, item, { + options: this.allSelectOptions["SYCPXCLASS"] + }) + } else if (item.attrField === 'SYRZ') { + return Object.assign({}, item, { + options: this.allSelectOptions["SYRZCLASS"] + }) + } else if (item.attrField === 'ZRBM') { + return Object.assign({}, item, { + options: this.allSelectOptions["ZRBMCLASS"] + }) + } else if (item.attrField === 'ZRGCS') { + return Object.assign({}, item, { + options: this.allSelectOptions["ZRGCSCLASS"] + }) + } else if (item.attrField === 'TXLB') { + return Object.assign({}, item, { + options: this.allSelectOptions["TXLBCLASS"] + }) + } else { + return Object.assign({}, item, { + options: this.allSelectOptions[item.selVal] + }) + } } else { return item } @@ -4462,7 +4597,7 @@ export default { /** * 生成校验规则 */ - resolveFormFieldListRules (isEdit) { + resolveFormFieldListRules(isEdit) { this.reloadAddForm = false const formFieldList = this.formFieldList const rules = {...this.defaultAddFormFieldRules} @@ -4472,15 +4607,15 @@ export default { if (item.attrType === 'DATE_PICKER') { rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'blur'}) } else if (item.attrType === 'SEL_OPTION') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'DATE_PIC_OPTS') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'INPUT_NUM') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'blur' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'blur'}) } else if (item.attrType === 'SEL_OPTS') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) - }else if(item.attrType ==='INPUT_STR'){ - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) + } else if (item.attrType === 'INPUT_STR') { + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } } // isEdit 为0 标准状态不是必填 @@ -4492,11 +4627,16 @@ export default { if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') { rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'}) } else { - rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'}) + rule.push({ + type: 'string', + max: item.attrLen, + message: `${item.attrName}不能超过${item.attrLen}个字符`, + trigger: 'blur' + }) } } if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') { - rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'}) + rule.push({validator: this.verify.validateStandardItem, trigger: 'blur'}) } if (rule.length > 0) { rules[item.attrField] = rule @@ -4512,10 +4652,10 @@ export default { // }) }, /** - * 是否添加进标准法规清单change事件 + * 是否添加进标准法规清单change事件 * 动态改变必填项 - * */ - isRegulationsChange (val) { + * */ + isRegulationsChange(val) { if (val === '2') { const formFieldList = this.formFieldList const rules = {...this.defaultAddFormFieldRules} @@ -4525,17 +4665,22 @@ export default { if (item.attrType === 'DATE_PICKER') { rule.push({required: false, type: 'date', message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'SEL_OPTION') { - rule.push({ required: false, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: false, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'DATE_PIC_OPTS') { - rule.push({ required: false, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: false, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'INPUT_NUM') { - rule.push({ required: false, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: false, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'SEL_OPTS') { - rule.push({ required: false, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: false, message: `${item.attrName}不能为空`, trigger: 'change'}) } } if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { - rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) + rule.push({ + type: 'string', + max: item.attrLen, + message: `${item.attrName}不能超过${item.attrLen}个字符`, + trigger: 'change' + }) } if (rule.length > 0) { // this.$set(this.rules, item.attrField, rule) @@ -4559,19 +4704,24 @@ export default { if (item.attrType === 'DATE_PICKER') { rule.push({required: true, type: 'date', message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'SEL_OPTION') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'DATE_PIC_OPTS') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'INPUT_NUM') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } else if (item.attrType === 'SEL_OPTS') { - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) - }else if(item.attrType ==='INPUT_STR'){ - rule.push({ required: true, message: `${item.attrName}不能为空`, trigger: 'change' }) + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) + } else if (item.attrType === 'INPUT_STR') { + rule.push({required: true, message: `${item.attrName}不能为空`, trigger: 'change'}) } } if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { - rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'change'}) + rule.push({ + type: 'string', + max: item.attrLen, + message: `${item.attrName}不能超过${item.attrLen}个字符`, + trigger: 'change' + }) } if (rule.length > 0) { // this.$set(this.rules, item.attrField, rule) @@ -4588,7 +4738,7 @@ export default { } }, // 获取工作组信息下拉框信息 - getGzzOption () { + getGzzOption() { this.$http.get('lawss/sarGroupMenu/queryGroup', '', { _this: this }, res => { @@ -4605,7 +4755,7 @@ export default { }) }, - getDept () { + getDept() { return new Promise((resolve, reject) => { let url = 'sys/org/getTree' this.$http.get(url, {}, { @@ -4644,12 +4794,12 @@ export default { formatText(str) { return formatText(str) }, - onChecked () { + onChecked() { // this.sarStandardsInfoEO.FO = '' this.sarStandardsInfoEO.XMPGJS = '' }, // 编辑时文件上传成功更改标准状态 - fileSuccess (boolean) { + fileSuccess(boolean) { // 判断当前是新增还是编辑 if (this.addOrUPdateFlag === 2) { let sarStandardsInfoEO = this.sarStandardsInfoEO @@ -4705,7 +4855,7 @@ export default { } }, // 将文本状态的id与name对应 - setMap(data){ + setMap(data) { data.forEach(item => { this.$set(this.textStatusMap, item.value, item.label) }) @@ -4714,7 +4864,7 @@ export default { }, computed: { // 是否拥有拖拽权限 - hasPermissionDrag () { + hasPermissionDrag() { let has = false let permissionList = this.$store.getters.getMenuList permissionList.map((menu) => { @@ -4724,19 +4874,19 @@ export default { }) return has }, - addBtnDisabled () { + addBtnDisabled() { if (this.selectSarMenu.id === 'wdsc' || - this.selectSarMenu.id === 'gxhbq' || - this.selectSarMenu.pId === 'gxhbq') { + this.selectSarMenu.id === 'gxhbq' || + this.selectSarMenu.pId === 'gxhbq') { return true } else { return false } } }, - created(){ - }, - async mounted () { + created() { + }, + async mounted() { // 进入页面后查询树形结构目录 await this.selectMenu() // 进入页面后查询标准体系树形结构目录 引用 数据字典配置 @@ -4746,25 +4896,25 @@ export default { this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this }, res => { - this.allSelectOptions = res.data || {} - this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 - this.standNatureOptions = res.data.SARPROPERTY // 标准性质 - this.standStateOptions = res.data.WBZTCLASS // 文本状态 - this.standSystemOptions = res.data.BZTXCLASS // 标准体系 - this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 - this.categoryOptions = res.data.NYLXCLASS // 能源类型 - this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 - this.cysdOptions = res.data.WSCYSD // 我司参与深度 - this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 - this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 - this.txlbOptions = res.data.TXLBCLASS // 体系类别 + this.allSelectOptions = res.data || {} + this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 + this.standNatureOptions = res.data.SARPROPERTY // 标准性质 + this.standStateOptions = res.data.WBZTCLASS // 文本状态 + this.standSystemOptions = res.data.BZTXCLASS // 标准体系 + this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型 + this.categoryOptions = res.data.NYLXCLASS // 能源类型 + this.applyAuthOptions = res.data.SYRZCLASS // 适用认证 + this.cysdOptions = res.data.WSCYSD // 我司参与深度 + this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 + this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 + this.txlbOptions = res.data.TXLBCLASS // 体系类别 this.qcdwOptions = res.data.QCDW // 起草单位 this.nylxOptions = res.data.NYLXCLASS // 能源类型 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.syrzOptions = res.data.SYRZCLASS // 适用认证 - this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 + this.gkglbmOptions = res.data.GKGLBM;//归口管理部门 this.getGzzOption() this.setMap(this.standStateOptions) }, e => { @@ -4778,7 +4928,7 @@ export default { this.busVsFunc() this.modelFunc() }, - destroyed () { + destroyed() { this.allSelectOptions = {} this.countryOptions = [] this.regionOptions = [] @@ -4801,172 +4951,197 @@ export default { } diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 5adcb7f01..fff49ca0f 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -341,24 +341,28 @@ :wrapperClosable="false" :visible.sync="isAdvancedSearch">
- + - - + - - - + - - - - {{ opt.label}} - - - - + + + + + - + + - + + + + + {{ opt.label }} + + + + + + + + + + + + + + + + + {{ opt.label }} + + + - {{ opt.label}} - - - - - - - + {{ opt.label }} + + + @@ -426,139 +459,153 @@ - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} - - - - - - {{ opt.label}} + {{ opt.label }} + - - + - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - {{ opt.label}} + {{ opt.label }} + - - - - - - - - - - - - - - - - - - - - {{ opt.label}} - - - - - - - - - - - {{ opt.label}} + {{ opt.label }} + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -566,11 +613,13 @@ class="common-button-primary" icon="el-icon-check" type="primary" - @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索 + @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索 + 取消 + @click="clearAllSearch('sarStandardsSearch')">取消 +
@@ -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 () { diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 3b1616db0..c56b05480 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -188,7 +188,7 @@ @@ -236,7 +236,7 @@ align="center"> @@ -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) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue index b82a765f5..a68f0a129 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue @@ -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(); }, // 查看项目符合性 diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 8850b9076..b9a65f2d9 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -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 => { // 责任部门转换