From a3350d3b221f68b00d7476b481455406cb6ddcc5 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期一, 14 七月 2025 09:18:42 +0800
Subject: [PATCH] qx
---
src/views/system/tijian/index.vue | 58 +++--
src/api/system/comp.js | 10 +
src/views/doctor/checkAll/index.vue | 1
src/components/proposal/index.vue | 6
src/views/hosp/commonAdvice/index.vue | 128 ++++----------
src/views/system/info/index.vue | 271 +++++++++++------------------
src/views/system/package/index.vue | 2
src/views/reservation/roupsettlement/index.vue | 35 +--
src/api/team/tuanti.js | 6
src/views/hosp/project/index.vue | 16 +
10 files changed, 222 insertions(+), 311 deletions(-)
diff --git a/src/api/system/comp.js b/src/api/system/comp.js
index 77e66f8..d94dcb2 100644
--- a/src/api/system/comp.js
+++ b/src/api/system/comp.js
@@ -203,4 +203,14 @@
dwId:dwId
}
})
+}
+
+
+// 鏍规嵁鍗曚綅id鍜岄儴闂↖D鏌ヨ鍗曚綅鍒嗙粍淇℃伅
+export function gettuantijiesuanrenyuan(data) {
+ return request({
+ url: '/hosp/water/gettuantijiesuanrenyuan',
+ method: 'get',
+ params: data
+ })
}
\ No newline at end of file
diff --git a/src/api/team/tuanti.js b/src/api/team/tuanti.js
index a498571..f4568b3 100644
--- a/src/api/team/tuanti.js
+++ b/src/api/team/tuanti.js
@@ -45,13 +45,11 @@
});
}
//
-export function getTeamTjPeopleList(teamNo) {
+export function getTeamTjPeopleList(data) {
return request({
url: '/team/pay/getTeamTjPeopleList',
method: 'get',
- params:{
- teamNo:teamNo
- }
+ params:data
})
}
diff --git a/src/components/proposal/index.vue b/src/components/proposal/index.vue
index feec761..61d0bb6 100644
--- a/src/components/proposal/index.vue
+++ b/src/components/proposal/index.vue
@@ -19,8 +19,10 @@
<el-form inline @submit.native.prevent="search">
<el-form-item>
<el-radio-group v-model="tjproposal" @input="radiotjproposalChange">
- <el-radio-button label="0">甯哥敤寤鸿</el-radio-button>
- <el-radio-button label="1">蹇嵎寤鸿</el-radio-button>
+ <!-- <el-radio-button label="0">甯哥敤寤鸿</el-radio-button>
+ <el-radio-button label="1">蹇嵎寤鸿</el-radio-button> -->
+ <el-radio-button label="0">蹇嵎寤鸿</el-radio-button>
+ <el-radio-button label="1">甯哥敤寤鸿</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item v-show="tjproposal == 0">
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index 1570009..1964efc 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -2113,6 +2113,7 @@
this.startTime = [];
this.resetForm("tableList");
this.submitForm();
+ this.queryParams.tjCategory =null
},
huifu(row) {
diff --git a/src/views/hosp/commonAdvice/index.vue b/src/views/hosp/commonAdvice/index.vue
index 76f673f..f7f4059 100644
--- a/src/views/hosp/commonAdvice/index.vue
+++ b/src/views/hosp/commonAdvice/index.vue
@@ -1,113 +1,52 @@
<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="bt">
- <el-input
- v-model="queryParams.bt"
- placeholder="璇疯緭鍏ユ爣棰�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.bt" placeholder="璇疯緭鍏ユ爣棰�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="寤鸿" prop="nr">
- <el-input
- v-model="queryParams.nr"
- placeholder="璇疯緭鍏ユ鏌ラ」鐩�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.nr" placeholder="璇疯緭鍏ユ鏌ラ」鐩�" clearable @keyup.enter.native="handleQuery" />
</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-table
- :data="dataList"
- ref="elTable"
- v-loading="loading"
- @selection-change="handleSelectionChange"
- border
- height="580px"
- >
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button type="primary" size="mini" @click="proposalChange">鏂板</el-button>
+ </el-col>
+
+ </el-row>
+
+ <el-table :data="dataList" ref="elTable" v-loading="loading" @selection-change="handleSelectionChange" border
+ height="580px">
<el-table-column type="selection" width="40" align="center" />
<el-table-column label="搴忓彿" width="70" align="center" prop="newID" />
<el-table-column label="鏍囬" width="120" align="center" prop="title" />
<el-table-column label="寤鸿鍐呭" align="left" prop="advice" />
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="100px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="100px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleEdit(scope.row)"
- title="淇敼"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEdit(scope.row)" title="淇敼"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 淇敼蹇�熷缓璁爣棰樺拰鍐呭 -->
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1000px"
- append-to-body
- :close-on-click-modal="false"
- >
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" label-width="80px" :inline="true">
<el-form-item label="鏍囬" prop="title">
- <el-input
- v-model="form.title"
- placeholder="璇疯緭鍏ユ爣棰�"
- style="width: 200px"
- />
+ <el-input v-model="form.title" placeholder="璇疯緭鍏ユ爣棰�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍐呭" prop="advice">
- <el-input
- v-model="form.advice"
- type="textarea"
- placeholder="璇疯緭鍏ヤ富瑕佸唴瀹�"
- style="width: 780px"
- />
+ <el-input v-model="form.advice" type="textarea" placeholder="璇疯緭鍏ヤ富瑕佸唴瀹�" style="width: 780px" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -117,14 +56,17 @@
</el-dialog>
</div>
</template>
-
- <script>
+
+<script>
import {
updateAdvice,
addAdvice,
getAdvice,
delAdvice
} from "@/api/advice/advice";
+import {
+ addCyTjAdvice,
+} from "@/api/system/biaoqianzidian";
import {
getKjTjAdviceKjbqBySex,
getCyTjAdviceKjbqBySex,
@@ -198,6 +140,9 @@
this.open = false;
this.reset();
},
+ proposalChange() {
+ this.open = true;
+ },
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -238,7 +183,12 @@
this.getList();
});
} else {
- addAdvice(this.form).then((response) => {
+ // addAdvice(this.form).then((response) => {
+ // this.$modal.msgSuccess("鏂板鎴愬姛");
+ // this.open = false;
+ // this.getList();
+ // });
+ addCyTjAdvice(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
@@ -276,6 +226,4 @@
},
},
};
-</script>
-
-
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index 31c8c32..a135a21 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -636,6 +636,12 @@
></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鏄惁澶栭��" prop="proDelivery">
+ <el-select v-model="form.proDelivery" placeholder="璇烽�夋嫨鏄惁澶栭��" style="width: 200px">
+ <el-option v-for="dict in wsTypesy" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
</el-form>
<el-button
style="margin-left: 40px"
@@ -1022,6 +1028,16 @@
label: "鍚�",
},
],
+ wsTypesy: [
+ {
+ value:"1",
+ label:"鏄�"
+ },
+ {
+ value:"0",
+ label:"鍚�"
+ }
+ ],
xmmc: "",
chargeId: [],
List: false,
diff --git a/src/views/reservation/roupsettlement/index.vue b/src/views/reservation/roupsettlement/index.vue
index 5c34e59..13b1f81 100644
--- a/src/views/reservation/roupsettlement/index.vue
+++ b/src/views/reservation/roupsettlement/index.vue
@@ -11,7 +11,7 @@
<el-input v-model="queryParams.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鍗曚綅鍚嶇О" prop="company">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="dwId">
<el-select :remote-method="getRemoteData" v-model="queryParams.company" remote default-first-option
allow-create filterable style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1">
<el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName"
@@ -107,7 +107,7 @@
<div class="pag">
<div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
</div>
@@ -178,7 +178,7 @@
</template>
<script>
-import { addComp } from "@/api/system/comp";
+import { addComp,gettuantijiesuanrenyuan } from "@/api/system/comp";
import {
listReservation,
} from "@/api/reservation/reservation";
@@ -257,12 +257,6 @@
value: 1,
sendFlag: 0,
sector: 0,
- // 鏌ヨ鍙傛暟
- queryParams: {
- pageNum: 1,
- pageSize: 10,
- },
-
fmobj: {},
// 琛ㄥ崟鏍￠獙
form1: {},
@@ -330,19 +324,16 @@
title: "",
// 鏌ヨ鍙傛暟
queryParams: {
- pageNum: 1,
+ page: 1,
pageSize: 10,
- orderByColumn: "reservationTime",
- isAsc: "desc",
name: null,
- reservationTime: null,
- idCard: null,
- phoe: null,
- email: null,
- tjType: null,
- company: null,
- reservationTime: null,
- isExpire: null,
+ dwId: null,
+ djkssj: null,
+ djjssj: null,
+ jskssj: null,
+ jsjssj: null,
+ tjh: null,
+ jsrid: null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -463,8 +454,8 @@
/** 鏌ヨ浣撴棰勭害鍒楄〃 */
getList() {
this.loading = true;
- listReservation(this.queryParams).then((response) => {
- this.reservationList = response.rows;
+ gettuantijiesuanrenyuan(this.queryParams).then((response) => {
+ this.reservationList = response.customers;
// response.rows.forEach((item, index) =>
// {item.newID =(this.queryParams.pageNum - 1) * this.queryParams.pageSize +index +1;
// });
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index 775b407..de56ed4 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -1,48 +1,21 @@
<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-row>
<el-col :span="11">
<el-form-item label="鍗曚綅鍚嶇О" prop="company" style="display: flex">
- <el-select
- :remote-method="getRemoteData"
- v-model="queryParams.company"
- value-key="drugManufacturerId"
- remote
- filterable
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @change="searchSelect"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.drugManufacturerId"
- :label="dict.cnName"
- :value="dict.drugManufacturerId"
- />
+ <el-select :remote-method="getRemoteData" v-model="queryParams.company" value-key="drugManufacturerId"
+ remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+ <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
+ :value="dict.drugManufacturerId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- style="margin: 0 15px"
- >鎼滅储</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"
+ style="margin: 0 15px">鏌ヨ</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-col>
</el-row>
@@ -93,51 +66,35 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> -->
- <el-table
- id="sig"
- v-loading="loading"
- :data="infoList"
- @selection-change="handleSelectionChange"
- border
- ref="tb"
- max-height="260px"
- >
+ <el-table id="sig" v-loading="loading" :data="infoList" @selection-change="handleSelectionChange" border ref="tb"
+ max-height="260px">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="閮ㄩ棬" align="center" prop="pacName" />
<el-table-column label="棰勬浜烘暟" align="center" prop="count" />
<el-table-column label="瀹炴浜烘暟" align="center" prop="sjCount" />
+ <el-table-column label="宸茬粨浜烘暟" align="center" prop="yjsrs" />
<el-table-column label="搴旀敹閲戦" align="center" prop="copeWith" />
<el-table-column label="绛剧害閲戦" align="center" prop="signingPrice">
</el-table-column>
- <el-table-column
- label="宸蹭粯閲戦"
- align="center"
- prop="transactionAmount"
- />
+ <el-table-column label="宸蹭粯閲戦" align="center" prop="transactionAmount" />
<el-table-column label="宸" align="center" prop="difference" />
<el-table-column label="绛剧害浜�" align="center" prop="payer" />
- <el-table-column
- label="棰勭害鏃堕棿"
- align="center"
- prop="createTime"
- :formatter="formatDate"
- />
+ <el-table-column label="棰勭害鏃堕棿" align="center" prop="createTime" :formatter="formatDate" />
</el-table>
- <el-form
- :inline="true"
- :model="formInline"
- class="demo-form-inline"
- style="margin: 12px 6px"
- label-width="100px"
- >
+
+ <div >
+ <el-radio-group v-model="jcStatus" @change="radioChange" style="margin-left: 20px; margin-top: 20px">
+ <el-radio-button label="0">宸叉鏈粨璐︿汉鍛�</el-radio-button>
+ <el-radio-button label="1">鏈浜哄憳</el-radio-button>
+ <el-radio-button label="2">鍏ㄩ儴浜哄憳</el-radio-button>
+ </el-radio-group>
+
+ <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px" label-width="100px">
<el-row>
<el-col :span="5">
<el-form-item label="璐熻矗浜�" style="display: flex">
- <el-input
- v-model="formInline.payer"
- placeholder="鍗曚綅璐熻矗浜�"
- ></el-input>
+ <el-input v-model="formInline.payer" placeholder="鍗曚綅璐熻矗浜�"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -147,28 +104,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="浜ゆ槗绫诲瀷" prop="payType" style="display: flex">
- <el-select
- v-model="formInline.payType"
- placeholder="璇烽�夋嫨浜ゆ槗绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="formInline.payType" placeholder="璇烽�夋嫨浜ゆ槗绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item style="display: flex">
- <el-button
- type="primary"
- size="mini"
- @click="SubmitEvent"
- style="margin: 0 15px"
- >鏀惰垂</el-button
- >
+ <el-button type="primary" size="mini" @click="SubmitEvent" style="margin: 0 15px">缁撹处</el-button>
</el-form-item>
</el-col>
<!-- <el-col :span="7">
@@ -188,65 +132,37 @@
</el-row>
</el-form>
- <div style="display: flex; justify-content: space-between;">
- <el-radio-group
- v-model="jcStatus"
- @input="radioChange"
- style="margin-left: 20px; margin-top: 20px"
- >
- <el-radio-button label="0">宸叉鏈粨璐︿汉鍛�</el-radio-button>
- <el-radio-button label="1">鏈浜哄憳</el-radio-button>
- <el-radio-button label="2">鍏ㄩ儴浜哄憳</el-radio-button>
- </el-radio-group>
- <el-form
- :model="queryParams1"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="68px"
- style="margin-top: 20px; margin-right: 22%;"
- >
- <el-form-item label="缁撹处鏃堕棿">
- <el-date-picker clearable v-model="queryParams1.reservationTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨缁撹处鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery1"
- style="margin: 0 15px"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
- >閲嶇疆</el-button
- >
- </el-form-item>
- </el-form>
+
</div>
<el-row :gutter="20">
+ <!-- <el-form :model="queryParams1" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
+ style="margin-top: 20px; margin-right: 22%;">
+ <el-form-item label="缁撹处鏃堕棿">
+ <el-date-picker clearable v-model="queryParams1.reservationTime" type="date" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨缁撹处鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery1"
+ style="margin: 0 15px">鏌ヨ</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form> -->
<el-col :span="12" :xs="24" style="padding: 0px 20px">
<div class="tj">
<span class="tj_txt">浣撴浜哄憳鎯呭喌琛�</span>
</div>
- <el-table
- v-loading="loading"
- :data="peopleList"
- border
- max-height="260px"
- >
+ <el-table v-loading="loadings" :data="peopleList" border max-height="260px" @selection-change="handlepeopleListChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="newID" width="50" />
<el-table-column label="濮撳悕" align="center" prop="name" width="100" />
- <el-table-column label="鎬у埆" align="center" prop="sex" width="80" />
- <el-table-column label="鐢佃瘽" align="center" prop="iphone" width="120" />
- <el-table-column label="鐘舵��" align="center" prop="tjStatus" width="80" />
+ <el-table-column label="鎬у埆" align="center" prop="xb" width="80" />
+ <el-table-column label="鐢佃瘽" align="center" prop="dh" width="120" />
+ <el-table-column label="閲戦" align="center" prop="tjf" width="120" />
+
+ <el-table-column label="鐘舵��" align="center" prop="tjStatus" width="80" />
<el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime">
</el-table-column>
</el-table>
@@ -257,22 +173,9 @@
<span class="tj_txt">宸茬粨璐﹁褰�</span>
</div>
- <el-table
- v-loading="loading"
- :data="dataList"
- border
- max-height="260px"
- >
- <el-table-column
- label="浜ゆ槗閲戦"
- align="center"
- prop="transactionAmount"
- />
- <el-table-column
- label="浜ゆ槗鏂瑰紡"
- align="center"
- prop="paymentMethod"
- />
+ <el-table v-loading="loading" :data="dataList" border max-height="260px">
+ <el-table-column label="浜ゆ槗閲戦" align="center" prop="transactionAmount" />
+ <el-table-column label="浜ゆ槗鏂瑰紡" align="center" prop="paymentMethod" />
<el-table-column label="浜ゆ槗浜哄憳" align="center" prop="payer" />
<el-table-column label="鎿嶄綔浜哄憳" align="center" prop="payee">
</el-table-column>
@@ -328,6 +231,8 @@
},
// 閬僵灞�
loading: true,
+ // 閬僵灞�
+ loadings: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -342,6 +247,7 @@
// 浣撴鍗曚綅缂磋垂鏄庣粏琛ㄦ牸鏁版嵁
infoList: [],
copeWith: "",
+ pacIds: "",
transactionAmount: "",
dataList: [],
tableList: [],
@@ -366,8 +272,8 @@
payer: null,
payee: null,
},
- queryParams1:{
- reservationTime:null
+ queryParams1: {
+ reservationTime: null
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -416,7 +322,33 @@
this.compId = val;
},
- radioChange(val) {},
+ radioChange(val) {
+ this.peopleList = []
+ this.loadings = true
+ let data = {
+ teamNo: this.teamNo,
+ pacId: this.pacIds
+ }
+ getTeamTjPeopleList(data).then((res) => {
+ if (res.data) {
+ if (this.jcStatus == 0) {
+ this.peopleList = res.data.yjwjzList;
+
+ } else if (this.jcStatus == 1) {
+ this.peopleList = res.data.wjList;
+ } else {
+ this.peopleList = res.data.syList;
+ }
+
+ }
+ this.loadings = false
+ });
+ },
+
+
+ handlepeopleListChange(selection){
+ console.log(selection)
+ },
// 浣撴鍏徃鎷奸煶鎼滅储
getRemoteData(query) {
@@ -462,7 +394,7 @@
this.infoList.forEach((item) => {
this.copeWith = item.copeWith;
this.transactionAmount = item.transactionAmount;
- this.formInline.price = item.copeWith - item.transactionAmount;
+
if (item.payInfo != null) {
this.tjCompPayId = item.payInfo.tjCompPayId;
}
@@ -488,10 +420,10 @@
this.loading = false;
});
},
- handleQuery1(){
+ handleQuery1() {
},
- resetQuery1() {
+ resetQuery1() {
this.resetForm("queryForm1");
this.handleQuery1();
},
@@ -502,7 +434,6 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- console.log(2222);
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
@@ -512,11 +443,12 @@
// this.multiple = !selection.length;
this.tableList = selection;
this.teamNo = "";
+ this.pacIds = "";
this.tableList.forEach((item) => {
this.teamNo = item.teamNo;
+ this.pacIds = item.pacId
this.copeWith = item.copeWith;
this.transactionAmount = item.transactionAmount;
- this.formInline.price = item.copeWith - item.transactionAmount;
if (item.payInfo != null) {
this.tjCompPayId = item.payInfo.tjCompPayId;
}
@@ -537,18 +469,24 @@
});
}
});
- console.log(11111);
+ this.loadings = true
if (this.teamNo) {
- getTeamTjPeopleList(this.teamNo).then((res) => {
+ let data = {
+ teamNo: this.teamNo,
+ pacId: this.pacIds
+ }
+ getTeamTjPeopleList(data).then((res) => {
if (res.data) {
- this.peopleList = res.data;
- res.data.forEach((item, index) => {
- item.newID =
- (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
- index +
- 1;
- });
+ if (this.jcStatus == 0) {
+ this.peopleList = res.data.yjwjzList;
+ } else if (s.jcStatus == 1) {
+ this.peopleList = res.data.wjList;
+ } else {
+ this.peopleList = res.data.syList
+ ;
+ }
}
+ this.loadings = false
});
}
},
@@ -558,9 +496,6 @@
// this.open = true;
// this.title = "娣诲姞浣撴鍗曚綅缂磋垂鏄庣粏";
// },
-
- // 鍗曢�夋寜閽�
- radioChange(val) {},
/** 鏀惰垂鎻愪氦鎸夐挳 */
SubmitEvent() {
@@ -608,7 +543,7 @@
}
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {},
+ handleExport() { },
},
};
</script>
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 6dc6de8..d6cb7f3 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -318,7 +318,7 @@
debounceTimer: null,
rules: {
pacName: [{ required: true, message: "璇疯緭鍏ュ椁愬悕绉�", trigger: "blur" }],
- pics: [{ required: true, message: "璇疯緭鍏ュ師浠�", trigger: "blur" }],
+ // pics: [{ required: true, message: "璇疯緭鍏ュ師浠�", trigger: "change" }],
xianprice: [{ required: true, message: "璇疯緭鍏ョ幇浠�", trigger: "blur" }],
},
};
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index b290a15..4a193d2 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -146,25 +146,14 @@
},
trigger: 'blur',
},
-<<<<<<< HEAD
+
]">
<span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
璇佷欢鍙风爜
</span>
<el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="handleIdCardInput" />
+ @input="handleIdCardInput" maxlength="18" />
<!-- <i style="
-=======
- trigger: 'blur',
- },
- ]">
- <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
- 璇佷欢鍙风爜
- </span>
- <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="handleIdCardInput" maxlength="18"/>
- <!-- <i style="
->>>>>>> 0c23ed71897641b9ee66d81082cbc999e0c5f0ae
font-size: 1rem;
position: absolute;
right: -20px;
@@ -478,10 +467,19 @@
<el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="鎬у埆" prop="cusSex">
- <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
+ <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 200px">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
</el-select>
+ </el-form-item>
+
+
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" :disabled="isDisabled" style="width: 142px"/>
+ <!-- <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 15%">
+ <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select> -->
</el-form-item>
<el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
<span slot="label"> 璇佷欢鍙风爜 </span>
@@ -575,9 +573,9 @@
">
<span v-if="this.tableData1[0]">{{
this.tableData1[0].pacName || ""
- }}</span>
+ }}</span>
宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
- }}</span>鏉�
+ }}</span>鏉�
</div>
宸查�夐」鐩垪琛�
</div>
@@ -1174,7 +1172,10 @@
.then(() => {
this.TotalPrice1 = 0;
getTransitionList1(row.cusId).then((response) => {
- this.tableData1 = response.data;
+ this.tableData1 = response.data.list;
+ if (response.data.tjCategory != null) {
+ this.tjCategory = response.data.tjCategory;
+ }
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.ordPrice;
@@ -1495,7 +1496,10 @@
let cusId = this.form.cusIdcard;
this.proIds = [];
getTransitionList1(cusId).then((response) => {
- this.tableData1 = response.data;
+ this.tableData1 = response.data.list;
+ if (response.data.tjCategory != null) {
+ this.tjCategory = response.data.tjCategory;
+ }
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
@@ -1869,7 +1873,10 @@
_this.tcShow = true;
getTransitionList1(this.form.cusIdcard).then((res) => {
- this.tableData1 = res.data;
+ this.tableData1 = res.data.list;
+ if (res.data.tjCategory != null) {
+ this.tjCategory = res.data.tjCategory;
+ }
if (this.tableData1) {
this.tableData1.forEach((item) => {
this.TotalPrice1 += item.ordPrice;
@@ -1894,7 +1901,10 @@
_this.formPacId = this.form.pacId;
let cusId = this.form.cusIdcard;
getTransitionList1(cusId).then((response) => {
- this.tableData1 = response.data;
+ this.tableData1 = response.data.list;
+ if (response.data.tjCategory != null) {
+ this.tjCategory = response.data.tjCategory;
+ }
if (this.tableData1) {
this.TotalPrice1 = 0;
this.tableData1.forEach((item) => {
@@ -2400,7 +2410,10 @@
let cusId = this.form.cusIdcard;
this.proIds = [];
getTransitionList1(cusId).then((response) => {
- this.tableData1 = response.data;
+ this.tableData1 = response.data.list;
+ if (response.data.tjCategory != null) {
+ this.tjCategory = response.data.tjCategory;
+ }
this.TotalPrice1 = 0;
if (this.tableData1.length >= 1) {
this.list1 = false;
@@ -3026,14 +3039,11 @@
// 澶勭悊璁㈠崟椤圭洰
processOrderItems(cusId) {
- console.log(111112222233333)
getTransitionList1(cusId).then((response) => {
this.contentLoading = false;
this.tableData1 = response.data.list;
if (response.data.tjCategory != null) {
this.tjCategory = response.data.tjCategory;
-
-
}
let Price = 0;
if (this.tableData1) {
--
Gitblit v1.8.0