diff --git a/src/utils/dict.js b/src/utils/dict.js
index 22b7df14..4ea6c05d 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -141,7 +141,8 @@ export const DICT_TYPE = {
HANDLE_RESULT: 'handle_result',
//借阅状态
BORROW_STATUS: 'borrow_status',
- //
+ //会计凭证类型
+ ACCOUNTING_VOUCHER_TYPE: 'accounting_voucher_type',
}
diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue
index 1f4bfdb6..22985f6f 100644
--- a/src/views/accounting/voucher/index.vue
+++ b/src/views/accounting/voucher/index.vue
@@ -94,7 +94,14 @@
-
+
+
+
+
+
-
+
+
@@ -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) => {
diff --git a/src/views/setting/depotCabinet/index.vue b/src/views/setting/depotCabinet/index.vue
index 61c428dc..40ec4e73 100644
--- a/src/views/setting/depotCabinet/index.vue
+++ b/src/views/setting/depotCabinet/index.vue
@@ -175,8 +175,16 @@
-
-
+
+
+
+
+
@@ -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;