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

Compare commits

base: wangpeng:1306882ed0d7fd357888d6e967cd8c954ade964e
Branches Tags
wangpeng:dev
wangpeng:main
..
compare: wangpeng:8619753b0a6e2628b9c822fe0e59ccd4a98ea6df
Branches Tags
wangpeng:dev
wangpeng:main

No commits in common. "1306882ed0d7fd357888d6e967cd8c954ade964e" and "8619753b0a6e2628b9c822fe0e59ccd4a98ea6df" have entirely different histories.
1306882ed0 ... 8619753b0a

2 changed files with 12 additions and 67 deletions
Show Stats Expand all files Collapse all files

38
src/views/enterprise_management/basics_info_management/operation_vehicle/index.vue
View File

@ -69,7 +69,7 @@
</el-select>
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-col :span="10">
<el-form-item label-width="10px">
<el-button type="primary" native-type="submit">搜索</el-button>
<el-button native-type="reset" @click="fnResetPaginationTransfer"
@ -77,12 +77,9 @@
>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="30">
<el-form-item label-width="10px" class="end">
<el-button type="primary" @click="fnImportDialogChangeShow">
导入
</el-button>
<el-button type="primary" @click="fnExport">导出</el-button>
<el-button @click="fnExport">导出</el-button>
</el-form-item>
</el-col>
</el-row>
@ -173,11 +170,6 @@
</template>
</layout-table>
</layout-card>
<layout-import-file
v-model:visible="data.importDialogVisible"
template-url="/template/truckExcelTemplate.xls"
@submit="fnSubmitImport"
/>
</div>
</template>
@ -194,15 +186,8 @@ import useButtonJurisdiction from "@/assets/js/useButtonJurisdiction.js";
import { debounce } from "throttle-debounce";
import { ElMessage, ElMessageBox } from "element-plus";
import { NETWORK_STATE } from "@/assets/js/constant.js";
import { reactive } from "vue";
import { setFreightTrailerImport } from "@/request/enterprise_management.js";
const router = useRouter();
const data = reactive({
importDialogVisible: false,
});
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
useListData(getOperationVehicleList, {});
const troubleshootingCycleList = await layoutFnGetVehicleColor();
@ -228,23 +213,6 @@ const fnDelete = debounce(
{ atBegin: true }
);
const fnImportDialogChangeShow = () => {
data.importDialogVisible = !data.importDialogVisible;
};
const fnSubmitImport = async (formData) => {
const resData = await setFreightTrailerImport(formData);
if (resData.resultStr) {
ElMessage({
dangerouslyUseHTMLString: true,
message: resData.resultStr,
type: resData.resultType,
});
}
fnImportDialogChangeShow();
fnResetPaginationTransfer();
};
const fnExport = async () => {
const selectionData = tableRef.value.getSelectionRows();
if (selectionData.length === 0) {

41
src/views/mechanical_files/inspect_annually/index.vue
View File

@ -56,7 +56,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-form-item label="提醒状态" prop="REMINDER_STATUS">
<el-select v-model="searchForm.REMINDER_STATUS">
<el-option
@ -76,10 +76,9 @@
</el-button>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="2">
<el-form-item label-width="10px" class="end">
<el-button type="primary" @click="fnImportDialogChangeShow">导入</el-button>
<el-button type="primary" @click="fnExport">导出</el-button>
<el-button link @click="fnExport">导出</el-button>
</el-form-item>
</el-col>
</el-row>
@ -212,10 +211,10 @@
</template>
</layout-table>
</layout-card>
<layout-import-file
v-model:visible="data.importDialogVisible"
template-url="/template/truckExcelTemplate.xls"
@submit="fnSubmitImport"
<export-excel
v-model:visible="data.exportExcelDialog.visible"
:search-form="searchForm"
:ids="data.exportExcelDialog.ids"
/>
</div>
</template>
@ -230,6 +229,7 @@ import {
setInspectAnnuallyDelete,
setInspectAnnuallyEdit2,
} from "@/request/mechanical_files.js";
import ExportExcel from "./components/export_excel.vue";
import { reactive } from "vue";
import { debounce } from "throttle-debounce";
import { ElMessageBox, ElMessage } from "element-plus";
@ -238,15 +238,12 @@ import {
DUE_STATUS_LIST,
REMINDER_STATUS_LIST,
} from "@/assets/js/constant.js";
import { setFreightTrailerImport } from "@/request/enterprise_management.js";
import LayoutImportFile from "@/components/import_file/index.vue";
const router = useRouter();
const data = reactive({
exportExcelDialog: {
visible: false,
ids: [],
},
importDialogVisible: false,
});
const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
useListData(getInspectAnnuallyList);
@ -309,26 +306,8 @@ const fnStatusChange = debounce(
);
const buttonJurisdiction = await useButtonJurisdiction("hidden");
const fnImportDialogChangeShow = () => {
data.importDialogVisible = !data.importDialogVisible;
};
const fnSubmitImport = async (formData) => {
const resData = await setFreightTrailerImport(formData);
if (resData.resultStr) {
ElMessage({
dangerouslyUseHTMLString: true,
message: resData.resultStr,
type: resData.resultType,
});
}
fnImportDialogChangeShow();
fnResetPaginationTransfer();
};
const fnExport = async () => {
const selectionData = tableRef.value.getSelectionRows();
console.log("selectionData",selectionData);
if (selectionData.length === 0) {
ElMessage.warning("请选择需要导出至excel报表的记录信息");
return;
@ -339,14 +318,12 @@ const fnExport = async () => {
.join(",");
window.location.href =
import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] +
"/inspectAnnually/excel?" +
"/operatingvehicles/excel?" +
"&KEYWORDS=" +
(searchForm.value.KEYWORDS || "") +
"&DATA_IDS=" +
DATA_IDS;
};
</script>
<style scoped></style>