diff --git a/src/views/electronic_waybill_management/waybill_registration/edit.vue b/src/views/electronic_waybill_management/waybill_registration/edit.vue
index 186eb7e..1a242ed 100644
--- a/src/views/electronic_waybill_management/waybill_registration/edit.vue
+++ b/src/views/electronic_waybill_management/waybill_registration/edit.vue
@@ -409,7 +409,7 @@ const fnGetData = async () => {
data.form.DISPATCHER = data.form.DISPATCHER.split(",");
data.form.SHIPPINGADDRESS = data.form.SHIPPING_ADDR; // 起运地址
data.form.DESTINATIONADDRESS = data.form.DESTINATION_ADDR; // 目的地址
- data.userList = data.form.names; // 获取部门下的|或有人员
+ data.userList = data.form.deptList; // 获取部门下的所有人员
data.form.CLIENTCONTACTPHONE = data.form.ENTRUST_PHONE;
data.form.CONFIRMINGPHONE = data.form.CONFIRM_PHONE;
data.form.STARTADMINISTRATIVEAREA = data.form.DEPARTURE_ADDR;
@@ -624,6 +624,7 @@ const fnDepartmentChange = async () => {
};
const fnGetUser = async (DEPARTMENT_ID) => {
const resData = await getUserListAll({ DEPARTMENT_ID });
+ console.log(resData);
data.userList = resData.userList;
};
diff --git a/src/views/security_investment/extraction_and_use/index.vue b/src/views/security_investment/extraction_and_use/index.vue
index 133b259..2b0388b 100644
--- a/src/views/security_investment/extraction_and_use/index.vue
+++ b/src/views/security_investment/extraction_and_use/index.vue
@@ -29,7 +29,7 @@
日期 | -预提额 | -用途摘要 | -费用项目 | -余额 | -|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
- {{ item }} - | -|||||||||||||
日期 | +预提额 | +用途摘要 | +费用项目 | +余额 | +|||||||||
+ {{ item }} + | +|||||||||||||
{{ item.USE_DATE }} | -{{ item.USE_TYPE === "1" ? item.AMOUNT : "" }} | -{{ item.USE_TYPE === "2" ? item.PURPOSESUMMARY : "" }} | -- {{ item.TYPE === item1 ? item.AMOUNT : "" }} - | -{{ item.TOTAL }} | -|||||||||
{{ item.USE_DATE }} | +{{ item.USE_TYPE === "1" ? item.AMOUNT : "" }} | +{{ item.USE_TYPE === "2" ? item.PURPOSESUMMARY : "" }} | ++ {{ item.TYPE === item1 ? item.AMOUNT : "" }} + | +{{ item.TOTAL }} | +