From d3ea99796e35f4be7d2a77957b0be57bee011663 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 01 八月 2025 15:46:42 +0800
Subject: [PATCH] tj
---
src/views/system/comp/index.vue | 142 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 107 insertions(+), 35 deletions(-)
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index ce09f16..f29b2d6 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -128,12 +128,12 @@
<el-form-item label="绛剧害閲戦" prop="signingPrice">
<el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
</el-form-item>
- <el-form-item label="鐥呯" prop="bz" v-if="dwlxs == 1">
- <el-select v-model="form.bz" placeholder="璇烽�夋嫨鐥呯" style="width: 130px" clearable>
- <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
- </el-form-item>
+ <el-form-item label="鐥呯" prop="bz" v-if="dwlxs == 1">
+ <el-select v-model="form.bz" placeholder="璇烽�夋嫨鐥呯" style="width: 130px" clearable>
+ <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -185,7 +185,12 @@
:value="dict.value" />
</el-select>
</el-form-item>
-
+ <el-form-item label="鏄惁鏇挎" prop="tj">
+ <el-select v-model="forms.tj" placeholder="璇烽�夋嫨鏄惁鏇挎" style="width: 120px" clearable>
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
<el-form-item label="骞撮緞娈�">
<el-col :span="7">
<el-input v-model="forms.ltAge" style="width: 53px" />
@@ -195,6 +200,7 @@
<el-input v-model="forms.gtAge" style="width: 54px" />
</el-col>
</el-form-item>
+
</el-form>
<el-row :gutter="10" class="mb8">
@@ -246,7 +252,7 @@
@submit.native.prevent>
<el-form-item label="濂楅鍚嶇О" prop="pacName">
<el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
- @keyup.enter.native="handleSearch" style="width: 140px" />
+ @keyup.enter.native="handleSearch" @clear="handleClearSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
@@ -417,7 +423,7 @@
label-width="68px" @submit.native.prevent>
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
- @keyup.enter.native="handleSearchFor" style="width: 140px" />
+ @keyup.enter.native="handleSearchFor" @clear="handleClearSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
@@ -511,7 +517,7 @@
label-width="68px" @submit.native.prevent>
<el-form-item label="椤圭洰鍚嶇О" prop="proName">
<el-input ref="inputName" v-model="queryParams1.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
- @keyup.enter.native="handleSearchFor" style="width: 140px" />
+ @keyup.enter.native="handleSearchFor" @clear="handleClearSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
@@ -532,7 +538,7 @@
</el-dialog>
</div>
- <el-dialog :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+ <el-dialog :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
<!-- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" label-width="auto">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
<el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle"
@@ -543,17 +549,38 @@
</el-form-item>
</el-form> -->
- <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 10px;margin-bottom: 20px;">
- <el-radio-button label="0">鍩虹濂楅</el-radio-button>
- <el-radio-button label="1">鍗曚綅濂楅</el-radio-button>
- </el-radio-group>
- <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading" border
- :data="newpacName1" @selection-change="handleSelectionChange1" height="450px" ref="tb">
- <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
- <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
- <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
- <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
- </el-table>
+ <el-radio-group v-model="taocanStatus" @input="radioChangetaocan" style="margin-left: 10px;margin-bottom: 20px;">
+ <el-radio-button label="0">鍩虹濂楅</el-radio-button>
+ <el-radio-button label="1">鍗曚綅濂楅</el-radio-button>
+ </el-radio-group>
+ <div>
+ <el-form :model="formdanwen" ref="queryForm" size="small" :inline="true" label-width="68px"
+ @submit.native.prevent v-if="taocanStatus == 1">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="drugManufacturerId">
+ <el-select v-model="formdanwen.drugManufacturerId" remote filterable style="width: 200px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable>
+ <el-option v-for="dict in compList" :key="dict.cnName" :label="dict.cnName"
+ :value="dict.drugManufacturerId" />
+ </el-select>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerydanwen"
+ style="margin: 0 15px">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading" border
+ :data="newpacName1" @selection-change="handleSelectionChange1" height="450px" ref="tb">
+ <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+ <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
+ </el-table>
+ </div>
+ <!-- <div v-else>
+
+ </div> -->
+
<span slot="footer" class="dialog-footer">
<el-button @click="cancel1">鍙� 娑�</el-button>
<el-button type="primary" @click="submit">纭� 瀹�</el-button>
@@ -692,6 +719,7 @@
getPackageList,
delegrouping,
getDetails,
+ huoqutuantitaocanxiangmuList
} from "@/api/system/comp";
import {
deptTreeSelect,
@@ -706,7 +734,7 @@
"dict_data_status",
"sys_user_sex",
"reservation_pay_type",
- "sys_yes_no",
+ "sys_yes_no", "sys_normal_disable"
],
data() {
let checkPhoneNum = (rule, value, callback) => {
@@ -722,6 +750,7 @@
return {
// 閬僵灞�
loading: true,
+ taocanStatus: 0,
Treedata: [],
id: "",
// 閫変腑鏁扮粍
@@ -766,6 +795,7 @@
proName: null,
pym: null,
},
+ formdanwen: {},
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -1100,7 +1130,7 @@
// 涓嶈鐩存帴璧嬪�兼暣涓� response.data锛岃�屾槸閫愪釜灞炴�ц祴鍊�
Object.assign(this.form, response.data);
this.form.isZybUnit = response.data.isZybUnit === true ? 1 : 0;
- this.form.dwlx= Number(response.data.dwlx)
+ this.form.dwlx = Number(response.data.dwlx)
console.log("淇敼鏃剁殑 isZybUnit 鍊�:", this.form.isZybUnit);
this.open = true;
this.title = "淇敼浣撴鍗曚綅淇℃伅缁存姢";
@@ -1275,7 +1305,7 @@
});
}
},
- handleSearchFor() {
+ /* handleSearchFor() {
// 鍒ゆ柇鏄惁涓烘眽瀛�
const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char);
if (isChineseChar(this.queryParams1.proName)) {
@@ -1290,6 +1320,27 @@
this.Treedata = response.data;
});
}
+ }, */
+ handleSearchFor() {
+ // 鍒ゆ柇鏄惁涓烘眽瀛�
+ const keyword = this.queryParams1.proName?.trim() || '';
+ const isChineseChar = /[\u4E00-\u9FA5]/.test(keyword);
+ const query = {
+ ...this.queryParams1,
+ proName: isChineseChar ? keyword : null,
+ pym: isChineseChar ? null : keyword
+ };
+ getProjectList(query).then((response) => {
+ this.Treedata = response.data;
+ });
+ },
+ handleClearSearch() {
+ this.queryParams1.proName = '';
+ this.queryParams1.pym = null;
+ // 閲嶆柊鍔犺浇琛ㄦ牸鏁版嵁
+ getProjectList({}).then((response) => {
+ this.Treedata = response.data;
+ });
},
// 鍗曢」鏁版嵁鑾峰彇
handleChangesingle(selection) {
@@ -1527,7 +1578,9 @@
});
},
xiangmuWh() {
- if (!this.forms.groupingName || !this.forms.sex || !this.forms.payType) {
+ if (!this.forms.groupingName ||
+ !this.forms.sex ||
+ !this.forms.payType) {
this.$modal.msgError("璇峰厛濉啓鎵�鏈夊繀濉」!");
return; // Stop execution if any required field is empty
}
@@ -1535,6 +1588,9 @@
this.title = "鍒嗙粍椤圭洰缁存姢";
this.OnenewpacName = [];
this.queryParams.price = 0;
+ // 娓呯┖椤圭洰鍚嶇О鎼滅储妗�
+ this.queryParams1.proName = '';
+ this.queryParams1.pym = null;
this.loading = true;
if (this.groupList[0]) {
let id = this.groupList[0].id || "";
@@ -1596,14 +1652,14 @@
handleGroup() {
// 濡傛灉娌℃湁閫変腑浠讳綍閮ㄩ棬锛堝嵆娌℃湁 selectionList锛夛紝鍙互鐩存帴浠� OnenewpacName 鑾峰彇鏁版嵁
let mapList = [];
- this.OnenewpacName.forEach((item) => {
- mapList.push({
- proName: item.proName,
- proId: item.proId,
- proPrice: item.proPrice,
- });
- });
-
+ // this.OnenewpacName.forEach((item) => {
+ // mapList.push({
+ // proName: item.proName,
+ // proId: item.proId,
+ // proPrice: item.proPrice,
+ // });
+ // });
+ console.log(this.groupList)
let data = {
groupingName: this.forms.groupingName,
gtAge: this.forms.gtAge,
@@ -1740,6 +1796,21 @@
this.form.dwlx = val
},
+ radioChangetaocan(val) {
+ if (val == 0) {
+ this.getList()
+ } else {
+ this.handleQuerydanwen()
+ }
+ },
+
+ handleQuerydanwen() {
+ let dwId = this.formdanwen.drugManufacturerId
+ huoqutuantitaocanxiangmuList(dwId).then(res => {
+ this.newpacName1 = res.data
+ })
+ },
+
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate((valid) => {
@@ -1798,7 +1869,7 @@
// 鑾峰彇閫変腑鐨勫椁愰」鐩垪琛�
const newProjects = this.selectedPackage.tjProjectList || [];
-
+ console.log(newProjects, 22222)
// 灏嗛�変腑鐨勫椁愰」鐩坊鍔犲埌宸︿晶琛ㄦ牸
this.loading = true;
newProjects.forEach((project) => {
@@ -1837,6 +1908,7 @@
},
handleSelectionChange1(selection) {
+ console.log(selection, 11111)
// 瀹炵幇鍗曢�夐�昏緫
if (selection.length > 1) {
const lastSelected = selection[selection.length - 1];
--
Gitblit v1.8.0