Browse Source

0412 新看板

master
ruanqi 2 years ago
parent
commit
e2510dbd29
  1. 8
      src/api/production/query.js
  2. 584
      src/views/modules/query/hlQuery.vue
  3. 399
      src/views/modules/query/liuhuaIssureAndReport.vue

8
src/api/production/query.js

@ -0,0 +1,8 @@
import { createAPI } from "@/utils/httpRequest.js";
export const getHunlianTaskList = data => createAPI(`dailyPlan/getHunlianTaskList`, 'post', data);
export const getHunlianTaskIssure = data => createAPI(`dailyPlan/getHunlianTaskIssure`, 'post', data);
export const liuhuaIssureAndReport= data => createAPI(`dailyPlan/liuhuaIssureAndReport`, 'post', data);

584
src/views/modules/query/hlQuery.vue

@ -0,0 +1,584 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-form-item :label="'混炼任务单号:'">
<el-input v-model="searchData.taskNo" style="width: 120px"></el-input>
</el-form-item >
<el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">物料编码</a></span>
<el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'合并日期:'">
<el-date-picker
style="width: 130px"
v-model="searchData.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item style="margin-top: 23px;">
<laber style="margin-left: -9px;font-size: 19px">&#10142</laber>
</el-form-item>
<el-form-item :label="' '">
<el-date-picker
style="width: 130px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'是否报工:'">
<el-select filterable v-model="searchData.reportFlag" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="否" value="N"></el-option>
<el-option label="是" value="Y"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="searchTable()">查询</el-button>
<el-button type="primary" @click="addModal()">新增</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
</el-form-item>
</el-form>
<el-table
:data="dataList"
@row-click="changeData"
:height="height"
border
highlight-current-row
ref="mainTable"
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="合并明细" name="detail">
<el-table
:data="dataList2"
:height="height"
border
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
prop="taskNo"
header-align="center"
align="left"
min-width="80"
label="混炼任务单号">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
min-width="70"
label="周计划号">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="left"
min-width="100"
label="混炼胶名称">
</el-table-column>
<el-table-column
prop="orderQty"
header-align="center"
align="right"
min-width="70"
label="周计划数量">
</el-table-column>
<el-table-column
prop="hunlianQty"
header-align="center"
align="right"
min-width="70"
label="混炼胶数量">
</el-table-column>
<el-table-column
prop="orderDate"
header-align="center"
align="left"
min-width="100"
label="周计划日期">
</el-table-column>
</el-table>
</el-tab-pane>
<el-tab-pane label="分发记录" name="issureDetail">
<el-table
:data="dataList3"
:height="height"
border
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
prop="seqNo"
header-align="center"
align="center"
min-width="60"
label="派工单号">
</el-table-column>
<el-table-column
prop="sScheduledDate"
header-align="center"
align="center"
min-width="130"
label="派工日期">
</el-table-column>
<el-table-column
prop="operatorName"
header-align="center"
align="left"
min-width="100"
label="操作员">
</el-table-column>
<el-table-column
prop="issureQty"
header-align="center"
align="right"
min-width="70"
label="发料数量">
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
getHunlianTaskList
,getHunlianTaskIssure
} from "@/api/production/query.js"
import {
getHunlianTaskDetailData
} from "@/api/production.js"
import Chooselist from '@/views/modules/common/Chooselist'
export default {
components: {
Chooselist
},
data() {
return {
height:200,
modelFlag:false,
activeName: 'detail',
dataList: [],
dataList2: [],
dataList3: [],
searchData: {
page: 1,
limit: 100,
taskNo:'',
partNo:'',
startDate:'',
endDate:'',
reportFlag:'',
},
wareHouseList:[],
exportList:[],
pageIndex: 1,
pageSize: 100,
totalPage: 0,
dataListLoading: false,
currentRow:'',
headerData:'',
columnList1:[
{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1TaskNo',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "taskNo",
headerAlign: "center",
align: "left",
columnLabel: "混炼任务单号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1PartNo',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "partNo",
headerAlign: "center",
align: "left",
columnLabel: "混炼物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1PartDesc',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "partDesc",
headerAlign: "center",
align: "center",
columnLabel: "混炼胶名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 160
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1TaskQty',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "taskQty",
headerAlign: "center",
align: "right",
columnLabel: "混炼胶数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1CreateDate',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "createDate",
headerAlign: "center",
align: "left",
columnLabel: "合并日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1CreateBy',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "createBy",
headerAlign: "center",
align: "left",
columnLabel: "合并人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1ReportFlag',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "reportFlag",
headerAlign: "center",
align: "left",
columnLabel: "是否报工",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1ReportQty',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "reportQty",
headerAlign: "center",
align: "right",
columnLabel: "报工数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1OrderRef1',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "orderRef1",
headerAlign: "center",
align: "left",
columnLabel: "合并生产订单号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1WareHouseFlag',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "wareHouseFlag",
headerAlign: "center",
align: "left",
columnLabel: "是否入库",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1QtyOnHand',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "qtyOnHand",
headerAlign: "center",
align: "right",
columnLabel: "库存数量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 200001,
serialNumber: '200001Table1Umid',
tableId: "200001Table1",
tableName: "混炼胶跟踪主表",
columnProp: "umid",
headerAlign: "center",
align: "center",
columnLabel: "计量单位",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
],
// start
exportData: [],
exportName: '混炼跟踪主表'+this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["混炼跟踪主表"],
exportFooter: [],
// end
}
},
mounted () {
this.$nextTick(() => {
this.height = (window.innerHeight- 260) / 2
})
},
methods: {
// S
getBaseList (val, type) {
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
if (val === 5) {
strVal = this.searchData.partNo
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 5) {
this.searchData.partNo = val.PartNo
}
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.searchTable()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.searchTable()
},
tabClick (tab, event) {
//
this.refreshCurrentTabTable()
},
changeData(row){
this.currentRow = JSON.parse(JSON.stringify(row));
this.headerData=row;
this.refreshCurrentTabTable ();
},
refreshCurrentTabTable(){
if(this.currentRow===''||this.currentRow===null){
this.currentRow={site:'',taskNo:''}
}
if(this.activeName==='detail'){
getHunlianTaskDetailData(this.currentRow).then(({data}) => {
//
if (data && data.code == 0) {
this.dataList2 = data.rows
} else {
this.dataList2 = [];
}
});
}else if(this.activeName==='issureDetail'){
getHunlianTaskIssure(this.currentRow).then(({data}) => {
//
if (data && data.code == 0) {
this.dataList3 = data.rows
} else {
this.dataList3 = [];
}
});
}
},
searchTable(){
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
getHunlianTaskList(this.searchData).then(({data}) => {
//
if (data && data.code == 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
if(this.dataList.length>0){
this.$refs.mainTable.setCurrentRow(this.dataList[0]);
this.changeData(this.dataList[0])
}else {
this.changeData(null)
}
} else {
this.dataList = [];
}
});
},
//excel
//excel
async createExportData() {
this.searchData.limit = -1
this.searchData.page = 1
await searchTransHeader(this.searchData).then(({data}) => {
this.exportList= data.page.list;
})
return this.exportList;
},
startDownload() {
// this.exportData = this.dataList
},
finishDownload() {
},
fields() {
let json = "{"
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
},
}
</script>
<style scoped>
</style>

399
src/views/modules/query/liuhuaIssureAndReport.vue

@ -0,0 +1,399 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form-item :label="'派工单号'">
<el-input v-model="searchData.seqNo" type="number" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'物料编码'">
<el-input v-model="searchData.partNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'派工日期'">
<el-date-picker
style="width: 120px"
v-model="searchData.startDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item :label="'至'">
<el-date-picker
style="width: 120px"
v-model="searchData.endDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
<el-form-item label="差异超过1KG">
<el-select v-model="searchData.sql" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="是" value="( Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_Part_NetWeight(a.Site,a.partNo),2) >1 or -1>Round(dbo.Get_scheduleIssure(a.Site,a.SeqNo) -QtyReported*dbo.Get_Part_NetWeight(a.Site,a.partNo),2))"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
<el-button type="primary" @click="searchTable()">查询</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
</el-form-item>
</el-form>
<el-table
:data="dataList"
:height="height"
border
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="sizeChangeHandle"
@current-change="currentChangeHandle"
:current-page="pageIndex"
:page-sizes="[20, 50, 100, 1000]"
:page-size="pageSize"
:total="totalPage"
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
liuhuaIssureAndReport,
} from "@/api/production/query.js"
import Chooselist from '@/views/modules/common/Chooselist'
export default {
components: {
Chooselist
},
data() {
return {
dataList: [],
searchData: {
page: 1,
limit: 100,
site:this.$store.state.user.site,
username: this.$store.state.user.name,
seqNo: '',
partNo :'',
sql:'',
startDate:'',
endDate:'',
},
exportList:[],
pageIndex: 1,
pageSize: 100,
totalPage: 0,
visible:false,
dataListLoading: false,
columnList1:[
{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1SeqNo',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "seqNo",
headerAlign: "center",
align: "left",
columnLabel: "派工单",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1PartNo',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "partNo",
headerAlign: "center",
align: "left",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1PartDesc',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "partDesc",
headerAlign: "center",
align: "left",
columnLabel: "物料名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1OperatorId',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "operatorName",
headerAlign: "center",
align: "left",
columnLabel: "操作员",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1ScheduledDate',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "sScheduledDate",
headerAlign: "center",
align: "center",
columnLabel: "派工日期",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1QtyIssure',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "qtyIssure",
headerAlign: "center",
align: "right",
columnLabel: "发料重量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1ReportWeight',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "reportWeight",
headerAlign: "center",
align: "right",
columnLabel: "报工重量",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1Qty',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "qty",
headerAlign: "center",
align: "right",
columnLabel: "差异数",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1IssurePartNo',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "issurePartNo",
headerAlign: "center",
align: "left",
columnLabel: "发料物料",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 400003,
serialNumber: '400003Table1IssurePartDesc',
tableId: "400003Table1",
tableName: "硫化发料产出",
columnProp: "issurePartDesc",
headerAlign: "center",
align: "center",
columnLabel: "发料物料名称型号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 150
},
],
// start
exportData: [],
exportName: '硫化派工单收发记录'+this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["硫化派工单收发记录"],
exportFooter: [],
// end
height:200,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight- 200
})
},
methods: {
// S
getBaseList (val, type) {
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
if (val === 1013) {
if(type==1) {
strVal = this.dataForm.partType
}
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 1013) {
if(this.tagNo1==1) {
this.dataForm.partType = val.Base_id
this.dataForm.partTypeDesc = val.Base_desc
}
}
},
//
init(inData) {
//
this.searchData = JSON.parse(JSON.stringify(inData));
//
this.searchTable();
},
//
sizeChangeHandle (val) {
this.pageSize = val
this.pageIndex = 1
this.search()
},
//
currentChangeHandle (val) {
this.pageIndex = val
this.search()
},
searchTable(){
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
liuhuaIssureAndReport(this.searchData).then(({data}) => {
if (data.code == 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
}
this.dataListLoading = false
})
},
//excel
//excel
async createExportData() {
this.searchData.limit = -1
this.searchData.page = 1
await soFinalRollSearch(this.searchData).then(({data}) => {
this.exportList= data.page.list;
})
return this.exportList;
},
startDownload() {
// this.exportData = this.dataList
},
finishDownload() {
},
fields() {
let json = "{"
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
},
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save