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

0412 新看板

master
ruanqi 2 years ago
parent
fd8fc1b6fd
commit
5dce60189a
6 changed files with 144 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/api/production/generateReport.js
  2. 4
      src/views/modules/print/print_seqNo_label.js
  3. 34
      src/views/modules/production/cancelSfdc.vue
  4. 34
      src/views/modules/production/cancelSfdcForWareHouse.vue
  5. 47
      src/views/modules/production/generateReport.vue
  6. 34
      src/views/modules/production/searchSfdc.vue

1
src/api/production/generateReport.js
View File

@ -48,3 +48,4 @@ export const getLiuHuaPrintData= data => createAPI(`dailyPlan/getLiuHuaPrintData
export const getTvList=data => createAPI(`dailyPlan/getTvList`, 'post', data)
export const getBadCodeList=data => createAPI(`dailyPlan/getBadCodeList`, 'post', data)

4
src/views/modules/print/print_seqNo_label.js
View File

@ -71,6 +71,10 @@ export function printSeqNoLabel(printList) {
LODOP.ADD_PRINT_TEXT(175,265,110,20,"工序:"+printData.itemDesc);
LODOP.SET_PRINT_STYLEA(0,"FontSize",11);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
LODOP.ADD_PRINT_TEXT(132,159,68,20,printData.jobType);
LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
LODOP.SET_PRINT_STYLEA(0,"Bold",1);
}
// LODOP.PRINT_DESIGN();
LODOP.PREVIEW();

34
src/views/modules/production/cancelSfdc.vue
View File

@ -450,6 +450,40 @@
serialNumber: null,
columnType: null,
align: 'right'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectDesc",
columnLabel: "不良处理方式",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 85,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectRemark",
columnLabel: "不良处理备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 150,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,

34
src/views/modules/production/cancelSfdcForWareHouse.vue
View File

@ -392,6 +392,40 @@
serialNumber: null,
columnType: null,
align: 'right'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectDesc",
columnLabel: "不良处理方式",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 85,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectRemark",
columnLabel: "不良处理备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 150,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,

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

@ -484,18 +484,33 @@
<el-input type="number" class="input_left" style="width: 178px;" disabled v-model="saveHeaderData.liLunQty" ></el-input>
</el-form-item>
</el-form>
<fieldset class="customer-fieldset" style="width: 597px;margin-left: -10px;">
<legend class="customer-legend">不良品分析</legend>
<fieldset class="customer-fieldset" style="width: 597px;margin-left: -3px;">
<legend class="customer-legend">不良处理</legend>
<!-- <el-form :inline="true" label-position="top">-->
<!-- <el-form-item>-->
<!-- <span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">操作员</a></span>-->
<!-- <el-input style="width: 178px;" v-model="saveHeaderData.operatorId2"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="操作员姓名">-->
<!-- <el-input style="width: 178px;" v-model="saveHeaderData.operatorIdName2"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="报废原因">-->
<!-- <el-input style="width: 178px;" v-model="saveHeaderData.scrapReason"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<el-form :inline="true" label-position="top">
<el-form-item>
<span slot="label" style="" @click="getBaseList(26 ,2)"><a herf="#">操作员</a></span>
<el-input style="width: 178px;" v-model="saveHeaderData.operatorId2"></el-input>
</el-form-item>
<el-form-item label="操作员姓名">
<el-input style="width: 178px;" v-model="saveHeaderData.operatorIdName2"></el-input>
<el-form-item label="处理方式">
<el-select v-model="saveHeaderData.badCodeNo" style="width: 120px"
placeholder="请选择">
<el-option label="无" value=""></el-option>
<el-option v-for="item in badCodeList " :key="index" :label="item.defectDesc"
:value="item.defectCode">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="报废原因">
<el-input style="width: 178px;" v-model="saveHeaderData.scrapReason"></el-input>
<el-form-item label="备注">
<el-input style="width: 440px;" v-model="saveHeaderData.badRemark"></el-input>
</el-form-item>
</el-form>
</fieldset>
@ -586,6 +601,7 @@
stopWork,
continueWork,
getTvList,
getBadCodeList,
} from '@/api/production/generateReport.js'
import Chooselist from '@/views/modules/common/Chooselist'
import {
@ -618,7 +634,10 @@
moQty:'',
tvList:[],
tvId:'',
badCodeList:'',
saveHeaderData: {
badCodeNo:'',
badRemark:'',
wasteWeight:0,
printQty:'',
boxWeight:0,
@ -1098,6 +1117,8 @@
this.KGRework=0
this.saveHeaderData.qtyApprove=0
this.saveHeaderData.qtyUnApprove=0
this.saveHeaderData.badCodeNo=''
this.saveHeaderData.badRemark= ''
this.saveHeaderData.qtyRework=0
this.saveHeaderData.moldQty=0
this.saveHeaderData.reportWeight=0
@ -1350,8 +1371,14 @@
this.tvList = data.rows;
})
},
getBadCodeList(){
getBadCodeList().then(({data}) => {
this.badCodeList = data.rows;
})
},
},
created () {
this.getBadCodeList();
this.searchAllTV();
}
}

34
src/views/modules/production/searchSfdc.vue
View File

@ -438,6 +438,40 @@
serialNumber: null,
columnType: null,
align: 'right'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectDesc",
columnLabel: "不良处理方式",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 85,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,
columnProp: "defectRemark",
columnLabel: "不良处理备注",
columnHidden: false,
columnImage: false,
columnSortable: false,
columnWidth: 150,
format: null,
functionId: this.$route.meta.menuId,
sortLv: 0,
status: true,
fixed: '',
serialNumber: null,
columnType: null,
align: 'left'
}, {
tableId: "sfdcList",
tableName: this.$route.meta.title,

Write Preview
Loading…
Cancel
Save