add:排产相关功能。 rev:修改工单管理,销售订单管理,工厂日历功能;

add:排产相关功能。
rev:修改工单管理,销售订单管理,工厂日历功能;
This commit is contained in:
2023-07-05 16:00:55 +08:00
parent cc5d6be4da
commit e233f01bec
28 changed files with 1226 additions and 738 deletions

View File

@@ -12,7 +12,13 @@
label-suffix=":"
>
<el-form-item label="销售单号">
<el-input v-model="query.sale_code" clearable placeholder="销售单号" style="width: 200px;" class="filter-item" />
<el-input
v-model="query.sale_code"
clearable
placeholder="销售单号"
style="width: 200px;"
class="filter-item"
/>
</el-form-item>
<el-form-item label="物料搜索">
<el-input
@@ -31,7 +37,7 @@
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00','23:59:59']"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
@@ -62,7 +68,7 @@
placeholder="请选择"
/>
</el-form-item>
<el-form-item label="是否正常">
<!-- <el-form-item label="是否正常">
<el-select
v-model="query.is_success"
style="width: 200px"
@@ -78,11 +84,21 @@
:value="item.value"
/>
</el-select>
</el-form-item>
</el-form-item> -->
<rrOperation :crud="crud" />
</el-form>
</div>
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-upload2"
size="mini"
@click="uploadShow = true"
>
导入
</el-button>
<el-button
slot="right"
class="filter-item"
@@ -95,26 +111,58 @@
</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" size="mini" label-width="80px">
</el-form>
<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" size="mini" label-width="80px" />
<div 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>
<el-button
:loading="crud.cu === 2"
type="primary"
@click="crud.submitCU"
>确认</el-button>
</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
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="sale_code" label="销售单号" min-width="100" show-overflow-tooltip/>
<el-table-column
prop="sale_code"
label="销售单号"
min-width="100"
show-overflow-tooltip
/>
<el-table-column prop="seq_no" label="明细序号" />
<el-table-column prop="sale_type" label="销售单类型" min-width="100" show-overflow-tooltip>
<el-table-column
prop="sale_type"
label="销售单类型"
min-width="100"
show-overflow-tooltip
>
<template slot-scope="scope">
{{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
<el-table-column
prop="material_name"
label="物料名称"
min-width="100"
show-overflow-tooltip
/>
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
@@ -122,15 +170,28 @@
</el-table-column>
<el-table-column prop="sale_qty" label="销售数量" />
<el-table-column prop="produce_seq" label="生产顺序" />
<el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')"/>
<el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')"/>
<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="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')" />
<el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')" />
<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="flexWidth('create_time',crud.data,'创建时间')"/>
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<el-table-column
prop="create_time"
label="创建时间"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
prop="confirm_time"
label="修改时间"
min-width="120"
show-overflow-tooltip
/>
<!-<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:data="scope.row"
@@ -142,6 +203,7 @@
<!--分页组件-->
<pagination />
</div>
<UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
<Dialog :dialog-show.sync="dialogShow" />
</div>
</template>
@@ -151,20 +213,45 @@ 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 UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'
import Dialog from '@/views/wms/pcs/saleorder/Dialog'
import pagination from '@crud/Pagination'
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 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 }
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', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, Treeselect, Dialog },
components: { pagination, crudOperation, rrOperation, Treeselect, UploadDialog, Dialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({ title: '销售订单', url: 'api/saleOrder', idField: 'sale_id', sort: 'sale_id,desc',
return CRUD({
title: '销售订单',
url: 'api/mpsSaleOrder',
idField: 'sale_id',
sort: 'sale_id,desc',
optShow: {
add: false,
edit: false,
@@ -172,17 +259,16 @@ export default {
reset: true,
download: false
},
crudMethod: { ...crudSaleOrder }})
crudMethod: { ...crudSaleOrder }
})
},
data() {
return {
classes3: [],
uploadShow: false,
dialogShow: false,
permission: {
},
queryTypeOptions: [
{ key: 'sale_code', display_name: '销售单号' }
]
permission: {},
queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
}
},
created() {
@@ -191,7 +277,7 @@ export default {
methods: {
queryClassId() {
const param = {
'class_idStr': this.class_idStr
class_idStr: this.class_idStr
}
crudClassstandard.queryClassById(param).then(res => {
this.classes = res.content.map(obj => {
@@ -205,6 +291,9 @@ export default {
importin() {
this.dialogShow = true
},
tableChanged3() {
this.crud.toQuery()
},
buildTree(classes) {
classes.forEach(data => {
if (data.children) {
@@ -249,6 +338,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>