+
+
+
+
+
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
@@ -573,7 +507,9 @@ import {
} from "@/api/build/meas";
import { getToken } from "@/utils/auth";
import { getFileStream } from "@/api/system/upload";
+import chooseSection from "./components/chooseSection.vue";
export default {
+ components: { chooseSection },
name: "Meas",
props: ["proNo", "proCode"],
data() {
@@ -602,8 +538,19 @@ export default {
pageSize: 10,
ids: null,
data: {
+ id: null,
proCode: null,
proNo: null,
+ workCommencementOrder1: null,
+ reportTime1: null,
+ approvalTime1: null,
+ approvalOpinion1: null,
+ sectionName: null,
+ },
+ cv: {
+ name: "sectionName",
+ type: "like",
+ value: null,
},
// 排序方式
params: {
@@ -618,6 +565,9 @@ export default {
preMsg: {},
// 表单校验
rules: {
+ sectionName: [
+ { required: true, message: "请选择标段名称", trigger: "change" },
+ ],
workCommencementOrder1: [
{ required: true, message: "请上传开工令文件", trigger: "blur" },
],
@@ -653,54 +603,125 @@ export default {
fileList3: [],
fileList4: [],
fileList5: [],
+ infoList: [],
};
},
created() {
this.getList();
},
methods: {
- // 表单重置
- reset() {
- this.resetForm("form");
- },
getList() {
this.loading = true;
this.queryParams.data.proNo = this.proNo;
this.queryParams.data.proCode = this.proCode;
listMeas(this.queryParams).then((response) => {
- console.log("responseresponse", response);
- if (response.records[0]) {
- this.preMsg = response.records[0];
- }
+ this.infoList = response.records;
+ // console.log("responseresponse", response);
+ // if (response.records[0]) {
+ // this.preMsg = response.records[0];
+ // }
- // this.total = response.total;
+ this.total = response.total;
this.loading = false;
});
},
- handleUpdate() {
+ // 表单重置
+ reset() {
+ this.fileList1 = [];
+ this.fileList2 = [];
+ this.fileList3 = [];
+ this.fileList4 = [];
+ this.fileList5 = [];
+ this.form = {
+ id: null,
+ proCode: null,
+ proNo: null,
+ workCommencementOrder1: null,
+ reportTime1: null,
+ approvalTime1: null,
+ approvalOpinion1: null,
+ sectionName: null,
+ };
+ this.resetForm("form");
+ },
+ // 查询表单重置
+ resetQueryForm() {
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ data: {
+ id: null,
+ proCode: null,
+ proNo: null,
+ workCommencementOrder1: null,
+ reportTime1: null,
+ approvalTime1: null,
+ approvalOpinion1: null,
+ sectionName: null,
+ },
+ cv: {
+ name: "sectionName",
+ type: "like",
+ value: null,
+ },
+ // 排序方式
+ params: {
+ // 按哪个字段排序
+ orderBy: "create_time",
+ // desc降序，升序asc
+ sortBy: "desc",
+ },
+ };
+ this.resetForm("form");
+ },
+ /** 搜索按钮操作 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+ /** 重置按钮操作 */
+ resetQuery() {
+ this.resetQueryForm();
+ this.handleQuery();
+ },
+ // 多选框选中数据
+ handleSelectionChange(selection) {
+ this.ids = selection.map((item) => item.id);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+ },
+ handleAdd() {
this.reset();
- this.form = { ...this.preMsg };
- if (this.form.workCommencementOrder1) {
- this.fileList1 = JSON.parse(this.form.workCommencementOrder1);
- }
- if (this.form.workCommencementOrder2) {
- this.fileList2 = JSON.parse(this.form.workCommencementOrder2);
- }
- if (this.form.workCommencementOrder3) {
- this.fileList3 = JSON.parse(this.form.workCommencementOrder3);
- }
- if (this.form.workCommencementOrder4) {
- this.fileList4 = JSON.parse(this.form.workCommencementOrder4);
- }
- if (this.form.workCommencementOrder5) {
- this.fileList5 = JSON.parse(this.form.workCommencementOrder5);
- }
+ this.form.proNo = this.proNo;
+ this.form.proCode = this.proCode;
+ this.open = true;
+ this.title = "添加施工准备信息";
+ },
+ handleUpdate(row) {
+ this.reset();
+ const id = row.id || this.ids;
+ getMeas(id).then((response) => {
+ this.form = response.data;
+ if (this.form.workCommencementOrder1) {
+ this.fileList1 = JSON.parse(this.form.workCommencementOrder1);
+ }
+ if (this.form.workCommencementOrder2) {
+ this.fileList2 = JSON.parse(this.form.workCommencementOrder2);
+ }
+ if (this.form.workCommencementOrder3) {
+ this.fileList3 = JSON.parse(this.form.workCommencementOrder3);
+ }
+ if (this.form.workCommencementOrder4) {
+ this.fileList4 = JSON.parse(this.form.workCommencementOrder4);
+ }
+ if (this.form.workCommencementOrder5) {
+ this.fileList5 = JSON.parse(this.form.workCommencementOrder5);
+ }
+ });
this.open = true;
this.title = "修改施工准备信息";
},
submitForm() {
- if (this.fileList1.length) {
- }
this.form.workCommencementOrder1 = this.fileList1.length
? JSON.stringify(this.fileList1)
: null;
@@ -723,9 +744,6 @@ export default {
// this.form.workCommencementOrder5 = JSON.stringify(this.fileList5);
this.$refs["form"].validate((valid) => {
if (valid) {
- this.form.proNo = this.proNo;
- this.form.proCode = this.proCode;
-
if (this.form.id != null) {
updateMeas(this.form).then((response) => {
if (response.code === 200) {
@@ -750,6 +768,29 @@ export default {
// this.$router.back();
this.open = false;
},
+
+ /** 删除按钮操作 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ if (ids) {
+ this.$confirm("是否删除选中的数据？", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(function () {
+ return delMeas(ids);
+ })
+ .then(() => {
+ this.getList();
+ this.msgSuccess("删除成功");
+ })
+ .catch(function () {});
+ } else {
+ this.$message.warning("请选择要删除的数据！！");
+ }
+ },
+
// 上传意见附件
submitOpinionUpload1(_, fileList) {
console.log("fileList", fileList);
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance copy.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance copy.vue
new file mode 100644
index 00000000..2bf715c4
--- /dev/null
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance copy.vue
@@ -0,0 +1,1735 @@
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+ 合同工程完工验收管理
+
+
+
+ 所属项目
+ {{ this.projectAcceptanceMsg.projectName }}
+
+
+ 项目编码
+ {{ this.projectAcceptanceMsg.proCode }}
+
+
+ 项目法人
+ {{ this.projectAcceptanceMsg.projectLegal }}
+
+
+ 合同名称
+ {{ this.projectAcceptanceMsg.contractName }}
+
+
+ 完工验收时间
+ {{ this.projectAcceptanceMsg.contractAcceptTime }}
+
+
+
+ 验收结论
+ {{ this.projectAcceptanceMsg.contractResult }}
+
+
+ 验收人员
+ {{ acceptancePersonFarmat(this.projectAcceptanceMsg.acceptancePerson) }}
+
+
+
+ 合同完工验收鉴定书
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ 竣工验收
+
+
+
+ 竣工技术鉴定时间
+ {{ this.projectAcceptanceMsg.completionTechnicalTime }}
+
+
+ 竣工技术预验收时间
+ {{ this.projectAcceptanceMsg.technicalPreAcceptanceTime }}
+
+
+ 竣工验收时间
+ {{ this.projectAcceptanceMsg.completionAcceptanceTime }}
+
+
+ 验收结果
+ {{ this.projectAcceptanceMsg.acceptanceResults }}
+
+
+
+ 验收人员
+ {{
+ acceptancePersonFarmat(this.projectAcceptanceMsg.acceptancePersonnel)
+ }}
+
+
+
+ 是否完成环保验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isEnvironmentalAcceptance) }}
+
+
+
+ 环保验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 竣工验收鉴定书
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成移民安置验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isResettlementAcceptance) }}
+
+
+ 移民安置验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 竣工验收影像质量
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成水土保持验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isWaterConservation) }}
+
+
+ 水土保持验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成工程档案验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isEngineeringArchives) }}
+
+
+ 工程档案验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成竣工决算验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isEngineeringArchives) }}
+
+
+ 竣工决算验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+ 合同工程完工验收管理
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加人员
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+ 竣工验收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 添加人员
+
+ {{ tag }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传
+
+
+ 支持jpg/png/pdf/word/excel文件等，不超过200M
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 2bf715c4..3685d2f4 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/projectAcceptance.vue
@@ -1,284 +1,211 @@
-
-
-
-
- 编辑
-
-
-
-
- 合同工程完工验收管理
-
-
-
- 所属项目
- {{ this.projectAcceptanceMsg.projectName }}
-
-
- 项目编码
- {{ this.projectAcceptanceMsg.proCode }}
-
-
- 项目法人
- {{ this.projectAcceptanceMsg.projectLegal }}
-
-
- 合同名称
- {{ this.projectAcceptanceMsg.contractName }}
-
-
- 完工验收时间
- {{ this.projectAcceptanceMsg.contractAcceptTime }}
-
-
-
- 验收结论
- {{ this.projectAcceptanceMsg.contractResult }}
-
-
- 验收人员
- {{ acceptancePersonFarmat(this.projectAcceptanceMsg.acceptancePerson) }}
-
-
-
- 合同完工验收鉴定书
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
- 竣工验收
-
-
-
- 竣工技术鉴定时间
- {{ this.projectAcceptanceMsg.completionTechnicalTime }}
-
-
- 竣工技术预验收时间
- {{ this.projectAcceptanceMsg.technicalPreAcceptanceTime }}
-
-
- 竣工验收时间
- {{ this.projectAcceptanceMsg.completionAcceptanceTime }}
-
-
- 验收结果
- {{ this.projectAcceptanceMsg.acceptanceResults }}
-
-
-
- 验收人员
- {{
- acceptancePersonFarmat(this.projectAcceptanceMsg.acceptancePersonnel)
- }}
-
-
-
- 是否完成环保验收
- {{ whetherFarmet(this.projectAcceptanceMsg.isEnvironmentalAcceptance) }}
-
+
+
+
+
+
-
- 环保验收文件
-
+ 重置
-
- {{ item.name }}
+
+
-
-
-
-
-
- 竣工验收鉴定书
-
+
+ 新增
-
- {{ item.name }}
+
+
+ 修改
+
+
+ 删除
+
+
+
-
-
-
-
+
+
+
+
+
+
-
- 是否完成移民安置验收
- {{ whetherFarmet(this.projectAcceptanceMsg.isResettlementAcceptance) }}
-
-
- 移民安置验收文件
-
-
- {{ item.name }}
+
+
+
-
-
+
+
+
+ {{ acceptancePersonFarmat(scope.row.acceptancePerson) }}
-
-
- 竣工验收影像质量
-
+
+
+
+
{{ item.name }}
-
-
-
-
- 是否完成水土保持验收
- {{ whetherFarmet(this.projectAcceptanceMsg.isWaterConservation) }}
-
-
- 水土保持验收文件
-
-
+
+
+ 查看
- {{ item.name }}
-
-
-
-
-
-
-
- 是否完成工程档案验收
- {{ whetherFarmet(this.projectAcceptanceMsg.isEngineeringArchives) }}
-
-
- 工程档案验收文件
-
- 修改
- {{ item.name }}
-
-
-
-
-
-
-
- 是否完成竣工决算验收
- {{ whetherFarmet(this.projectAcceptanceMsg.isEngineeringArchives) }}
-
-
- 竣工决算验收文件
-
- 删除
- {{ item.name }}
-
-
-
-
-
+
+
+
+
合同工程完工验收管理
+ 合同工程完工验收管理
+
+
+
+ 标段名称
+ {{ this.projectAcceptanceMsg.sectionName }}
+
+
+ 所属项目
+ {{ this.projectAcceptanceMsg.projectName }}
+
+
+ 项目编码
+ {{ this.projectAcceptanceMsg.proCode }}
+
+
+ 项目法人
+ {{ this.projectAcceptanceMsg.projectLegal }}
+
+
+ 合同名称
+ {{ this.projectAcceptanceMsg.contractName }}
+
+
+ 完工验收时间
+ {{ this.projectAcceptanceMsg.contractAcceptTime }}
+
+
+
+ 验收结论
+ {{ this.projectAcceptanceMsg.contractResult }}
+
+
+ 验收人员
+ {{
+ acceptancePersonFarmat(this.projectAcceptanceMsg.acceptancePerson)
+ }}
+
+
+
+ 合同完工验收鉴定书
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ 竣工验收
+
+
+
+ 竣工技术鉴定时间
+ {{ this.projectAcceptanceMsg.completionTechnicalTime }}
+
+
+ 竣工技术预验收时间
+ {{ this.projectAcceptanceMsg.technicalPreAcceptanceTime }}
+
+
+ 竣工验收时间
+ {{ this.projectAcceptanceMsg.completionAcceptanceTime }}
+
+
+ 验收结果
+ {{ this.projectAcceptanceMsg.acceptanceResults }}
+
+
+
+ 验收人员
+ {{
+ acceptancePersonFarmat(
+ this.projectAcceptanceMsg.acceptancePersonnel
+ )
+ }}
+
+
+
+ 是否完成环保验收
+ {{
+ whetherFarmet(this.projectAcceptanceMsg.isEnvironmentalAcceptance)
+ }}
+
+
+
+ 环保验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 竣工验收鉴定书
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成移民安置验收
+ {{
+ whetherFarmet(this.projectAcceptanceMsg.isResettlementAcceptance)
+ }}
+
+
+ 移民安置验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 竣工验收影像质量
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成水土保持验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isWaterConservation) }}
+
+
+ 水土保持验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成工程档案验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isEngineeringArchives) }}
+
+
+ 工程档案验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 是否完成竣工决算验收
+ {{ whetherFarmet(this.projectAcceptanceMsg.isEngineeringArchives) }}
+
+
+ 竣工决算验收文件
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
-
-
+
+
-->
-
+
-
-
+
+
{
+ this.sectionNameOptions = res.records;
+ // console.log("sectionNameOptions", this.sectionNameOptions);
+ });
},
methods: {
/** 查询单位工程列表 */
@@ -250,6 +265,7 @@ export default {
if (key !== "edit") {
this.form = {
id: null,
+ sectionName: null,
belongsSection: null,
unitProjectName: null,
unitProjectCode: null,
@@ -270,6 +286,7 @@ export default {
} else {
this.editForm = {
id: null,
+ sectionName: null,
belongsSection: null,
unitProjectName: null,
unitProjectCode: null,
@@ -295,6 +312,7 @@ export default {
pageSize: 10,
data: {
id: null,
+ sectionName: null,
belongsSection: null,
unitProjectName: null,
unitProjectCode: null,
@@ -341,8 +359,8 @@ export default {
const id = row.id || this.ids;
getUnitProject(id).then((response) => {
this.editForm = response.data;
- this.editForm.belongsSection =
- this.editForm.belongsSection + "[" + this.editForm.proCode + "]";
+ // this.editForm.belongsSection =
+ // this.editForm.belongsSection + "[" + this.editForm.proCode + "]";
// console.log("response.data", response.data);
this.open = true;
this.title = "修改单位工程";
@@ -353,10 +371,10 @@ export default {
if (!this.open) {
this.$refs["form"].validate((valid) => {
if (valid) {
- this.form.belongsSection = this.form.belongsSection.slice(
- 0,
- this.form.belongsSection.indexOf("[")
- );
+ // this.form.belongsSection = this.form.belongsSection.slice(
+ // 0,
+ // this.form.belongsSection.indexOf("[")
+ // );
this.form.proNo = this.proNo;
this.form.proCode = this.proCode;
addUnitProject(this.form).then((response) => {
@@ -371,10 +389,10 @@ export default {
} else {
this.$refs["editForm"].validate((valid) => {
if (valid) {
- this.editForm.belongsSection = this.editForm.belongsSection.slice(
- 0,
- this.editForm.belongsSection.indexOf("[")
- );
+ // this.editForm.belongsSection = this.editForm.belongsSection.slice(
+ // 0,
+ // this.editForm.belongsSection.indexOf("[")
+ // );
updateUnitProject(this.editForm).then((response) => {
if (response.code === 200) {
this.msgSuccess("修改成功");
diff --git a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/safetyRecord.vue b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/safetyRecord.vue
index 10d76368..a4cb75a6 100644
--- a/jwtech-admin-page/src/views/building/projectInfo/projectProcess/safetyRecord.vue
+++ b/jwtech-admin-page/src/views/building/projectInfo/projectProcess/safetyRecord.vue
@@ -13,7 +13,12 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+