wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

BUG 优化

dev
xiepeng 2024-04-25 18:01:55 +08:00
parent d291a9b98e
commit 9a445bc29b
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/electronic_waybill_management/waybill_registration/edit.vue
View File

@ -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;
};

62
src/views/security_investment/extraction_and_use/index.vue
View File

@ -29,7 +29,7 @@
</el-col>
<el-col :span="12">
<el-form-item class="end">
<el-button v-print="'#printContent'"> 打印 </el-button>
<el-button v-print="'#printContent'"> 打印</el-button>
</el-form-item>
</el-col>
</el-row>
@ -81,29 +81,29 @@
<div id="printContent">
<table class="print_use">
<thead>
<tr>
<th rowspan="2" style="width: 55px">日期</th>
<th rowspan="2" style="width: 70px">预提额</th>
<th rowspan="2" style="width: 85px">用途摘要</th>
<th colspan="10" class="tc">费用项目</th>
<th rowspan="2" style="width: 55px">余额</th>
</tr>
<tr>
<th v-for="(item, index) in costItems" :key="index">
{{ item }}
</th>
</tr>
<tr>
<th rowspan="2" style="width: 55px">日期</th>
<th rowspan="2" style="width: 70px">预提额</th>
<th rowspan="2" style="width: 85px">用途摘要</th>
<th colspan="10" class="tc">费用项目</th>
<th rowspan="2" style="width: 55px">余额</th>
</tr>
<tr>
<th v-for="(item, index) in costItems" :key="index">
{{ item }}
</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in list" :key="index">
<td>{{ item.USE_DATE }}</td>
<td>{{ item.USE_TYPE === "1" ? item.AMOUNT : "" }}</td>
<td>{{ item.USE_TYPE === "2" ? item.PURPOSESUMMARY : "" }}</td>
<td v-for="(item1, index1) in costItems" :key="index1">
{{ item.TYPE === item1 ? item.AMOUNT : "" }}
</td>
<td>{{ item.TOTAL }}</td>
</tr>
<tr v-for="(item, index) in list" :key="index">
<td>{{ item.USE_DATE }}</td>
<td>{{ item.USE_TYPE === "1" ? item.AMOUNT : "" }}</td>
<td>{{ item.USE_TYPE === "2" ? item.PURPOSESUMMARY : "" }}</td>
<td v-for="(item1, index1) in costItems" :key="index1">
{{ item.TYPE === item1 ? item.AMOUNT : "" }}
</td>
<td>{{ item.TOTAL }}</td>
</tr>
</tbody>
</table>
<div v-html="PRINT_STYLE" />
@ -121,7 +121,7 @@
import useListData from "@/assets/js/useListData.js";
import {
getExtractionAndUseList,
setExtractionAndUseBatchDelete,
setExtractionAndUseBatchDelete
} from "@/request/security_investment.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
@ -147,15 +147,17 @@ const costItems = [
"应急管理、事故救援演练以及救援队伍建设",
"安全标志及标识",
"配备劳动防护用品",
"其它与安全生产直接相关的物品或者活动",
"其它与安全生产直接相关的物品或者活动"
];
const total = await getExtractionAndUseList();
console.log(total);
const addDialogVisible = ref(false);
const { list, searchForm, fnGetData, tableRef } = useListData(
getExtractionAndUseList,
{
usePagination: false,
defaultSearchForm: {
YEAR: new Date().getFullYear(),
YEAR: new Date().getFullYear()
},
callbackFn: (list) => {
for (let i = 0; i < list.length; i++) {
@ -168,7 +170,7 @@ const { list, searchForm, fnGetData, tableRef } = useListData(
else list[i].TOTAL = list[i - 1].TOTAL - list[i].AMOUNT;
}
}
},
}
}
);
const fnGetSummaries = ({ columns, data }) => {
@ -178,6 +180,13 @@ const fnGetSummaries = ({ columns, data }) => {
sums[index] = "合计";
return;
}
// var arr = ref([5, 6, 7, 8, 9, 10, 11, 12, 13, 14])
// if (arr.includes(index)) {
// sums[index] = total.allOutlayTotalList[index - 5].total;
// return;
// }
if (index !== columns.length - 1) {
sums[index] = "--";
return;
@ -212,7 +221,6 @@ const fnDelete = debounce(
await setExtractionAndUseBatchDelete({ DATA_IDS });
ElMessage.success("删除成功");
fnGetData();
},
{ atBegin: true }
);