This commit is contained in:
zds
2022-12-01 18:59:08 +08:00
parent 238a61ccad
commit 70fe17b48c
15 changed files with 215 additions and 66 deletions

View File

@@ -481,9 +481,6 @@ export default {
this.mstrow = this.checkrows.pop()
this.changeShow = true
},
onInput() {
this.$forceUpdate()
},
submit(status) {
this.checkrows = this.$refs.table.selection
if (this.checkrows.length === 0) {
@@ -541,6 +538,9 @@ export default {
this.crud.loading = false
})
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''

View File

@@ -12,7 +12,7 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="工令日期">
<el-form-item label="日期">
<el-date-picker
v-model="query.createTime"
type="daterange"

View File

@@ -38,7 +38,7 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="45" />
<el-table-column v-permission="[]" label="操作" fixed="right" width="120px" align="center">
<el-table-column v-permission="[]" label="操作" fixed="right" min-width="120px" align="center">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -46,20 +46,20 @@
/>
</template>
</el-table-column>
<el-table-column prop="material_code" label="碳化钨编码" width="120" align="center" />
<el-table-column prop="material_name" width="120" label="碳化钨名称" align="center">
<el-table-column prop="material_code" label="碳化钨编码" min-width="120" align="center" />
<el-table-column prop="material_name" min-width="120" label="碳化钨名称" align="center">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.material_name }}</el-link>
</template>
</el-table-column>
<el-table-column prop="mark_code" width="150px" label="牌号" align="center" />
<el-table-column prop="c_balance" label="碳平衡" width="90px" align="center" :formatter="crud.formatQlNum4" />
<el-table-column prop="liquid_rate" label="液料比" width="60" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_rate" label="球料比" width="60" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_speed" label="球磨转速(RPM)" width="120px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_time" label="研磨时间(h)" width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="accept_qty" label="标准重量(g)" width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="detail_count" label="明细数" align="center" min-width="60" />
<el-table-column prop="mark_code" min-width="150px" label="牌号" align="center" />
<el-table-column prop="c_balance" label="碳平衡" min-width="90" align="center" :formatter="crud.formatQlNum4" />
<el-table-column prop="liquid_rate" label="液料比" min-width="70" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_rate" label="球料比" min-width="70" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_speed" label="球磨转速(RPM)" min-width="120px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="ball_time" label="研磨时间(h)" min-width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="accept_qty" label="标准重量(g)" min-width="90px" align="center" :formatter="crud.formatNum2" />
<el-table-column prop="detail_count" label="明细数" align="center" min-width="70" />
<el-table-column prop="remark" label="备注" align="center" min-width="135" />
<el-table-column prop="create_name" label="创建人" align="center" min-width="80" />
<el-table-column prop="create_time" label="创建时间" min-width="135" align="center" />

View File

@@ -48,7 +48,16 @@
/>
</el-form-item>
<el-form-item label="维修单日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="单据状态">
<el-select
@@ -105,9 +114,9 @@
<el-table-column fixed="left" prop="device_name" label="设备名称" min-width="150"/>
<el-table-column fixed="left" prop="extend_code" label="设备自编码" min-width="100" />
<el-table-column fixed="left" prop="use_name" label="使用班组" min-width="130"/>
<el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="70"/>
<el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="70"/>
<el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" width="95" />
<el-table-column fixed="left" prop="fault_level" label="故障等级" :formatter="formatLevelName" min-width="80"/>
<el-table-column fixed="left" prop="invstatus" label="单据状态" :formatter="formatStatusName" min-width="80"/>
<el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" width="110" />
<el-table-column fixed="left" prop="input_optname" label="创建人" min-width="90"/>
<el-table-column fixed="left" prop="input_time" label="创建时间" min-width="140" />
<el-table-column prop="bx_name" label="报修人" min-width="90"/>
@@ -287,6 +296,19 @@ export default {
return '维修计划'
}
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
downdtl() {
if (this.currentRow !== null) {
crud.downloadLoading = true

View File

@@ -151,7 +151,8 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<rrOperation />
@@ -238,6 +239,7 @@ import DivDialog from '@/views/wms/statistics/ioStorQuery/DivDialog'
import TaskDialog from '@/views/wms/statistics/ioStorQuery/TaskDialog'
import crudStorattr from '@/api/wms/basedata/st/storattr'
import crudRawAssist from '@/api/wms/st/core/inbill/rawassist'
import Date from '@/utils/datetime'
export default {
name: 'IoStorQuery',
@@ -269,6 +271,7 @@ export default {
dis_flag: true,
work_flag: true,
openParam: [],
query_flag: true,
mstrow: {},
currentRow: null,
checkrows: [],
@@ -289,9 +292,15 @@ export default {
checkoutbill.getType().then(res => {
this.billtypelist = res
})
this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
this.handleCurrentChange(null)
},
fun(val) {
@@ -315,6 +324,19 @@ export default {
this.$refs.table.clearSelection()
this.handleCurrentChange(null)
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
buttonChange(current) {
if (current !== null) {
this.currentRow = current

View File

@@ -15,7 +15,16 @@
<el-form-item label="日期">
<label slot="label">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
<date-range-picker v-model="query.createTime" class="date-item" />
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="单据编号">
@@ -124,13 +133,13 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="index" label="序号" width="100" align="center" fixed />
<el-table-column prop="0" label="质检单号" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="1" label="物料编码" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="20" label="物料名称" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="2" label="批号" min-width="100" show-overflow-tooltip fixed />
<el-table-column type="index" label="序号" width="60" align="center" fixed />
<el-table-column prop="0" label="质检单号" min-width="130" fixed />
<el-table-column prop="1" label="物料编码" min-width="130" fixed />
<el-table-column prop="20" label="物料名称" min-width="130" fixed />
<el-table-column prop="2" label="批号" min-width="130" fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="140" />
</template>
</el-table>
<!--分页组件-->
@@ -150,10 +159,11 @@ import DateRangePicker from '@/components/DateRangePicker'
import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import Date from '@/utils/datetime'
export default {
name: 'PhySicalQuery',
components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker },
components: { pagination, crudOperation, rrOperation },
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
@@ -179,6 +189,7 @@ export default {
return {
cols: [],
statusList: [],
query_flag: true,
permission: {
},
rules: {
@@ -187,10 +198,16 @@ export default {
beforeCreate() {
},
created() {
this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
crudPhySicalQuery.getHeader().then(res => {
this.cols = res
})
@@ -198,6 +215,19 @@ export default {
this.statusList = res
})
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
hand(value) {
this.crud.toQuery()
},

View File

@@ -45,13 +45,13 @@
<el-table ref="table" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="material_code" label="产品编码" width="180" />
<el-table-column prop="sum_qty" label="计划重量(吨)" :formatter="crud.formatNum3" min-width="80" />
<el-table-column prop="sum_qty" label="计划重量(吨)" :formatter="crud.formatNum3" min-width="100" />
<el-table-column prop="product_num" label="计划批次" min-width="80" />
<el-table-column prop="device_name" label="关键设备" width="100" />
<el-table-column prop="workorder_date" min-width="130" label="粉料配粉时间" />
<el-table-column prop="pw_time" label="粉料喷雾时间" width="130" />
<el-table-column prop="in_time" label="最后入库时间" width="130" />
<el-table-column prop="in_qty" label="入库重量(吨)" :formatter="crud.formatNum3" min-width="80" />
<el-table-column prop="workorder_date" min-width="140" label="粉料配粉时间" />
<el-table-column prop="pw_time" label="粉料喷雾时间" width="140" />
<el-table-column prop="in_time" label="最后入库时间" width="140" />
<el-table-column prop="in_qty" label="入库重量(吨)" :formatter="crud.formatNum3" min-width="100" />
<el-table-column prop="in_num" label="入库批数" width="80" />
</el-table>
<!--分页组件-->

View File

@@ -13,7 +13,16 @@
>
<el-form-item label="到货日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="单据编号">
@@ -96,13 +105,13 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="index" label="序号" width="100" align="center" fixed />
<el-table-column prop="1" label="物料编码" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="2" label="物料名称" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="3" label="批号" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="4" label="重量" min-width="100" show-overflow-tooltip fixed />
<el-table-column type="index" label="序号" min-width="60" align="center" fixed />
<el-table-column prop="1" label="物料编码" min-width="130" fixed />
<el-table-column prop="2" label="物料名称" min-width="150" fixed />
<el-table-column prop="3" label="批号" min-width="130" fixed />
<el-table-column prop="4" label="重量" min-width="100" fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
<el-table-column v-if="col" :prop="col.prop" :label="col.label" align="center" min-width="200" />
</template>
</el-table>
<!--分页组件-->
@@ -122,6 +131,7 @@ import DateRangePicker from '@/components/DateRangePicker'
import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
import {download} from "@/api/data";
import {downloadFile} from "@/utils";
import Date from '@/utils/datetime'
export default {
name: 'RawUatCbQuery',
@@ -159,11 +169,16 @@ export default {
beforeCreate() {
},
created() {
this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if(this.query_flag){
this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
var str = this.$route.path
// var material_type_id = str.substring(str.length - 2)
// 截取最后一个/之后的内容
@@ -179,6 +194,19 @@ export default {
this.query.material_type_id = str
return true
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
hand(value) {
this.crud.toQuery()
},

View File

@@ -13,7 +13,16 @@
>
<el-form-item label="到货日期">
<date-range-picker v-model="query.createTime" class="date-item" />
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="单据编号">
@@ -96,13 +105,13 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="index" label="序号" width="100" align="center" fixed />
<el-table-column prop="1" label="物料编码" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="2" label="物料名称" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="3" label="批号" min-width="100" show-overflow-tooltip fixed />
<el-table-column prop="4" label="重量" min-width="100" show-overflow-tooltip fixed />
<el-table-column type="index" label="序号" width="60" align="center" fixed />
<el-table-column prop="1" label="物料编码" min-width="110" fixed />
<el-table-column prop="2" label="物料名称" min-width="150" fixed />
<el-table-column prop="3" label="批号" min-width="130" fixed />
<el-table-column prop="4" label="重量" min-width="100" fixed />
<template v-for="(col,index) in cols">
<el-table-column v-if="col" :prop="col.prop" :label="col.label" width="120px" show-overflow-tooltip />
<el-table-column v-if="col" :prop="col.prop" :label="col.label" align="center" min-width="220" />
</template>
</el-table>
<!--分页组件-->
@@ -122,6 +131,7 @@ import DateRangePicker from '@/components/DateRangePicker'
import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
import {download} from "@/api/data";
import {downloadFile} from "@/utils";
import Date from '@/utils/datetime'
export default {
name: 'RawUatWcQuery',
@@ -159,11 +169,16 @@ export default {
beforeCreate() {
},
created() {
this.crud.query.createTime = [new Date().daysAgo(30), new Date()]
},
methods: {
// 钩子在获取表格数据之前执行false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
if(this.query_flag){
this.crud.query.begin_time = (new Date().daysAgo(30)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
var str = this.$route.path
// var material_type_id = str.substring(str.length - 2)
// 截取最后一个/之后的内容
@@ -182,6 +197,19 @@ export default {
hand(value) {
this.crud.toQuery()
},
onInput() {
this.$forceUpdate()
},
mytoQuery(array1) {
if (array1 === null) {
this.crud.query.begin_time = ''
this.crud.query.end_time = ''
} else {
this.crud.query.begin_time = array1[0]
this.crud.query.end_time = array1[1]
}
this.crud.toQuery()
},
downdtl() {
if (this.currentRow !== null) {
crud.downloadLoading = true