wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0412 新看板

master
ruanqi 3 years ago
parent
829ce9cab6
commit
52d24acc23
10 changed files with 100 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/views/modules/production/closeSchedule.vue
  2. 27
      src/views/modules/production/dailyPlan.vue
  3. 21
      src/views/modules/production/generateReport.vue
  4. 2
      src/views/modules/production/operator.vue
  5. 12
      src/views/modules/production/scheduleForSOTask.vue
  6. 10
      src/views/modules/production/scheduleForShopOrder.vue
  7. 13
      src/views/modules/production/searchDailyPlan.vue
  8. 5
      src/views/modules/production/soscheduleRouting.vue
  9. 5
      src/views/modules/production/stockPrint.vue
  10. 13
      src/views/modules/production/transFerPrint.vue

12
src/views/modules/production/closeSchedule.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;"> <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item :label="'工厂编码'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'生产订单号'"> <el-form-item :label="'生产订单号'">
<el-input v-model="searchData.orderNo" style="width: 130px"></el-input> <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
@ -106,6 +109,13 @@
<a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a> <a v-if="scope.row.circulationSeqNo!=null" type="text" size="small" >派工单已流转</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="60"
label="工厂编码">
</el-table-column>
<el-table-column <el-table-column
prop="seqNo" prop="seqNo"
header-align="center" header-align="center"
@ -409,7 +419,7 @@
orderNo: '', orderNo: '',
sWorkCenterNo: '', sWorkCenterNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site,
site: '',
itemDesc:'', itemDesc:'',
scheduleType:'', scheduleType:'',
reportFlag:'QtyRequired>QtyReported', reportFlag:'QtyRequired>QtyReported',

27
src/views/modules/production/dailyPlan.vue
View File

@ -2,6 +2,9 @@
<div class="mod-config"> <div class="mod-config">
<el-form inline="true" v-model="searchData"> <el-form inline="true" v-model="searchData">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" > <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
<el-form-item :label="'工厂编号：'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'订单号：'"> <el-form-item :label="'订单号：'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input> <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -100,7 +103,6 @@
style="width: 100%"> style="width: 100%">
<el-table-column <el-table-column
prop="" prop=""
fixed="right"
header-align="center" header-align="center"
align="center" align="center"
min-width="30" min-width="30"
@ -109,6 +111,13 @@
<a type="text" size="small" @click="openScheduleModel(scope.row)">排产</a> <a type="text" size="small" @click="openScheduleModel(scope.row)">排产</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="60"
label="工厂编码">
</el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center" header-align="center"
@ -339,7 +348,8 @@
planStartDate: '', planStartDate: '',
needDate: '', needDate: '',
schedulingSize: '', schedulingSize: '',
unSchedulingSize: ''
unSchedulingSize: '',
site:'',
}, },
dataListSelections: [], dataListSelections: [],
scheduledingData: { scheduledingData: {
@ -350,7 +360,7 @@
lotSize: '', lotSize: '',
planStartDate: '', planStartDate: '',
needDate: '', needDate: '',
site: this.$store.state.user.site,
site: '',
productionType: '生产订单', productionType: '生产订单',
planAdd: 0, planAdd: 0,
partNo: '' partNo: ''
@ -365,7 +375,7 @@
lotSize: '', lotSize: '',
planStartDate: '', planStartDate: '',
needDate: '', needDate: '',
site: this.$store.state.user.site,
site: '',
productionType: '生产订单', productionType: '生产订单',
planAdd: 0, planAdd: 0,
partNo: '' partNo: ''
@ -384,7 +394,7 @@
partNo: '', partNo: '',
startDate3: '', startDate3: '',
endDate3: '', endDate3: '',
site: this.$store.state.user.site,
site: '',
planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(so.scheduling_size,0),3)' planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(so.scheduling_size,0),3)'
}, },
// table高度 // table高度
@ -431,6 +441,7 @@
this.scheduledingData.userName = this.$store.state.user.name this.scheduledingData.userName = this.$store.state.user.name
this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate
this.scheduledingData.needDate = this.scheduledModelData.needDate this.scheduledingData.needDate = this.scheduledModelData.needDate
this.scheduledingData.site = this.scheduledModelData.site
this.scheduledingData.orderNo = this.scheduledModelData.orderNo this.scheduledingData.orderNo = this.scheduledModelData.orderNo
this.scheduledingData.orderDate = this.scheduledModelData.planStartDate this.scheduledingData.orderDate = this.scheduledModelData.planStartDate
this.scheduledingData.planAdd = 0 this.scheduledingData.planAdd = 0
@ -449,6 +460,7 @@
this.scheduledingsData.planStartDate = this.scheduledModelData.planStartDate this.scheduledingsData.planStartDate = this.scheduledModelData.planStartDate
this.scheduledingsData.needDate = this.scheduledModelData.needDate this.scheduledingsData.needDate = this.scheduledModelData.needDate
this.scheduledingsData.orderNo = this.scheduledModelData.orderNo this.scheduledingsData.orderNo = this.scheduledModelData.orderNo
this.scheduledingsData.site = this.scheduledModelData.site
this.scheduledingsData.orderDate = this.scheduledModelData.planStartDate this.scheduledingsData.orderDate = this.scheduledModelData.planStartDate
this.scheduledingsData.planAdd = 0 this.scheduledingsData.planAdd = 0
this.scheduledingsData.orderQty = '' this.scheduledingsData.orderQty = ''
@ -471,7 +483,9 @@
this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize) this.scheduledModelData.unSchedulingSize = this.decimalUtil.sub(this.scheduledingData.lotSize,data.schedulingSize)
}) })
this.scheduledingData.lotSize = row.lotSize this.scheduledingData.lotSize = row.lotSize
this.scheduledingData.site = row.site
this.scheduledingData.partNo = row.partNo this.scheduledingData.partNo = row.partNo
this.scheduledModelData.site = row.site
this.scheduledingsData.lotSize = row.lotSize this.scheduledingsData.lotSize = row.lotSize
this.scheduledingsData.partNo = row.partNo this.scheduledingsData.partNo = row.partNo
this.scheduledModelData.needDate = row.needDate this.scheduledModelData.needDate = row.needDate
@ -589,7 +603,7 @@
"userName": this.$store.state.user.name, "userName": this.$store.state.user.name,
"planStartDate": this.scheduledingsData.planStartDate, "planStartDate": this.scheduledingsData.planStartDate,
"needDate": this.scheduledingsData.needDate, "needDate": this.scheduledingsData.needDate,
"site": this.$store.state.user.site,
"site": this.scheduledingsData.site,
"productionType": '生产订单', "productionType": '生产订单',
"partNo": this.scheduledingsData.partNo, "partNo": this.scheduledingsData.partNo,
"lotSize": this.scheduledingsData.lotSize, "lotSize": this.scheduledingsData.lotSize,
@ -678,6 +692,7 @@
this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate this.scheduledingData.planStartDate = this.scheduledModelData.planStartDate
this.scheduledingData.needDate = this.scheduledModelData.needDate this.scheduledingData.needDate = this.scheduledModelData.needDate
this.scheduledingData.orderNo = this.scheduledModelData.orderNo this.scheduledingData.orderNo = this.scheduledModelData.orderNo
this.scheduledingData.site = this.scheduledModelData.site
this.scheduledingData.orderDate = row.orderDate this.scheduledingData.orderDate = row.orderDate
this.scheduledingData.planAdd = 1 this.scheduledingData.planAdd = 1
this.scheduledingData.orderQty = row.orderQty this.scheduledingData.orderQty = row.orderQty

21
src/views/modules/production/generateReport.vue
View File

@ -1,12 +1,15 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" > <el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'工厂编码'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'生产订单号'"> <el-form-item :label="'生产订单号'">
<el-input v-model="searchData.orderNo" style="width: 130px"></el-input> <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item >
<span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span> <span slot="label" style="" @click="getBaseList(24)"><a herf="#">加工中心编码</a></span>
<el-input v-model="searchData.sWorkCenterNo" style="width: 130px"></el-input>
<el-input v-model="searchData.sWorkCenterNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item > <el-form-item >
<span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span> <span slot="label" style="" @click="getBaseList(5)"><a herf="#">产品编码</a></span>
@ -121,6 +124,13 @@
<a type="text" size="small" @click="SOPModal2(scope.row)">查看SOP</a> <a type="text" size="small" @click="SOPModal2(scope.row)">查看SOP</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="60"
label="工厂编码">
</el-table-column>
<el-table-column <el-table-column
prop="seqNo" prop="seqNo"
header-align="center" header-align="center"
@ -529,7 +539,7 @@
qty2:'', qty2:'',
qty3:'', qty3:'',
sopFlag:false, sopFlag:false,
site: this.$store.state.user.site,
site: '',
operatorType: 0, operatorType: 0,
// 导出 start // 导出 start
exportData: [], exportData: [],
@ -564,7 +574,7 @@
orderNo: '', orderNo: '',
sWorkCenterNo: '', sWorkCenterNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site,
site: '',
itemDesc:'', itemDesc:'',
scheduleType:'', scheduleType:'',
reportFlag:"closedFlag='N'", reportFlag:"closedFlag='N'",
@ -891,7 +901,7 @@
return false; return false;
} }
let inData={ let inData={
site:this.$store.state.user.site,
seqNo:this.scanSeqNo seqNo:this.scanSeqNo
} }
searchSeqNo(inData).then(({data}) => { searchSeqNo(inData).then(({data}) => {
@ -1016,7 +1026,6 @@
}, },
startSeqNo(){ startSeqNo(){
let inData={ let inData={
site:this.$store.state.user.site,
username:this.$store.state.user.name, username:this.$store.state.user.name,
seqNo:this.scanSeqNo seqNo:this.scanSeqNo
} }
@ -1040,7 +1049,6 @@
}, },
stopWork(){ stopWork(){
let inData={ let inData={
site:this.$store.state.user.site,
username:this.$store.state.user.name, username:this.$store.state.user.name,
seqNo:this.scanSeqNo seqNo:this.scanSeqNo
} }
@ -1064,7 +1072,6 @@
}, },
continueWork(){ continueWork(){
let inData={ let inData={
site:this.$store.state.user.site,
username:this.$store.state.user.name, username:this.$store.state.user.name,
seqNo:this.scanSeqNo seqNo:this.scanSeqNo
} }

2
src/views/modules/production/operator.vue
View File

@ -205,7 +205,7 @@
operatorID:'', operatorID:'',
operatorName:'', operatorName:'',
status:'all', status:'all',
site:this.$store.state.user.site,
site:'',
}, },
operatorData:{ operatorData:{
operatorID:'', operatorID:'',

12
src/views/modules/production/scheduleForSOTask.vue
View File

@ -2,6 +2,9 @@
<div class="mod-config"> <div class="mod-config">
<el-form inline="true" v-model="searchData"> <el-form inline="true" v-model="searchData">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" > <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
<el-form-item :label="'工厂编号：'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'日计划号：'"> <el-form-item :label="'日计划号：'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input> <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -96,6 +99,13 @@
<a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a> <a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="120"
label="工厂编号">
</el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center" header-align="center"
@ -440,7 +450,7 @@
status: '(\'已计划\')', status: '(\'已计划\')',
partNo: '', partNo: '',
orderRef1:'', orderRef1:'',
site: this.$store.state.user.site,
site: '',
planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)', planStatus: 'a.OrderQty>isnull(SL.scheduledQty,0)',
itemNo:'', itemNo:'',
finishFlag:'', finishFlag:'',

10
src/views/modules/production/scheduleForShopOrder.vue
View File

@ -2,6 +2,9 @@
<div class="mod-config"> <div class="mod-config">
<el-form inline="true" v-model="searchData"> <el-form inline="true" v-model="searchData">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" > <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;" >
<el-form-item :label="'工厂编码：'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'订单号：'"> <el-form-item :label="'订单号：'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input> <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -133,6 +136,13 @@
<a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a> <a type="text" size="small" @click="openScheduleModel(scope.row)">派工</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="site"
header-align="center"
align="left"
width="60"
label="工厂编码">
</el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center" header-align="center"

13
src/views/modules/production/searchDailyPlan.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" > <el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'工厂编码：'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'日计划单号：'"> <el-form-item :label="'日计划单号：'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input> <el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item> </el-form-item>
@ -55,6 +58,14 @@
:data="tableData" :data="tableData"
border border
style="width: 100%"> style="width: 100%">
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="60"
label="工厂编码">
</el-table-column>
<el-table-column <el-table-column
prop="orderNo" prop="orderNo"
header-align="center" header-align="center"
@ -167,7 +178,7 @@
startDate1:new Date(), startDate1:new Date(),
endDate1:'', endDate1:'',
status:'all', status:'all',
site:this.$store.state.user.site,
site:'',
}, },
} }
}, },

5
src/views/modules/production/soscheduleRouting.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" > <el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'工厂编码'">
<el-input v-model="searchData.site" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'生产订单号'"> <el-form-item :label="'生产订单号'">
<el-input v-model="searchData.orderNo" style="width: 130px"></el-input> <el-input v-model="searchData.orderNo" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
@ -342,7 +345,7 @@
orderNo: '', orderNo: '',
sWorkCenterNo: '', sWorkCenterNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site,
site: '',
itemDesc:'', itemDesc:'',
scheduleType:'', scheduleType:'',
reportFlag:'QtyRequired>QtyApprove', reportFlag:'QtyRequired>QtyApprove',

5
src/views/modules/production/stockPrint.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" > <el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'工厂编码:'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'入库日期：'"> <el-form-item :label="'入库日期：'">
<el-date-picker <el-date-picker
style="width: 130px" style="width: 130px"
@ -161,7 +164,7 @@
searchData: { searchData: {
orderNo: '', orderNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site,
site: '',
startDate:new Date(), startDate:new Date(),
endDate:'', endDate:'',
printFlag:'N', printFlag:'N',

13
src/views/modules/production/transFerPrint.vue
View File

@ -1,6 +1,9 @@
<template> <template>
<div class="mod-config"> <div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" > <el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'工厂编码:'">
<el-input v-model="searchData.site" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'报工日期：'"> <el-form-item :label="'报工日期：'">
<el-date-picker <el-date-picker
style="width: 130px" style="width: 130px"
@ -44,6 +47,14 @@
<a type="text" size="small" @click="printStock(scope.row)">打印标签</a> <a type="text" size="small" @click="printStock(scope.row)">打印标签</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="site"
header-align="center"
align="left"
min-width="60"
style="font-size: 20px"
label="工厂编码">
</el-table-column>
<el-table-column <el-table-column
prop="transNo" prop="transNo"
header-align="center" header-align="center"
@ -137,7 +148,7 @@
searchData: { searchData: {
orderNo: '', orderNo: '',
partNo: '', partNo: '',
site: this.$store.state.user.site,
site: '',
startDate:new Date(), startDate:new Date(),
endDate:'', endDate:'',
seqNo:'', seqNo:'',

Write Preview
Loading…
Cancel
Save