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

车型页面完善（高级搜索未完成）

Browse Source
This commit is contained in:
Jaunty
2021-07-08 21:03:23 +08:00
parent 5638724d7a
commit 7f1124d0b6
2 changed files with 75 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+74 -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,40 @@
v-btn-permission="'e5ca15122f554414e6365eb09efac5c4'"
@click="selectMoreBtn"
><i class="iconfont">&#xe7a5;</i>高级查询</el-button>
<el-dialog title="收货地址" :visible.sync="dialogFormVisible">
<el-form :model="form">
<el-form-item label="活动名称" :label-width="formLabelWidth">
<el-input v-model="form.name" autocomplete="off"></el-input>
</el-form-item>
<el-form-item label="活动区域" :label-width="formLabelWidth">
<el-select v-model="form.region" placeholder="请选择活动区域">
<el-option label="区域一" value="shanghai"></el-option>
<el-option label="区域二" value="beijing"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogFormVisible = false">确 定</el-button>
</div>
</el-dialog>
</el-form-item>
</el-form>
</div>
@@ -144,9 +178,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 +199,7 @@
<el-table-column
prop="projectEndDate"
label="项目计划完成日期"
:formatter="dateFormat"
min-width="120"
width="160"
align="center"
@@ -201,14 +245,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 +254,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 +292,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 +317,7 @@ export default {
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
validFlag: 0,
prodectCode: '',
projectNumber:'',
productSet: '',
productName: '',
productBrand: '',
@@ -679,11 +723,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 +753,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 +971,7 @@ export default {
// 清空条件查询
clearAllSearch () {
this.localProTableSearch = {...this.localProTableSearchDefault}
this.projectLibrarySearch = {...this.projectLibrarySearchDefault}
this.localProTableSearch.page = 1
this.getLocalProductTable()
},
@@ -1029,7 +1076,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 +1175,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
}
src/sysConfig/index.js
+1 -1
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
const devIp = '192.168.10.248'
const devIp = '192.168.10.30'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'