From 1bff9afb2dfda9824c3956c4a491a1b2261ad306 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期日, 27 四月 2025 14:37:54 +0800
Subject: [PATCH] 1
---
src/views/picture/picture/index.vue | 279 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 174 insertions(+), 105 deletions(-)
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index e24dc28..e182a8b 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -5,9 +5,17 @@
ref="queryForm"
size="small"
:inline="true"
- v-show="showSearch"
label-width="68px"
>
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 110px"
+ />
+ </el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
<el-input
ref="inputName"
@@ -19,13 +27,13 @@
style="width: 170px"
/>
</el-form-item>
- <el-form-item label="濮撳悕" prop="name">
+ <el-form-item label="椤圭洰" prop="tcm">
<el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
+ v-model="queryParams.tcm"
+ placeholder="璇疯緭鍏ラ」鐩�"
clearable
@keyup.enter.native="handleQuery"
- style="width: 110px"
+ style="width: 170px"
/>
</el-form-item>
<el-form-item
@@ -52,31 +60,6 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="椤圭洰" prop="tcm">
- <el-input
- v-model="queryParams.tcm"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 170px"
- />
- </el-form-item>
- <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
- <el-date-picker
- v-model="createTimeList"
- type="datetimerange"
- align="right"
- :picker-options="pickerOptions"
- style="width: 310px"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
- </el-date-picker>
- </el-form-item>
<el-form-item>
<el-button
type="primary"
@@ -89,7 +72,50 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
>閲嶇疆</el-button
>
+ <el-button
+ type="primary"
+ size="mini"
+ @click="toggleCollapse"
+ style="margin-right: 15px"
+ v-show="isCollapsed == 0"
+ >楂樼骇鎼滅储
+ </el-button>
+ <!-- 灞曞紑鏇村绛涢�夐」 -->
+ <el-button
+ type="primary"
+ size="mini"
+ @click="toggleCollapse3"
+ style="margin-right: 15px"
+ v-show="isCollapsed == 1"
+ >楂樼骇鎼滅储
+ </el-button>
+ <!-- 鏀惰捣鏇村绛涢�夐」 -->
</el-form-item>
+
+ <el-row v-show="isCollapsed == 1" :gutter="20">
+ <el-col :span="8">
+ <el-form-item style="margin-left: 22px;"
+ label="鐧昏鏃堕棿"
+ prop="createTimeList"
+ v-show="isCollapsed == 1"
+ >
+ <el-date-picker
+ v-model="createTimeList"
+ type="datetimerange"
+ align="right"
+ :picker-options="pickerOptions"
+ style="width: 310px"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm"
+ value-format="yyyy-MM-dd HH:mm"
+ @change="dateChangebirthday1"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<el-radio-group
@@ -101,10 +127,9 @@
<el-radio-button label="1">宸叉</el-radio-button>
</el-radio-group>
- <div style="width: 100%; margin-left: 10px; display: flex">
- <div style="width: 36%; margin-right: 30px">
+ <el-row :gutter="20">
+ <el-col :span="11">
<el-table
- id="table"
v-loading="loading"
ref="tb"
:data="pictureList"
@@ -114,6 +139,7 @@
border
height="520px"
>
+ <!-- <el-table-column type="selection" width="55" /> -->
<!-- @selection-change="handleSelectionChange" -->
<el-table-column
label="浣撴鍙�"
@@ -189,20 +215,33 @@
</template>
</el-table-column>
</el-table>
- </div>
- <div style="width: 44%; height: 610px">
+ <div class="pag">
+ <div class="pag1">
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.page"
+ :limit.sync="queryParams.pageSize"
+ @pagination="submitForm"
+ />
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="11">
<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 +268,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 +281,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 +301,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" />
@@ -313,34 +351,22 @@
</el-form-item>
</el-form>
</div>
-
- <!-- <div style="display:flex;margin:15px 0px;width: 100%;">
- <div style="width: 100%;display:flex;">
- <el-button type="primary" class="default-button-style" size="small"
- @click="submiepilog">缁撴灉缁撹</el-button>
- <el-button type="primary" icon="el-icon-s-claim" size="mini" @click="submito">鎻愪氦</el-button>
-
- </div>
- </div> -->
- </div>
- </div>
+ </el-col>
+ </el-row>
<el-dialog title="鎻愮ず" :visible.sync="dialogVisible" width="60%">
<!-- :before-close="handleClose" -->
<img src="../../../assets/logo/logo.png" alt="" />
</el-dialog>
- <div style="margin-right: 58%">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="submitForm"
- />
- </div>
-
- <Public ref="aaa" :check-status="checkStatus" :pro-result="form.proResult" :conclusion="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>
@@ -394,6 +420,7 @@
// 閫変腑鏁扮粍
ids: [],
CheckBox: {},
+ isCollapsed: 0, // 榛樿涓烘姌鍙犵姸鎬�
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -413,6 +440,7 @@
pictureList: [],
tableList: [],
CompanyList: [],
+ projectList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -536,7 +564,6 @@
this.queryParams.endTime = null;
}
/* getYxJcList(this.queryParams).then((response) => {
- // console.log(response.data.customers, 666);
if (response.data) {
this.pictureList = response.data.customers;
@@ -552,15 +579,12 @@
this.$refs.tb.clearSelection();
}
this.total = response.data.total;
- console.log(response.data.total, 88);
this.loading = false;
}); */
getCompany(this.queryParams).then((response) => {
this.CompanyList = response.data;
- // console.log(this.CompanyList, 555);
-
this.loading = false;
});
},
@@ -602,9 +626,7 @@
},
handleRowClick(row, column, event) {
- // console.log(row, 2323);
this.name = row.proName;
- // console.log(this.name, 99999);
},
// 浣撴鍏徃鎷奸煶鎼滅储
getRemoteData(query) {
@@ -618,6 +640,8 @@
radioChange(value) {
this.loading = true;
this.queryParams.checkStatus = value;
+ this.form.proResult = "";
+ this.form.conclusion = "";
getYxJcList(this.queryParams).then((res) => {
if (res.code == 200) {
this.loading = false;
@@ -641,11 +665,11 @@
getYxJcXx(tjNumber).then((res) => {
- console.log(res, 222);
this.tableList = res.data;
this.loading = false;
}); */
},
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -660,7 +684,6 @@
this.resetForm("form");
},
hb() {
- // console.log(this.queryParams.tjNum);
if (this.queryParams.tjNumber != null) {
// this.handleQuery();
this.submitForm();
@@ -703,18 +726,25 @@
// 閫夋鏁版嵁
searchSelect(val) {
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,
@@ -732,6 +762,20 @@
this.loading = true;
},
+ toggleCollapse3() {
+ // this.isCollapsed = !this.isCollapsed; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ this.isCollapsed = 0;
+ this.$nextTick(() => {
+ this.$refs.inputName.focus();
+ });
+ },
+ toggleCollapse() {
+ this.isCollapsed = 1; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ this.$nextTick(() => {
+ this.$refs.inputName.focus();
+ });
+ },
+
tableRowClassName({ row, rowIndex }) {
for (let i = 0; i < this.selectList.length; i++) {
if (row === this.selectList[i]) {
@@ -747,17 +791,33 @@
this.tableList = [];
return;
}
-
- let tjNumber = val.tjNumber;
this.selectedTjNumber = val.tjNumber;
- this.loading = true;
+ this.changtjNumber(val.tjNumber);
+ },
+ changtjNumber(val) {
+ console.log(8989);
+ let tjNumber = val;
+ this.loading = true;
getYxJcXx(tjNumber).then((res) => {
- console.log(res, 222);
this.tableList = res.data;
this.loading = false;
this.$nextTick(() => {
- if (this.tableList.length > 0) {
+ const headerCheckbox = this.$refs.mu.$el.querySelector(
+ ".el-table__header .el-checkbox"
+ );
+ if (headerCheckbox) headerCheckbox.style.display = "none";
+ if (this.queryParams.checkStatus == 0) {
+ if (this.tableList.length > 0) {
+ this.tableList.forEach((item, index) => {
+ if (item.type == 0) {
+ const firstRow = item;
+ this.$refs.mu.toggleRowSelection(firstRow, true);
+ this.handleChange([firstRow]);
+ }
+ });
+ }
+ } else {
const firstRow = this.tableList[0];
this.$refs.mu.toggleRowSelection(firstRow, true);
this.handleChange([firstRow]);
@@ -880,20 +940,24 @@
});
},
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
- if (this.selectedRow && this.selectedRow.tjNumber) {
- const tjNumber = this.selectedRow.tjNumber;
- 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);
- });
- } else {
- console.warn("selectedRow 鏈噯澶囧ソ锛岃烦杩囨帴鍙ｈ皟鐢�");
- }
+ 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];
@@ -901,13 +965,11 @@
},
/* handleChange(selection) {
- // console.log(selection, 123);
if (selection && selection.length > 0) {
const proId = selection[0].proId;
const tjNumber = this.selectedRow.tjNumber;
this.selectedRow = selection[0];
getYxJcXxJg(tjNumber, proId).then((res) => {
- console.log(res, 333);
this.form.proResult = res.data.jcsj;
this.form.conclusion = res.data.jcjl;
});
@@ -928,6 +990,7 @@
tupian() {
this.dialogVisible = true;
},
+
// 纭畾鎸夐挳
submito() {
/* if (this.dataobj) {
@@ -950,16 +1013,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,
@@ -968,11 +1030,19 @@
jcjl: jcjl, // 浼犻�掓鏌ョ粨璁�
})
.then((response) => {
- console.log("鎻愪氦鎴愬姛", response);
- this.submitForm();
-
this.form.proResult = "";
this.form.conclusion = "";
+ if (this.tableList.length == 1) {
+ this.submitForm();
+ } else {
+ this.tableList.forEach((item, index) => {
+ if (item.type == 0) {
+ this.changtjNumber(this.selectedTjNumber);
+ } else {
+ this.submitForm();
+ }
+ });
+ }
})
.catch((error) => {
console.error("鎻愪氦澶辫触", error);
@@ -990,10 +1060,6 @@
<style>
-#table .el-table__header-wrapper .el-checkbox {
- display: none;
-}
-
.default-button-style :hover {
width: 80px;
border-bottom: none;
@@ -1055,4 +1121,7 @@
float: left;
position: relative;
}
-</style>
\ No newline at end of file
+.el-input--small {
+ font-size: 13px;
+}
+</style>
--
Gitblit v1.8.0