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