root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
zds
2022-08-03 11:38:57 +08:00
parent ef3704cf38
commit 6cdbdfdf6b
9 changed files with 407 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mes/qd/src/views/wms/pdm/produce/workorder/AddDialog.vue
View File

@@ -125,8 +125,8 @@
import CRUD, { crud, form } from '@crud/crud'
import DeviceDialog from '@/views/wms/pub/DeviceDialog'
import MaterDialog from '@/views/wms/pub/MaterDialog'
import workorder from "@/api/wms/pdm/workorder"
import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
import workorder from '@/api/wms/pdm/workorder'
import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
const defaultForm = {
workorder_code: '',
@@ -243,6 +243,7 @@ export default {
this.form.qty_unit_id = row.base_unit_id
this.form.qty_unit_name = row.base_unit_id_name
this.form.pcsn = ''
this.form.workorder_qty = row.standard_weight_pft
},
storChange(row) {
this.form.pcsn = ''

10
mes/qd/src/views/wms/pf/formula/DivDialog.vue
View File

@@ -302,6 +302,8 @@
<el-table-column prop="is_CXJ006" label="白油" align="center" width="80px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ007" label="油酸" align="center" width="80px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="80px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column align="center" label="操作" width="270" fixed="right">
<template scope="scope">
<el-button :disabled="scope.row.edit || scope.row.status!='10'" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index,tableDtl)" />
@@ -794,7 +796,7 @@ export default {
}
}
if (!this.flagnow) {
const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',is_CJZB00021: '',is_CJZB00020: '',
material_name: '', pcsn: '', quality_scode: '',need_sum_qty:'0', ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_add: '1', is_tan: '', is_09030102: '', qty_unit_id: '', qty_unit_name: '' }
row.material_id = item.material_id
row.quality_scode = item.quality_scode
@@ -820,10 +822,12 @@ export default {
row.is_need_move = item.is_need_move
row.qty_unit_id = item.qty_unit_id
row.qty_unit_name = item.qty_unit_name
row.is_CJZB00020 = item.is_CJZB00020
row.is_CJZB00021 = item.is_CJZB00021
tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
}
} else {
const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
const row = { edit: false, status:'10', is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',is_CJZB00021: '',is_CJZB00020: '',
material_name: '', pcsn: '', quality_scode: '',need_sum_qty:'0', ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_add: '1', is_tan: '', is_09030102: '', qty_unit_id: '', qty_unit_name: '' }
row.material_id = item.material_id
row.quality_scode = item.quality_scode
@@ -849,6 +853,8 @@ export default {
row.is_need_move = item.is_need_move
row.qty_unit_id = item.qty_unit_id
row.qty_unit_name = item.qty_unit_name
row.is_CJZB00020 = item.is_CJZB00020
row.is_CJZB00021 = item.is_CJZB00021
tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
}
})

9
mes/qd/src/views/wms/pf/formula/ViewDialog.vue
View File

@@ -203,6 +203,8 @@
<el-table-column prop="is_CXJ006" label="白油" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ007" label="油酸" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
</el-table>
</el-card>
<div class="crud-opts2" v-if="form.bucket_type==='02'">
@@ -264,15 +266,16 @@
<el-table-column prop="is_CXJ006" label="白油" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ007" label="油酸" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
</el-table>
</el-card>
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import { crud } from '@crud/crud'
import formula from '@/api/wms/pf/formula'
import autoformula from "@/api/wms/pf/autoformula";
export default {
name: 'ViewDialog',
mixins: [crud()],
@@ -292,7 +295,7 @@ export default {
tableDtl: [],
mstrow: {},
tabledis: [],
form :{},
form: {},
form2: {
total_qty1: '0',
add_qty1: '0',

12
mes/qd/src/views/wms/pf/initformula/DivDialog.vue
View File

@@ -259,6 +259,8 @@
<el-table-column prop="is_CXJ006" label="白油" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ007" label="油酸" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CXJ008" label="8号分散剂" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00021" label="碳化铬%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column prop="is_CJZB00020" label="碳化钒%" align="center" width="100px" :formatter="crud.formatQlNum4"/>
<el-table-column align="center" label="操作" width="160" fixed="right">
<template scope="scope">
<el-button :disabled="!button2" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index,tableDtl)" />
@@ -365,7 +367,7 @@
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import { crud } from '@crud/crud'
import StructIvt from '@/views/wms/pf/initformula/StructIvt'
import StructIvt2 from '@/views/wms/pf/initformula/StructIvt2'
import StructIvt3 from '@/views/wms/pf/initformula/StructIvt3'
@@ -904,7 +906,7 @@ export default {
if (!this.flagnow) {
const row = { edit: false,is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
material_name: '', pcsn: '', quality_scode: '', ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_tan: '', is_09030102: '',
is_CXJ001: '', is_CXJ003: '',need_sum_qty:'0', is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',
is_CXJ001: '', is_CXJ003: '',need_sum_qty:'0', is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',is_CJZB00021: '',is_CJZB00020: '',
qty_unit_id: '', qty_unit_name: '' }
row.material_id = item.material_id
row.quality_scode = item.quality_scode
@@ -929,12 +931,14 @@ export default {
row.is_CXJ007 = item.is_CXJ007
row.is_CXJ008 = item.is_CXJ008
row.is_CXJ002 = item.is_CXJ002
row.is_CJZB00020 = item.is_CJZB00020
row.is_CJZB00021 = item.is_CJZB00021
tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
}
} else {
const row = { edit: false, is_rf_xl: '1', bucket_type: '01', material_type: '01', material_id: '', material_code: '',
material_name: '', pcsn: '', quality_scode: '', need_sum_qty:'0',ivt_level: '', is_active: '', formula_qty: '0', sum_ivt_qty: '', is_need_move: '', is_need_manage: '1', is_tan: '', is_09030102: '', is_CXJ001: '',
is_CXJ003: '',is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',
is_CXJ003: '',is_CXJ004: '',is_CXJ005: '',is_CXJ006: '',is_CXJ007: '',is_CXJ008: '',is_CXJ002: '',is_CJZB00021: '',is_CJZB00020: '',
qty_unit_id: '', qty_unit_name: '' }
row.material_id = item.material_id
row.quality_scode = item.quality_scode
@@ -959,6 +963,8 @@ export default {
row.is_CXJ007 = item.is_CXJ007
row.is_CXJ008 = item.is_CXJ008
row.is_CXJ002 = item.is_CXJ002
row.is_CJZB00020 = item.is_CJZB00020
row.is_CJZB00021 = item.is_CJZB00021
tablemap.set(item.material_id+"--"+item.quality_scode+"--"+item.pcsn+"--"+item.is_active+"--"+item.ivt_level, row)
}
})