Merge remote-tracking branch 'origin/main'

main
JiilingLee 1 year ago
commit 4339a7358a

@ -141,7 +141,8 @@ export const DICT_TYPE = {
HANDLE_RESULT: 'handle_result',
//借阅状态
BORROW_STATUS: 'borrow_status',
//
//会计凭证类型
ACCOUNTING_VOUCHER_TYPE: 'accounting_voucher_type',
}

@ -94,7 +94,14 @@
<el-table-column label="纸档位置" align="center" prop="position" />
<el-table-column label="审核人" align="center" prop="audit" />
<el-table-column label="制单人" align="center" prop="createBy" />
<el-table-column label="凭证类型" align="center" prop="type" />
<el-table-column label="凭证类型" align="center" prop="type">
<template v-slot="scope">
<dict-tag
:type="DICT_TYPE.ACCOUNTING_INVOICES_CHECK"
:value="scope.row.type"
/>
</template>
</el-table-column>
<el-table-column label="完整性" align="center" prop="cherks">
<template v-slot="scope">
<dict-tag
@ -155,7 +162,13 @@
<el-col :span="8">
<el-form-item label="凭证类型" prop="type">
<el-select v-model="form.type" placeholder="请选择凭证类型">
<el-option label="请选择字典生成" value="" />
<el-option
v-for="item in typeOptions"
:key="item.id"
:value="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
@ -276,6 +289,7 @@ import {
} from "@/api/accounting/voucher";
import { listUser } from "@/api/system/user";
import { getSiteTree } from "@/api/setting/organization";
import { listData } from "@/api/system/dict/data";
export default {
name: "Voucher",
@ -343,6 +357,7 @@ export default {
userOptions: [], //
siteOptions: [], //
siteArray: [], //
typeOptions: [], //
audit: null,
checker: null,
handle: null,
@ -352,6 +367,7 @@ export default {
this.getList();
this.getUserList();
this.getSiteList();
this.handleInitList();
},
methods: {
/** 查询列表 */
@ -364,6 +380,17 @@ export default {
this.loading = false;
});
},
//
handleInitList() {
//
listData({
pageNo: 1,
pageSize: 100,
dictType: "accounting_voucher_type",
}).then((res) => {
this.typeOptions = res.data.list || [];
});
},
//
getSiteList() {
getSiteTree().then((response) => {

@ -175,8 +175,16 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="库房地址" prop="address">
<el-input v-model="form.address" placeholder="请输入库房地址" />
<el-form-item label="库房" prop="depotId">
<el-select v-model="form.depotId" placeholder="请选择库房">
<el-option
v-for="item in addressList"
:key="item.id"
:value="item.id"
:label="item.name"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@ -224,7 +232,7 @@ import {
getDepotCabinetPage,
exportDepotCabinetExcel,
} from "@/api/setting/depotCabinet";
// import { getDepotPage } from "@/api/setting/depot";
import { getDepotPage } from "@/api/setting/depot";
import { listUser } from "@/api/system/user";
export default {
@ -269,11 +277,13 @@ export default {
//
rules: {},
userOptions: [], //
addressList: [], //
manegerName: null,
};
},
created() {
this.getList();
this.getAddressList();
this.getUserList();
},
methods: {
@ -293,6 +303,17 @@ export default {
this.userOptions = response.data.list;
});
},
//
getAddressList() {
getDepotPage().then((response) => {
this.addressList = response.data.list;
});
},
// handleSelectAddress(val) {
// console.log(val);
// this.form.depotId = val.id;
// this.form.depotName = val.name;
// },
handleSelectUser(val) {
console.log(val);
this.form.manegerId = val.id;

Loading…
Cancel
Save