feat: 业务类型、分页12

20240912_adapter_z
chenhc 11 months ago
parent 2174f8c21f
commit 4d7d7f06a7

@ -218,14 +218,14 @@
</pagination> </pagination>
</el-tab-pane> </el-tab-pane>
<el-tab-pane> <el-tab-pane>
<span slot="label">{{ workplaceName }}-单据类型</span> <span slot="label">{{ workplaceName }}-业务类型</span>
<el-form :inline="true" :model="busQuery" class="query-form" size="mini" <el-form :inline="true" :model="busQuery" class="query-form" size="mini"
style="margin-bottom: 10px" style="margin-bottom: 10px"
> >
<el-form-item class="query-form-item" label="单据类型编号/业务名称:"> <el-form-item class="query-form-item" label="业务类型编号/业务名称:">
<el-input <el-input
v-model="busQuery.busKey" v-model="busQuery.busKey"
placeholder="请输入单据类型编号/业务名称" placeholder="请输入业务类型编号/业务名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -244,7 +244,7 @@
> >
<el-button type="primary" @click="chooseBusType" <el-button type="primary" @click="chooseBusType"
icon="el-icon-plus" icon="el-icon-plus"
>新增单据类型 >新增业务类型
</el-button </el-button
> >
</el-button-group> </el-button-group>
@ -254,7 +254,7 @@
highlight-current-row highlight-current-row
> >
<el-table-column type="index" label="序号"></el-table-column> <el-table-column type="index" label="序号"></el-table-column>
<el-table-column label="单据类型编码 " prop="documentTypeCode"></el-table-column> <el-table-column label="业务类型编码 " prop="documentTypeCode"></el-table-column>
<el-table-column label="业务名称 " prop="busName"></el-table-column> <el-table-column label="业务名称 " prop="busName"></el-table-column>
<el-table-column label="仓库名称 " prop="invName"></el-table-column> <el-table-column label="仓库名称 " prop="invName"></el-table-column>
<el-table-column label="是否配套系统" prop="isMatching"> <el-table-column label="是否配套系统" prop="isMatching">
@ -700,8 +700,8 @@ export default {
}, },
busName: '', busName: '',
busTypeMap: { busTypeMap: {
'add': '新增单据类型', 'add': '新增业务类型',
'edit': '编辑单据类型' 'edit': '编辑业务类型'
}, },
formData: { formData: {
operationType: 1, operationType: 1,

@ -208,6 +208,7 @@
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
:page-sizes="[12, 24, 48]"
@pagination="handleCurrentChange" @pagination="handleCurrentChange"
></pagination> ></pagination>
</el-card> </el-card>
@ -306,6 +307,7 @@
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
:page-sizes="[12, 24, 48]"
@pagination="handleCurrentChange" @pagination="handleCurrentChange"
></pagination> ></pagination>
</div> </div>
@ -408,7 +410,7 @@ export default {
billNo: null, billNo: null,
tagStatus: null, tagStatus: null,
page: 1, page: 1,
limit: 10, limit: 12,
}, },
defaultSort: {prop: 'createTime', order: 'desc'}, defaultSort: {prop: 'createTime', order: 'desc'},
loading: false, loading: false,
@ -488,7 +490,12 @@ export default {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
onReset() { onReset() {
this.filterQuery = {}; this.filterQuery = {
billNo: null,
tagStatus: null,
page: 1,
limit: 12,
};
this.actDateRange = []; this.actDateRange = [];
this.getList(); this.getList();
}, },

@ -872,6 +872,7 @@ export default {
this.isLinkDisabled = true this.isLinkDisabled = true
this.selectBusTypeDisabled = true this.selectBusTypeDisabled = true
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true
this.workplaceId = Number(this.$route.query.workplaceId);
this.formData.workPlaceCode = Number(this.$route.query.workplaceId); this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
this.getWorkBindBusTypes(this.formData.workPlaceCode); this.getWorkBindBusTypes(this.formData.workPlaceCode);
} }

@ -418,18 +418,16 @@ export default {
}, },
methods: { methods: {
getBillNo(billNo,workPlaceCode){ getBillNo(billNo){
let post = { let post = {
billNo: billNo, billNo: billNo,
workPlaceCode: workPlaceCode,
page: 1, page: 1,
limit: 10, limit: 10,
} }
findByBill(post).then(res => { findByBill(post).then(res => {
if (res.code == 20000) { if (res.code == 20000) {
if (res.data.billNo != null){ if (res.data.list.length > 0){
this.formData = res.data this.formData = res.data.list[0]
this.startDeal();
} }
} }
}) })
@ -457,7 +455,7 @@ export default {
this.findFromInvList(""); this.findFromInvList("");
} }
if (this.formData.billNo != null){ if (this.formData.billNo != null){
this.getBillNo(this.formData.billNo,this.formData.workPlaceCode) this.getBillNo(this.formData.billNo)
}else { }else {
this.findCurOrder(); this.findCurOrder();
} }
@ -874,6 +872,7 @@ export default {
this.isLinkDisabled = true this.isLinkDisabled = true
this.selectBusTypeDisabled = true this.selectBusTypeDisabled = true
this.corpOrderIdDisabled = true this.corpOrderIdDisabled = true
this.workplaceId = Number(this.$route.query.workplaceId);
this.formData.workPlaceCode = Number(this.$route.query.workplaceId); this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
this.getWorkBindBusTypes(this.formData.workPlaceCode); this.getWorkBindBusTypes(this.formData.workPlaceCode);
} }

Loading…
Cancel
Save