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 
# Conflicts:
#	src/components/navMenu/index.vue
This commit is contained in:
Way Downtown
2021-07-08 21:06:17 +08:00
parent 75e0704cbc fa3e499722
commit 9caac69769
7 changed files with 530 additions and 863 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+56 -84
View File
@@ -189,14 +189,14 @@
<div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
<el-table
v-show="!isListType"
ref="searchTable"
@selection-change="sarAccessInfoSearchSelect"
:data="sarAccessInfoSearchList"
style="width: 100%"
border
height="300px"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="sarAccessInfoSearchSelect"
ref="searchTable"
>
<el-table-column
type="selection"
@@ -253,7 +253,7 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="searchTable"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
@@ -293,15 +293,6 @@
<div class="list-entry">
<el-divider content-position="left">清单条目</el-divider>
<div class="action-bar">
<el-button
class="common-button-default"
size="small" @click="moveUp" v-if="!disabledFlag"
>上移</el-button>
<el-button
class="common-button-default"
size="small" @click="moveDown"
v-if="!disabledFlag"
>下移</el-button>
<el-button
class="common-button-default export-button"
size="mini" @click="exportAccessInfo('apart')"
@@ -315,7 +306,7 @@
><i class="iconfont">&#xe61b;</i>删除</el-button>
</div>
<el-table
ref="entryTable"
ref="entryTable"
:data="sarAccessInfoList"
class="un-select"
style="width: 100%"
@@ -366,6 +357,22 @@
width="120px"
label="文本状态">
</el-table-column>
<el-table-column>
<template slot-scope="scope">
<el-button
class="common-button-default"
type="primary"
size="small" @click="moveUp(scope.$index, scope.row)"
v-if="!disabledFlag"
>上移</el-button>
<el-button
class="common-button-default"
type="danger"
size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag"
>下移</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="footer">
@@ -1011,73 +1018,45 @@ export default {
})
if(addList > -1){
this.$message.warning('请勿添加重复数据')
} else(
this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
} else{
this.sarAccessInfoList.push(item)
)
this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
}
})
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
},
// 上移 事件
moveUp () {
// i 全部对象数组的下标
// s 选中对象数组的下标
let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry))
if (sarAccessInfoListArry.length === 1) {
//数组交换下标
console.log('s', sarAccessInfoListArry);
console.log('i',this.sarAccessInfoList);
for (var s in sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) {
if (Number(i) !== 0) {
let tempOption = this.sarAccessInfoList[i - 1]
this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i])
this.$set(this.sarAccessInfoList, i, tempOption)
// this.sarAccessInfoListArry = []
return
} else {
this.$message.error('数据已经是第一个,请选择其他数据上移!')
}
}
}
}
} else if (this.sarAccessInfoListArry.length === 0) {
this.$message.error('请选择需要移动的数据!')
} else {
this.$message.error('请选择单一数据进行移动!')
}
moveUp (index, row) {
if (index === 0) {
this.$message({
message: '已经是列表中第一个素材！',
type: 'warning'
})
} else {
let temp = this.sarAccessInfoList[index - 1]
this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, temp)
}
},
// 下移事件
moveDown () {
// y 全部对象数组的下标
// t 选中对象数组的下标
if (this.sarAccessInfoListArry.length === 1) {
for (var t in this.sarAccessInfoListArry) {
for (var y in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) {
var ass = this.sarAccessInfoList.length - 1
if (Number(y) !== Number(ass)) {
var s = parseInt(y) + 1
var tempOption = this.sarAccessInfoList[parseInt(s)]
this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)])
this.$set(this.sarAccessInfoList, parseInt(y), tempOption)
return
} else {
this.$message.error('数据已经是最后一个,请选择其他数据进行移动!')
}
}
}
}
} else if (this.sarAccessInfoListArry.length === 0) {
this.$message.error('请选择需要移动的数据!')
} else {
this.$message.error('请选择单一数据进行移动!')
}
moveDown (index) {
if (index === (this.sarAccessInfoList.length - 1)) {
this.$message({
message: '已经是列表中最后一个素材！',
type: 'warning'
})
} else {
let i = this.sarAccessInfoList[index + 1]
this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, i)
}
},
// 点击清单条目导入按钮事件
importmodalFlags () {
@@ -1120,12 +1099,8 @@ export default {
}
},
// 清单条目 table select事件
sarAccessInfoSelect (data) {
let sarAccessInfoListArry = [];
for(let i = 0; i< data.length; i++){
this.sarAccessInfoListArry.push(data[i].id)
}
console.log(this.sarAccessInfoListArry);
sarAccessInfoSelect (selectData) {
this.sarAccessInfoListArry = selectData
},
// 点击取消按钮 返回事件
backCancal () {
@@ -1207,12 +1182,9 @@ export default {
return row.isRelateAccess === '1'
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect (selectData) {
this.selectedAccInfoSearchList = selectData
this.selectSearch = []
for(let i = 0; i <selectData.length; i++) {
this.selectSearch.push(selectData[i].id)
}
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
console.log(val)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+46 -68
View File
@@ -238,7 +238,7 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="accessSarTypeSelect"
ref="searchTable"
ref="accessTypeSelect"
>
<el-table-column
type="selection"
@@ -278,15 +278,6 @@
<div class="list-entry">
<el-divider content-position="left">清单条目</el-divider>
<div class="action-bar">
<el-button
class="common-button-default"
size="small" @click="moveUp" v-if="!disabledFlag"
>上移</el-button>
<el-button
class="common-button-default"
size="small" @click="moveDown"
v-if="!disabledFlag"
>下移</el-button>
<el-button
class="common-button-default export-button"
size="mini" @click="exportAccessInfo('apart')"
@@ -351,6 +342,22 @@
width="120px"
label="文本状态">
</el-table-column>
<el-table-column>
<template slot-scope="scope">
<el-button
class="common-button-default"
type="primary"
size="small" @click="moveUp(scope.$index, scope.row)"
v-if="!disabledFlag"
>上移</el-button>
<el-button
class="common-button-default"
type="danger"
size="small" @click="moveDown(scope.$index, scope.row)"
v-if="!disabledFlag"
>下移</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="footer">
@@ -996,9 +1003,15 @@ export default {
})
if(addList > -1){
this.$message.warning('请勿添加重复数据')
} else(
this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
} else{
this.sarAccessInfoList.push(item)
)
this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
}
})
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
@@ -1008,60 +1021,28 @@ export default {
}
},
// 上移 事件
moveUp () {
// i 全部对象数组的下标
// s 选中对象数组的下标
let sarAccessInfoListArry = JSON.parse(JSON.stringify(this.sarAccessInfoListArry))
if (sarAccessInfoListArry.length === 1) {
//数组交换下标
console.log('s', sarAccessInfoListArry);
console.log('i',this.sarAccessInfoList);
for (var s in sarAccessInfoListArry) {
for (var i in this.sarAccessInfoList) {
if (sarAccessInfoListArry[s].resId === this.sarAccessInfoList[i].resId) {
if (Number(i) !== 0) {
let tempOption = this.sarAccessInfoList[i - 1]
this.$set(this.sarAccessInfoList, i - 1, this.sarAccessInfoList[i])
this.$set(this.sarAccessInfoList, i, tempOption)
// this.sarAccessInfoListArry = []
return
} else {
this.$message.error('数据已经是第一个,请选择其他数据上移!')
}
}
}
}
} else if (this.sarAccessInfoListArry.length === 0) {
this.$message.error('请选择需要移动的数据!')
moveUp (index, row) {
if (index === 0) {
this.$message({
message: '已经是列表中第一个素材！',
type: 'warning'
})
} else {
this.$message.error('请选择单一数据进行移动!')
let temp = this.sarAccessInfoList[index - 1]
this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, temp)
}
},
// 下移事件
moveDown () {
// y 全部对象数组的下标
// t 选中对象数组的下标
if (this.sarAccessInfoListArry.length === 1) {
for (var t in this.sarAccessInfoListArry) {
for (var y in this.sarAccessInfoList) {
if (this.sarAccessInfoListArry[t].resId === this.sarAccessInfoList[y].resId) {
var ass = this.sarAccessInfoList.length - 1
if (Number(y) !== Number(ass)) {
var s = parseInt(y) + 1
var tempOption = this.sarAccessInfoList[parseInt(s)]
this.$set(this.sarAccessInfoList, parseInt(s), this.sarAccessInfoList[parseInt(y)])
this.$set(this.sarAccessInfoList, parseInt(y), tempOption)
return
} else {
this.$message.error('数据已经是最后一个,请选择其他数据进行移动!')
}
}
}
}
} else if (this.sarAccessInfoListArry.length === 0) {
this.$message.error('请选择需要移动的数据!')
moveDown (index) {
if (index === (this.sarAccessInfoList.length - 1)) {
this.$message({
message: '已经是列表中最后一个素材！',
type: 'warning'
})
} else {
this.$message.error('请选择单一数据进行移动!')
let i = this.sarAccessInfoList[index + 1]
this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
this.$set(this.sarAccessInfoList, index, i)
}
},
// 点击清单条目导入按钮事件
@@ -1188,12 +1169,9 @@ export default {
return row.isRelateAccess === '1'
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect (selectData) {
this.selectedAccInfoSearchList = selectData
this.selectSearch = []
for(let i = 0; i <selectData.length; i++) {
this.selectSearch.push(selectData[i].id)
}
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
console.log(val)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+208 -666
View File
File diff suppressed because it is too large Load Diff
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+55 -27
View File
@@ -6,7 +6,7 @@
<el-form inline :model="localProTableSearch" class="label-input-form" @keyup.enter.native="getLocalProductTableBtn">
<el-form-item label="项目编号" class="search-item">
<el-input
v-model="localProTableSearch.productName"
v-model="localProTableSearch.projectNumber"
placeholder="根据项目编号查找"
:maxlength="100"
clearable
@@ -22,12 +22,12 @@
</el-form-item>
<el-form-item label="项目分类" class="search-item">
<el-select
v-model="projectLibrarySearch.projectSort"
v-model="projectLibrarySearch.projectClassification"
placeholder="请选择项目类别"
>
<el-option
v-for="opt in productTypeOptions"
:value="opt.value"
:value="opt.label"
:key="opt.value"
:label="opt.label"
>{{ opt.label}}</el-option>
@@ -38,7 +38,7 @@
<el-option
v-for="opr in xmztOptions"
:key="opr.value"
:value="opr.value"
:value="opr.label"
:label="opr.label"
></el-option>
</el-select>
@@ -66,6 +66,21 @@
v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
@click="selectMoreBtn"
><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
</el-form-item>
</el-form>
</div>
@@ -144,9 +159,18 @@
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="120"
align="center"
>
</el-table-column>
<el-table-column
prop="projectStartDate"
label="项目计划开始日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
@@ -156,6 +180,7 @@
<el-table-column
prop="projectEndDate"
label="项目计划完成日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
@@ -201,14 +226,8 @@
@pageSizeChange="pageSizeChange"></pagination>
<loading :loading="loading">数据获取中</loading>
</div>
<AdvancedQuery
:isAdvancedSearch.sync="isAdvancedSearch"
:twoOptions="twoOptions"
:threeOptions="threeOptions"
@twoSelectChange="twoSelectChange"
@getDomesticStandardTableBtn="getStandardTableBtn"
></AdvancedQuery>
</div>
</template>
<script>
import DatePickerGroup from './components/DatePickerGroup'
@@ -216,6 +235,7 @@ import OrgTree from '@/components/CustomFormComponents/OrgTree'
import eventHub from '@/common/eventHub'
import ProjectRelatedPersonnel from '@/components/CustomFormComponents/ProjectRelatedPersonnel'
import {dateFormat} from '@/common/date/index'
import moment from 'moment'
function checkFD (rules, value, callback) {
this.value = value
let arr = []
@@ -253,16 +273,21 @@ export default {
//查询3类
projectLibrarySearch: {
projectName: '',
projectSort: '',
projectClassification: '',
projectStatus: '',
},
//查询3类
projectLibrarySearchDefault: {
projectName: '',
projectClassification: '',
projectStatus: '',
},
// 查询条件
localProTableSearch: {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
prodectCode: '',
projectNumber:'',
productSet: '',
productName: '',
productBrand: '',
@@ -273,7 +298,7 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
prodectCode: '',
projectNumber:'',
productSet: '',
productName: '',
productBrand: '',
@@ -679,11 +704,20 @@ export default {
* @author zmf
* @date 2021/3/8
*/
//时间格式化
dateFormat(row, column) {
var date = row[column.property];
if (date == undefined) {
return "";
}
return moment(date).format("YYYY-MM-DD");
},
selectMoreBtn () {
this.isAdvancedSearch = true
this.threeOptions = []
},
twoSelectChange (val, obj) {
console.log('twoSelectChange')
if (val === 'product_type') {
this.threeOptions = this.productTypeOptions
} else if (val === 'product_brand') {
@@ -700,13 +734,6 @@ export default {
}]
}
},
// 高级检索搜索
getStandardTableBtn (advancedSearch) {
this.localProTableSearch = {...this.localProTableSearchDefault}
this.localProTableSearch.page = 1
this.localProTableSearch.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
this.getLocalProductTable()
},
// 编辑项目相关人员回显选中人员数据
relatePersonTreeShow () {
let checkedArr = this.localProEO.relatePerson ? this.localProEO.relatePerson.split(',') : []
@@ -925,6 +952,7 @@ export default {
// 清空条件查询
clearAllSearch () {
this.localProTableSearch = {...this.localProTableSearchDefault}
this.projectLibrarySearch = {...this.projectLibrarySearchDefault}
this.localProTableSearch.page = 1
this.getLocalProductTable()
},
@@ -1029,7 +1057,6 @@ export default {
this.$refs['addLocalProductForm'].validate((valid, fields) => {
if (valid) {
const formData = this.resolveTime(this.localProEO)
console.log(formData)
if (formData.energyKind != null && (formData.energyKind instanceof Array)) {
formData.energyKind = formData.energyKind.join(',') // 能源种类
}
@@ -1129,13 +1156,14 @@ export default {
this.localProTableSearch.dataType = this.insideTabsActiveName
this.SarExportSearchEo = this.localProTableSearch
this.$http.get('sarStandProjectLibrary/queryProject',{
projectName: this.projectLibrarySearch.projectName,
projectClassification: this.projectLibrarySearch.projectSort,
projectStatus: this.projectLibrarySearch.projectStatus
// projectName: this.projectLibrarySearch.projectName,
// projectClassification: this.projectLibrarySearch.projectSort,
// projectStatus: this.projectLibrarySearch.projectStatus
...this.localProTableSearch,
...this.projectLibrarySearch,
},{
_this: this, loading: 'loading'
}, res => {
// console.log(res.data)
if (this.localProTableSearch.prodectCode === 'Maintenance') {
this.localProTableList = res.data.Maintenance.records
}