From aefe8cd7fffd5d61082442df071c077861036ab0 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 11 四月 2025 17:32:27 +0800
Subject: [PATCH] 2
---
src/views/picture/picture/index.vue | 147 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 116 insertions(+), 31 deletions(-)
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index 91c4462..f2cab30 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -55,7 +55,7 @@
<el-form-item label="椤圭洰" prop="tcm">
<el-input
v-model="queryParams.tcm"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+ placeholder="璇疯緭鍏ラ」鐩�"
clearable
@keyup.enter.native="handleQuery"
style="width: 170px"
@@ -104,7 +104,6 @@
<div style="width: 100%; margin-left: 10px; display: flex">
<div style="width: 36%; margin-right: 30px">
<el-table
- id="table"
v-loading="loading"
ref="tb"
:data="pictureList"
@@ -191,18 +190,20 @@
</el-table>
</div>
- <div style="width: 44%; height: 610px">
+ <div id="table" style="width: 44%; height: 610px">
<el-table
v-loading="loading"
ref="mu"
:data="tableList"
:row-class-name="tableRowClassName"
+ @header-click="handleHeaderClick"
highlight-current-row
@selection-change="handleChange"
border
style="height: 400px"
>
- <el-table-column type="selection" width="50" align="center" />
+ <el-table-column type="selection" width="50" align="center">
+ </el-table-column>
<el-table-column
label="绉戝"
align="center"
@@ -229,7 +230,7 @@
v-if="scope.row.type == '0'"
:style="type == 0 ? { color: 'red' } : { color: '#409EFF' }"
>
- {{ type == 0 ? "鏈� 妫�" : "鍦� 妫�" }}
+ {{ type == 0 ? "鏈� 妫�" : "鍦� 妫�" }}
</span>
<span v-if="scope.row.type == '1'">宸插畬鎴�</span>
<span v-if="scope.row.type == '2'">寮冩</span>
@@ -242,7 +243,7 @@
prop="bcupdateTime"
min-width="160"
/>
- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
+ <!-- <el-table-column label="鎿嶄綔" align="center" min-width="120px">
<template slot-scope="scope">
<el-button
size="mini"
@@ -262,9 +263,8 @@
@click="queryResultone(scope.row)"
>缁撴灉</el-button
>
- <!-- @click="chaxun(scope.row) " -->
</template>
- </el-table-column>
+ </el-table-column> -->
<!-- <el-table-column type="selection" width="40" align="center" />
<el-table-column label="鏀惰垂椤圭洰" align="center" prop="proName" />
@@ -280,7 +280,12 @@
label-width="68px"
>
<el-form-item label="妫�鏌ユ墍瑙�" prop="proResult">
- <el-input v-model="form.proResult" clearable type="textarea" />
+ <el-input
+ v-model="form.proResult"
+ clearable
+ type="textarea"
+ @focus="submiepilog"
+ />
</el-form-item>
<el-form-item label="妫�鏌ョ粨璁�" prop="conclusion">
<el-input
@@ -335,7 +340,15 @@
/>
</div>
- <Public ref="aaa" :last-desc="form.conclusion" @add="handleChanges" />
+ <Public
+ ref="aaa"
+ :check-status="checkStatus"
+ :pro-result="form.proResult"
+ :conclusion="form.conclusion"
+ @add="handleChanges"
+ :project-list="projectList"
+ />
+ <!-- :last-desc="form.conclusion" -->
</div>
</template>
@@ -407,6 +420,7 @@
pictureList: [],
tableList: [],
CompanyList: [],
+ projectList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -640,6 +654,7 @@
this.loading = false;
}); */
},
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -699,16 +714,24 @@
this.CheckBox = val;
// console.log(this.CheckBox, 9999);
},
+
+ handleHeaderClick(column, event) {
+ if (column.type === "selection") {
+ // 鏌ユ壘鍏ㄩ�夋骞堕殣钘�
+ const checkbox = event.target.closest(".el-checkbox");
+ if (checkbox) checkbox.style.display = "none";
+ }
+ },
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
- this.queryParams.pageNum = 1;
+ this.queryParams.page = 1;
this.submitForm();
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.createTimeList = [];
(this.queryParams = {
- pageNum: 1,
+ page: 1,
pageSize: 10,
tjNumber: null,
compId: null,
@@ -735,6 +758,7 @@
},
handleCurrentChange(val) {
+ console.log(val);
this.selectedRow = val;
if (!val || !val.tjNumber) {
console.warn("tjNumber 涓虹┖锛屼笉璋冪敤鎺ュ彛");
@@ -747,9 +771,20 @@
this.loading = true;
getYxJcXx(tjNumber).then((res) => {
- console.log(res, 222);
this.tableList = res.data;
this.loading = false;
+ this.$nextTick(() => {
+ const headerCheckbox = this.$refs.mu.$el.querySelector(
+ ".el-table__header .el-checkbox"
+ );
+ if (headerCheckbox) headerCheckbox.style.display = "none";
+
+ if (this.tableList.length > 0) {
+ const firstRow = this.tableList[0];
+ this.$refs.mu.toggleRowSelection(firstRow, true);
+ this.handleChange([firstRow]);
+ }
+ });
});
},
@@ -807,7 +842,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
+ /* handleSelectionChange(selection) {
this.imgsrc = selection[0].picturePath;
this.tjNumber = selection[0].customer.tjNumber;
this.ids = selection.map((item) => item.id);
@@ -834,9 +869,64 @@
}
this.single = selection.length !== 1;
this.multiple = !selection.length;
+ }, */
+ handleSelectionChange(selection) {
+ this.imgsrc = selection[0].picturePath;
+ this.tjNumber = selection[0].customer.tjNumber;
+ this.ids = selection.map((item) => item.id);
+
+ if (selection.length > 1) {
+ let del_row = selection.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false);
+ }
+
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+
+ selection.forEach((element) => {
+ this.tableList = element.list;
+
+ if (this.tableList.length !== 0) {
+ // 鉁� 鎻愬墠璧嬪�� selectedRow锛岄伩鍏� handleChange 鏃舵湭璧嬪��
+ this.selectedRow = this.tableList[0];
+ this.form.proResult = this.tableList[0].proResult;
+ this.form.conclusion = this.tableList[0].conclusion;
+
+ this.$nextTick(() => {
+ this.$refs.mu.toggleRowSelection(this.tableList[0], true);
+ });
+ } else {
+ this.selectedRow = null;
+ this.$refs.mu.clearSelection();
+ }
+ });
+ },
+ handleChange(selection) {
+ if (selection.length > 1) {
+ let del_row = selection.shift();
+ this.$refs.mu.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.projectList = selection.map((item) => ({
+ proId: item.proId,
+ proName: item.proName,
+ }));
+ if (selection && selection.length > 0) {
+ const proId = selection[0].proId;
+
+ // 鉁� 纭繚 selectedRow 瀛樺湪涓旀湁 tjNumber
+ const tjNumber = this.selectedTjNumber;
+ getYxJcXxJg(tjNumber, proId).then((res) => {
+ this.form.proResult = res.data.jcsj;
+ this.form.conclusion = res.data.jcjl;
+ this.$refs.aaa.updateData(res.data.jcsj, res.data.jcjl);
+ });
+
+ // 鉁� 鍚屾椂鏇存柊 selectedRow
+ this.selectedRow = selection[0];
+ }
},
- handleChange(selection) {
+ /* handleChange(selection) {
// console.log(selection, 123);
if (selection && selection.length > 0) {
const proId = selection[0].proId;
@@ -848,9 +938,9 @@
this.form.conclusion = res.data.jcjl;
});
}
- },
+ }, */
- handleChanges(value,yxbx) {
+ handleChanges(value, yxbx) {
this.form.conclusion = value;
this.form.proResult = yxbx;
},
@@ -858,15 +948,16 @@
submiepilog() {
this.$refs.aaa.open = true;
let proId = "1633660948860522585";
- // let proId = null
+ // let proId = null
this.$refs.aaa.getList(proId);
-
},
tupian() {
this.dialogVisible = true;
},
+
// 纭畾鎸夐挳
submito() {
+ console.log(111112225);
/* if (this.dataobj) {
if (this.form.proResult) {
this.dataobj.proResult = this.form.proResult;
@@ -887,16 +978,15 @@
console.error("鏈�変腑琛屾垨缂哄皯 proId");
return;
}
- console.log(this.selectedRow.proId, 96);
const proId = this.selectedRow.proId;
- const jcsj = this.form.proResult; // 鑾峰彇妫�鏌ユ墍瑙�
- const jcjl = this.form.conclusion; // 鑾峰彇妫�鏌ョ粨璁�
+ const jcsj = this.form.proResult || " "; // 鑾峰彇妫�鏌ユ墍瑙�
+ const jcjl = this.form.conclusion || " "; // 鑾峰彇妫�鏌ョ粨璁�
// 纭繚 jcsj 鍜� jcjl 瀛樺湪
- if (!jcsj || !jcjl) {
- console.error("妫�鏌ユ墍瑙佹垨妫�鏌ョ粨璁轰笉鑳戒负绌�");
- return;
- }
+ // if (!jcsj || !jcjl) {
+ // console.error("妫�鏌ユ墍瑙佹垨妫�鏌ョ粨璁轰笉鑳戒负绌�");
+ // return;
+ // }
addYxJcXx({
proId: proId,
@@ -905,7 +995,6 @@
jcjl: jcjl, // 浼犻�掓鏌ョ粨璁�
})
.then((response) => {
- console.log("鎻愪氦鎴愬姛", response);
this.submitForm();
this.form.proResult = "";
@@ -927,10 +1016,6 @@
<style>
-#table .el-table__header-wrapper .el-checkbox {
- display: none;
-}
-
.default-button-style :hover {
width: 80px;
border-bottom: none;
--
Gitblit v1.8.0