diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java index c1cc076c..8643408a 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java @@ -25,10 +25,18 @@ public class ProProjectChecked extends BaseEntity @Excel(name = "公司主键") private Long comId; + /** 公司名称 */ + @Excel(name = "公司名称") + private String comName; + /** 项目主键 */ @Excel(name = "项目主键") private Long projectId; + /** 项目名称 */ + @Excel(name = "项目名称") + private String projectName; + /** 验收类型 */ @Excel(name = "验收类型") private String checkType; @@ -124,7 +132,16 @@ public class ProProjectChecked extends BaseEntity { return comId; } - public void setProjectId(Long projectId) + + public String getComName() { + return comName; + } + + public void setComName(String comName) { + this.comName = comName; + } + + public void setProjectId(Long projectId) { this.projectId = projectId; } @@ -133,7 +150,16 @@ public class ProProjectChecked extends BaseEntity { return projectId; } - public void setCheckType(String checkType) + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public void setCheckType(String checkType) { this.checkType = checkType; } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java index 9048125c..443382fa 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java @@ -1,6 +1,8 @@ package com.yanzhu.manage.mapper; import java.util.List; +import java.util.Map; + import com.yanzhu.manage.domain.ProProjectChecked; /** @@ -27,6 +29,14 @@ public interface ProProjectCheckedMapper */ public List selectProProjectCheckedList(ProProjectChecked proProjectChecked); + /** + * 查询项目举牌验收列表 + * + * @param proProjectChecked 项目举牌验收 + * @return 项目举牌验收集合 + */ + public List> selectProProjectCheckedListCount(ProProjectChecked proProjectChecked); + /** * 新增项目举牌验收 * diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml index 71072be9..a1218e21 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml @@ -7,7 +7,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -34,30 +36,63 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, com_id, project_id, check_type, main_image, image_urls, working_position, working_position_type, checking_num, check_result, intro, technician_user, technician_user_name, supervise_user, supervise_user_name, group_dept_user, group_dept_user_name, checking_date, checking_files, is_del, approve_status, create_by, create_time, update_by, update_time, remark from pro_project_checked + select ppc.id, ppc.com_id, sd.dept_name as com_name, ppc.project_id, pi.project_name, ppc.check_type, ppc.main_image, ppc.image_urls, ppc.working_position, ppc.working_position_type, ppc.checking_num, ppc.check_result, ppc.intro, ppc.technician_user, ppc.technician_user_name, ppc.supervise_user, ppc.supervise_user_name, ppc.group_dept_user, ppc.group_dept_user_name, ppc.checking_date, ppc.checking_files, ppc.is_del, ppc.approve_status, ppc.create_by, ppc.create_time, ppc.update_by, ppc.update_time, ppc.remark + from pro_project_checked ppc + left join pro_project_info pi on pi.id = ppc.project_id + left join sys_dept sd on sd.dept_id = ppc.com_id - + + + diff --git a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/SysExpressionController.java b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/SysExpressionController.java index fa362f54..59e3d112 100644 --- a/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/SysExpressionController.java +++ b/yanzhu-modules/yanzhu-flowable/src/main/java/com/yanzhu/flowable/controller/SysExpressionController.java @@ -24,8 +24,10 @@ import java.util.List; @RestController @RequestMapping("/expression") public class SysExpressionController extends BaseController { + @Autowired private ISysExpressionService sysExpressionService; + private Long id; /** diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java index 6cf55836..8f492715 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Map; /** * 项目举牌验收Controller @@ -102,4 +103,19 @@ public class ProProjectCheckedController extends BaseController { return toAjax(proProjectCheckedService.deleteProProjectCheckedByIds(ids)); } + + /** + * 查询项目举牌验收列表 + */ + @RequiresPermissions("manage:projectChecked:list") + @GetMapping("/listCount") + public AjaxResult listCount(ProProjectChecked proProjectChecked) + { + startPage(); + if(proProjectChecked.getProjectId()==null){ + proProjectChecked.setProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId()); + } + List> list = proProjectCheckedService.selectProProjectCheckedListCount(proProjectChecked); + return success(list); + } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java index ad071c5c..dabe2a91 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java @@ -1,6 +1,8 @@ package com.yanzhu.manage.service; import java.util.List; +import java.util.Map; + import com.yanzhu.manage.domain.ProProjectChecked; /** @@ -27,6 +29,14 @@ public interface IProProjectCheckedService */ public List selectProProjectCheckedList(ProProjectChecked proProjectChecked); + /** + * 查询项目举牌验收列表 + * + * @param proProjectChecked 项目举牌验收 + * @return 项目举牌验收集合 + */ + public List> selectProProjectCheckedListCount(ProProjectChecked proProjectChecked); + /** * 新增项目举牌验收 * diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java index 251db92c..2da2ecff 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** * 项目举牌验收Service业务层处理 @@ -59,6 +60,17 @@ public class ProProjectCheckedServiceImpl implements IProProjectCheckedService return proProjectCheckedMapper.selectProProjectCheckedList(proProjectChecked); } + /** + * 查询项目举牌验收列表 + * + * @param proProjectChecked 项目举牌验收 + * @return 项目举牌验收集合 + */ + @Override + public List> selectProProjectCheckedListCount(ProProjectChecked proProjectChecked){ + return proProjectCheckedMapper.selectProProjectCheckedListCount(proProjectChecked); + } + /** * 新增项目举牌验收 * diff --git a/yanzhu-ui-app/miniprogram/api/project.js b/yanzhu-ui-app/miniprogram/api/project.js index 3dd33591..ae3d648f 100644 --- a/yanzhu-ui-app/miniprogram/api/project.js +++ b/yanzhu-ui-app/miniprogram/api/project.js @@ -337,4 +337,24 @@ export function getYsToken(id){ url: '/manage/videoMonitor/getYsToken/' + id, method: 'get' }) - } \ No newline at end of file + } + + + // 举牌验收管理 +export function projectCheckedList(query) { + return request({ + url: '/manage/projectChecked/list', + method: 'get', + params: query + }) +} + + // 举牌验收管理 + export function projectCheckedListCount(query) { + return request({ + url: '/manage/projectChecked/listCount', + method: 'get', + params: query + }) +} + diff --git a/yanzhu-ui-app/miniprogram/app.json b/yanzhu-ui-app/miniprogram/app.json index ace2ab8c..0d048308 100644 --- a/yanzhu-ui-app/miniprogram/app.json +++ b/yanzhu-ui-app/miniprogram/app.json @@ -40,7 +40,11 @@ "project_magusers/info/index", "project_schedule/list/index", "project_schedule/add/index", - "project_schedule/info/index" + "project_schedule/info/index", + "project_checked/list/index", + "project_checked/add/index", + "project_checked/info/index", + "project_checked/handle/index" ], "independent": false } diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js new file mode 100644 index 00000000..42dd5dd0 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.js @@ -0,0 +1,66 @@ +// pageage/project_checked/add/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.json b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.json new file mode 100644 index 00000000..3928faa4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxml new file mode 100644 index 00000000..e2312f5f --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxml @@ -0,0 +1,2 @@ + +pageage/project_checked/add/index.wxml \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxss new file mode 100644 index 00000000..b8edd84f --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/add/index.wxss @@ -0,0 +1 @@ +/* pageage/project_checked/add/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.js new file mode 100644 index 00000000..8b547f86 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.js @@ -0,0 +1,66 @@ +// pageage/project_checked/handle/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.json b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.json new file mode 100644 index 00000000..3928faa4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.wxml new file mode 100644 index 00000000..ff1f9e04 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.wxml @@ -0,0 +1,2 @@ + +pageage/project_checked/handle/index.wxml \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.wxss new file mode 100644 index 00000000..3476de30 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/handle/index.wxss @@ -0,0 +1 @@ +/* pageage/project_checked/handle/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js new file mode 100644 index 00000000..f71997ed --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.js @@ -0,0 +1,66 @@ +// pageage/project_checked/info/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.json b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.json new file mode 100644 index 00000000..3928faa4 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml new file mode 100644 index 00000000..b4c1d93e --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxml @@ -0,0 +1,2 @@ + +pageage/project_checked/info/index.wxml \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxss new file mode 100644 index 00000000..01ad0f4e --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/info/index.wxss @@ -0,0 +1 @@ +/* pageage/project_checked/info/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js new file mode 100644 index 00000000..47271e69 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.js @@ -0,0 +1,233 @@ +import config from '../../../config' +import { + getToken, + getUserInfo +} from '../../../utils/auth' +import { + projectCheckedList, + projectCheckedListCount +} from '../../../api/project' +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + addFlag: false, + projectId: "", + projectName: "", + initData: {}, + pageNum: 1, + pageSize: 10, + total: 0, + listData: [], + activeState: "jxz", + qbCount: 0, + jxzCount: 0, + ywcCount: 0, + imgBaseUrl: config.baseImgUrl, + projectUserInfo: {} + }, + + //项目切换 返回值 + onProjectSelect(e) { + let projectId = e.detail.id; + let projectName = e.detail.text; + app.globalData.useProjectId = projectId; + app.globalData.useProjectName = projectName; + this.onLoad(); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + if (!getToken()) { + wx.redirectTo({ + url: '../../../pages/login/login', + }) + } + const proUserInfo = getUserInfo(); + this.setData({ + addFlag: proUserInfo.projectUserInfo.subDeptType == "1", + projectUserInfo: proUserInfo.projectUserInfo, + projectId: app.globalData.useProjectId, + projectName: app.globalData.useProjectName, + initData: { + id: app.globalData.useProjectId, + text: app.globalData.useProjectName, + }, + pageNum: 1, + pageSize: 10, + listData: [], + total: 0 + }); + this.getListData(this.data.activeState); + }, + + /** + * 添加验收信息 + */ + skipAdd() { + wx.redirectTo({ + url: `../add/index`, + }) + }, + + getInfo(e) { + let { + id, + checkState, + lordSent, + recheckSend + } = e.currentTarget.dataset.set + if ((checkState == 0 || checkState == 3) && lordSent == this.data.projectUserInfo.userId) { + //整改页面（状态时待整改&&整改人是当前登录人） + wx.redirectTo({ + url: `../modify/index?type=${this.data.type}&id=${id}`, + }) + } else if (checkState == 1 && recheckSend == this.data.projectUserInfo.userId) { + //复检页面 (状态时待复检&&复检人是当前登录人) + wx.redirectTo({ + url: `../check/index?type=${this.data.type}&id=${id}`, + }) + } else { + wx.redirectTo({ + url: `../info/index?type=${this.data.type}&id=${id}`, + }) + } + }, + + /** + * 查询项目举牌验收数据 + */ + getListData(activeState) { + let params = "pageNum=" + this.data.pageNum + "&pageSize=" + this.data.pageSize + "&projectId=" + app.globalData.useProjectId + "activeTags=" + activeState; + projectCheckedList(params).then(res => { + if (res.code == 200) { + this.setData({ + total: res.total, + listData: this.data.listData.concat(res.rows) + }) + } + }); + // 统计列表 + projectCheckedListCount(params).then(res => { + if (res.code == 200) { + let _qb=0,_jxz=0,_ywc=0; + res.data.forEach(item =>{ + if(item.approve_status=='100' && item.check_result=='1'){ + _qb += item.total; + _ywc += item.total; + }else{ + _qb += item.total; + _jxz += item.total; + } + }); + this.setData({ + qbCount: _qb, + jxzCount: _jxz, + ywcCount: _ywc, + }) + } + }); + }, + + /** + * 标签切换 + */ + trainJump(e) { + let index = e.currentTarget.dataset.index; + let nav = ""; + if (index == 1) { + nav = 'qb'; + } + if (index == 2) { + nav = 'jxz'; + } else if (index == 3) { + nav = 'ywc'; + } + this.setData({ + activeState: nav, + pageNum: 1, + pageSize: 10, + listData: [], + }); + this.getListData(nav); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + returnToPage: function () { + /*关闭当前页面，跳转到其它页面。*/ + if (wx.getStorageSync('nav-menu') == "xmgl") { + wx.redirectTo({ + url: '../../project_more/index', + }) + } else { + wx.redirectTo({ + url: '../../project_quality/index', + }) + } + }, + + onScrollToLower() { + let nal = Math.ceil(this.data.total / this.data.pageSize); + if (this.data.pageNum < nal) { + this.setData({ + pageNum: this.data.pageNum + 1 + }); + this.getListData(this.data.activeState); + } else { + console.log("已经到底了，没有数据可加载！！！"); + } + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json new file mode 100644 index 00000000..d98015c7 --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationStyle":"custom" + } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml new file mode 100644 index 00000000..eea0a49e --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxml @@ -0,0 +1,69 @@ + + + + + + + + + + 项目举牌验收 + + + + + + + + 全部（{{qbCount}}） + 进行中（{{jxzCount}}） + 已完成（{{ywcCount}}） + + + + + + + + {{index < 10 ?'0'+(index+1):(index+1)}} + + {{item.createTime}} + + 常规验收 + + + + + + 待审批 + 已驳回 + 已完成 + + + + 工序部位：{{item.workingPosition}} + 技术专员：{{item.technicianUserName}} + 监理专员：{{item.superviseUserName}} + 验收时间：{{item.recheckSendUser}} + + + + 验收描述：{{item.intro}} + + + + + + + + 暂无数据 + + + + + + 新增 + + + + \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss new file mode 100644 index 00000000..0a6a2a6f --- /dev/null +++ b/yanzhu-ui-app/miniprogram/pageage/project_checked/list/index.wxss @@ -0,0 +1 @@ +/* pageage/project_checked/list/index.wxss */ \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/list/index.json b/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/list/index.json index 2c79689d..d98015c7 100644 --- a/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/list/index.json +++ b/yanzhu-ui-app/miniprogram/pageage/project_problemmodify/list/index.json @@ -1,7 +1,4 @@ { - "usingComponents": { - "van-overlay": "@vant/weapp/overlay/index" , - "van-popup": "@vant/weapp/popup/index" - }, + "usingComponents": {}, "navigationStyle":"custom" } \ No newline at end of file diff --git a/yanzhu-ui-vue3/vite.config.js b/yanzhu-ui-vue3/vite.config.js index e9ea2795..d3324a32 100644 --- a/yanzhu-ui-vue3/vite.config.js +++ b/yanzhu-ui-vue3/vite.config.js @@ -39,7 +39,8 @@ export default defineConfig(({ mode, command }) => { }, // https://cn.vitejs.dev/config/#server-proxy "/dev-api": { - target: "http://localhost:8080", + //target: "http://localhost:8080", + target: "http://62.234.3.186", changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, ""), },