Browse Source

0412 新看板

master
ruanqi 3 years ago
parent
commit
332497f090
  1. 2
      src/views/modules/production/generateReport.vue
  2. 2
      src/views/modules/production/scheduleForSOTask.vue
  3. 4
      src/views/modules/production/scheduleForShopOrder.vue
  4. 2
      src/views/modules/taskmanage/mysendtasklist.vue

2
src/views/modules/production/generateReport.vue

@ -972,7 +972,7 @@
this.qty1 = data.row.qtyReported; this.qty1 = data.row.qtyReported;
this.qty2 = data.row.lastApproveQty; this.qty2 = data.row.lastApproveQty;
this.saveHeaderData.manufacturingTime = data.row.timeReported; this.saveHeaderData.manufacturingTime = data.row.timeReported;
if (data.row.weightFactor == -1) {
if (data.row.weightFactor == 0) {
this.qty3 = "erp未维护数据" this.qty3 = "erp未维护数据"
this.KGReported = '' this.KGReported = ''
this.KGApprove = '' this.KGApprove = ''

2
src/views/modules/production/scheduleForSOTask.vue

@ -590,7 +590,7 @@
sumQty: 0, sumQty: 0,
operatorId: '', operatorId: '',
} }
if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='-1'){
if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
this.weightFactorFlag=true; this.weightFactorFlag=true;
this.schedulingModalData.weightFactor='ERP未维护数据' this.schedulingModalData.weightFactor='ERP未维护数据'
}else { }else {

4
src/views/modules/production/scheduleForShopOrder.vue

@ -533,7 +533,7 @@
partNo: '', partNo: '',
startDate3: '', startDate3: '',
endDate3: '', endDate3: '',
site: this.$store.state.user.site,
site: '',
planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)', planStatus: 'ROUND(a.LotSize,3) >ROUND(ISNULL(SL.scheduledQty,0),3)',
itemNo:'', itemNo:'',
userId:this.$store.state.user.name, userId:this.$store.state.user.name,
@ -648,7 +648,7 @@
lastApproveQty:null, lastApproveQty:null,
qty1:'', qty1:'',
} }
if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='-1'){
if(this.schedulingModalData.weightFactor==null||this.schedulingModalData.weightFactor==''||this.schedulingModalData.weightFactor=='0'){
this.weightFactorFlag=true; this.weightFactorFlag=true;
this.schedulingModalData.weightFactor='ERP未维护数据' this.schedulingModalData.weightFactor='ERP未维护数据'
}else { }else {

2
src/views/modules/taskmanage/mysendtasklist.vue

@ -12,7 +12,7 @@
class="el-button el-button--primary el-button--medium"> class="el-button el-button--primary el-button--medium">
{{ '导出' }} {{ '导出' }}
</download-excel> </download-excel>
<el-button v-if="isAuth('taskmanage:tasklist:save')" @click="addOrUpdateHandle()" type="primary">发起任务
<el-button @click="addOrUpdateHandle()" type="primary">发起任务
</el-button> </el-button>
</el-col> </el-col>
</el-row> </el-row>

Loading…
Cancel
Save