diff --git a/jwtech-admin-page/src/api/build/sectionInfo.js b/jwtech-admin-page/src/api/build/sectionInfo.js index 91b87549..0aae7999 100644 --- a/jwtech-admin-page/src/api/build/sectionInfo.js +++ b/jwtech-admin-page/src/api/build/sectionInfo.js @@ -1,5 +1,12 @@ import request from '@/utils/request' +// 批量导入模版 +export function tagTemplate(id) { + return request({ + url: '/build/sectionInfo/exportTemplate', + method: 'get' + }) +} // 查询标段基本信息管理列表 export function listSectionInfo(query) { return request({ diff --git a/jwtech-admin-page/src/components/map/index.vue b/jwtech-admin-page/src/components/map/index.vue index 770d27bd..849eef75 100644 --- a/jwtech-admin-page/src/components/map/index.vue +++ b/jwtech-admin-page/src/components/map/index.vue @@ -819,15 +819,14 @@ export default { // 保存绘制 handleSaveCoords() { + this.all_point_coords = this.pointVectorSource + .getFeatures() + .map((item) => item.geometryChangeKey_.target.flatCoordinates); if (this.all_point_coords.length == 0 && this.all_line_coords == 0) { this.$message.warning("暂无需要保存数据"); return; } - this.all_point_coords = this.pointVectorSource - .getFeatures() - .map((item) => item.geometryChangeKey_.target.flatCoordinates); - let lineArr = []; let dataArr = this.lineVectorSource.getFeatures(); diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue index 9808b8b1..ce6f4b59 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/clockingIn.vue @@ -312,10 +312,12 @@ icon="el-icon-download" size="mini" @click="importTemplate" + style="font-size: 14px" >模版下载 - 提示:仅允许导入“xls”或“xlsx”格式文件!提示:仅允许导入“xls”或“xlsx”格式文件! + 需要优先在农民工花名册中导入农民工信息! diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/jlProjectmanager.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/jlProjectmanager.vue index 05a2694a..fbdf8702 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/jlProjectmanager.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/jlProjectmanager.vue @@ -508,6 +508,26 @@ export default { recordClose() { this.recordForm = {}; }, + handleDeleteRecord(row) { + const ids = row.id || this.ids; + if (ids) { + this.$confirm("是否删除选中的数据?", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(function () { + return delSupervisorAttendance(ids); + }) + .then(() => { + this.getList(); + this.msgSuccess("删除成功"); + }) + .catch(function () {}); + } else { + this.$message.warning("请选择要删除的数据!!"); + } + }, /** 查询项目管理人员列表 */ getList() { this.loading = true; diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue index 6dd53b51..d97cb00f 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/realNameSystem.vue @@ -638,9 +638,10 @@ icon="el-icon-download" size="mini" @click="importTemplate" + style="font-size: 14px" >模版下载 - 提示:仅允许导入“xls”或“xlsx”格式文件! diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/sgProjectmanager.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/sgProjectmanager.vue index 203daf2d..74e02f24 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/sgProjectmanager.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/sgProjectmanager.vue @@ -509,6 +509,26 @@ export default { recordClose() { this.recordForm = {}; }, + handleDeleteRecord(row) { + const ids = row.id || this.ids; + if (ids) { + this.$confirm("是否删除选中的数据?", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(function () { + return delConstructionAttendance(ids); + }) + .then(() => { + this.getList(); + this.msgSuccess("删除成功"); + }) + .catch(function () {}); + } else { + this.$message.warning("请选择要删除的数据!!"); + } + }, /** 查询项目管理人员列表 */ getList() { this.loading = true; diff --git a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue index a4f91c03..6f8dc871 100644 --- a/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue +++ b/jwtech-admin-page/src/views/building/peasantWorkerSystem/options/specificMarginAccount.vue @@ -833,7 +833,26 @@ export default { recordClose() { this.recordForm = {}; }, - handleDeleteRecord() {}, + handleDeleteRecord(row) { + const ids = row.id || this.ids; + if (ids) { + this.$confirm("是否删除选中的数据?", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(function () { + return delGzbzj(ids); + }) + .then(() => { + this.getList(); + this.msgSuccess("删除成功"); + }) + .catch(function () {}); + } else { + this.$message.warning("请选择要删除的数据!!"); + } + }, /** 查询农民工工资专用账户列表 */ getList() { this.loading = true; diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue index ead365f1..0fe65c73 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg/options/sectionProject.vue @@ -55,6 +55,16 @@ >新增 + + 批量导入 + 修改 + + + + + + + + + + + + + 点击上传 + + + + 模版下载 + 提示:仅允许导入“xls”或“xlsx”格式文件! + + + + + + + + +