diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 5593b545e..3907c404a 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -6,42 +6,42 @@
+ :loading="searching"
+ type="primary"
+ class="common-button-primary"
+ size="small"
+ v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+ @click="searchSarAccess">
查询
清空
+ class="common-button-default"
+ size="small"
+ v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+ @click="clearSearch">清空
@@ -49,59 +49,59 @@
新增
批量删除
数据获取中
+ type="selection"
+ width="55"
+ align="center">
+ prop="countryAreaShow"
+ label="国家/地区"
+ align="center">
{{ scope.row.detailedListName }}
+ prop="detailedListState"
+ label="清单状态"
+ align="center">
未发布
已发布
@@ -109,27 +109,31 @@
+ prop="detailedListVision"
+ label="清单版本"
+ align="center">
{{ scope.row.detailedListVision
+ v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+ scope.row.detailedListVision
}}
+ prop="updateTime"
+ label="更新时间"
+ align="center">
- {{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime }}
+ {{
+ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+ }}
+
+ prop="updatePeople"
+ label="更新人"
+ align="center">
@@ -137,11 +141,14 @@
- 查看
+
+ 查看
- 编辑
+
+ 编辑
- 删除
+
+ 删除
@@ -190,14 +197,14 @@ export default {
drawerTotal: 0, // 抽屉分页的总条数
sarAccessEORules: {
region: [
- { required: true, message: "区域不能为空", trigger: "change" }
+ {required: true, message: "区域不能为空", trigger: "change"}
],
country: [
- { required: true, message: "国家不能为空", trigger: "change" }
+ {required: true, message: "国家不能为空", trigger: "change"}
],
detailedListName: [
- { required: true, message: "清单名称不能为空", trigger: "blur" },
- { type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" }
+ {required: true, message: "清单名称不能为空", trigger: "blur"},
+ {type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"}
]
},
countryOptions: [],
@@ -216,10 +223,10 @@ export default {
applyAuth: "" // 认证类型
},
dataSourceOptions: [
- { value: "INLAND_STAND", label: "国内标准法规" },
- { value: "FOREIGN_STAND", label: "海外标准法规" },
- { value: "FOREIGN_LAWS", label: "国内外政策" },
- { value: "BUSINESS", label: "企业标准 " }
+ {value: "INLAND_STAND", label: "国内标准法规"},
+ {value: "FOREIGN_STAND", label: "海外标准法规"},
+ {value: "FOREIGN_LAWS", label: "国内外政策"},
+ {value: "BUSINESS", label: "企业标准 "}
],
tableLoading: true,
sarAccessInfoSearchList: [],
@@ -260,24 +267,27 @@ export default {
}, {
_this: this
}, res => {
- this.sarAccessListDatas = res.data.records
- this.sarAccessListDatas.forEach(item => {
+ let arr = res.data.records;
+ console.log('271', arr)
+ arr.forEach(item => {
// 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") {
let k = (item.countryArea || "").split(',')
for (let i in this.countryOptions) {
- for (let m = 0; m< k.length; m++) {
+ for (let m = 0; m < k.length; m++) {
if (this.countryOptions[i].value === k[m]) {
- k[m] = this.countryOptions[i].label
+ k[m] = this.countryOptions[i].label
}
- item.countryArea = k.join(',')
+ item.countryAreaShow = k.join(',')
}
}
}
})
+ console.log('286',arr)
+ this.sarAccessListDatas = arr
+ this.tableLoading = false
this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total
- this.tableLoading = false
}, e => {
});
@@ -360,7 +370,7 @@ export default {
});
},
// 将文本状态的id与name对应
- setMap(data){
+ setMap(data) {
data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label)
})
@@ -400,6 +410,7 @@ export default {
flex: auto;
width: 100%;
height: calc(100% - 110px) !important;
+
.pagination {
position: static;
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 600b9ab8e..cf8d0d45c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1360,11 +1360,11 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
- //this.$message.success('编辑成功')
- this.isNext = true
- this.$router.push({
- name: 'AccessStandardsAndRegulations'
- })
+ if(res.message === '修改成功'){
+ this.$router.push({
+ name: 'AccessStandardsAndRegulations'
+ })
+ }
}
}, e => {
})
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index ad197ae8b..6761aa645 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -2051,7 +2051,7 @@ export default {
//this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
// this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
this.sarAccessEO.detailedListName = accessRow.detailedListName
- this.sarAccessEO.projectName = accessRow.projectName
+ this.sarAccessEO.carType = accessRow.carType
this.sarAccessEO.id = accessRow.id
this.sarAccessEO.remark = accessRow.remark || ''
this.sarAccessEO.relateFile = accessRow.relateFile
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index b76465bb6..0c1c556e0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -700,72 +700,69 @@ export default {
this.standModel = false;
},
//添加标准确定事件
- // this.detailedListModel = false
- // this.standModel = false
- // okStand(){
- // console.log(this.dataList);
- // if(this.standList.length < 1){
- // this.$message.warning('请至少选择一条数据进行添加')
- // }else{
- // this.standList.map(item => {
- // let addIndex;
- // addIndex = this.dataList.findIndex(items => {
- // return items.standId == item.id
- // })
- // console.log(addIndex);
- // if(addIndex > -1){
- // this.$message.warning('请勿重复添加数据')
- // }else{
- // this.dataList.push(item)
- // }
- // })
- //
+ okStand(){
+ if(this.standList.length > 0){
+ this.standList.forEach(item => {
+ let addIndex
+ addIndex = this.dataList.findIndex(items => {
+ return items.standId === item.id
+ })
+ if(addIndex > -1){
+ this.$message.warning('请勿重复添加数据')
+ }else{
+ this.dataList.push(item)
+ }
+ })
+ this.detailedListModel = false
+ this.standModel = false
+ }else{
+ this.$message.warning('请至少选择一条数据进行添加')
+ }
+ },
+ // okStand() {
+ // let _this = this;
+ // if (this.standList.length < 1) {
+ // _this.$message.warning("请选择标准");
+ // } else {
+ // for (let i = 0; i < this.dataList.length; i++) {
+ // let newStand = false;
+ // for (let j = 0; j < this.standList.length; j++) {
+ // if (this.standList[j].id == this.dataList[i].standId) {
+ // newStand = true;
+ // this.standList.splice(j, 1)
+ // j--
+ // }
+ // }
+ // if (newStand) {
+ // _this.$message.warning("请勿重复添加数据");
+ // } else {
+ // // _this.dataList.push(item);
+ // }
+ // }
+ // this.standardData = []
+ // _this.standModel = false;
+ // for (var i = 0; i < this.standList.length; i++) {
+ // this.standList1.push({
+ // standId: this.standList[i].id,
+ // projectId: this.localProEO.id
+ // })
+ // }
+ // if (this.standList1 != '') {
+ // this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+ // _this: this
+ // }, res => {
+ // if (res.ok) {
+ // // this.$message.success(res.message)
+ // this.getDataList()
+ // }
+ // }, e => {
+ // });
+ // }
+ // this.standList = []
+ // this.standList1 = []
+ // _this.standModel = false;
// }
// },
- okStand() {
- let _this = this;
- if (this.standList.length < 1) {
- _this.$message.warning("请选择标准");
- } else {
- for (let i = 0; i < this.dataList.length; i++) {
- let newStand = false;
- for (let j = 0; j < this.standList.length; j++) {
- if (this.standList[j].id == this.dataList[i].standId) {
- newStand = true;
- this.standList.splice(j, 1)
- j--
- }
- }
- if (newStand) {
- _this.$message.warning("请勿重复添加数据");
- } else {
- // _this.dataList.push(item);
- }
- }
- this.standardData = []
- _this.standModel = false;
- for (var i = 0; i < this.standList.length; i++) {
- this.standList1.push({
- standId: this.standList[i].id,
- projectId: this.localProEO.id
- })
- }
- if (this.standList1 != '') {
- this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
- _this: this
- }, res => {
- if (res.ok) {
- // this.$message.success(res.message)
- this.getDataList()
- }
- }, e => {
- });
- }
- this.standList = []
- this.standList1 = []
- _this.standModel = false;
- }
- },
//获取标准
getStandrd(data){
this.detailedId = data.id