From 967f71ac99954cc1f76254c9bcd18bb6cbb93366 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 16 四月 2025 14:15:18 +0800
Subject: [PATCH] qx
---
vue.config.js | 4
src/views/system/comp/index.vue | 19 ++-
src/views/jmreport/payment/index.vue | 43 ++++++++
src/components/public/index.vue | 120 ++++++++++++------------
src/views/picture/picture/index.vue | 92 +++++++++++-------
5 files changed, 171 insertions(+), 107 deletions(-)
diff --git a/src/components/public/index.vue b/src/components/public/index.vue
index 8e16d25..19a6ccc 100644
--- a/src/components/public/index.vue
+++ b/src/components/public/index.vue
@@ -5,14 +5,12 @@
<h3 v-if="fList.proResult">
妫�娴嬬粨鏋� :{{ fList.proResult }}{{ fList.project.proMetering }}
</h3>
- <!-- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="68px"
- > -->
- <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
+
+ <h2 style="text-align: center;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
+ <div style="display: flex; width: 100%">
+ <div style="width: 50%; margin-right: 40px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+ <!-- <el-form-item label="鐥呯鍚嶇О" prop="bingzhong">
<el-input
v-model="queryParams.bingzhong"
placeholder="璇疯緭鍏ョ畝绉�"
@@ -20,37 +18,23 @@
@keyup.enter.native="handleQuery"
style="width: 120px"
/>
- </el-form-item>
- <el-form-item label="鎷奸煶鐮�" prop="bzPinyin">
- <el-input
- v-model="queryParams.bzPinyin"
- placeholder="璇疯緭鍏ユ嫾闊崇爜"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 130px"
- />
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- </el-form-item> -->
- <!-- <el-form-item>
+ </el-form-item>-->
+ <el-form-item label="妫�鏌ョ粨璁�" prop="ruleStr">
+ <el-input v-model="queryParams.ruleStr" placeholder="璇疯緭鍏ユ鏌ョ粨璁�" clearable @keyup.enter.native="getList"
+ style="width: 130px" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">鎼滅储</el-button>
+ </el-form-item>
+ <!-- <el-form-item>
<h3 >{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h3>
</el-form-item> -->
- <!-- <el-form-item>
+ <!-- <el-form-item>
<h3 style="margin-left: 160px">宸查�夐」鐩�</h3>
</el-form-item> -->
- <!-- </el-form> -->
- <h2 style="text-align: center;margin-top: -30px;">{{ queryParams.proName || '鏆傛棤椤圭洰鍚嶇О' }}</h2>
- <div style="display: flex; width: 100%">
- <div style="width: 50%; margin-right: 40px">
+ </el-form>
<el-table :data="dataList" ref="multipleTable" v-loading="loading" @selection-change="handleSelectionChange"
- border height="420px">
+ border height="480px">
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="搴忓彿" type="index" align="center" width="50px" />
<!-- <el-table-column label="瑙勫垯" align="center" prop="ruleStr" /> -->
@@ -65,7 +49,7 @@
</div>
</div>
- <div style="width: 100%; height: 600px">
+ <div class="jianc">
<!-- <h3 style="margin-top: -30px;">宸查�夐」鐩�</h3> -->
<el-form :model="form" ref="queryForm" size="small" label-width="68px" :label-position="labelPosition">
<!-- :inline="true" -->
@@ -79,14 +63,14 @@
<el-form-item label="妫�鏌ユ墍瑙�" prop="jcsj">
<el-input v-model="form.jcsj" clearable type="textarea" :autosize="{ minRows: 7 }" style="width: 380px" />
</el-form-item>
- <el-form-item label="妫�鏌ョ粨璁�" prop="conclusion">
+ <el-form-item label="妫�鏌ョ粨璁�" prop="desc">
<el-input v-model="form.desc" clearable type="textarea" :autosize="{ minRows: 7 }" style="width: 380px" />
</el-form-item>
</el-form>
</div>
</div>
- <span slot="footer" class="dialog-footer" style="margin-top: -120px">
+ <span slot="footer" class="dialog-footer" style="margin-top: -20px">
<el-button @click="callcolos">鍙� 娑�</el-button>
<el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
</span>
@@ -121,7 +105,7 @@
data() {
return {
open: false,
- labelPosition:"top",
+ labelPosition: "top",
// 寮瑰嚭灞傛爣棰�
title: "",
yxbx: "",
@@ -136,10 +120,7 @@
jcsj: "",
},
queryParams: {
- bingzhong: "",
- bzPinyin: "",
- proId: "",
- proName: "",
+ ruleStr: "",
pageNum: 1,
pageSize: 10,
},
@@ -151,6 +132,7 @@
},
watch: {
checkStatus(newValue) {
+ console.log(565658)
if (newValue === "1") {
this.updateData(this.proResult, this.conclusion);
}
@@ -179,10 +161,11 @@
this.loading = true; // 娣诲姞鍔犺浇鐘舵��
const res = await getlist(this.queryParams);
this.dataList = res.data.rows;
- if( res.data.total){
+ if (res.data.total) {
this.total = res.data.total;
}
- this.updateData(this.proResult, this.conclusion);
+ this.updateData(this.proResult, this.conclusion);
+
// 濡傛灉闇�瑕侀�変腑鎿嶄綔锛屽皢鍏跺皝瑁呬负鐙珛鏂规硶
await this.handleAutoSelection();
} catch (error) {
@@ -219,23 +202,29 @@
updateData(proResult, conclusion) {
console.log(proResult, conclusion, 5658)
-
+ if (this.checkStatus == 1) {
+
this.form.jcsj = proResult; // 鏇存柊妫�鏌ユ墍瑙�
this.form.desc = conclusion; // 鏇存柊妫�鏌ョ粨璁�
- if (this.list.length != 0) {
- let desc = ""
- desc += this.list
- .map((item) => item.bingzhong || item.ruleStr)
- .filter(Boolean)
- .join(",");
- let jcsj = ""
- jcsj += this.list
- .map((item) => item.yxbx)
- .filter(Boolean)
- .join(",");
- this.form.jcsj = this.form.jcsj+jcsj; // 鏇存柊妫�鏌ユ墍瑙�
- this.form.desc= this.form.desc+desc;
- }
+ } else {
+ this.form.desc = "";
+ this.form.jcsj = "";
+ }
+
+ if (this.list.length != 0) {
+ let desc = ""
+ desc += this.list
+ .map((item) => item.bingzhong || item.ruleStr)
+ .filter(Boolean)
+ .join(",");
+ let jcsj = ""
+ jcsj += this.list
+ .map((item) => item.yxbx)
+ .filter(Boolean)
+ .join(",");
+ this.form.jcsj = this.form.jcsj + jcsj; // 鏇存柊妫�鏌ユ墍瑙�
+ this.form.desc = this.form.desc + desc;
+ }
},
handleSelectionChange(selection) {
@@ -310,11 +299,22 @@
<style scoped>
.el-dialog__body {
- padding: 10px 20px;
+ padding: 0px 20px;
+}
+
+::v-deep .el-dialog__header {
+ padding: 0px !important;
+ padding-bottom: 0px !important;
}
::v-deep .el-dialog__footer {
padding: 0 !important;
padding-bottom: 40px !important;
}
+
+.jianc {
+ width: 100%;
+ height: 600px;
+ padding-top: 40px
+}
</style>
\ No newline at end of file
diff --git a/src/views/jmreport/payment/index.vue b/src/views/jmreport/payment/index.vue
new file mode 100644
index 0000000..fe613d4
--- /dev/null
+++ b/src/views/jmreport/payment/index.vue
@@ -0,0 +1,43 @@
+<template>
+ <div v-loading="loading" :style="'height:' + height">
+ <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
+ </div>
+ </template>
+ <script>
+ import {
+ getToken
+ } from '@/utils/auth'
+ import { view } from "@/api/jmreport/jimu";
+ export default {
+ name: "Ureport",
+ data() {
+ return {
+ src: "",
+ height: document.documentElement.clientHeight - 94.5 + "px;",
+ loading: true,
+ viewNum:"1072318375476887552",
+ };
+ },
+ created() {
+ view().then((res) => {
+ this.src =
+ res +
+ "/" +
+ this.viewNum +
+ "?token=Bearer" +
+ getToken();
+ });
+ // this.src = "http://192.168.0.99:8080/ltkj-admin/jmreport/view/815468234724306944?token=Bearer " + getToken();
+ },
+
+ mounted: function () {
+ setTimeout(() => {
+ this.loading = false;
+ }, 230);
+ const that = this;
+ window.onresize = function temp() {
+ that.height = document.documentElement.clientHeight - 94.5 + "px;";
+ };
+ }
+ };
+ </script>
\ No newline at end of file
diff --git a/src/views/picture/picture/index.vue b/src/views/picture/picture/index.vue
index 3c01a4d..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,8 +44,8 @@
<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 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" /> -->
@@ -74,9 +81,15 @@
</template>
</el-table-column>
</el-table>
- </div>
- <div id="table" 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">
@@ -137,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" />
@@ -214,6 +217,7 @@
// 閫変腑鏁扮粍
ids: [],
CheckBox: {},
+ isCollapsed: 0, // 榛樿涓烘姌鍙犵姸鎬�
// 闈炲崟涓鐢�
single: true,
// 闈炲涓鐢�
@@ -433,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;
@@ -553,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]) {
@@ -577,7 +591,6 @@
console.log(8989)
let tjNumber = val;
this.loading = true;
-
getYxJcXx(tjNumber).then((res) => {
this.tableList = res.data;
this.loading = false;
@@ -586,16 +599,20 @@
".el-table__header .el-checkbox"
);
if (headerCheckbox) headerCheckbox.style.display = "none";
-
- 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]);
- }
- })
-
+ 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]);
}
});
});
@@ -810,14 +827,14 @@
if (this.tableList.length == 1) {
this.submitForm();
} else {
- this.tableList.forEach((item, index) =>{
+ this.tableList.forEach((item, index) => {
if (item.type == 0) {
this.changtjNumber(this.selectedTjNumber);
- }else{
+ } else {
this.submitForm();
}
})
-
+
}
})
.catch((error) => {
@@ -897,4 +914,5 @@
float: left;
position: relative;
}
-</style>
\ No newline at end of file
+
+</style>
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index a81a3a7..ce1944f 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -345,6 +345,10 @@
</el-form-item>
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
+
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
</el-form-item>
</el-form>
<el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"
@@ -390,9 +394,7 @@
<el-col :span="7" :xs="24">
<el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
- <el-form-item>
- <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
- </el-form-item>
+
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
@@ -404,8 +406,8 @@
<el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
height="478" style="width: 100%">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
- <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" />
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="230px"/>
+ <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" width="100px"/>
</el-table>
</el-col>
</el-row>
@@ -450,6 +452,9 @@
<el-form-item>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+ </el-form-item>
</el-form>
<el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478"
:cell-style="{ padding: '5px 0' }">
@@ -482,9 +487,7 @@
<el-col :span="8" :xs="24">
<el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px" @submit.native.prevent>
- <el-form-item>
- <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
- </el-form-item>
+
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
@keyup.enter.native="handleSearchFor" style="width: 140px" />
diff --git a/vue.config.js b/vue.config.js
index 0e775f0..fd5ce6e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,8 +53,8 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
- // target: `http://192.168.1.2:5011`,
- target: `http://192.168.1.113:5011`,
+ target: `http://192.168.1.2:5011`,
+ // target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0