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-11-29 20:10:59 +08:00
parent aa38c4c722
commit e5632397fe
30 changed files with 358 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mes/qd/src/views/wms/basedata/master/class/index.vue
View File

@@ -65,7 +65,7 @@
<el-input v-model.trim="form.class_desc" style="width: 370px;" />
</el-form-item>
<el-form-item label="顶级类目">
<el-radio-group v-model="form.isTop" style="width: 140px">
<el-radio-group v-model="form.isTop" style="width: 140px" @change="mychange">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
@@ -187,6 +187,7 @@ export default {
data() {
return {
classes: [],
base_data_type: null,
permission: {},
rules: {
class_id: [
@@ -290,6 +291,18 @@ export default {
this.classes = date
})
},
mychange(val) {
if (val === '0' && this.form.base_data_type != null) {
crudClassstandard.getClass({ base_data_type: this.form.base_data_type }).then(res => {
this.classes = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
return obj
})
})
}
},
getClass() {
crudClassstandard.getClass({ enabled: true }).then(res => {
this.classes = res.content.map(function(obj) {

28
mes/qd/src/views/wms/basedata/master/storageVehiclePoint/index.vue
View File

@@ -58,7 +58,7 @@
</crudOperation>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :max-height="590" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<!-- <el-table-column type="selection" width="55" />-->
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="storagevehiclepoint_id" label="载具点位对应标识" />
<el-table-column v-if="false" prop="set_type" label="对应类型" />
<el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
@@ -74,16 +74,8 @@
</el-table-column>
<el-table-column v-if="false" prop="point_id" label="点位标识" />
<el-table-column v-if="false" prop="area_type" label="所属区域" />
<el-table-column prop="update_optname" label="修改者" />
<el-table-column prop="update_time" label="修改时间" />
<!-- <el-table-column v-permission="['admin','storagevehiclepoint:edit','storagevehiclepoint:del']" label="操作" width="150px" align="center">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>-->
<el-table-column prop="update_optname2" label="修改者" />
<el-table-column prop="update_time2" label="修改时间" />
</el-table>
<!--分页组件-->
<pagination />
@@ -114,7 +106,7 @@ const defaultForm = {
}
export default {
name: 'Storagevehiclepoint',
components: { pagination, crudOperation, rrOperation, udOperation },
components: { pagination, crudOperation, rrOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -147,6 +139,7 @@ export default {
data() {
return {
storageVehicleTypeList: [],
checkrows: [],
permission: {
}}
},
@@ -156,16 +149,17 @@ export default {
})
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
hand(value) {
this.crud.toQuery()
},
save() {
this.checkrows = this.$refs.table.selection
if (this.checkrows.length === 0) {
this.crud.notify('请勾选需要操作的记录！')
return false
}
const data = {
'data': this.$refs.table.data
'data': this.checkrows
}
crudStoragevehiclepoint.save(data).then(res => {
this.crud.toQuery()

12
mes/qd/src/views/wms/pa/workloadstat/index.vue
View File

@@ -22,18 +22,6 @@
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="人员">
<el-input
v-model="query.assessor_id"
clearable
size="mini"
placeholder="请输人员姓名"
style="width: 230px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form>
</div>

2
mes/qd/src/views/wms/pdm/produce/workorder/index.vue
View File

@@ -253,7 +253,7 @@
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.workorder_code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="org_id" :formatter="orgFormat" min-width="105" label="所属组织" />
<el-table-column prop="org_id" :formatter="orgFormat" min-width="120" label="所属组织" />
<el-table-column prop="workorder_type" :formatter="bill_typeFormat" min-width="75" label="工令类型" />
<el-table-column :formatter="stateFormat" min-width="75" prop="status" label="工令状态" />
<el-table-column prop="device_name" min-width="80" label="设备" />

4
mes/qd/src/views/wms/pdm/produce/worktask/index.vue
View File

@@ -81,12 +81,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="设备编码">
<el-form-item label="设备">
<el-input
v-model="query.device_code"
size="mini"
clearable
placeholder="设备编码"
placeholder="设备"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>

83
mes/qd/src/views/wms/pf/flourwork/ExceptionDialog.vue
View File

@@ -67,7 +67,7 @@
</el-form-item>
<el-form-item label="不考虑误差" label-width="120px">
<el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()"/>
<el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()" />
</el-form-item>
<rrOperation />
</el-form>
@@ -94,28 +94,29 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55"/>
<el-table-column show-overflow-tooltip prop="workordercard_id" label="工艺指令卡" />
<el-table-column min-width="120" show-overflow-tooltip prop="formula_code" label="配方号" />
<el-table-column min-width="120" show-overflow-tooltip prop="product_material_code" label="产品编码" />
<el-table-column show-overflow-tooltip prop="product_pcsn" label="产品批次" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="配粉槽" />
<el-table-column min-width="120" show-overflow-tooltip prop="dtl_material_code" label="物料编码" />
<el-table-column min-width="120" show-overflow-tooltip prop="dtl_material_name" label="物料名称" />
<el-table-column min-width="100" show-overflow-tooltip prop="dtl_pcsn" label="物料批次" />
<el-table-column min-width="140" show-overflow-tooltip prop="bucketunique" label="桶号" />
<el-table-column show-overflow-tooltip prop="storage_qty" label="库存重量" />
<el-table-column show-overflow-tooltip prop="putconfirm_qty" label="实际投料" />
<el-table-column show-overflow-tooltip prop="outconfirm_qty" label="出库重量" />
<el-table-column show-overflow-tooltip prop="bad_qty" label="差异重量" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" :formatter="formatQtyName"/>
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" />
<el-table-column show-overflow-tooltip prop="jobstoragevehicle_code" label="托盘号" />
<el-table-column show-overflow-tooltip prop="put_name" label="投料人" />
<el-table-column min-width="150" show-overflow-tooltip prop="put_time" label="投料时间" />
<el-table-column show-overflow-tooltip prop="is_process" label="是否已处理" />
<el-table-column show-overflow-tooltip prop="process_name" label="处理人" />
<el-table-column show-overflow-tooltip prop="process_time" label="处理时间" />
<el-table-column type="selection" width="55" />
<el-table-column prop="workordercard_id" label="工艺指令卡" min-width="150" />
<el-table-column min-width="120" prop="formula_code" label="配方号" />
<el-table-column min-width="120" prop="product_material_code" label="产品编码" />
<el-table-column prop="product_pcsn" label="产品批次" />
<el-table-column prop="storagevehicle_code" label="配粉槽" />
<el-table-column min-width="120" prop="dtl_material_code" label="物料编码" />
<el-table-column min-width="120" prop="dtl_material_name" label="物料名称" />
<el-table-column min-width="100" prop="dtl_pcsn" label="物料批次" />
<el-table-column min-width="140" prop="bucketunique" label="桶号" />
<el-table-column prop="storage_qty" label="库存重量" />
<el-table-column prop="putconfirm_qty" label="实际投料" />
<el-table-column prop="outconfirm_qty" label="出库重量" />
<el-table-column prop="bad_qty" label="差异重量" />
<el-table-column prop="qty_unit_name" label="单位" :formatter="formatQtyName" />
<el-table-column prop="struct_code" label="货位" />
<!-- <el-table-column prop="device_id" label="配粉工位" :formatter="deviceListFormat" />-->
<el-table-column prop="jobstoragevehicle_code" label="托盘号" />
<el-table-column prop="put_name" label="投料人" />
<el-table-column min-width="150" prop="put_time" label="投料时间" />
<el-table-column prop="is_process" label="是否已处理" :formatter="formatQtyName2" />
<el-table-column prop="process_name" label="处理人" />
<el-table-column prop="process_time" label="处理时间" />
</el-table>
<!--分页组件-->
<pagination />
@@ -132,23 +133,22 @@
import CRUD, { presenter, header, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudOrderproc from '@/api/wms/pcs/orderproc'
import crudFlourwork from '@/api/wms/pf/flourwork'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
export default {
name: 'ExceptionDialog',
components: { rrOperation, crudOperation, udOperation, pagination, crudOrderproc },
components: { rrOperation, crudOperation, pagination },
mixins: [presenter(), header()],
cruds() {
return CRUD({
url: 'api/flourwork/queryException',
idField: 'formula_id',
sort: 'formula_id,desc',
idField: 'formuladtljob_id',
sort: '',
crudMethod: { ... crudFlourwork },
query: { is_deal: '0', is_all: '0', is_query: '0' },
optShow: {
add: false,
edit: false,
@@ -195,29 +195,40 @@ export default {
.catch(_ => {
})
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
close() {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
},
open() {
this.crud.query.is_query = '1'
this.crud.toQuery()
},
hand(value) {
this.crud.toQuery()
},
deviceListFormat(row) {
for (const item of this.deviceList) {
if (item.code === row.device_id) {
return item.name
}
}
},
formatQtyName(row, cloum) {
return 'Kg'
},
formatQtyName2(row, cloum) {
if (row.is_process === '1') {
return '是'
} else {
return '否'
}
},
sure() {
const _selectData = this.$refs.table.selection
if (!_selectData || _selectData.length !== 1) {
return this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO)
if (!_selectData || _selectData.length === 0) {
return this.crud.notify('请选择需要操作的记录', CRUD.NOTIFICATION_TYPE.INFO)
}
const data = _selectData[0]
crudFlourwork.exceptionSure(data).then(res => {
crudFlourwork.exceptionSure({ 'rows': _selectData }).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})

15
mes/qd/src/views/wms/pf/flourwork/index.vue
View File

@@ -59,22 +59,7 @@
</el-form-item>
<el-form-item label="显示全部" label-width="120px">
<!--<el-select
v-model="query.is_all"
clearable
placeholder="默认为否"
size="mini"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in isAllList"
:label="item.name"
:value="item.code"
/>
</el-select>-->
<el-switch v-model="query.is_all" active-value="1" inactive-value="0" @change="crud.toQuery()"/>
</el-form-item>
<rrOperation />

105
mes/qd/src/views/wms/pf/formula/index.vue
View File

@@ -37,7 +37,8 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
@input="onInput()"
@change="mytoQuery"
/>
</el-form-item>
<el-form-item label="配方编号">
@@ -130,16 +131,6 @@
>
配粉补料
</el-button>
<!-- <el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-check"
size="mini"
@click="pointCard"
>
打印工艺指令控制卡
</el-button>-->
<el-button
slot="right"
class="filter-item"
@@ -177,15 +168,15 @@
<!--表格渲染-->
<el-table
ref="table"
:max-height="590"
v-loading="crud.loading"
:max-height="590"
size="mini"
:data="crud.data"
style="width: 100%;"
:highlight-current-row="true"
@selection-change="mySelectionChange"
>
<el-table-column type="selection" width="55" />
<el-table-column type="selection" width="55" />
<el-table-column prop="formula_code" width="130" label="配方编号">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.formula_code }}</el-link>
@@ -193,25 +184,25 @@
</el-table-column>
<el-table-column prop="workorder_code" width="130" label="工令号" />
<el-table-column prop="bucket_type" :formatter="bucket_typeFormat" min-width="80" label="桶类型" />
<el-table-column prop="material_code" min-width="130" label="物料编码"/>
<el-table-column prop="material_code" min-width="130" label="物料编码" />
<el-table-column :formatter="seriesFormat" min-width="130" prop="product_series_id" label="系列" />
<el-table-column prop="pcsn" min-width="130" label="批次"/>
<el-table-column prop="detail_count" min-width="100" label="明细数"/>
<el-table-column prop="masterbucket_qty" min-width="100" label="重量" :formatter="crud.formatNum3"/>
<el-table-column prop="pcsn" min-width="130" label="批次" />
<el-table-column prop="detail_count" min-width="100" label="明细数" />
<el-table-column prop="masterbucket_qty" min-width="100" label="重量" :formatter="crud.formatNum3" />
<el-table-column prop="status" :formatter="stateFormat" min-width="80" label="状态" />
<el-table-column prop="is_audit" :formatter="stateFormat2" min-width="80" label="是否审核" />
<el-table-column prop="audit_time" min-width="140" label="审核时间"/>
<el-table-column prop="audit_name" min-width="80" label="审核人"/>
<el-table-column prop="create_time" min-width="140" label="开单时间"/>
<el-table-column prop="create_name" min-width="80" label="开单人"/>
<el-table-column prop="update_time" min-width="140" label="修改时间"/>
<el-table-column prop="update_optname" min-width="80" label="修改人"/>
<el-table-column prop="start_time" min-width="140" label="开始时间"/>
<el-table-column prop="start_name" min-width="80" label="开始人"/>
<el-table-column prop="end_time" min-width="140" label="结束时间"/>
<el-table-column prop="end_name" min-width="80" label="结束人"/>
<el-table-column prop="add_time" min-width="140" label="补料时间"/>
<el-table-column prop="add_name" min-width="80" label="补料人"/>
<el-table-column prop="audit_time" min-width="140" label="审核时间" />
<el-table-column prop="audit_name" min-width="80" label="审核人" />
<el-table-column prop="create_time" min-width="140" label="开单时间" />
<el-table-column prop="create_name" min-width="80" label="开单人" />
<el-table-column prop="update_time" min-width="140" label="修改时间" />
<el-table-column prop="update_optname" min-width="80" label="修改人" />
<el-table-column prop="start_time" min-width="140" label="开始时间" />
<el-table-column prop="start_name" min-width="80" label="开始人" />
<el-table-column prop="end_time" min-width="140" label="结束时间" />
<el-table-column prop="end_name" min-width="80" label="结束人" />
<el-table-column prop="add_time" min-width="140" label="补料时间" />
<el-table-column prop="add_name" min-width="80" label="补料人" />
</el-table>
<!--分页组件-->
<pagination />
@@ -259,20 +250,20 @@ import formula from '@/api/wms/pf/formula'
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import DivDialog from '@/views/wms/pf/formula/DivDialog'
import ViewDialog from '@/views/wms/pf/formula/ViewDialog'
import crudseriesProcessRoute from "@/api/wms/pdm/seriesProcessRoute";
import {download} from "@/api/data";
import {downloadFile} from "@/utils";
import {getToken} from "@/utils/auth";
import {mapGetters} from "vuex";
import crudseriesProcessRoute from '@/api/wms/pdm/seriesProcessRoute'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
import { getToken } from '@/utils/auth'
import { mapGetters } from 'vuex'
import PicDialog from '@/views/wms/pf/formula/PicDialog'
import Date from '@/utils/datetime'
export default {
name: 'formula',
components: { ViewDialog, DivDialog, crudOperation, rrOperation, udOperation, pagination, PicDialog },
name: 'Formula',
components: { ViewDialog, DivDialog, crudOperation, rrOperation, pagination, PicDialog },
cruds() {
return CRUD({ title: '工令', idField: 'formula_id', url: 'api/formula',
props: {
@@ -309,8 +300,9 @@ export default {
viewShow: false,
changeShow: false,
currentRow: null,
query_flag: true,
checkrows: [],
XLList:[]
XLList: []
}
},
computed: {
@@ -329,12 +321,18 @@ export default {
crudseriesProcessRoute.getXLlist2().then(res => {
this.XLList = res
})
this.crud.query.createTime = [new Date().daysAgo(7), new Date()]
},
methods: {
canUd(row) {
return row.status !== '10'
},
[CRUD.HOOK.beforeRefresh]() {
if (this.query_flag) {
this.crud.query.begin_time = (new Date().daysAgo(7)).strftime('%F', 'zh')
this.crud.query.end_time = (new Date()).strftime('%F', 'zh')
this.query_flag = false
}
this.handleCurrentChange()
},
toView(index, row) {
@@ -361,11 +359,11 @@ export default {
if (rows[i].status === '99') {
this.Export_flag = true
}
if (!'30,20'.includes(rows[i].status) || rows.length !== 1) {
if (!'30,20'.includes(rows[i].status) || rows.length !== 1) {
this.change_flag = true
}
}
}else{
} else {
this.handleCurrentChange()
}
},
@@ -402,31 +400,31 @@ export default {
},
typeChange() {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length !== 1 ){
if (this.checkrows.length !== 1) {
this.crud.notify('只能勾选一条记录开单！')
return false
}
this.mstrow = this.checkrows.pop()
this.changeShow = true
},
cancel(){
cancel() {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length === 0){
if (this.checkrows.length === 0) {
this.crud.notify('请先选择需要作废的配方记录！')
return false
}
formula.cancel({'rows':this.checkrows}).then(res => {
formula.cancel({ 'rows': this.checkrows }).then(res => {
this.crud.notify('作废配方成功！')
this.querytable()
})
},
audit(){
audit() {
this.checkrows = this.$refs.table.selection
if(this.checkrows.length === 0){
if (this.checkrows.length === 0) {
this.crud.notify('请先选择需要审核的配方记录！')
return false
}
formula.audit({'rows':this.checkrows}).then(res => {
formula.audit({ 'rows': this.checkrows }).then(res => {
this.crud.notify('审核配方成功！')
this.querytable()
})
@@ -435,6 +433,19 @@ export default {
this.crud.toQuery()
this.handleCurrentChange()
},
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()
},
pointCard() {
const _selectData = this.$refs.table.selection
if (_selectData.length === 0 || _selectData.length > 1) {

45
mes/qd/src/views/wms/sb/outbill/IvtDialog.vue
View File

@@ -15,22 +15,22 @@
label-width="80px"
label-suffix=":"
>
<el-form-item label="模糊搜索">
<el-input
v-model="queryrow.search"
clearable
size="mini"
placeholder="编码、名称"
@keyup.enter.native="crud.toQuery"
/>
<el-form-item label="模糊搜索">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="编码、名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryBtn">查询</el-button>
<rrOperation />
</el-form>
<!--表格渲染-->
<el-table
ref="table"
:data="tableDtl"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
size="mini"
border
@@ -63,16 +63,18 @@
<script>
import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
import CRUD, { header } from '@crud/crud'
import CRUD, { header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import sparePartout from '@/api/wms/sb/sparepartout'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
export default {
name: 'MaterDtl',
components: { rrOperation, pagination },
mixins: [header()],
cruds() {
return CRUD({ title: '库存', url: 'api/sb/outbill/getIvt', optShow: {}})
},
mixins: [presenter(), header()],
dicts: ['product_series'],
props: {
dialogShow: {
@@ -121,16 +123,6 @@ export default {
}
}
},
open() {
sparePartout.getIvt(this.queryrow).then(res => {
this.tableDtl = res
})
},
queryBtn() {
sparePartout.getIvt(this.queryrow).then(res => {
this.tableDtl = res
})
},
queryClassId() {
const param = {
'class_idStr': this.class_idStr
@@ -161,6 +153,9 @@ export default {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
},
open() {
this.crud.resetQuery(true)
},
submit() {
// 处理单选
if (this.isSingle && this.tableRadio) {

4
mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/DeviceDialog.vue
View File

@@ -6,6 +6,7 @@
destroy-on-close
width="1000px"
@close="close"
@open="open"
>
<el-form
:inline="true"
@@ -173,6 +174,9 @@ export default {
onSelectAll() {
this.$refs.table.clearSelection()
},
open() {
this.crud.resetQuery(true)
},
close() {
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)

17
mes/qd/src/views/wms/sch/task/index.vue
View File

@@ -145,23 +145,18 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="50" />
<el-table-column v-if="false" prop="taskdtl_id" label="任务标识" />
<el-table-column prop="task_code" label="任务编码" />
<el-table-column v-if="false" prop="task_type" label="任务类型" />
<el-table-column prop="task_type_name" label="任务类型" />
<el-table-column v-if="false" prop="taskdtl_type" label="任务明细" />
<el-table-column prop="taskdtl_type_name" label="任务明细" />
<el-table-column v-if="false" prop="task_status" label="任务状态" />
<el-table-column prop="task_status_name" label="任务状态" width="95px" :formatter="formatTaskStatusName" />
<el-table-column prop="start_area_name" label="起始区域" width="95" show-overflow-tooltip />
<el-table-column prop="start_area_name" label="起始区域" width="95" />
<el-table-column prop="start_point_code" label="起点编码" width="85" />
<el-table-column prop="start_point_name" label="起点名称" width="105" show-overflow-tooltip />
<el-table-column prop="next_area_name" label="下一区域" width="95" show-overflow-tooltip />
<el-table-column prop="next_point_code" label="下一点编码" width="85" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" show-overflow-tooltip />
<el-table-column prop="start_point_name" label="起点名称" width="105" />
<el-table-column prop="next_area_name" label="下一区域" width="95" />
<el-table-column prop="next_point_code" label="下一点编码" width="105" />
<el-table-column prop="next_point_name" label="下一点名称" width="105" />
<el-table-column prop="vehicle_code" label="载具编码" />
<el-table-column prop="remark" label="备注" width="120" show-overflow-tooltip />
<el-table-column v-if="false" prop="update_by" label="修改者" />
<el-table-column prop="remark" label="备注" width="120" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column

5
mes/qd/src/views/wms/st/core/inbill/wastewashinbill/AddDialog.vue
View File

@@ -247,11 +247,6 @@
</template>
</el-table-column>
</el-table>
<div v-show="crud.status.cu > 0" slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
<AddDtl :dialog-show.sync="dtlShow" :open-param="opendtlParam" @tableChanged="tableChanged" />
<MaterDtl
:dialog-show.sync="materShow"

14
mes/qd/src/views/wms/st/core/outbill/wastewashoutbill/index.vue
View File

@@ -173,18 +173,18 @@
</template>
</el-table-column>
<el-table-column :selectable="checkboxT" type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="bill_code" width="130" label="订单编码">
<el-table-column prop="bill_code" min-width="130" label="订单编码">
<template slot-scope="scope">
<el-link type="warning" @click="toView(scope.$index, scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip :formatter="stateFormat" width="100" prop="bill_status" label="单据状态" />
<el-table-column :formatter="stateFormat" min-width="100" prop="bill_status" label="单据状态" />
<el-table-column prop="stor_name" label="仓库" width="100" />
<el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column show-overflow-tooltip width="135" prop="biz_date" label="业务日期" />
<el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" width="100" />
<el-table-column show-overflow-tooltip prop="input_time" width="135" label="创建日期" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" min-width="120" label="业务类型" />
<el-table-column min-width="135" prop="biz_date" label="业务日期" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" label="生成方式" min-width="100" />
<el-table-column label="明细数" align="center" prop="detail_count" min-width="100" />
<el-table-column prop="input_time" min-width="135" label="创建日期" />
</el-table>
<!--分页组件-->
<pagination />

1
mes/qd/src/views/wms/st/return/inAndOutReturn/index.vue
View File

@@ -236,6 +236,7 @@ export default {
// 每页数据条数
size: 20
}, idField: 'iostorinv_id', url: 'api/inandoutreturn', crudMethod: { ...inandoutreturn },
query: { is_upload: '0' },
optShow: {
add: false,
edit: false,