diff --git a/jwtech-admin-page/src/api/build/unpaidWages.js b/jwtech-admin-page/src/api/build/unpaidWages.js new file mode 100644 index 00000000..635a44a1 --- /dev/null +++ b/jwtech-admin-page/src/api/build/unpaidWages.js @@ -0,0 +1,53 @@ +import request from '@/utils/request' + +// 查询欠薪情况列表 +export function listUnpaidWages(query) { + return request({ + url: '/build/unpaidWages/list', + method: 'post', + data: query + }) +} + +// 查询欠薪情况详细 +export function getUnpaidWages(id) { + return request({ + url: '/build/unpaidWages/' + id, + method: 'get' + }) +} + +// 新增欠薪情况 +export function addUnpaidWages(data) { + return request({ + url: '/build/unpaidWages', + method: 'post', + data: data + }) +} + +// 修改欠薪情况 +export function updateUnpaidWages(data) { + return request({ + url: '/build/unpaidWages', + method: 'put', + data: data + }) +} + +// 删除欠薪情况 +export function delUnpaidWages(id) { + return request({ + url: '/build/unpaidWages/' + id, + method: 'delete' + }) +} + +// 导出欠薪情况 +export function exportUnpaidWages(query) { + return request({ + url: '/build/unpaidWages/export', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/jwtech-admin-page/src/main.js b/jwtech-admin-page/src/main.js index 8db4d0cc..a64db01b 100644 --- a/jwtech-admin-page/src/main.js +++ b/jwtech-admin-page/src/main.js @@ -64,8 +64,8 @@ Vue.prototype.$formatAdcd=function(row) { if (row.adcd) { let provinceCode = row.adcd.slice(0, 2); let cityCode = row.adcd.slice(2, 4); - let areaCode = row.adcd.slice(4, 6); - if (areaCode != "00") { + let areaCode = row.adcd.slice(4); + if (areaCode != "00"|| areaCode.length > 2) { return ( codeToText[provinceCode] + "-" + diff --git a/jwtech-admin-page/src/views/building/partyConstructionDevelopment/index.vue b/jwtech-admin-page/src/views/building/partyConstructionDevelopment/index.vue index 0c955871..2320f457 100644 --- a/jwtech-admin-page/src/views/building/partyConstructionDevelopment/index.vue +++ b/jwtech-admin-page/src/views/building/partyConstructionDevelopment/index.vue @@ -307,7 +307,7 @@ export default { }, proQueryParams: { pageNum: 1, - pageSize: 10, + pageSize: 50, ids: null, data: {}, // 排序方式 @@ -336,9 +336,7 @@ export default { }, created() { this.getList(); - listInfo(this.proQueryParams).then((response) => { - this.projectNameOptions = response.records; - }); + this.getDicts("whether").then((response) => { this.isCarryOptions = response.data; }); @@ -354,7 +352,10 @@ export default { listDjjgd(this.queryParams).then((response) => { this.djjgdList = response.records; this.total = response.total; - this.loading = false; + listInfo(this.proQueryParams).then((response) => { + this.projectNameOptions = response.records; + this.loading = false; + }); }); }, // 是否开展字典翻译 @@ -439,6 +440,8 @@ export default { if (this.form.attachment) { this.fileList = JSON.parse(this.form.attachment); } + this.form.projectName = + this.form.projectName + "[" + this.form.proCode + "]"; this.open = true; this.title = "修改党建工地开展情况"; }); @@ -450,6 +453,15 @@ export default { if (this.fileList.length) { this.form.attachment = JSON.stringify(this.fileList); } + if ( + this.form.projectName && + this.form.projectName.indexOf("[") != -1 + ) { + this.form.projectName = this.form.projectName.slice( + 0, + this.form.projectName.indexOf("[") + ); + } if (this.form.id != null) { updateDjjgd(this.form).then((response) => { if (response.code === 200) { diff --git a/jwtech-admin-page/src/views/building/projectInfo/index.vue b/jwtech-admin-page/src/views/building/projectInfo/index.vue index 0114825d..6402129c 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/index.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/index.vue @@ -124,7 +124,7 @@ align="center" prop="adcd" min-width="120" - :formatter="formatAdcd" + :formatter="$formatAdcd" /> --> - + {{ this.proMsg.isMajorProject }} - + diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue index c738535d..9808b8b1 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue @@ -488,6 +488,7 @@ export default { // excel表上传 handleChange(file, fileList) { // console.log(22222222); + if (file.status !== "ready") return; this.uploadParams.fileTemp = file.raw; // console.log(this.uploadParams.fileTemp); // 判断上传文件格式 @@ -548,20 +549,34 @@ export default { outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]); //outdata就是读取excel内容之后输出的东西 this.da = [...outdata]; let arr = []; + let successNo = 0; this.da.map((v) => { console.log(7777, v); + let obj = {}; obj.attendanceDay = v["考勤天数"]; //ip是表的标题 - obj.attendanceYear = v["考勤所属年月"].setMonth( - v["考勤所属年月"].getMonth() + 1 + obj.attendanceYear = v["考勤所属年月"]?.setMonth( + v["考勤所属年月"]?.getMonth() + 1 ); //ip是表的标题 obj.idNo = v["身份证"]; //ip是表的标题 obj.name = v["姓名"]; //ip是表的标题 if (obj.idNo && obj.name) { + successNo += 1; arr.push(obj); } }); + if (this.da.length > 0) { + _this.$message({ + type: "success", + message: + "一共" + + this.da.length + + "条数据，成功导入" + + successNo + + "条数据", + }); + } //return arr // 把读取的excel表格中的内容放进tableData中(这里要改成自己的表的名字) _this.uploadParams.tableData = diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue index 9348575b..0a8142d4 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/realNameSystem.vue @@ -161,32 +161,44 @@ prop="name" min-width="120" /> + + + - - - - + - + --> - + - - + + @@ -803,7 +807,7 @@ export default { }, // 职务字典 postOptions: [], - // 工种分类字典 + // 工种字典 tradesOptions: [], // 民族字典 @@ -868,7 +872,8 @@ export default { }, // excel表上传 handleChange(file, fileList) { - // console.log(22222222); + // console.log(22222222, file); + if (file.status !== "ready") return; this.uploadParams.fileTemp = file.raw; // console.log(this.uploadParams.fileTemp); // 判断上传文件格式 @@ -941,17 +946,17 @@ export default { arr.push(obj); } }); - // if (this.da.length > 0) { - // _this.$message({ - // type: "success", - // message: - // "一共" + - // this.da.length + - // "条数据，成功导入" + - // successNo + - // "条数据", - // }); - // } + if (this.da.length > 0) { + _this.$message({ + type: "success", + message: + "一共" + + this.da.length + + "条数据，成功导入" + + successNo + + "条数据", + }); + } //return arr // 把读取的excel表格中的内容放进tableData中(这里要改成自己的表的名字) diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/unpaidSituation.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/unpaidSituation.vue index 5547ae29..b916038b 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/unpaidSituation.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/unpaidSituation.vue @@ -1,3 +1,630 @@ + + + diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue index 40125b67..2bf715c4 100644 --- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue +++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue @@ -32,6 +32,10 @@ {{ this.projectAcceptanceMsg.projectName }} + + {{ this.projectAcceptanceMsg.proCode }} + + {{ this.projectAcceptanceMsg.projectLegal }} @@ -311,6 +315,15 @@ + + + + + { if (valid) { - this.form.projectName = this.form.projectName.slice( - 0, - this.form.projectName.indexOf("[") - ); + // this.form.projectName = this.form.projectName.slice( + // 0, + // this.form.projectName.indexOf("[") + // ); this.form.proNo = this.proNo; this.form.proCode = this.proCode; diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue index f60f7631..354b5646 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/index.vue @@ -114,7 +114,7 @@ align="center" prop="adcd" min-width="120" - :formatter="formatAdcd" + :formatter="$formatAdcd" /> --> - - - - - - + + + + + + --> - - - - - - - - + + + + + + + + - {{ formatAdcd(this.specialMsg) }} + {{ $formatAdcd(this.specialMsg) }} diff --git a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue index 9283f8ad..ac501ee4 100644 --- a/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue +++ b/jwtech-admin-page/src/views/projectStatistics/projectStatisticsSort/components/list.vue @@ -100,7 +100,7 @@ align="center" prop="adcd" min-width="120" - :formatter="formatAdcd" + :formatter="$formatAdcd" /> -->