yunxi
/
yueyueshu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat():前端组件样式修改，后端逻辑优化;

Browse Source
master
jiyufei 3 months ago
parent ab86d9b39e
commit 21248cd4c0
4 changed files with 582 additions and 641 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdaypackage/YysDayPackageConstant.java
View File

File diff suppressed because one or more lines are too long

157
jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/Detail.vue
Unescape View File

@ -1,110 +1,93 @@
<template> <template>
<transition name="el-zoom-in-center"> <transition name="el-zoom-in-center">
<div class="JNPF-preview-main"> <div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" /> <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header"> <div class="JNPF-common-page-header">
<el-page-header @back="goBack" <el-page-header @back="goBack" content="详情" />
content="详情"/>
<div class="options"> <div class="options">
<el-button @click="goBack">取 消</el-button> <el-button @click="goBack">取 消</el-button>
</div> </div>
</div> </div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}"> <el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" > <el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading"> <template v-if="!loading">
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="生产日期" <jnpf-form-tip-item label="生产日期" prop="manufactureTime">
prop="manufactureTime" > <p>{{ dataForm.manufactureTime }}</p>
<p>{{dataForm.manufactureTime}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="设备编码" <jnpf-form-tip-item label="设备编码" prop="deviceCode">
prop="deviceCode" > <p>{{ dataForm.deviceCode }}</p>
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="设备名称" <jnpf-form-tip-item label="设备名称" prop="deviceName">
prop="deviceName" > <p>{{ dataForm.deviceName }}</p>
<p>{{dataForm.deviceName}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="顺序号" <jnpf-form-tip-item label="顺序号" prop="sort">
prop="sort" > <JnpfNumber v-model="dataForm.sort" placeholder="顺序号" disabled :min="1" :step="1">
<JnpfNumber v-model="dataForm.sort"
placeholder="顺序号" disabled
:min="1" :step="1" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="班次" <jnpf-form-tip-item label="班次" prop="post">
prop="post" >
<p>{{ dataForm.post }} </p> <p>{{ dataForm.post }} </p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="开始时间" <jnpf-form-tip-item label="开始时间" prop="startTime">
prop="startTime" > <p>{{ dataForm.startTime }}</p>
<p>{{dataForm.startTime}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="结束时间" <jnpf-form-tip-item label="结束时间" prop="endTime">
prop="endTime" > <p>{{ dataForm.endTime }}</p>
<p>{{dataForm.endTime}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="产品编码" <jnpf-form-tip-item label="产品编码" prop="productCode">
prop="productCode" > <p>{{ dataForm.productCode }}</p>
<p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="产品名称" <jnpf-form-tip-item label="产品名称" prop="productName">
prop="productName" > <p>{{ dataForm.productName }}</p>
<p>{{dataForm.productName}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="规格型号" <jnpf-form-tip-item label="规格型号" prop="models">
prop="models" > <p>{{ dataForm.models }}</p>
<p>{{dataForm.models}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="计量单位" <jnpf-form-tip-item label="计量单位" prop="measurementUnit">
prop="measurementUnit" > <p>{{ dataForm.measurementUnit }}</p>
<p>{{dataForm.measurementUnit}}</p>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8" > <el-col :span="8">
<jnpf-form-tip-item label="计量数量" <jnpf-form-tip-item label="计量数量" prop="planNumber">
prop="planNumber" > <JnpfNumber v-model="dataForm.planNumber" placeholder="请输入计量数量" disabled :step="1">
<JnpfNumber v-model="dataForm.planNumber"
placeholder="请输入计量数量" disabled
:step="1" >
</JnpfNumber> </JnpfNumber>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
</template> </template>
</el-form> </el-form>
</el-row> </el-row>
</div> </div>
</transition> </transition>
</template> </template>
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf' import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail' import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
export default { export default {
components: { Detail}, components: { Detail },
props: [], props: [],
data() { data() {
return { return {
@ -113,22 +96,22 @@
loading: false, loading: false,
dataForm: { dataForm: {
id :'', id: '',
manufactureTime : '', manufactureTime: '',
deviceCode : "", deviceCode: "",
deviceName : '', deviceName: '',
sort : 1, sort: 1,
post : "1", post: "1",
startTime : '', startTime: '',
endTime : '', endTime: '',
productCode : '', productCode: '',
productName : '', productName: '',
models : '', models: '',
measurementUnit : '', measurementUnit: '',
planNumber : '', planNumber: '',
}, },
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季晚班","id":"2"}], postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }],
postProps:{"label":"fullName","value":"id" }, postProps: { "label": "fullName", "value": "id" },
} }
}, },
@ -137,7 +120,7 @@
created() { created() {
}, },
mounted() {}, mounted() { },
methods: { methods: {
toDetail(defaultValue, modelId) { toDetail(defaultValue, modelId) {
if (!defaultValue) return if (!defaultValue) return
@ -151,8 +134,8 @@
}) })
}) })
}, },
dataInfo(dataAll){ dataInfo(dataAll) {
let _dataAll =dataAll let _dataAll = dataAll
this.dataForm = _dataAll this.dataForm = _dataAll
}, },
@ -163,10 +146,10 @@
this.dataForm.id = id || 0; this.dataForm.id = id || 0;
this.visible = true; this.visible = true;
this.$nextTick(() => { this.$nextTick(() => {
if(this.dataForm.id){ if (this.dataForm.id) {
this.loading = true this.loading = true
request({ request({
url: '/api/example/YysDayPackage/detail/'+this.dataForm.id, url: '/api/example/YysDayPackage/detail/' + this.dataForm.id,
method: 'get' method: 'get'
}).then(res => { }).then(res => {
this.dataInfo(res.data) this.dataInfo(res.data)
@ -177,6 +160,6 @@
}) })
}, },
}, },
} }
</script> </script>

22
jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/form.vue
Unescape View File

@ -37,9 +37,10 @@
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="生产日期" prop="manufactureTime"> <jnpf-form-tip-item label="生产日期" prop="manufactureTime">
<JnpfDatePicker v-model="dataForm.manufactureTime" <JnpfDatePicker v-model="dataForm.manufactureTime"
@change="changeData('manufactureTime', -1)" :startTime="dateTime(false, 1, 1, '', '')" @change="changeData('manufactureTime', -1)"
:endTime="dateTime(false, 1, 1, '', '')" placeholder="请选择生产日期" clearable :startTime="dateTime(false, 1, 1, '', '')" :endTime="dateTime(false, 1, 1, '', '')"
:style='{ "width": "100%" }' type="date" format="yyyy-MM-dd"> placeholder="请选择生产日期" clearable :style='{ "width": "100%" }' type="date"
format="yyyy-MM-dd">
</JnpfDatePicker> </JnpfDatePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -79,8 +80,9 @@
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="开始时间" prop="startTime"> <jnpf-form-tip-item label="开始时间" prop="startTime">
<JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)" <JnpfTimePicker v-model="dataForm.startTime" @change="changeData('startTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')" :startTime="time(false, 1, 1, '', 'HH:mm', '')"
placeholder="请选择开始时间" clearable :style='{ "width": "100%" }' format="HH:mm"> :endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择开始时间" clearable
:style='{ "width": "100%" }' format="HH:mm">
</JnpfTimePicker> </JnpfTimePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -88,8 +90,9 @@
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="结束时间" prop="endTime"> <jnpf-form-tip-item label="结束时间" prop="endTime">
<JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)" <JnpfTimePicker v-model="dataForm.endTime" @change="changeData('endTime', -1)"
:startTime="time(false, 1, 1, '', 'HH:mm', '')" :endTime="time(false, 1, 1, '', 'HH:mm', '')" :startTime="time(false, 1, 1, '', 'HH:mm', '')"
placeholder="请选择结束时间" clearable :style='{ "width": "100%" }' format="HH:mm"> :endTime="time(false, 1, 1, '', 'HH:mm', '')" placeholder="请选择结束时间" clearable
:style='{ "width": "100%" }' format="HH:mm">
</JnpfTimePicker> </JnpfTimePicker>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
@ -116,8 +119,9 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<jnpf-form-tip-item label="计量单位" prop="measurementUnit"> <jnpf-form-tip-item label="计量单位" prop="measurementUnit">
<JnpfInput v-model="dataForm.measurementUnit" @change="changeData('measurementUnit', -1)" <JnpfInput v-model="dataForm.measurementUnit"
placeholder="请输入计量单位" clearable :style='{ "width": "100%" }'> @change="changeData('measurementUnit', -1)" placeholder="请输入计量单位" clearable
:style='{ "width": "100%" }'>
</JnpfInput> </JnpfInput>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>

208
jnpf-java-boot/jnpf-web/src/views/yys/yysdaypackage/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template> <template>
<div class="JNPF-common-layout"> <div class="JNPF-common-layout">
<div class="JNPF-common-layout-center"> <div class="JNPF-common-layout-center">
@ -12,9 +5,8 @@
<el-form @submit.native.prevent> <el-form @submit.native.prevent>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="生产日期"> <el-form-item label="生产日期">
<JnpfDateRangePicker v-model="query.manufactureTime" <JnpfDateRangePicker v-model="query.manufactureTime" format="yyyy-MM-dd"
format="yyyy-MM-dd" startPlaceholder="开始日期" startPlaceholder="开始日期" endPlaceholder="结束日期">
endPlaceholder="结束日期" >
</JnpfDateRangePicker> </JnpfDateRangePicker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -39,10 +31,10 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button> <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll=true" v-if="!showAll"> <el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开 展开
</el-button> </el-button>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll=false" v-else> <el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起 收起
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -54,9 +46,9 @@
<div> <div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增 <el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button> </el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()" >导出 <el-button type="success" icon="icon-ym icon-ym-btn-download" @click="exportData()">导出
</el-button> </el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()" >导入 <el-button type="success" icon="icon-ym icon-ym-btn-upload" @click="handelUpload()">导入
</el-button> </el-button>
</div> </div>
<div class="JNPF-common-head-right"> <div class="JNPF-common-head-right">
@ -71,101 +63,63 @@
</div> </div>
</div> </div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod" :span-method="arraySpanMethod">
<el-table-column prop="manufactureTime" label="生产日期" align="left">
>
<el-table-column
prop="manufactureTime"
label="生产日期" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deviceCode" label="设备编码" align="left">
prop="deviceCode"
label="设备编码" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deviceName" label="设备名称" align="left">
prop="deviceName"
label="设备名称" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="sort" label="顺序号" align="left">
prop="sort" <template slot-scope="scope" v-if="scope.row.sort">
label="顺序号" align="left" <JnpfNumber v-model="scope.row.sort" :thousands="false" />
>
<template slot-scope="scope" v-if="scope.row.sort" >
<JnpfNumber v-model="scope.row.sort" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="班次" prop="post" algin="left" <el-table-column label="班次" prop="post" algin="left">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.post}} {{ scope.row.post }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="startTime" label="开始时间" align="left">
prop="startTime"
label="开始时间" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="endTime" label="结束时间" align="left">
prop="endTime"
label="结束时间" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="productCode" label="产品编码" align="left">
prop="productCode"
label="产品编码" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="productName" label="产品名称" align="left">
prop="productName"
label="产品名称" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="models" label="规格型号" align="left">
prop="models"
label="规格型号" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="measurementUnit" label="计量单位" align="left">
prop="measurementUnit"
label="计量单位" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="planNumber" label="计量数量" align="left">
prop="planNumber" <template slot-scope="scope" v-if="scope.row.planNumber">
label="计量数量" align="left" <JnpfNumber v-model="scope.row.planNumber" :thousands="false" />
>
<template slot-scope="scope" v-if="scope.row.planNumber" >
<JnpfNumber v-model="scope.row.planNumber" :thousands="false"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column label="操作" fixed="right" width="150">
fixed="right" width="150" > <template slot-scope="scope">
<template slot-scope="scope" > <el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
</el-button> </el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除 <el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button> </el-button>
<el-button type="text" <el-button type="text" @click="goDetail(scope.row.id)">详情
@click="goDetail(scope.row.id)">详情
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</JNPF-table> </JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/> <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div> </div>
</div> </div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh"/> <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download"/> <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" /> <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false"/> <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" /> <ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson" <SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" /> @superQuery="superQuery" />
@ -174,39 +128,39 @@
<script> <script>
import request from '@/utils/request' import request from '@/utils/request'
import {mapGetters} from "vuex"; import { mapGetters } from "vuex";
import {getDictionaryDataSelector} from '@/api/systemData/dictionary' import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form' import JNPFForm from './form'
import Detail from './Detail' import Detail from './Detail'
import ExportBox from '@/components/ExportBox' import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail' import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import {getDataInterfaceRes} from '@/api/systemData/dataInterface' import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev' import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user' import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize' import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList' import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index" import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery' import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson' import superQueryJson from './superQueryJson'
export default { export default {
components: { components: {
JNPFForm, JNPFForm,
Detail, Detail,
ExportBox,ToFormDetail , SuperQuery ExportBox, ToFormDetail, SuperQuery
}, },
data() { data() {
return { return {
keyword:'', keyword: '',
expandsTree: true, expandsTree: true,
refreshTree: true, refreshTree: true,
toFormDetailVisible:false, toFormDetailVisible: false,
expandObj:{}, expandObj: {},
columnOptions: [], columnOptions: [],
mergeList: [], mergeList: [],
exportList:[], exportList: [],
columnList, columnList,
showAll: false, showAll: false,
@ -215,10 +169,10 @@
uploadBoxVisible: false, uploadBoxVisible: false,
detailVisible: false, detailVisible: false,
query: { query: {
manufactureTime:undefined, manufactureTime: undefined,
productCode:undefined, productCode: undefined,
productName:undefined, productName: undefined,
deviceName:undefined, deviceName: undefined,
}, },
treeProps: { treeProps: {
children: 'children', children: 'children',
@ -242,10 +196,10 @@
flowListVisible: false, flowListVisible: false,
flowList: [], flowList: [],
exportBoxVisible: false, exportBoxVisible: false,
postOptions:[{"fullName":"旺季白班","id":"1"},{"fullName":"旺季晚班","id":"2"}], postOptions: [{ "fullName": "旺季白班", "id": "1" }, { "fullName": "旺季晚班", "id": "2" }],
postProps:{"label":"fullName","value":"id" }, postProps: { "label": "fullName", "value": "id" },
interfaceRes: { interfaceRes: {
deviceCode:[] , deviceCode: [],
}, },
} }
}, },
@ -289,9 +243,9 @@
}, },
loadNode(node, resolve) { loadNode(node, resolve) {
const nodeData = node.data const nodeData = node.data
const config ={ const config = {
treeInterfaceId:"", treeInterfaceId: "",
treeTemplateJson:[] treeTemplateJson: []
} }
if (config.treeInterfaceId) { if (config.treeInterfaceId) {
//这里是为了拿到参数中关联的字段的值，后端自行拿 //这里是为了拿到参数中关联的字段的值，后端自行拿
@ -370,7 +324,7 @@
} }
}) })
newList.forEach(item => { newList.forEach(item => {
if (item.children && item.children.length ) { if (item.children && item.children.length) {
item.children.forEach((child, index) => { item.children.forEach((child, index) => {
if (index == 0) { if (index == 0) {
this.mergeList.push({ this.mergeList.push({
@ -408,13 +362,13 @@
} }
this.exportList = exportList this.exportList = exportList
}, },
goDetail(id){ goDetail(id) {
this.detailVisible = true this.detailVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Detail.init(id) this.$refs.Detail.init(id)
}) })
}, },
sortChange({column, prop, order}) { sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc' this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop this.listQuery.sidx = !order ? '' : prop
this.initData() this.initData()
@ -433,16 +387,16 @@
...this.query, ...this.query,
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId:this.menuId, menuId: this.menuId,
moduleId:'590536677781408453', moduleId: '590536677781408453',
type:1, type: 1,
}; };
request({ request({
url: `/api/example/YysDayPackage/getList`, url: `/api/example/YysDayPackage/getList`,
method: 'post', method: 'post',
data: _query data: _query
}).then(res => { }).then(res => {
var _list =res.data.list; var _list = res.data.list;
this.list = _list.map(o => ({ this.list = _list.map(o => ({
...o, ...o,
...this.expandObj, ...this.expandObj,
@ -470,10 +424,10 @@
}).catch(() => { }).catch(() => {
}); });
}, },
handelUpload(){ handelUpload() {
this.uploadBoxVisible = true this.uploadBoxVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysDayPackage") this.$refs.UploadBox.init("", "example/YysDayPackage")
}) })
}, },
openSuperQuery() { openSuperQuery() {
@ -488,10 +442,10 @@
this.initData() this.initData()
}, },
addOrUpdateHandle(row, isDetail) { addOrUpdateHandle(row, isDetail) {
let id = row?row.id:"" let id = row ? row.id : ""
this.formVisible = true this.formVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail,this.list) this.$refs.JNPFForm.init(id, isDetail, this.list)
}) })
}, },
exportData() { exportData() {
@ -501,7 +455,7 @@
}) })
}, },
download(data) { download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId} let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({ request({
url: `/api/example/YysDayPackage/Actions/Export`, url: `/api/example/YysDayPackage/Actions/Export`,
method: 'post', method: 'post',
@ -514,10 +468,10 @@
}) })
}, },
search() { search() {
this.listQuery.currentPage=1 this.listQuery.currentPage = 1
this.listQuery.pageSize=20 this.listQuery.pageSize = 20
this.listQuery.sort="desc" this.listQuery.sort = "desc"
this.listQuery.sidx="post" this.listQuery.sidx = "post"
this.initData() this.initData()
}, },
refresh(isrRefresh) { refresh(isrRefresh) {
@ -533,5 +487,5 @@
if (isrRefresh) this.reset() if (isrRefresh) this.reset()
}, },
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save