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

Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-14 15:07:21 +08:00
parent 4dc47922bd 80ed1f05dc
commit 78b36d2f2c
4 changed files with 69 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/qd/src/views/wms/basedata/master/bagrecord/index.vue
View File

@@ -244,6 +244,7 @@ export default {
{ 'code': '02', 'name': '组桶' }, { 'code': '02', 'name': '组桶' },
{ 'code': '03', 'name': '清洗' } { 'code': '03', 'name': '清洗' }
], ],
open: true,
permission: { permission: {
}, },
rules: { rules: {
@@ -252,7 +253,12 @@ export default {
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
if (this.open) {
this.open = false
return false
} else {
return true return true
}
}, },
hand(value) { hand(value) {
this.crud.toQuery() this.crud.toQuery()

6
mes/qd/src/views/wms/basedata/master/bucketrecord/index.vue
View File

@@ -232,6 +232,7 @@ export default {
return { return {
StatusList: [], StatusList: [],
TypeList: [], TypeList: [],
open: true,
QualityList: [], QualityList: [],
IvtList: [], IvtList: [],
permission: { permission: {
@@ -257,7 +258,12 @@ export default {
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
if (this.open) {
this.open = false
return false
} else {
return true return true
}
}, },
hand(value) { hand(value) {
this.crud.toQuery() this.crud.toQuery()

7
mes/qd/src/views/wms/basedata/master/material/index.vue
View File

@@ -202,6 +202,7 @@ export default {
data() { data() {
return { return {
classes: [], classes: [],
open: true,
class_idStr: null, class_idStr: null,
fullscreenLoading: false, fullscreenLoading: false,
measure_unit: [], measure_unit: [],
@@ -247,7 +248,12 @@ export default {
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
if (this.open) {
this.open = false
return false
} else {
return true return true
}
}, },
initTree() { initTree() {
const param = { const param = {
@@ -256,7 +262,6 @@ export default {
crudMaterialbase.getMaterOptType(param).then(res => { crudMaterialbase.getMaterOptType(param).then(res => {
this.class_idStr = res.class_idStr this.class_idStr = res.class_idStr
this.crud.query.class_idStr = res.class_idStr this.crud.query.class_idStr = res.class_idStr
this.crud.toQuery()
this.queryClassId() this.queryClassId()
}) })
}, },

89
mes/qd/src/views/wms/basedata/master/materialParameters/index.vue
View File

@@ -35,11 +35,11 @@
/> />
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<rrOperation /> <rrOperation/>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<crudOperation :permission="permission" /> <crudOperation :permission="permission"/>
<!--表格渲染--> <!--表格渲染-->
<el-table <el-table
ref="table" ref="table"
@@ -62,45 +62,45 @@
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="false" prop="material_id" label="material_id" /> <el-table-column v-if="false" prop="material_id" label="material_id"/>
<el-table-column prop="material_code" label="物料编码" min-width="160" show-overflow-tooltip /> <el-table-column prop="material_code" label="物料编码" min-width="160" show-overflow-tooltip/>
<el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip/> <el-table-column prop="material_name" label="物料名称" min-width="200" show-overflow-tooltip/>
<el-table-column prop="unit_name" label="单位" /> <el-table-column prop="unit_name" label="单位"/>
<el-table-column prop="class_name" label="物料类别" width="140px" /> <el-table-column prop="class_name" label="物料类别" width="140px"/>
<el-table-column prop="is_need_plan_name" label="是否参与需求计划计算" width="150px" /> <el-table-column prop="is_need_plan_name" label="是否参与需求计划计算" width="150px"/>
<el-table-column prop="stock_is_need_move" label="原料是否配粉移库" width="150px" :formatter="stockIsNeedMove"/> <el-table-column prop="stock_is_need_move" label="原料是否配粉移库" width="150px" :formatter="stockIsNeedMove"/>
<el-table-column prop="is_pure" label="是否纯粉" width="150px" :formatter="stockIsPure"/> <el-table-column prop="is_pure" label="是否纯粉" width="150px" :formatter="stockIsPure"/>
<el-table-column prop="stock_standard_weight" label="原料标准桶重" width="100px" :formatter="crud.formatNum3" /> <el-table-column prop="stock_standard_weight" label="原料标准桶重" width="100px" :formatter="crud.formatNum3"/>
<el-table-column prop="stock_is_report_name" label="原料是否生成理化报告" width="150px" /> <el-table-column prop="stock_is_report_name" label="原料是否生成理化报告" width="150px"/>
<el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px" /> <el-table-column prop="wc_seqno" label="原料碳化钨顺序号" width="120px"/>
<el-table-column prop="old_mark" label="原牌号" /> <el-table-column prop="old_mark" label="原牌号"/>
<el-table-column prop="product_mode_name" label="生产方式" /> <el-table-column prop="product_mode_name" label="生产方式"/>
<el-table-column prop="is_auto_open_name" label="是否允许自动开单" width="120px" /> <el-table-column prop="is_auto_open_name" label="是否允许自动开单" width="120px"/>
<el-table-column prop="waste_limit_down" label="软废添加比列下限" width="120px" /> <el-table-column prop="waste_limit_down" label="软废添加比列下限" width="120px"/>
<el-table-column prop="waste_limit_up" label="软废添加比列上限" width="120px" /> <el-table-column prop="waste_limit_up" label="软废添加比列上限" width="120px"/>
<el-table-column prop="standard_weight_pft" label="工令标准桶重" width="100px" :formatter="crud.formatNum3" /> <el-table-column prop="standard_weight_pft" label="工令标准桶重" width="100px" :formatter="crud.formatNum3"/>
<el-table-column prop="report_time" label="产品理化时间" width="100px" /> <el-table-column prop="report_time" label="产品理化时间" width="100px"/>
<el-table-column prop="produc_is_report_name" label="产品是否生成理化报告" width="150px" /> <el-table-column prop="produc_is_report_name" label="产品是否生成理化报告" width="150px"/>
<el-table-column prop="product_is_need_move" label="产品是否配粉移库" width="150px" :formatter="productIsNeedMove"/> <el-table-column prop="product_is_need_move" label="产品是否配粉移库" width="150px" :formatter="productIsNeedMove"/>
<el-table-column prop="is_again_put_name" label="是否二次投料" width="100px" /> <el-table-column prop="is_again_put_name" label="是否二次投料" width="100px"/>
<el-table-column prop="produc_standard_weight" label="产品标准桶重" width="100px" :formatter="crud.formatNum3" /> <el-table-column prop="produc_standard_weight" label="产品标准桶重" width="100px" :formatter="crud.formatNum3"/>
<el-table-column prop="product_series" label="产品系列" :formatter="formatterName"/> <el-table-column prop="product_series" label="产品系列" :formatter="formatterName"/>
<el-table-column prop="c_balance" label="碳平衡" /> <el-table-column prop="c_balance" label="碳平衡"/>
<el-table-column prop="ball_time" label="球磨时间" /> <el-table-column prop="ball_time" label="球磨时间"/>
<el-table-column prop="ball_speed" label="球磨转速" /> <el-table-column prop="ball_speed" label="球磨转速"/>
<el-table-column prop="product_ball_time" label="排产球磨时间" width="100px" /> <el-table-column prop="product_ball_time" label="排产球磨时间" width="100px"/>
<el-table-column prop="weight_lost_down" label="重损上限" /> <el-table-column prop="weight_lost_down" label="重损上限"/>
<el-table-column prop="weight_lost_up" label="重损上限" /> <el-table-column prop="weight_lost_up" label="重损上限"/>
<el-table-column prop="net_rate" label="纯粉系数" /> <el-table-column prop="net_rate" label="纯粉系数"/>
<el-table-column prop="technology_code" label="工艺代码" /> <el-table-column prop="technology_code" label="工艺代码"/>
<el-table-column prop="ball_rate" label="球料比" /> <el-table-column prop="ball_rate" label="球料比"/>
<el-table-column prop="liquid_rate" label="液料比" /> <el-table-column prop="liquid_rate" label="液料比"/>
<el-table-column v-if="false" prop="is_used" label="是否启用" /> <el-table-column v-if="false" prop="is_used" label="是否启用"/>
<el-table-column prop="update_optname" label="修改人" /> <el-table-column prop="update_optname" label="修改人"/>
<el-table-column prop="update_time" label="修改时间" width="150px" /> <el-table-column prop="update_time" label="修改时间" width="150px"/>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination /> <pagination/>
</div> </div>
<el-dialog <el-dialog
@@ -127,9 +127,9 @@
<script> <script>
import crudMaterialparameters from '@/api/wms/basedata/master/materialparameters' import crudMaterialparameters from '@/api/wms/basedata/master/materialparameters'
import crudClassstandard from '@/api/wms/basedata/master/classstandard' import crudClassstandard from '@/api/wms/basedata/master/classstandard'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import CRUD, { crud, header, presenter } from '@crud/crud' import CRUD, {crud, header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation' import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation' import udOperation from '@crud/UD.operation'
@@ -140,7 +140,7 @@ import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
export default { export default {
name: 'MaterialParameters', name: 'MaterialParameters',
components: { pagination, crudOperation, rrOperation, udOperation, YflDialog, CpDialog, Treeselect }, components: {pagination, crudOperation, rrOperation, udOperation, YflDialog, CpDialog, Treeselect},
mixins: [presenter(), header(), crud()], mixins: [presenter(), header(), crud()],
cruds() { cruds() {
return CRUD({ return CRUD({
@@ -148,7 +148,7 @@ export default {
url: 'api/MaterialParameters', url: 'api/MaterialParameters',
idField: 'material_id', idField: 'material_id',
sort: 'material_id,desc', sort: 'material_id,desc',
crudMethod: { ...crudMaterialparameters }, crudMethod: {...crudMaterialparameters},
optShow: { optShow: {
add: false, add: false,
edit: false, edit: false,
@@ -167,6 +167,7 @@ export default {
viewDialogVisible: false, viewDialogVisible: false,
fullscreen: false, fullscreen: false,
material_id: '', material_id: '',
open: true,
currentComponent: '', currentComponent: '',
openParam: {}, openParam: {},
dialogTitle: null, dialogTitle: null,
@@ -181,7 +182,6 @@ export default {
crudMaterialbase.getMaterOptType(param).then(res => { crudMaterialbase.getMaterOptType(param).then(res => {
this.class_idStr = res.class_idStr this.class_idStr = res.class_idStr
this.crud.query.class_idStr = this.class_idStr this.crud.query.class_idStr = this.class_idStr
this.crud.toQuery()
this.queryClassId() this.queryClassId()
}) })
crudMaterialparameters.getSeries().then(res => { crudMaterialparameters.getSeries().then(res => {
@@ -191,7 +191,12 @@ export default {
methods: { methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据 // 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
if (this.open) {
this.open = false
return false
} else {
return true return true
}
}, },
stockIsNeedMove(row, clou) { stockIsNeedMove(row, clou) {
if (row.stock_is_need_move === '0') return '否' if (row.stock_is_need_move === '0') return '否'
@@ -264,10 +269,10 @@ export default {
} }
}) })
}, },
loadClass({ action, parentNode, callback }) { loadClass({action, parentNode, callback}) {
if (action === LOAD_CHILDREN_OPTIONS) { if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => { crudClassstandard.getClass({pid: parentNode.id}).then(res => {
parentNode.children = res.content.map(function(obj) { parentNode.children = res.content.map(function (obj) {
if (obj.hasChildren) { if (obj.hasChildren) {
obj.children = null obj.children = null
} }