From a2c6e0da9d51c37ceff8d0d7e1bb7f4f85f1deb5 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 16 四月 2025 14:15:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb
---
src/views/picture/picture/index.vue | 148 ++++++++++++++++++++++++++++--------------------
1 files changed, 86 insertions(+), 62 deletions(-)
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index dd30464..792376a 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -1,31 +1,38 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="浣撴鍙�" prop="tjNumber">
<el-input ref="inputName" v-model="queryParams.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
@keyup.enter.native="handleQuery" @blur="hb" style="width: 170px" />
</el-form-item>
- <el-form-item label="濮撳悕" prop="name">
+
+ <el-form-item label="濮撳悕" prop="name" v-show="isCollapsed == 1">
<el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handleQuery"
style="width: 110px" />
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px" v-show="isCollapsed == 1">
<el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId"
style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
<el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" />
</el-select>
</el-form-item>
- <el-form-item label="椤圭洰" prop="tcm">
+ <el-form-item label="椤圭洰" prop="tcm" v-show="isCollapsed == 1">
<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-form-item 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-form-item>
+ <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-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
style="margin-right: 15px">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -37,10 +44,11 @@
<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-table v-loading="loading" ref="tb" :data="pictureList" highlight-current-row
+ <el-row :gutter="20">
+ <el-col :span="11">
+ <el-table v-loading="loading" ref="tb" :data="pictureList" highlight-current-row
:row-class-name="tableRowClassName" @current-change="handleCurrentChange" border height="520px">
+ <!-- <el-table-column type="selection" width="55" /> -->
<!-- @selection-change="handleSelectionChange" -->
<el-table-column label="浣撴鍙�" align="center" prop="tjNumber" min-width="160" />
<el-table-column label="濮撳悕" align="center" prop="cusName" min-width="80" />
@@ -73,13 +81,19 @@
</template>
</el-table-column>
</el-table>
- </div>
- <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">
+ <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>
<el-table-column label="绉戝" align="center" prop="deptName" min-width="100" :show-overflow-tooltip="true" />
<el-table-column label="椤圭洰" align="center" prop="proName" min-width="150" :show-overflow-tooltip="true" />
@@ -136,27 +150,17 @@
</el-form-item>
</el-form>
</div>
+ </el-col>
+ </el-row>
- <!-- <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-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" :project-list="projectList" />
@@ -213,6 +217,7 @@
// 閫変腑鏁扮粍
ids: [],
CheckBox: {},
+ isCollapsed: 0, // 榛樿涓烘姌鍙犵姸鎬�
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -356,7 +361,6 @@
this.queryParams.endTime = null;
}
/* getYxJcList(this.queryParams).then((response) => {
- // console.log(response.data.customers, 666);
if (response.data) {
this.pictureList = response.data.customers;
@@ -372,15 +376,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;
});
},
@@ -422,9 +423,7 @@
},
handleRowClick(row, column, event) {
- // console.log(row, 2323);
this.name = row.proName;
- // console.log(this.name, 99999);
},
// 浣撴鍏徃鎷奸煶鎼滅储
getRemoteData(query) {
@@ -438,6 +437,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;
@@ -461,7 +462,6 @@
getYxJcXx(tjNumber).then((res) => {
- console.log(res, 222);
this.tableList = res.data;
this.loading = false;
}); */
@@ -481,7 +481,6 @@
this.resetForm("form");
},
hb() {
- // console.log(this.queryParams.tjNum);
if (this.queryParams.tjNumber != null) {
// this.handleQuery();
this.submitForm();
@@ -524,14 +523,13 @@
// 閫夋鏁版嵁
searchSelect(val) {
this.CheckBox = val;
- // console.log(this.CheckBox, 9999);
},
handleHeaderClick(column, event) {
- if (column.type === 'selection') {
+ if (column.type === "selection") {
// 鏌ユ壘鍏ㄩ�夋骞堕殣钘�
- const checkbox = event.target.closest('.el-checkbox');
- if (checkbox) checkbox.style.display = 'none';
+ const checkbox = event.target.closest(".el-checkbox");
+ if (checkbox) checkbox.style.display = "none";
}
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -561,6 +559,14 @@
this.loading = true;
},
+ toggleCollapse3() {
+ // this.isCollapsed = !this.isCollapsed; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ this.isCollapsed = 0;
+ },
+ toggleCollapse() {
+ this.isCollapsed = 1; // 鐐瑰嚮鎸夐挳鏃跺垏鎹sCollapsed鐨勫��
+ },
+
tableRowClassName({ row, rowIndex }) {
for (let i = 0; i < this.selectList.length; i++) {
if (row === this.selectList[i]) {
@@ -576,19 +582,34 @@
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) => {
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 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]);
@@ -723,16 +744,12 @@
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];
@@ -740,13 +757,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;
});
@@ -768,10 +783,8 @@
this.dialogVisible = true;
},
-
// 纭畾鎸夐挳
submito() {
- console.log(111112225)
/* if (this.dataobj) {
if (this.form.proResult) {
this.dataobj.proResult = this.form.proResult;
@@ -809,10 +822,20 @@
jcjl: jcjl, // 浼犻�掓鏌ョ粨璁�
})
.then((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);
@@ -891,4 +914,5 @@
float: left;
position: relative;
}
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.8.0