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

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

Browse Source
This commit is contained in:
super_liu
2021-08-23 17:49:39 +08:00
parent e87f39d83b b9388d5c77
commit c1ac951e43
5 changed files with 97 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+28 -21
View File
@@ -287,6 +287,8 @@
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/> />
<el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
<template v-else> <template v-else>
@@ -306,12 +308,12 @@
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
</p> </p>
<!-- <el-button--> <!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"--> <!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"--> <!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"--> <!-- class="decomposition-btn"-->
<!-- icon="icon-separate"--> <!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>--> <!-- >标准分解单</el-button>-->
</div> </div>
</div> </div>
@@ -383,6 +385,11 @@
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/> />
<!-- OCR按钮,根据文件名取后缀判断是否出现-->
<el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
<template v-else> <template v-else>
@@ -1513,6 +1520,14 @@ export default {
props: {}, props: {},
watch: {}, watch: {},
methods: { methods: {
judgeSuffix(fileName){
if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
return true;
}else return false;
},
ocrFunction(file){
return "ocr"
},
FormatDate(date) { FormatDate(date) {
return moment(date).format('YYYY-MM-DD'); return moment(date).format('YYYY-MM-DD');
}, },
@@ -2089,16 +2104,11 @@ export default {
}, },
// 分页点击后方法 // 分页点击后方法
pageChange(page) { pageChange(page) {
console.log("page");
console.log(page);
this.standItemSearch.page = page this.standItemSearch.page = page
this.selectSarStandItems() this.selectSarStandItems()
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
console.log("pageSize");
console.log(pageSize);
// this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
this.standItemSearch.pageSize = pageSize; this.standItemSearch.pageSize = pageSize;
this.selectSarStandItems() this.selectSarStandItems()
@@ -2124,7 +2134,7 @@ export default {
if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') { if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') {
this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',') this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',')
} }
// eslint-disable-next-line no-mixed-operators // // eslint-disable-next-line no-mixed-operators
Object.keys((this.sarStandardsInfoEO && this.sarStandardsInfoEO.attrInfoMap) || {}).forEach((key) => { Object.keys((this.sarStandardsInfoEO && this.sarStandardsInfoEO.attrInfoMap) || {}).forEach((key) => {
if (this.sarStandardsInfoEO.attrInfoMap[key]) { if (this.sarStandardsInfoEO.attrInfoMap[key]) {
this.sarStandardsInfoEO[key] = this.sarStandardsInfoEO.attrInfoMap[key] this.sarStandardsInfoEO[key] = this.sarStandardsInfoEO.attrInfoMap[key]
@@ -2502,9 +2512,7 @@ export default {
}, },
// 分解单-查看 // 分解单-查看
handlePreview(item) { handlePreview(item) {
console.log(item);
this.standShowItemEO = item this.standShowItemEO = item
console.log(this.standShowItemEO);
this.showItemInfoModal = true this.showItemInfoModal = true
let fileList = [] let fileList = []
item.defaultFileList = [] item.defaultFileList = []
@@ -2608,8 +2616,6 @@ export default {
// const { data: { STAND: data } } = res // const { data: { STAND: data } } = res
const {data = {}} = res const {data = {}} = res
this.formFieldListData = data[this.$route.params.pageType] this.formFieldListData = data[this.$route.params.pageType]
console.log('this.formFieldListData')
console.log(this.formFieldListData);
// this.resolveFormFieldList() // this.resolveFormFieldList()
resolve(data[this.$route.params.pageType]) resolve(data[this.$route.params.pageType])
} else { } else {
@@ -2836,14 +2842,14 @@ export default {
this.setMap(res.data.SARPROPERTY) // 标准性质 this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => { }, e => {
}) })
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then ((values) => {
const [displayLocation, standEO, formFieldList] = values const [displayLocation, standEO, formFieldList] = values
const dynamicFormField = standEO ? standEO.attrInfoMap : {} const dynamicFormField = standEO ? standEO.attrInfoMap : {}
formFieldList.forEach((field) => { formFieldList.forEach((field) => {
// 相关流程权限 // 相关流程权限
// if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) { if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
// return return
// } }
displayLocation.forEach((location) => { displayLocation.forEach((location) => {
location.isShowImp = '0' location.isShowImp = '0'
if (dynamicFormField) { if (dynamicFormField) {
@@ -2893,6 +2899,8 @@ export default {
location.half = half location.half = half
location.showAll = false location.showAll = false
}) })
console.log(standEO);
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
id: this.$route.params.id id: this.$route.params.id
}, { }, {
@@ -2911,7 +2919,6 @@ export default {
} }
}) })
this.dynamicFormField = displayLocation this.dynamicFormField = displayLocation
console.log(this.dynamicFormField)
}) })
sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
this.loading = false this.loading = false
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
-2
View File
@@ -268,7 +268,6 @@ export default {
_this: this _this: this
}, res => { }, res => {
let arr = res.data.records; let arr = res.data.records;
console.log('271', arr)
arr.forEach(item => { arr.forEach(item => {
// 国家地区转换 // 国家地区转换
if (item.countryArea !== null || item.countryArea !== "") { if (item.countryArea !== null || item.countryArea !== "") {
@@ -283,7 +282,6 @@ export default {
} }
} }
}) })
console.log('286',arr)
this.sarAccessListDatas = arr this.sarAccessListDatas = arr
this.tableLoading = false this.tableLoading = false
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+9 -7
View File
@@ -85,7 +85,7 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="carType" prop="carTypeShow"
label="车型类别" label="车型类别"
align="center"> align="center">
</el-table-column> </el-table-column>
@@ -279,8 +279,8 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records let arr = res.data.records;
this.sarAccessListDatas.forEach(item =>{ arr.forEach(item =>{
// 适用车型转换 // 适用车型转换
if (item.carType !== null) { if (item.carType !== null) {
let k = (item.carType || "").split(',') let k = (item.carType || "").split(',')
@@ -289,11 +289,12 @@ export default {
if (this.energyKindOptions[i].value === k[m]) { if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label k[m] = this.energyKindOptions[i].label
} }
item.carType = k.join(',') item.carTypeShow = k.join(',')
} }
} }
} }
}) })
this.sarAccessListDatas = arr
this.tableLoading = false this.tableLoading = false
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
@@ -393,8 +394,8 @@ export default {
}, { }, {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records let arr = res.data.records
this.sarAccessListDatas.forEach(item =>{ arr.forEach(item =>{
// 适用车型转换 // 适用车型转换
if (item.carType !== null) { if (item.carType !== null) {
let k = (item.carType || "").split(',') let k = (item.carType || "").split(',')
@@ -403,11 +404,12 @@ export default {
if (this.energyKindOptions[i].value === k[m]) { if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label k[m] = this.energyKindOptions[i].label
} }
item.carType = k.join(',') item.carTypeShow = k.join(',')
} }
} }
} }
}) })
this.sarAccessListDatas = arr
this.tableLoading = false this.tableLoading = false
this.sarSarAccessEOSearch.page = 1 this.sarSarAccessEOSearch.page = 1
this.sarAccessListTotal = res.data.total this.sarAccessListTotal = res.data.total
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+45 -108
View File
@@ -699,115 +699,52 @@ export default {
cancelStand() { cancelStand() {
this.standModel = false; this.standModel = false;
}, },
//如果张宇欢改好了就把这个放开，然后把底下那个注释了
// okStand() { okStand() {
// let _this = this; let _this = this;
// if (this.standList.length < 1) { if (this.standList.length < 1) {
// _this.$message.warning("请选择标准"); _this.$message.warning("请选择标准");
// } else { } else {
// for (let i = 0; i < this.dataList.length; i++) { for (let i = 0; i < this.dataList.length; i++) {
// let newStand = false; let newStand = false;
// for (let j = 0; j < this.standList.length; j++) { for (let j = 0; j < this.standList.length; j++) {
// if (this.standList[j].id == this.dataList[i].standId) { if (this.standList[j].id == this.dataList[i].standId) {
// newStand = true; newStand = true;
// this.standList.splice(j, 1) this.standList.splice(j, 1)
// j-- j--
// } }
// } }
// if (newStand) { if (newStand) {
// _this.$message.warning("请勿重复添加数据"); _this.$message.warning("请勿重复添加数据");
// } else { } else {
// // _this.dataList.push(item); // _this.dataList.push(item);
// } }
// } }
// this.standardData = [] this.standardData = []
// _this.standModel = false; _this.standModel = false;
// for (var i = 0; i < this.standList.length; i++) { for (var i = 0; i < this.standList.length; i++) {
// this.standList1.push({ this.standList1.push({
// standId: this.standList[i].id, standId: this.standList[i].id,
// projectId: this.localProEO.id projectId: this.localProEO.id
// }) })
// } }
// if (this.standList1 != '') { if (this.standList1 != '') {
// this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, { this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
// _this: this _this: this
// }, res => { }, res => {
// if (res.ok) { if (res.ok) {
// // this.$message.success(res.message) // this.$message.success(res.message)
// this.getDataList() this.getDataList()
// } }
// }, e => { }, e => {
// }); });
// } }
// this.standList = [] this.standList = []
// this.standList1 = [] this.standList1 = []
// _this.standModel = false; _this.detailedListModel = false;
// } _this.standModel = false;
// }, }
//添加标准确定事件
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;
// }
// },
//获取标准 //获取标准
getStandrd(data){ getStandrd(data){
this.detailedId = data.id this.detailedId = data.id
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+15 -13
View File
@@ -109,6 +109,13 @@
<div class="search-area"> <div class="search-area">
<div class="left"> <div class="left">
<el-form :inline="true" :model="sarProStateEO" class="label-input-form"> <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.productId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last"> <el-form-item label="项目名称" class="search-item search-item-last">
<el-input <el-input
v-model="sarProStateEO.productName" v-model="sarProStateEO.productName"
@@ -116,13 +123,6 @@
:maxlength="100" :maxlength="100"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -327,7 +327,7 @@ export default {
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: { sarProStateEO: {
productName: "", productName: "",
standId: "", productId: "",
type: "" type: ""
}, },
sarProStateTotal: 0, sarProStateTotal: 0,
@@ -335,7 +335,7 @@ export default {
sarProStatePageSize: this.$store.getters.userInfo.configContent, sarProStatePageSize: this.$store.getters.userInfo.configContent,
sarProStateListDatas: [], // 符合性项目列表数据 sarProStateListDatas: [], // 符合性项目列表数据
sarProStateTableHeight: null, // 符合性项目列表高度 sarProStateTableHeight: null, // 符合性项目列表高度
standId: "" // 符合性项目Id productId: "" // 符合性项目Id
}; };
}, },
methods: { methods: {
@@ -384,16 +384,18 @@ export default {
}, // 外层清空条件查询 }, // 外层清空条件查询
handleProjectCompliance(row) { handleProjectCompliance(row) {
this.sarProStateEO.type = row.type this.sarProStateEO.type = row.type
this.standId = row.standId; this.productId = row.productId;
this.querySarProStateZero(); this.querySarProStateZero();
}, // 查看项目符合性 }, // 查看项目符合性
querySarProStateZero(page) { querySarProStateZero(page) {
console.log(page)
if (page) { if (page) {
this.sarProStateTotalPage = page this.sarProStateTotalPage = page
} else { } else {
this.sarProStateTotalPage = 1; this.sarProStateTotalPage = 1;
} }
var form = this.sarProStateEO; var form = this.sarProStateEO;
console.log('395',form)
// form.standId = this.standId // form.standId = this.standId
form.current = this.sarProStateTotalPage; form.current = this.sarProStateTotalPage;
form.size = this.sarProStatePageSize; form.size = this.sarProStatePageSize;
@@ -416,15 +418,15 @@ export default {
}, // 查询项目数据 }, // 查询项目数据
clearSearchProState() { clearSearchProState() {
this.sarProStateEO.productName = ""; this.sarProStateEO.productName = "";
this.sarProStateEO.standId = ""; this.sarProStateEO.productId = "";
this.sarProStateTotalPage = 1; this.sarProStateTotalPage = 1;
this.querySarProStateZero(); this.querySarProStateZero();
}, // 清空条件查询 }, // 清空条件查询
clearSearchPro() { clearSearchPro() {
this.sarProStateEO.productName = ""; this.sarProStateEO.productName = "";
this.sarProStateEO.standId = ""; this.sarProStateEO.productId = "";
this.showSarProStateModal = false; this.showSarProStateModal = false;
this.standId = ""; this.productId = "";
}, // 关闭查看事件 }, // 关闭查看事件
pageProStateChange(page) { pageProStateChange(page) {
this.sarProStateTotalPage = page; this.sarProStateTotalPage = page;