From 967f71ac99954cc1f76254c9bcd18bb6cbb93366 Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期三, 16 四月 2025 14:15:18 +0800 Subject: [PATCH] qx --- src/views/picture/picture/index.vue | 505 +++++++++++++++++++++++-------------------------------- 1 files changed, 214 insertions(+), 291 deletions(-) diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue index 91c4462..792376a 100644 --- a/src/views/picture/picture/index.vue +++ b/src/views/picture/picture/index.vue @@ -1,138 +1,58 @@ <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-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-input - v-model="queryParams.name" - placeholder="璇疯緭鍏ュ鍚�" - clearable - @keyup.enter.native="handleQuery" - style="width: 110px" - /> + + <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-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-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-input - v-model="queryParams.tcm" - placeholder="璇疯緭鍏ヤ綋妫�鍙�" - clearable - @keyup.enter.native="handleQuery" - style="width: 170px" - /> + <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-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-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" - 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 - > + <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> </el-form-item> </el-form> - <el-radio-group - v-model="checkStatus" - @input="radioChange" - style="margin: 10px 15px" - > + <el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px"> <el-radio-button label="0">鏈</el-radio-button> <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 - id="table" - v-loading="loading" - ref="tb" - :data="pictureList" - highlight-current-row - :row-class-name="tableRowClassName" - @current-change="handleCurrentChange" - border - height="520px" - > + <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" - /> - <el-table-column - label="鎬у埆" - align="center" - prop="cusSex" - min-width="50" - > + <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" min-width="160" /> + <el-table-column label="濮撳悕" align="center" prop="cusName" min-width="80" /> + <el-table-column label="鎬у埆" align="center" prop="cusSex" min-width="50"> <template slot-scope="scope"> <span v-if="scope.row.cusSex == '0'">鐢�</span> <span v-if="scope.row.cusSex == '1'">濂�</span> @@ -145,104 +65,50 @@ <!-- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.cusSex " /> --> <!-- </template> --> </el-table-column> - <el-table-column - label="鎵嬫満鍙�" - align="center" - prop="cusPhone" - min-width="100" - /> - <el-table-column - label="濂楅鍚�" - align="center" - prop="tcm" - min-width="100" - /> - <el-table-column - label="鐧昏鏃堕棿" - align="center" - prop="tjTime" - min-width="120" - /> - <el-table-column - label="瀹℃牳鐘舵��" - align="center" - prop="confirmStatus" - min-width="80" - > + <el-table-column label="鎵嬫満鍙�" align="center" prop="cusPhone" min-width="100" /> + <el-table-column label="濂楅鍚�" align="center" prop="tcm" min-width="100" /> + <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" min-width="120" /> + <el-table-column label="瀹℃牳鐘舵��" align="center" prop="confirmStatus" min-width="80"> <template slot-scope="scope"> - <span - :style="{ - color: - scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29', - }" - v-if="scope.row.confirmStatus == '301'" - >宸查�氳繃</span - > - <span - :style="{ - color: - scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29', - }" - v-if="scope.row.confirmStatus == '299'" - >宸查┏鍥�</span - > + <span :style="{ + color: + scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29', + }" v-if="scope.row.confirmStatus == '301'">宸查�氳繃</span> + <span :style="{ + color: + scope.row.confirmStatus == '301' ? '#0CB618' : '#EA1B29', + }" v-if="scope.row.confirmStatus == '299'">宸查┏鍥�</span> </template> </el-table-column> </el-table> - </div> - <div style="width: 44%; height: 610px"> - <el-table - v-loading="loading" - ref="mu" - :data="tableList" - :row-class-name="tableRowClassName" - highlight-current-row - @selection-change="handleChange" - border - style="height: 400px" - > - <el-table-column type="selection" width="50" align="center" /> - <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" - /> - <el-table-column - label="鐘舵��" - align="center" - prop="type" - :show-overflow-tooltip="true" - min-width="100" - > + <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" /> + <el-table-column label="鐘舵��" align="center" prop="type" :show-overflow-tooltip="true" min-width="100"> <template slot-scope="scope"> - <span - v-if="scope.row.type == '0'" - :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }" - > - {{ type == 0 ? "鏈� 妫�" : "鍦� 妫�" }} + <span v-if="scope.row.type == '0'" :style="type == 0 ? { color: 'red' } : { color: '#409EFF' }"> + {{ type == 0 ? "鏈� 妫�" : "鍦� 妫�" }} </span> <span v-if="scope.row.type == '1'">宸插畬鎴�</span> <span v-if="scope.row.type == '2'">寮冩</span> <span v-if="scope.row.type == '3'">寤舵湡</span> </template> </el-table-column> - <el-table-column - label="妫�鏌ユ椂闂�" - align="center" - prop="bcupdateTime" - min-width="160" - /> - <el-table-column label="鎿嶄綔" align="center" min-width="120px"> + <el-table-column label="妫�鏌ユ椂闂�" align="center" prop="bcupdateTime" min-width="160" /> + <!-- <el-table-column label="鎿嶄綔" align="center" min-width="120px"> <template slot-scope="scope"> <el-button size="mini" @@ -262,9 +128,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" /> @@ -272,70 +137,34 @@ <el-table-column label="椤圭洰缁撴灉" align="center" prop="proResult" /> --> </el-table> <div style="margin-top: 10px"> - <el-form - :model="form" - ref="queryForm" - size="small" - :inline="false" - label-width="68px" - > + <el-form :model="form" ref="queryForm" size="small" :inline="false" 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 - v-model="form.conclusion" - clearable - type="textarea" - @focus="submiepilog" - /> + <el-input v-model="form.conclusion" clearable type="textarea" @focus="submiepilog" /> </el-form-item> <el-form-item> - <el-button - type="primary" - icon="el-icon-picture" - size="mini" - @click="tupian" - >鍥剧墖</el-button - > - <el-button - type="primary" - icon="el-icon-search" - size="mini" - @click="submito" - >鎻愪氦</el-button - > + <el-button type="primary" icon="el-icon-picture" size="mini" @click="tupian">鍥剧墖</el-button> + <el-button type="primary" icon="el-icon-search" size="mini" @click="submito">鎻愪氦</el-button> </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" :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> @@ -388,6 +217,7 @@ // 閫変腑鏁扮粍 ids: [], CheckBox: {}, + isCollapsed: 0, // 榛樿涓烘姌鍙犵姸鎬� // 闈炲崟涓鐢� single: true, // 闈炲涓鐢� @@ -407,6 +237,7 @@ pictureList: [], tableList: [], CompanyList: [], + projectList: [], // 寮瑰嚭灞傛爣棰� title: "", // 鏄惁鏄剧ず寮瑰嚭灞� @@ -530,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; @@ -546,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; }); }, @@ -596,9 +423,7 @@ }, handleRowClick(row, column, event) { - // console.log(row, 2323); this.name = row.proName; - // console.log(this.name, 99999); }, // 浣撴鍏徃鎷奸煶鎼滅储 getRemoteData(query) { @@ -612,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; @@ -635,11 +462,11 @@ getYxJcXx(tjNumber).then((res) => { - console.log(res, 222); this.tableList = res.data; this.loading = false; }); */ }, + // 鍙栨秷鎸夐挳 cancel() { this.open = false; @@ -654,7 +481,6 @@ this.resetForm("form"); }, hb() { - // console.log(this.queryParams.tjNum); if (this.queryParams.tjNumber != null) { // this.handleQuery(); this.submitForm(); @@ -697,18 +523,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, @@ -726,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]) { @@ -741,15 +582,39 @@ 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(() => { + 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]); + } + }); }); }, @@ -807,7 +672,7 @@ }, // 澶氶�夋閫変腑鏁版嵁 - handleSelectionChange(selection) { + /* handleSelectionChange(selection) { this.imgsrc = selection[0].picturePath; this.tjNumber = selection[0].customer.tjNumber; this.ids = selection.map((item) => item.id); @@ -834,23 +699,76 @@ } 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) { - // console.log(selection, 123); + /* handleChange(selection) { 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; }); } - }, + }, */ - handleChanges(value,yxbx) { + handleChanges(value, yxbx) { this.form.conclusion = value; this.form.proResult = yxbx; }, @@ -858,13 +776,13 @@ 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() { /* if (this.dataobj) { @@ -887,16 +805,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,11 +822,20 @@ 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); @@ -917,20 +843,16 @@ }, //鍒犻櫎鎸夐挳 - handleDelete() {}, + handleDelete() { }, // 瀵煎嚭 - handleExport() {}, + handleExport() { }, }, }; </script> <style> -#table .el-table__header-wrapper .el-checkbox { - display: none; -} - .default-button-style :hover { width: 80px; border-bottom: none; @@ -992,4 +914,5 @@ float: left; position: relative; } -</style> \ No newline at end of file + +</style> -- Gitblit v1.8.0