From c75699ddaed0b8c12d381c17baee193936f806e4 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 14 五月 2025 08:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/picture/picture/index.vue | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index 5ff34a5..76fcd3e 100644
--- a/src/views/picture/picture/index.vue
+++ b/src/views/picture/picture/index.vue
@@ -1,14 +1,17 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" 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" 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="tcm">
+ <el-input v-model="queryParams.tcm" placeholder="璇疯緭鍏ラ」鐩�" clearable @keyup.enter.native="handleQuery"
+ style="width: 170px" />
</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"
@@ -16,25 +19,26 @@
<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>
+ <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-form-item>
- <el-form-item label="鐧昏鏃堕棿" prop="createTimeList" v-show="isCollapsed == 1">
+
+ <el-row v-show="isCollapsed == 1" :gutter="20">
+ <el-col :span="8">
+ <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:59:59']"
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>
- </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<el-radio-group v-model="checkStatus" @input="radioChange" style="margin: 10px 15px">
@@ -46,7 +50,7 @@
<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 label="浣撴鍙�" align="center" prop="tjNumber" min-width="160" />
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" min-width="130" />
<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">
@@ -56,7 +60,7 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</el-table-column>
- <el-table-column label="鎵嬫満鍙�" align="center" prop="cusPhone" min-width="100" />
+ <el-table-column label="韬唤璇佸彿" align="center" prop="cusIdcard" min-width="190" />
<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">
@@ -137,9 +141,10 @@
<el-button type="primary" @click="imagePreviewVisible = false">纭畾</el-button>
</span>
</el-dialog>
+ <Public ref="aaa" :check-status="checkStatus" :pro-result="form.proResult" :conclusion="form.conclusion"
+ @add="handleChanges" :project-list="projectList" />
</div>
</template>
-
<script>
import {
getListPicture,
@@ -310,12 +315,19 @@
tupian(formData)
.then(response => {
console.log('鎴愬姛浜�', response);
- if (response.code === 200 && response.base64) {
+ if (response.code === 200) {
this.$message.success('鍥剧墖涓婁紶鎴愬姛锛�');
const index = this.tableList.findIndex(item => item.proId === proId);
if (index !== -1) {
- const base64Image = `data:image/${fileExtension};base64,${response.base64}`;
- this.$set(this.tableList[index], 'imageUrl', base64Image);
+ // 淇濆瓨 base64 鍥惧儚鐢ㄤ簬鏄剧ず
+ if (response.base64) {
+ const base64Image = `data:image/${fileExtension};base64,${response.base64}`;
+ this.$set(this.tableList[index], 'imageUrl', base64Image);
+ }
+ // 淇濆瓨杩斿洖鐨� url
+ if (response.url) {
+ this.$set(this.tableList[index], 'url', response.url);
+ }
}
} else {
this.$message.error('鍥剧墖涓婁紶澶辫触锛�');
@@ -537,7 +549,14 @@
let tjNumber = val;
this.loading = true;
getYxJcXx(tjNumber).then((res) => {
- this.tableList = res.data;
+ this.tableList = res.data.map(item => {
+ // 濡傛灉 imageUrl 瀛樺湪涓旀槸绾� Base64 瀛楃涓诧紝娣诲姞 data:image 鍓嶇紑
+ if (item.imageUrl && !item.imageUrl.startsWith('data:image')) {
+ // 鍋囪鍥剧墖绫诲瀷涓� png锛屽鏋滄帴鍙ｆ彁渚涚被鍨嬶紝鍙互鏇挎崲涓哄姩鎬佸��
+ item.imageUrl = `data:image/png;base64,${item.imageUrl}`;
+ }
+ return item;
+ });
this.loading = false;
this.$nextTick(() => {
const headerCheckbox = this.$refs.mu.$el.querySelector(
@@ -678,12 +697,14 @@
const proId = this.selectedRow.proId;
const jcsj = this.form.proResult || " ";
const jcjl = this.form.conclusion || " ";
+ const url = this.selectedRow.url || ""; // 鑾峰彇 url锛屽鏋滀笉瀛樺湪鍒欎负绌哄瓧绗︿覆
addYxJcXx({
proId: proId,
tjNumber: this.selectedTjNumber,
jcsj: jcsj,
jcjl: jcjl,
+ url: url // 娣诲姞 url 鍙傛暟
})
.then((response) => {
this.form.proResult = "";
@@ -704,8 +725,8 @@
console.error("鎻愪氦澶辫触", error);
});
},
- handleDelete() {},
- handleExport() {},
+ handleDelete() { },
+ handleExport() { },
},
};
</script>
--
Gitblit v1.8.0