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

month

Browse Source
master
zengchenxi 3 months ago
parent b7948ea5fd
commit 53a3420d9e
3 changed files with 425 additions and 461 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysrequisitionreport/YysRequisitionReportConstant.java
View File

File diff suppressed because one or more lines are too long

11
jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/form.vue
Unescape View File

@ -48,10 +48,11 @@
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)" <JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode" :rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据" placeholder="请选择设备编码" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='device_name' field='deviceCode' popupType="dialog" relationField='device_code' field='deviceCode'
interfaceId="590497496266971845" :pageSize="20" interfaceId="590497496266971845" :pageSize="20"
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'> :columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect> </JnpfPopupSelect>
</jnpf-form-tip-item> </jnpf-form-tip-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -319,6 +320,14 @@ export default {
this.$emit('refreshDataList', true) this.$emit('refreshDataList', true)
}, },
changeData(model, index) { changeData(model, index) {
if (model == 'deviceCode' && this.dataForm.deviceCode != undefined) {
request({
url: '/api/example/YysDevice/queryNameByCode/' + this.dataForm.deviceCode,
method: 'get'
}).then(res => {
this.dataForm.deviceName = res.msg;
});
}
this.isEdit = false this.isEdit = false
this.childIndex = index this.childIndex = index
let modelAll = model.split("-"); let modelAll = model.split("-");

201
jnpf-java-boot/jnpf-web/src/views/yys/yysrequisitionreport/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,78 +63,40 @@
</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"border>
<el-table-column prop="manufactureTime" label="生产日期" align="center">
>
<el-table-column
prop="manufactureTime"
label="生产日期" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deviceCode" label="设备编码" align="center">
prop="deviceCode"
label="设备编码" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="deviceName" label="设备名称" align="center">
prop="deviceName"
label="设备名称" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="sort" label="顺序号" align="center">
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="center">
>
<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="center">
prop="startTime"
label="开始时间" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="endTime" label="结束时间" align="center">
prop="endTime"
label="结束时间" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="productCode" label="产品编码" align="center">
prop="productCode"
label="产品编码" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="productName" label="产品名称" align="center">
prop="productName"
label="产品名称" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="model" label="规格型号" align="center">
prop="model"
label="规格型号" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="duty" label="当班领用" align="center">
prop="duty"
label="当班领用" align="left"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="classBalance" label="本班结存" align="center">
prop="classBalance"
label="本班结存" align="left"
>
</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>
@ -152,17 +106,18 @@
</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" />
@ -171,39 +126,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,
@ -212,10 +167,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',
@ -239,10 +194,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: [],
}, },
} }
}, },
@ -286,9 +241,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) {
//这里是为了拿到参数中关联的字段的值，后端自行拿 //这里是为了拿到参数中关联的字段的值，后端自行拿
@ -367,7 +322,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({
@ -405,13 +360,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()
@ -430,16 +385,16 @@
...this.query, ...this.query,
keyword: this.keyword, keyword: this.keyword,
dataType: 0, dataType: 0,
menuId:this.menuId, menuId: this.menuId,
moduleId:'590864498890378181', moduleId: '590864498890378181',
type:1, type: 1,
}; };
request({ request({
url: `/api/example/YysRequisitionReport/getList`, url: `/api/example/YysRequisitionReport/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,
@ -467,10 +422,10 @@
}).catch(() => { }).catch(() => {
}); });
}, },
handelUpload(){ handelUpload() {
this.uploadBoxVisible = true this.uploadBoxVisible = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.UploadBox.init("","example/YysRequisitionReport") this.$refs.UploadBox.init("", "example/YysRequisitionReport")
}) })
}, },
openSuperQuery() { openSuperQuery() {
@ -485,10 +440,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() {
@ -498,7 +453,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/YysRequisitionReport/Actions/Export`, url: `/api/example/YysRequisitionReport/Actions/Export`,
method: 'post', method: 'post',
@ -511,10 +466,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) {
@ -530,5 +485,5 @@
if (isrRefresh) this.reset() if (isrRefresh) this.reset()
}, },
} }
} }
</script> </script>

Write Preview
Loading…
Cancel
Save