From 5608958b603be7ee70f309d6bb35dc4739449778 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 19 二月 2024 15:11:41 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/examination/index.vue | 1
src/views/system/emer/index.vue | 31 ++
src/views/system/icd/index.vue | 31 ++
src/views/system/package/index.vue | 531 ++++++++-----------------------------------
src/views/system/indrefund/index.vue | 45 +-
src/views/system/ssdm/index.vue | 31 ++
src/api/system/package.js | 18 +
src/views/hosp/project/index.vue | 2
8 files changed, 229 insertions(+), 461 deletions(-)
diff --git a/src/api/system/package.js b/src/api/system/package.js
index bdca5ec..a32270c 100644
--- a/src/api/system/package.js
+++ b/src/api/system/package.js
@@ -9,6 +9,24 @@
})
}
+export function getPacList(query) {
+ return request({
+ url: '/system/package/getPacList',
+ method: 'get',
+ params: query
+ })
+}
+
+export function getPacInFo(pacId) {
+ return request({
+ url: '/system/package/getPacInFo',
+ method: 'get',
+ params:{
+ pacId:pacId
+ }
+ })
+}
+
// 鏌ヨ浣撴濂楅璇︾粏
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 71181a8..eb6f849 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -510,6 +510,7 @@
if (res.code == 200) {
// this.$forceUpdate();
this.getList();
+ this.xiangmuList = []
this.$modal.msgSuccess("鎻愪氦鎴愬姛锛�");
}
});
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index b7e7aa9..c333410 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -1233,7 +1233,7 @@
},
// 鑺傜偣鍗曞嚮浜嬩欢
handleNodeClick(date) {
- if (date.$treeNodeId == 3) {
+ if (date.children) {
this.xiugais = true;
} else {
this.xiugais = false;
diff --git a/src/views/system/emer/index.vue b/src/views/system/emer/index.vue
index dafeba1..3d86b18 100644
--- a/src/views/system/emer/index.vue
+++ b/src/views/system/emer/index.vue
@@ -25,12 +25,20 @@
/>
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="qybz">
- <el-input
+ <!-- <el-input
v-model="queryParams.qybz"
placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�"
clearable
@keyup.enter.native="handleQuery"
- />
+ /> -->
+ <el-select v-model="queryParams.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" clearable >
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<!-- <el-form-item label="鍒犻櫎鏍囧織" prop="deleted">
<el-input
@@ -145,7 +153,13 @@
prop="qybz"
:show-overflow-tooltip="true"
width="80px"
- />
+ >
+ <template slot-scope="scope">
+ <span v-if="scope.row.qybz == '0'">鍚敤</span>
+ <span v-if="scope.row.qybz == '1'">鍋滅敤</span>
+ <!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> -->
+ </template>
+ </el-table-column>
<!-- <el-table-column
label="鍒犻櫎鏍囧織"
align="center"
@@ -211,7 +225,15 @@
/>
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="qybz">
- <el-input v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" style="width:210px" />
+ <!-- <el-input v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" style="width:210px" /> -->
+ <el-select v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" clearable style="width:210px">
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鐭ヨ瘑搴撳唴瀹�:">
<editor v-model="form.emercontent" :min-height="192" />
@@ -240,6 +262,7 @@
export default {
name: "Emer",
+ dicts: ['sys_normal_disable'],
data() {
let checkPhoneNum = (rule, value, callback) => {
console.log( value)
diff --git a/src/views/system/icd/index.vue b/src/views/system/icd/index.vue
index b356d4d..42c90c3 100644
--- a/src/views/system/icd/index.vue
+++ b/src/views/system/icd/index.vue
@@ -49,12 +49,20 @@
/>
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="qybz">
- <el-input
+ <!-- <el-input
v-model="queryParams.qybz"
placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�"
clearable
@keyup.enter.native="handleQuery"
- />
+ /> -->
+ <el-select v-model="queryParams.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" clearable >
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鍖讳繚鐤剧梾缂栫爜" prop="gjybbm">
<el-input
@@ -165,7 +173,13 @@
<el-table-column label="鎷奸煶鐮�" align="center" prop="pym" :show-overflow-tooltip="true" />
<el-table-column label="鐤剧梾鍒嗙被" align="center" prop="jbfl" :show-overflow-tooltip="true" />
<el-table-column label="鐗堟湰" align="center" prop="ver" :show-overflow-tooltip="true" />
- <el-table-column label="鍚敤鏍囧織" align="center" prop="qybz" :show-overflow-tooltip="true" width="80px" />
+ <el-table-column label="鍚敤鏍囧織" align="center" prop="qybz" :show-overflow-tooltip="true" width="80px">
+ <template slot-scope="scope">
+ <span v-if="scope.row.qybz == '0'">鍚敤</span>
+ <span v-if="scope.row.qybz == '1'">鍋滅敤</span>
+ <!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> -->
+ </template>
+ </el-table-column>
<el-table-column label="鍥藉鍖讳繚鐤剧梾缂栫爜" align="center" prop="gjybbm" :show-overflow-tooltip="true" />
<el-table-column label="鍥藉鍖讳繚鐤剧梾鍚嶇О" align="center" prop="gjybmc" :show-overflow-tooltip="true" />
<el-table-column label="璇婃柇闄勫姞鐮�" align="center" prop="zdfjm" :show-overflow-tooltip="true" />
@@ -232,7 +246,15 @@
<el-input v-model="form.ver" placeholder="璇疯緭鍏ョ増鏈�" />
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="qybz">
- <el-input v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" />
+ <!-- <el-input v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" /> -->
+ <el-select v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" clearable style="width: 100%;">
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鍥藉鍖讳繚鐤剧梾缂栫爜" prop="gjybbm">
<el-input
@@ -266,6 +288,7 @@
export default {
name: "Icd",
+ dicts: ['sys_normal_disable'],
data() {
let checkPhoneNum = (rule, value, callback) => {
console.log( value)
diff --git a/src/views/system/indrefund/index.vue b/src/views/system/indrefund/index.vue
index 1e79b11..307ccea 100644
--- a/src/views/system/indrefund/index.vue
+++ b/src/views/system/indrefund/index.vue
@@ -32,21 +32,22 @@
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelect" border max-height="720px"
:row-style="changRed">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="濮撳悕" align="center" prop="customer.cusName" width="90px" />
- <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone" width="110px"
- :show-overflow-tooltip="true"></el-table-column>
- <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" width="194px" />
- <el-table-column label="浣撴椤圭洰" align="center" prop="tjProName" width="120px" :show-overflow-tooltip="true" />
- <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" width="90px" />
- <el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" width="80px" />
- <el-table-column label="浠樻绫诲瀷" align="center" prop="payType" width="80px">
+ <el-table-column label="濮撳悕" align="center" prop="customer.cusName" />
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="customer.cusPhone"
+ ></el-table-column>
+ <!-- :show-overflow-tooltip="true" -->
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="waterId" />
+ <el-table-column label="浣撴椤圭洰" align="center" prop="tjProName" />
+ <el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" />
+ <el-table-column label="瀹炴敹閲戦" align="center" prop="paidIn" />
+ <el-table-column label="浠樻绫诲瀷" align="center" prop="payType">
<template slot-scope="scope">
<dict-tag :options="dict.type.dict_pay_type" :value="scope.row.payType" />
</template>
</el-table-column>
- <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" width="100px" />
- <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" width="160px" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding " width="100px"
+ <el-table-column label="鏀惰垂鍛�" align="center" prop="updateBy" />
+ <el-table-column label="鏀堕��鏃堕棿" align="center" prop="updateTime" />
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding"
v-if="queryParams.type == '4'">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handlerefund(scope.row)"
@@ -246,18 +247,18 @@
},//娓呴櫎瀹氭椂鍣紝浠ラ伩鍏嶅唴瀛樻硠闇层��
getList() {
- getTjPrice().then(res => {
- if (res.data) {
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- if (r.test(res.data)) {
- this.form.ys = res.data + ".00";
- } else {
- this.form.ys = res.data
- }
+ // getTjPrice().then(res => {
+ // if (res.data) {
+ // const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
+ // if (r.test(res.data)) {
+ // this.form.ys = res.data + ".00";
+ // } else {
+ // this.form.ys = res.data
+ // }
- this.form.ss = this.form.ys
- }
- })
+ // this.form.ss = this.form.ys
+ // }
+ // })
getInfo(this.queryParams).then((response) => {
this.hospName = response.hospName;
});
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index c8a8541..263ee35 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -1,106 +1,41 @@
<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" v-show="showSearch" label-width="68px">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input
- v-model="queryParams.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="濂楅鎻忚堪" prop="pacRemark">
- <el-input
- v-model="queryParams.pacRemark"
- placeholder="璇疯緭鍏ュ椁愭弿杩�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.pacRemark" placeholder="璇疯緭鍏ュ椁愭弿杩�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="濂楅鍒嗙被" prop="categoryId">
- <el-select
- v-model="queryParams.categoryId"
- placeholder="璇烽�夋嫨鐘舵��"
- style="width: 200px"
- filterable
- clearable
- >
- <el-option
- v-for="dict in categoryList"
- :key="dict.id"
- :label="dict.name"
- :value="dict.id"
- ></el-option>
+ <el-select v-model="queryParams.categoryId" placeholder="璇烽�夋嫨鐘舵��" style="width: 200px" filterable clearable>
+ <el-option v-for="dict in categoryList" :key="dict.id" :label="dict.name" :value="dict.id"></el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['system:package:add']"
- >鏂板</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['system:package:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUp"
- v-hasPermi="['system:package:edit']"
- >淇敼</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUp"
+ v-hasPermi="['system:package:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:package:remove']"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['system:package:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['system:package:export']"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['system:package:export']">瀵煎嚭</el-button>
</el-col>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<!--
@@ -108,56 +43,16 @@
element-loading-spinner="el-icon-loading"
element-loading-text="姝ｅ湪鍔犺浇涓�..." -->
<template>
- <el-table
- v-loading="loading"
- style="width: 100%"
- :data="packageList"
- @selection-change="handleSelectionChange"
- border
- >
- <el-table-column
- fixed
- type="selection"
- width="40"
- align="center"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="搴忓彿"
- align="center"
- width="50"
- prop="newID"
- fixed
- />
+ <el-table v-loading="loading" style="width: 100%" :data="packageList" @selection-change="handleSelectionChange"
+ border>
+ <el-table-column fixed type="selection" width="40" align="center" :show-overflow-tooltip="true" />
+ <el-table-column label="搴忓彿" align="center" width="50" prop="newID" fixed />
<!-- <el-table-column label="缂栧彿" align="center" prop="pacId" /> -->
- <el-table-column
- label="濂楅鍒嗙被"
- width="100px"
- align="center"
- prop="categoryNames"
- fixed
- ></el-table-column>
- <el-table-column
- label="濂楅鍚嶇О"
- align="center"
- prop="pacName"
- width="150px"
- fixed
- />
- <el-table-column
- label="浠锋牸"
- width="80px"
- align="center"
- prop="price"
- fixed
- >
+ <el-table-column label="濂楅鍒嗙被" width="100px" align="center" prop="categoryNames" fixed></el-table-column>
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="150px" fixed />
+ <el-table-column label="浠锋牸" width="80px" align="center" prop="price" fixed>
</el-table-column>
- <el-table-column
- label="鍗曢」鍒楄〃"
- align="center"
- prop="allProName"
- width="1200px"
- >
+ <el-table-column label="鍗曢」鍒楄〃" align="center" prop="allProName" width="1200px">
</el-table-column>
<!-- <el-table-column
label="椤圭洰鏄庣粏"
@@ -166,12 +61,7 @@
:show-overflow-tooltip="true"
>
</el-table-column>-->
- <el-table-column
- label="濂楅鎻忚堪"
- align="center"
- :show-overflow-tooltip="true"
- width="120px"
- >
+ <el-table-column label="濂楅鎻忚堪" align="center" :show-overflow-tooltip="true" width="120px">
<template slot-scope="scope">
<div class="showInline">{{ scope.row.pacRemark }}</div>
</template>
@@ -188,23 +78,10 @@
</template>
</el-table-column> -->
- <el-table-column
- label="鍏抽敭瀛�"
- width="110px"
- align="center"
- prop="keyNames"
- ></el-table-column>
- <el-table-column
- label="鏄惁涓婃灦"
- width="94px"
- align="center"
- prop="isOnSale"
- >
+ <el-table-column label="鍏抽敭瀛�" width="110px" align="center" prop="keyNames"></el-table-column>
+ <el-table-column label="鏄惁涓婃灦" width="94px" align="center" prop="isOnSale">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_yes_no"
- :value="scope.row.isOnSale"
- />
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isOnSale" />
</template>
</el-table-column>
<!-- <el-table-column
@@ -214,70 +91,22 @@
align="center"
prop="detail"
></el-table-column> -->
- <el-table-column
- label="鎺掑簭"
- width="50px"
- align="center"
- prop="sort"
- ></el-table-column>
- <el-table-column
- label="灏忕▼搴忎环鏍�"
- width="90px"
- align="center"
- prop="retailPrice"
- ></el-table-column>
- <el-table-column
- label="鍘熶环"
- width="90px"
- align="center"
- prop="counterPrice"
- ></el-table-column>
- <el-table-column
- label="宸插敭鏁伴噺"
- width="90px"
- align="center"
- prop="saleNum"
- ></el-table-column>
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="pacStatus"
- fixed="right"
- width="100px"
- >
+ <el-table-column label="鎺掑簭" width="50px" align="center" prop="sort"></el-table-column>
+ <el-table-column label="灏忕▼搴忎环鏍�" width="90px" align="center" prop="retailPrice"></el-table-column>
+ <el-table-column label="鍘熶环" width="90px" align="center" prop="counterPrice"></el-table-column>
+ <el-table-column label="宸插敭鏁伴噺" width="90px" align="center" prop="saleNum"></el-table-column>
+ <el-table-column label="鐘舵��" align="center" prop="pacStatus" fixed="right" width="100px">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.pacStatus"
- active-value="0"
- inactive-value="1"
- @change="handleStatusChange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.pacStatus" active-value="0" inactive-value="1"
+ @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="80px"
- fixed="right"
- class-name="small-padding fixed-width"
- >
+ <el-table-column label="鎿嶄綔" align="center" width="80px" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:package:edit']"
- title="淇敼"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:package:remove']"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:package:edit']" title="淇敼"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['system:package:remove']" title="鍒犻櫎"></el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleSeach(scope.row)"
v-hasPermi="['system:package:Seach']" title="濂楅璇︽儏"></el-button> -->
</template>
@@ -286,65 +115,31 @@
<div class="pag">
<div class="pag1">
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
</template>
<!-- 淇敼浣撴濂楅瀵硅瘽妗� -->
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1100px"
- append-to-body
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
<!-- <div class="dialo">
<div class="dialo1"> -->
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="handlePackage"
- >
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handlePackage">
濂楅鍚嶇О
</span>
- <el-input
- v-model="form.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- style="width: 150px"
- />
+ <el-input v-model="form.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" style="width: 150px" />
</el-form-item>
<el-form-item label="濂楅鐘舵��" prop="pacStatus">
<!-- <el-radio-group v-model="form.pacStatus">
<el-radio :label="0">鍚敤</el-radio>
<el-radio :label="1">鍋滅敤</el-radio>
</el-radio-group> -->
- <el-select
- v-model="form.pacStatus"
- placeholder="璇烽�夋嫨鐘舵��"
- style="width: 150px"
- filterable
- clearable
- >
- <el-option
- v-for="dict in dict.type.sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.pacStatus" placeholder="璇烽�夋嫨鐘舵��" style="width: 150px" filterable clearable>
+ <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
@@ -354,39 +149,16 @@
placeholder="璇疯緭鍏ュ晢鍝佺被鐩�"
style="width: 200px"
/> -->
- <el-select
- v-model="form.categoryId"
- placeholder="璇烽�夋嫨濂楅绫荤洰"
- style="width: 150px"
- @change="shangpin"
- filterable
- clearable
- >
- <el-option
- v-for="item in categoryList"
- :key="item.id"
- :label="item.name"
- :value="item.id"
- ></el-option>
+ <el-select v-model="form.categoryId" placeholder="璇烽�夋嫨濂楅绫荤洰" style="width: 150px" @change="shangpin" filterable
+ clearable>
+ <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍏抽敭瀛�" prop="keywords">
- <el-select
- multiple
- v-model="form.keywords"
- placeholder="璇烽�夋嫨鍏抽敭瀛�"
- style="width: 150px"
- @change="sel"
- filterable
- clearable
- >
- <el-option
- v-for="item in keywordList"
- :key="item.id"
- :label="item.keyword"
- :value="item.id"
- ></el-option>
+ <el-select multiple v-model="form.keywords" placeholder="璇烽�夋嫨鍏抽敭瀛�" style="width: 150px" @change="sel" filterable
+ clearable>
+ <el-option v-for="item in keywordList" :key="item.id" :label="item.keyword" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鏄惁涓婃灦" prop="isOnSale">
@@ -394,68 +166,37 @@
<el-radio :label="0">鍚敤</el-radio>
<el-radio :label="1">鍋滅敤</el-radio>
</el-radio-group> -->
- <el-select
- v-model="form.isOnSale"
- placeholder="璇烽�夋嫨鏄惁涓婃灦"
- style="width: 150px"
- filterable
- clearable
- >
- <el-option
- v-for="dict in dict.type.sys_yes_no"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.isOnSale" placeholder="璇烽�夋嫨鏄惁涓婃灦" style="width: 150px" filterable clearable>
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎺掑簭" prop="sort">
- <el-input
- v-model="form.sort"
- placeholder="璇疯緭鍏ユ帓搴�"
- style="width: 150px"
- />
+ <el-input v-model="form.sort" placeholder="璇疯緭鍏ユ帓搴�" style="width: 150px" />
</el-form-item>
<el-form-item label="灏忕▼搴忎环鏍�" prop="retailPrice">
- <el-input
- v-model="form.retailPrice"
- placeholder="璇疯緭鍏ュ皬绋嬪簭浠锋牸"
- style="width: 150px"
- />
+ <el-input v-model="form.retailPrice" placeholder="璇疯緭鍏ュ皬绋嬪簭浠锋牸" style="width: 150px" />
</el-form-item>
<el-form-item label="鍘熶环" prop="counterPrice">
- <el-input
- v-model="form.counterPrice"
- placeholder="璇疯緭鍏ュ師浠�"
- style="width: 150px"
- />
+ <el-input v-model="form.counterPrice" placeholder="璇疯緭鍏ュ師浠�" style="width: 150px" />
</el-form-item>
<div v-if="!isCollapsed" style="display:flex">
<div>
<el-form-item label="濂楅鎻忚堪" prop="pacRemark">
- <el-input
- type="textarea"
- v-model="form.pacRemark"
- placeholder="璇疯緭鍏ュ椁愭弿杩�"
- style="width: 670px"
- rows="2"
- ></el-input>
- </el-form-item>
- <el-form-item label="璇︾粏浠嬬粛" prop="detail">
- <!-- <el-input
+ <el-input type="textarea" v-model="form.pacRemark" placeholder="璇疯緭鍏ュ椁愭弿杩�" style="width: 670px"
+ rows="2"></el-input>
+ </el-form-item>
+ <el-form-item label="璇︾粏浠嬬粛" prop="detail">
+ <!-- <el-input
v-model="form.detail"
placeholder="璇疯緭鍏ヨ缁嗕粙缁�"
style="width: 200px"
/> -->
- <editor
- v-model="form.detail"
- :min-height="192"
- style="width: 670px"
- />
- </el-form-item>
- </div>
+ <editor v-model="form.detail" :min-height="192" style="width: 670px" />
+ </el-form-item>
+ </div>
<!-- </div> -->
<div class="dialo2">
<el-form-item label="鍥剧墖">
@@ -468,97 +209,32 @@
<el-button type="primary" plain size="mini" @click="toggleCollapse">{{
isCollapsed ? "灞曞紑" : "鏀惰捣"
}}</el-button>
- <el-button
- type="primary"
- plain
- size="mini"
- icon="el-icon-plus"
- @click="addmembers()"
- >鏂板鍗曢」</el-button
- >
- <el-table
- v-loading="loading"
- :data="form.tjProjectList"
- @selection-change="handleSelectionChange"
- border
- max-height="275"
- style="margin: 10px 0"
- >
+ <el-button type="primary" plain size="mini" icon="el-icon-plus" @click="addmembers()">鏂板鍗曢」</el-button>
+ <el-table v-loading="loading" :data="form.tjProjectList" @selection-change="handleSelectionChange" border
+ max-height="275" style="margin: 10px 0">
<el-table-column label="搴忓彿" align="center" type="index" />
- <el-table-column
- label="椤圭洰鍚嶇О"
- align="center"
- prop="proName"
- width="180px"
- >
+ <el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" width="180px">
<template slot-scope="scope">
- <el-select
- filterable
- v-model="scope.row.proName"
- placeholder="璇烽�夋嫨椤圭洰鍚嶇О"
- @change="getSelectValue"
- >
- <el-option
- v-for="(item, index) in allList"
- :key="index"
- :label="item.proName"
- :value="item.proName"
- >
+ <el-select filterable v-model="scope.row.proName" placeholder="璇烽�夋嫨椤圭洰鍚嶇О" @change="getSelectValue">
+ <el-option v-for="(item, index) in allList" :key="index" :label="item.proName" :value="item.proName">
</el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- label="椤圭洰鏄庣粏"
- align="center"
- prop="allSonProName"
- width="400px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="椤圭洰鏄庣粏" align="center" prop="allSonProName" width="400px" :show-overflow-tooltip="true">
</el-table-column>
- <el-table-column
- label="鍘熶环(鍏�)"
- align="center"
- prop="proPrice"
- width="80px"
- />
- <el-table-column
- label="鐜颁环(鍏�)"
- align="center"
- prop="priceNow"
- width="80px"
- >
+ <el-table-column label="鍘熶环(鍏�)" align="center" prop="proPrice" width="80px" />
+ <el-table-column label="鐜颁环(鍏�)" align="center" prop="priceNow" width="80px">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.priceNow"
- autocomplete="off"
- placeholder="璇疯緭鍏ュ唴瀹�"
- ></el-input>
+ <el-input v-model="scope.row.priceNow" autocomplete="off" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</template>
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- fixed="right"
- align="center"
- class-name="small-padding fixed-width"
- >
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-circle-plus-outline"
- @click="addmembers(scope.row)"
- v-hasPermi="['system:package:edit']"
- title="鏂板琛�"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click.native.prevent="Delete(scope.$index)"
- v-hasPermi="['hosp:consumables:remove']"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-circle-plus-outline" @click="addmembers(scope.row)"
+ v-hasPermi="['system:package:edit']" title="鏂板琛�"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click.native.prevent="Delete(scope.$index)"
+ v-hasPermi="['hosp:consumables:remove']" title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -594,6 +270,8 @@
import { listCategory } from "@/api/mall/category";
import { listKeyword } from "@/api/mall/keyword";
import {
+ getPacList,
+ getPacInFo,
listPackage,
getPackage,
delPackage,
@@ -711,7 +389,16 @@
/** 鏌ヨ浣撴濂楅鍒楄〃 */
getList() {
this.loading = true;
- listPackage(this.queryParams).then((response) => {
+ getAllList().then((response) => {
+ this.allList = response.data;
+ if (this.allList.proStatus === 0) {
+ this.allList.proStatus = "鍚敤";
+ } else {
+ this.allList.proStatus = "鍋滅敤";
+ }
+ this.loading = false;
+ });
+ getPacList(this.queryParams).then((response) => {
response.rows.forEach((item, index) => {
item.newID =
(this.queryParams.pageNum - 1) * this.queryParams.pageSize +
@@ -811,6 +498,7 @@
this.reset();
this.open = true;
this.title = "浣撴濂楅淇℃伅缁存姢";
+
// getAllList().then((response) => {
// this.allList = response.data;
// if (this.allList.proStatus === 0) {
@@ -863,8 +551,8 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.form = row;
- this.form.keywords = this.form.keyIds;
+ // this.form = row;
+ // this.form.keywords = this.form.keyIds;
// if (this.form.pacStatus === 0) {
// this.form.pacStatus = "鍚敤";
// } else {
@@ -872,25 +560,16 @@
// }
this.title = "浣撴濂楅淇℃伅缁存姢";
this.open = true;
- // getAllList().then((response) => {
- // this.allList = response.data;
- // this.loading = false;
- // });
+ getPacInFo(row.pacId).then((response) => {
+ this.form = response.data;
+ this.form.keywords = this.form.keyIds;
+ });
},
// 鏂板琛�
addmembers() {
if (this.form.pacName) {
- this.loading = true;
- getAllList().then((response) => {
- this.allList = response.data;
- if (this.allList.proStatus === 0) {
- this.allList.proStatus = "鍚敤";
- } else {
- this.allList.proStatus = "鍋滅敤";
- }
- this.loading = false;
- });
+
if (!this.form.tjProjectList) {
this.form.tjProjectList = [];
this.form.tjProjectList.push({
@@ -1009,7 +688,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 鍒嗛厤濂楅鍐呴」鐩搷浣� */
diff --git a/src/views/system/ssdm/index.vue b/src/views/system/ssdm/index.vue
index 79adf3d..e0c1938 100644
--- a/src/views/system/ssdm/index.vue
+++ b/src/views/system/ssdm/index.vue
@@ -49,12 +49,20 @@
/>
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="qybz">
- <el-input
+ <!-- <el-input
v-model="queryParams.qybz"
placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�"
clearable
@keyup.enter.native="handleQuery"
- />
+ /> -->
+ <el-select v-model="queryParams.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" clearable >
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鍥藉鍖讳繚缂栫爜" prop="gjybbm">
<el-input
@@ -165,7 +173,13 @@
<el-table-column label="鎷奸煶鐮�" align="center" prop="pym" :show-overflow-tooltip="true" />
<el-table-column label="鎵嬫湳鍒嗙被" align="center" prop="ssfl" :show-overflow-tooltip="true" />
<el-table-column label="鐗堟湰鍙�" align="center" prop="ver" :show-overflow-tooltip="true" />
- <el-table-column label="鍚敤鏍囧織" align="center" prop="qybz" :show-overflow-tooltip="true" width="60px" />
+ <el-table-column label="鍚敤鏍囧織" align="center" prop="qybz" :show-overflow-tooltip="true" width="60px" >
+ <template slot-scope="scope">
+ <span v-if="scope.row.qybz == '0'">鍚敤</span>
+ <span v-if="scope.row.qybz == '1'">鍋滅敤</span>
+ <!-- <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> -->
+ </template>
+ </el-table-column>
<el-table-column label="鍥藉鍖讳繚缂栫爜" align="center" prop="gjybbm" :show-overflow-tooltip="true" />
<el-table-column label="鍥藉鍖讳繚鍚嶇О" align="center" prop="gjybmc" :show-overflow-tooltip="true" />
<el-table-column label="鎵嬫湳绛夌骇" align="center" prop="ssdj" :show-overflow-tooltip="true" />
@@ -232,7 +246,15 @@
<el-input v-model="form.ver" placeholder="璇疯緭鍏ョ増鏈彿" />
</el-form-item>
<el-form-item label="鍚敤鏍囧織" prop="qybz">
- <el-input v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" />
+ <!-- <el-input v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" /> -->
+ <el-select v-model="form.qybz" placeholder="璇疯緭鍏ュ惎鐢ㄦ爣蹇�" clearable style="width: 100%;">
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鍥藉鍖讳繚缂栫爜" prop="gjybbm">
<el-input v-model="form.gjybbm" placeholder="璇疯緭鍏ュ浗瀹跺尰淇濈紪鐮�" />
@@ -266,6 +288,7 @@
export default {
name: "Ssdm",
+ dicts: ['sys_normal_disable'],
data() {
let checkPhoneNum = (rule, value, callback) => {
console.log( value)
--
Gitblit v1.8.0