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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-03-24 16:57:57 +08:00
parent 8b49295639
commit f9f66b0528
25 changed files with 1423 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
mes/qd/src/views/wms/basedata/master/material/Dialog.vue Normal file
View File

@@ -0,0 +1,97 @@
<template>
<el-dialog
title="物料导入"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="true"
width="500px"
v-loading.fullscreen.lock="fullscreenLoading"
@close="close"
>
<div class="head-container">
<div>
<!-- 搜索 -->
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form-item label="日期区间：" prop="createTime">
<el-date-picker
v-model="form.createTime"
type="daterange"
vvalue-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item label="起始物料号:" prop="bill_code1">
<el-input v-model="form.bill_code1" style="width: 350px;"/>
</el-form-item>
<el-form-item label="终止物料号:" prop="bill_code2">
<el-input v-model="form.bill_code2" style="width: 350px;"/>
</el-form-item>
</el-form>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
</el-button>
</div>
</div>
</el-dialog>
</template>
<script>
import CRUD, {header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudSap from '@/api/wms/ext/sap'
import crudMaterialbase from "@/api/wms/basedata/master/materialbase";
export default {
name: 'importOrder',
components: {rrOperation, pagination, DateRangePicker},
cruds() {
},
mixins: [presenter(), header()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
fullscreenLoading: false,
dialogVisible: false,
form: {}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
close() {
this.form = {}
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
},
queryStruct() {
debugger
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]
this.form.date_end = this.form.createTime[1]
}
crudMaterialbase.synchronize(this.form).then(res => {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false
})
}
}
}
</script>

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

@@ -174,6 +174,7 @@
<!--分页组件-->
<pagination />
</div>
<Dialog :dialog-show.sync="dialogShow"/>
</div>
</template>
@@ -184,6 +185,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Dialog from '@/views/wms/basedata/master/material/Dialog'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
@@ -227,7 +229,7 @@ export default {
name: 'Materialbase',
// 数据字典
dicts: ['is_used'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -244,6 +246,7 @@ export default {
classes1: [],
classes2: [],
classes3: [],
dialogShow: false,
fullscreenLoading: false,
measure_unit: [],
productSeries: [],
@@ -347,13 +350,7 @@ export default {
})
},
synchronize() {
this.fullscreenLoading = true
crudMaterialbase.synchronize(this.crud.query).then(res => {
this.fullscreenLoading = false
this.crud.notify('同步成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(() => {
this.fullscreenLoading = false
})
this.dialogShow = true
},
queryClassId() {
const param = {

93
mes/qd/src/views/wms/pcs/deliveryorder/Dialog.vue Normal file
View File

@@ -0,0 +1,93 @@
<template>
<el-dialog
title="发货单导入"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="true"
width="500px"
v-loading.fullscreen.lock="fullscreenLoading"
@close="close"
>
<div class="head-container">
<div>
<!-- 搜索 -->
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form-item label="日期区间：" prop="createTime">
<el-date-picker
v-model="form.createTime"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item label="发货单号:" prop="bill_code">
<el-input v-model="form.bill_code" style="width: 350px;"/>
</el-form-item>
</el-form>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
</el-button>
</div>
</div>
</el-dialog>
</template>
<script>
import CRUD, {header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudSap from '@/api/wms/ext/sap'
export default {
name: 'importOrder',
components: {rrOperation, pagination, DateRangePicker},
cruds() {
},
mixins: [presenter(), header()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
fullscreenLoading: false,
dialogVisible: false,
form: {}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
close() {
this.form = {}
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
},
queryStruct() {
debugger
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]
this.form.date_end = this.form.createTime[1]
}
crudSap.getDeliveryNote(this.form).then(res => {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false
})
}
}
}
</script>

145
mes/qd/src/views/wms/pcs/deliveryorder/index.vue
View File

@@ -12,7 +12,8 @@
label-suffix=":"
>
<el-form-item label="发货单号">
<el-input v-model="query.deliver_code" clearable placeholder="发货单号" style="width: 200px;" class="filter-item" />
<el-input v-model="query.deliver_code" clearable placeholder="发货单号" style="width: 200px;"
class="filter-item"/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
@@ -62,13 +63,42 @@
placeholder="请选择"
/>
</el-form-item>
<rrOperation :crud="crud" />
<el-form-item label="是否正常">
<el-select
v-model="query.is_success"
style="width: 200px"
clearable
filterable
placeholder="请选择"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud"/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="importin"
>
同步
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
</el-form>
<div slot="footer" class="dialog-footer">
@@ -77,66 +107,92 @@
</div>
</el-dialog>
<!--表格渲染-->
<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="55" />
<el-table-column prop="deliver_code" label="发货单号" />
<el-table-column prop="seq_no" label="明细序号" />
<el-table-column prop="deliver_type" label="发货单类型">
<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="55"/>
<el-table-column prop="deliver_code" label="发货单号"/>
<el-table-column prop="seq_no" label="明细序号"/>
<el-table-column prop="deliver_type" label="发货单类型" width="120">
<template slot-scope="scope">
{{ dict.label.PCS_DELIVER_TYPE[scope.row.deliver_type] }}
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_name" label="物料名称" />
<el-table-column prop="material_code" label="物料编码"/>
<el-table-column prop="material_name" label="物料名称"/>
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.PCS_DELI_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="delivery_qty" label="发货数量" />
<el-table-column prop="cust_code" label="客户编码" />
<el-table-column prop="cust_coname" label="客户名称" />
<el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
<el-table-column prop="sale_code" label="销售单号" />
<el-table-column prop="sale_seq_no" label="销售明细序号" show-overflow-tooltip min-width="150" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" />
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>-->
<el-table-column prop="delivery_qty" label="发货数量"/>
<el-table-column prop="cust_code" label="客户编码"/>
<el-table-column prop="cust_coname" label="客户名称"/>
<el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150"/>
<el-table-column prop="sale_code" label="销售单号"/>
<el-table-column prop="sale_seq_no" label="销售明细序号" show-overflow-tooltip min-width="150"/>
<el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
<el-table-column prop="create_name" label="创建人"/>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column prop="update_optname" label="修改人"/>
<el-table-column prop="update_time" label="修改时间"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
:permission="permission"
/>
</template>
</el-table-column>-->
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
<Dialog :dialog-show.sync="dialogShow"/>
</div>
</template>
<script>
import crudDeliveryOrder from '@/api/wms/pcs/deliveryOrder'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import CRUD, {presenter, header, form, crud} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import Dialog from '@/views/wms/pcs/deliveryorder/Dialog'
import pagination from '@crud/Pagination'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import crudClassstandard from '@/api/wms/basedata/master/classstandard'
const defaultForm = { deliver_id: null, deliver_code: null, seq_no: null, deliver_type: null, material_id: null, status: null, delivery_qty: null, cust_id: null, qty_unit_id: null, sale_id: null, sale_code: null, sale_seq_no: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, cust_code: null, cust_name: null }
const defaultForm = {
deliver_id: null,
deliver_code: null,
seq_no: null,
deliver_type: null,
material_id: null,
status: null,
delivery_qty: null,
cust_id: null,
qty_unit_id: null,
sale_id: null,
sale_code: null,
sale_seq_no: null,
create_id: null,
create_name: null,
create_time: null,
update_optid: null,
update_optname: null,
update_time: null,
cust_code: null,
cust_name: null
}
export default {
name: 'DeliveryOrder',
dicts: ['PCS_DELIVER_TYPE', 'PCS_DELI_STATUS'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
components: {pagination, crudOperation, rrOperation, udOperation, Treeselect, Dialog},
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '发货单', url: 'api/deliveryOrder', idField: 'deliver_id', sort: 'deliver_id,desc',
return CRUD({
title: '发货单', url: 'api/deliveryOrder', idField: 'deliver_id', sort: 'deliver_id,desc',
optShow: {
add: false,
edit: false,
@@ -144,17 +200,17 @@ export default {
reset: true,
download: false
},
crudMethod: { ...crudDeliveryOrder }})
crudMethod: {...crudDeliveryOrder}
})
},
data() {
return {
classes3: [],
permission: {
},
rules: {
},
dialogShow: false,
permission: {},
rules: {},
queryTypeOptions: [
{ key: 'deliver_code', display_name: '发货单号' }
{key: 'deliver_code', display_name: '发货单号'}
]
}
},
@@ -175,6 +231,9 @@ export default {
})
})
},
importin() {
this.dialogShow = true
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
@@ -186,10 +245,10 @@ export default {
})
},
// 获取子节点数据
loadChildNodes({ action, parentNode, callback }) {
loadChildNodes({action, parentNode, callback}) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudClassstandard.getClass({ pid: parentNode.id }).then(res => {
parentNode.children = res.content.map(function(obj) {
crudClassstandard.getClass({pid: parentNode.id}).then(res => {
parentNode.children = res.content.map(function (obj) {
if (obj.hasChildren) {
obj.children = null
}

93
mes/qd/src/views/wms/pcs/saleorder/Dialog.vue Normal file
View File

@@ -0,0 +1,93 @@
<template>
<el-dialog
title="销售订单导入"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="true"
width="500px"
v-loading.fullscreen.lock="fullscreenLoading"
@close="close"
>
<div class="head-container">
<div>
<!-- 搜索 -->
<el-form ref="form" :model="form1" :rules="rules" size="mini" label-width="110px">
<el-form-item label="日期区间：" prop="createTime">
<el-date-picker
v-model="form.createTime"
type="daterange"
value-format="yyyy-MM-dd"
start-placeholder="开始日期"
end-placeholder="结束日期"
/>
</el-form-item>
<el-form-item label="销售订单号:" prop="bill_code">
<el-input v-model="form.bill_code" style="width: 350px;"/>
</el-form-item>
</el-form>
<el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="queryStruct">确认
</el-button>
</div>
</div>
</el-dialog>
</template>
<script>
import CRUD, {header, presenter} from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudSap from '@/api/wms/ext/sap'
export default {
name: 'importOrder',
components: {rrOperation, pagination, DateRangePicker},
cruds() {
},
mixins: [presenter(), header()],
props: {
dialogShow: {
type: Boolean,
default: false
}
},
data() {
return {
fullscreenLoading: false,
dialogVisible: false,
form: {}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
close() {
this.form = {}
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
},
queryStruct() {
debugger
this.fullscreenLoading = true
if (this.form.createTime) {
this.form.date_begin = this.form.createTime[0]
this.form.date_end = this.form.createTime[1]
}
crudSap.getSaleOrder(this.form).then(res => {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
this.fullscreenLoading = false
}).catch(() => {
this.fullscreenLoading = false
})
}
}
}
</script>

47
mes/qd/src/views/wms/pcs/saleorder/index.vue
View File

@@ -62,14 +62,41 @@
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="是否正常">
<el-select
v-model="query.is_success"
style="width: 200px"
clearable
filterable
placeholder="请选择"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.IS_OR_NOT"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
@click="importin"
>
同步
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form ref="form" :model="form" size="mini" label-width="80px">
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -99,6 +126,7 @@
<el-table-column prop="cust_name" label="客户名称" min-width="100" show-overflow-tooltip/>
<el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
<el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
<el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" min-width="120" show-overflow-tooltip/>
<el-table-column prop="update_time" label="修改时间" min-width="120" show-overflow-tooltip/>
@@ -114,6 +142,7 @@
<!--分页组件-->
<pagination />
</div>
<Dialog :dialog-show.sync="dialogShow" />
</div>
</template>
@@ -122,7 +151,7 @@ import crudSaleOrder from '@/api/wms/pcs/saleOrder'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import Dialog from '@/views/wms/pcs/saleorder/Dialog'
import pagination from '@crud/Pagination'
import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -131,8 +160,8 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
const defaultForm = { sale_id: null, sale_code: null, seq_no: null, sale_type: null, material_id: null, status: null, sale_qty: null, produce_seq: null, cust_id: null, qty_unit_id: null, plandeliver_date: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, cust_code: null, cust_name: null }
export default {
name: 'SaleOrder',
dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE'],
components: { pagination, crudOperation, rrOperation, udOperation, Treeselect },
dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, Treeselect, Dialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '销售订单', url: 'api/saleOrder', idField: 'sale_id', sort: 'sale_id,desc',
@@ -148,10 +177,9 @@ export default {
data() {
return {
classes3: [],
dialogShow: false,
permission: {
},
rules: {
},
queryTypeOptions: [
{ key: 'sale_code', display_name: '销售单号' }
]
@@ -174,6 +202,9 @@ export default {
})
})
},
importin() {
this.dialogShow = true
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {