From 94c40e717c313d91bde25bff7c6938dfc21d9aaf Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 24 五月 2024 18:14:14 +0800
Subject: [PATCH] qxtj
---
src/views/system/tijian/index.vue | 90 +-
src/api/system/comp.js | 36 +
vue.config.js | 2
src/views/reservation/grouprecords/index.vue | 645 +++++++++++++++++++
src/views/system/info/index.vue | 179 +++-
src/views/reservation/resercopy/index.vue | 22
src/views/system/biol/index.vue | 6
src/views/reservation/groupcheck/index.vue | 330 +++++++--
src/views/system/tijianall/index.vue | 643 ++++++++----------
9 files changed, 1,398 insertions(+), 555 deletions(-)
diff --git a/src/api/system/comp.js b/src/api/system/comp.js
index a7e51a7..5372b5f 100644
--- a/src/api/system/comp.js
+++ b/src/api/system/comp.js
@@ -149,4 +149,40 @@
method: 'get',
params: query
})
+}
+
+export function addPlOrderAndDetail(data) {
+ return request({
+ url: '/hosp/order/addPlOrderAndDetail',
+ method: 'post',
+ data: data
+ })
+}
+
+
+// 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
+export function getListByCompId(query) {
+ return request({
+ url: '/hosp/order/getCusTomterListByCompId',
+ method: 'get',
+ params: query
+ })
+}
+
+// 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
+export function plRevokeTjOrderByTjNum(data) {
+ return request({
+ url: '/hosp/order/plRevokeTjOrderByTjNum',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃
+export function makeTjPDF(query) {
+ return request({
+ url: '/hosp/order/makeTjPDF',
+ method: 'get',
+ params: query
+ })
}
\ No newline at end of file
diff --git a/src/views/reservation/groupcheck/index.vue b/src/views/reservation/groupcheck/index.vue
index 6f526cf..ab5ff8c 100644
--- a/src/views/reservation/groupcheck/index.vue
+++ b/src/views/reservation/groupcheck/index.vue
@@ -64,29 +64,16 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8" style="margin: 5px 20px">
- <el-col :span="1.5">
+ <el-row :gutter="20" style="margin: 5px 20px">
+ <el-col :span="12" style="margin-left: 50%;">
<el-button
type="primary"
class="btn"
icon="el-icon-thumb"
- :disabled="isdisabled"
size="mini"
- @click="submitForm"
+ @click="submitforms"
>
鎵归噺绛惧埌</el-button
- >
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="primary"
- class="btn"
- icon="el-icon-thumb"
- :disabled="isdisabled"
- size="mini"
- @click="submitForm"
- >
- 鎵归噺鎵撳嵃瀵兼鍗�</el-button
>
</el-col>
</el-row>
@@ -99,6 +86,7 @@
:data="userList"
@selection-change="handleSelectionChange"
border
+ height="490"
>
<el-table-column
type="selection"
@@ -195,62 +183,147 @@
<el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
<el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
</el-table>
- <div class="pag">
- <div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="objs.page"
- :limit.sync="objs.pageSize" @pagination="handleQuery" />
- </div>
- </div>
+ <!-- <div class="pag">
+ <div class="pag1">
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="objs.page"
+ :limit.sync="objs.pageSize"
+ @pagination="handleQuery"
+ />
+ </div>
+ </div> -->
</div>
</el-col>
- <el-col :span="12">
- <el-table
- :data="selectList"
- border
+ <el-col :span="12">
+ <el-table :data="selectList" border height="490">
+ <el-table-column
+ label="鍗曚綅鍚嶇О"
+ align="center"
+ prop="company"
+ width="200"
+ />
+ <el-table-column
+ label="宸ュ彿"
+ align="center"
+ prop="jobNo"
+ width="80"
+ />
+ <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_user_sex"
+ :value="scope.row.sex"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="韬唤璇佸彿"
+ align="center"
+ prop="idCard"
+ width="200"
+ />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="75" />
+ <el-table-column
+ label="鍑虹敓鏃ユ湡"
+ align="center"
+ prop="birthday"
+ width="100"
+ />
+ <el-table-column label="鑱屼綅" align="center" prop="position" />
+ <el-table-column label="閮ㄩ棬" align="center" prop="department" />
+ <el-table-column
+ label="閮ㄩ棬缂栧彿"
+ align="center"
+ prop="departmentId"
+ />
+ <el-table-column
+ label="鑱旂郴鐢佃瘽"
+ align="center"
+ prop="phoe"
+ width="120"
+ />
+ <el-table-column label="鍦板潃" align="center" prop="address" />
+ <el-table-column
+ label="濠氬Щ鐘跺喌"
+ align="center"
+ prop="marriage"
+ key="marriage"
>
- <el-table-column
- label="宸ュ彿"
- align="center"
- prop="jobNo"
- width="80"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="name"
- width="75"
- />
- <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
- </template>
- </el-table-column>
- <el-table-column
- label="韬唤璇佸彿"
- align="center"
- prop="idCard"
- width="200"
- />
- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="phoe"
- width="120"
- />
- <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
- <el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
- <el-table-column fixed="right" label="鎿嶄綔" align="center" width="90px" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
- title="鍒犻櫎"></el-button>
- </template>
- </el-table-column>
- </el-table>
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.dict_user_marry"
+ :value="scope.row.marriage"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="姘戞棌"
+ align="center"
+ prop="nation"
+ key="nation"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.dict_user_national"
+ :value="scope.row.nation"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="鑱旂郴閭" align="center" prop="email" />
+ <!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
+ <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+ <el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
+ <el-table-column
+ fixed="right"
+ label="鎿嶄綔"
+ align="center"
+ width="90px"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
</el-col>
</el-row>
+
+ <el-dialog
+ :title="title"
+ :visible.sync="open2"
+ width="800px"
+ append-to-body
+ >
+ <el-form ref="form" :model="forms" label-width="100px" :inline="true">
+ <el-form-item label="浣撴绫诲埆">
+ <el-select
+ style="width: 150px"
+ v-model="forms.tjCategory"
+ placeholder="璇烽�夋嫨浣撴绫诲埆"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_tjtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer2">
+ <el-button type="primary" @click="submitType">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
<div class="dia">
@@ -352,6 +425,20 @@
</div>
</el-dialog>
</div>
+ <el-dialog
+ title="PDF 棰勮"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ >
+ <div class="main">
+ <iframe
+ id="printIframe"
+ :src="url"
+ frameborder="0"
+ style="width: 100%; height: 100%"
+ ></iframe>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -359,9 +446,10 @@
import {
addDept,
addComp,
- Deptlist,getCusTomterListByCompId
+ addPlOrderAndDetail,
+ getCusTomterListByCompId,
} from "@/api/system/comp";
-import { getCompany, queryCompany } from "@/api/team/tuanti";
+import { getCompany, queryCompany } from "@/api/team/tuanti";
export default {
dicts: [
@@ -369,6 +457,7 @@
"dict_user_marry",
"sys_yes_no",
"sys_user_sex",
+ "dict_tjtype",
"reservation_pay_type",
"sys_normal_disable",
],
@@ -396,7 +485,7 @@
},
},
CompanyList: [],
- selectList:[],
+ selectList: [],
tableData: [], // 琛ㄦ暟鎹�
form: {
company: "",
@@ -407,8 +496,10 @@
discount: "",
},
size: "",
+ url: "",
// 濂楅鎻愪氦鎸夐挳
confirm: false,
+ dialogVisible: false,
deptList: [],
data: {
dwId: "",
@@ -420,8 +511,6 @@
compId: null,
name: null,
reservationTime: null,
- page:1,
- pageSize:10
},
// 闈炲崟涓鐢�
single: true,
@@ -429,7 +518,7 @@
multiple: true,
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
- userList: null,
+ userList: [],
// 鏌ヨ鍙傛暟
queryParam: {
@@ -437,7 +526,7 @@
pageSize: 10,
},
// 琛ㄥ崟鍙傛暟
- form: {},
+ forms: {},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -545,6 +634,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
open1: false,
+ open2: false,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -570,10 +660,11 @@
},
methods: {
handleQuery() {
- getCusTomterListByCompId(this.objs).then(res => {
- this.userList = res.data.records
- this.total = res.data.total
- })
+ this.loading = true;
+ getCusTomterListByCompId(this.objs).then((res) => {
+ this.userList = res.data;
+ this.loading = false;
+ });
},
// 淇濆瓨閮ㄩ棬
handleAddDept() {
@@ -599,18 +690,63 @@
// });
// }
// },
- // 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- console.log(selection)
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ selection.forEach((item) => {
+ this.selectList.push(item);
+ this.userList.forEach((item1, index) => {
+ if (item.idCard == item1.idCard) {
+ this.userList.splice(index, selection.length);
+ }
+ });
+ });
+ for (var i = 0; i < this.selectList.length; i++) {
+ // 棣栨閬嶅巻鏁扮粍
+ for (var j = i + 1; j < this.selectList.length; j++) {
+ // 鍐嶆閬嶅巻鏁扮粍
+ if (this.selectList[i].idCard == this.selectList[j].idCard) {
+ // 鍒ゆ柇杩炰釜鍊兼槸鍚︾浉绛�
+ this.selectList.splice(j, 1); // 鐩哥瓑鍒犻櫎鍚庤��
+ j--;
+ }
+ }
+ }
+ return this.selectList;
+ // console.log(this.selectList);
// this.ids = selection.map((item) => item.cusId);
// this.single = selection.length !== 1;
// this.multiple = !selection.length;
},
- handleDelete(row){
-
+ handleDelete(row) {
+ this.selectList.forEach((item, index) => {
+ if (item == row) {
+ this.selectList.splice(index, 1);
+ }
+ });
+ this.userList.push(row);
},
-
+
+ submitforms() {
+ this.open2 = true;
+ },
+ submitType() {
+ let cusIds = [];
+ this.selectList.forEach((item) => {
+ cusIds.push(item.idCard);
+ });
+ let data = {
+ cusIds: cusIds,
+ tjCategory: this.forms.tjCategory,
+ };
+ addPlOrderAndDetail(data).then((res) => {
+ this.open2 = false;
+ this.$modal.msgSuccess("绛惧埌鎴愬姛");
+ this.handleQuery();
+ this.selectList = [];
+ });
+ },
+
// 鎼滅储
getRemoteData(query) {
if (query) {
@@ -636,6 +772,7 @@
cancel() {
this.open = false;
this.open1 = false;
+ this.open2 = false;
this.reset();
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -678,9 +815,11 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
- this.objs.drugManufacturerId = "";
- this.objs.dwDeptName = "";
+ this.objs.compId = "";
+ this.objs.name = "";
this.objs.reservationTime = "";
+ this.userList = [];
+ this.selectList = [];
this.form = {};
},
@@ -688,16 +827,18 @@
selectTime(val) {
this.objs.reservationTime = val;
},
-
- /** 纭鎸夐挳 */
- submitForm() {},
+ doPrint(val) {
+ var ordonnance = document.getElementById(val).contentWindow;
+ setTimeout(() => {
+ ordonnance.print();
+ }, 100);
+ },
},
};
</script>
<style>
-
.pag {
width: 100%;
display: flex;
@@ -725,9 +866,14 @@
display: flex;
}
+.main {
+ height: 700px;
+ overflow: hidden;
+}
+
.dialog-footer2 {
- width: 960px;
- height: 36px;
+ /* width: 960px;
+ height: 36px; */
display: flex;
justify-content: center;
}
diff --git a/src/views/reservation/grouprecords/index.vue b/src/views/reservation/grouprecords/index.vue
new file mode 100644
index 0000000..2360633
--- /dev/null
+++ b/src/views/reservation/grouprecords/index.vue
@@ -0,0 +1,645 @@
+<template>
+ <div class="app-container">
+ <el-form
+ :model="objs"
+ :rules="rules"
+ ref="form"
+ size="small"
+ :inline="true"
+ label-width="100px"
+ >
+ <el-form-item label="鍗曚綅鍚嶇О" prop="compId">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="objs.compId"
+ remote
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @clear="getCompanyList"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.cnName"
+ :label="dict.cnName"
+ :value="dict.drugManufacturerId"
+ />
+ </el-select>
+ <i class="el-icon-circle-plus-outline" @click="handleAdd"></i>
+ </el-form-item>
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ v-model="objs.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="绛惧埌鏃堕棿" prop="reservationTime">
+ <el-date-picker
+ clearable
+ v-model="objs.reservationTime"
+ type="date"
+ format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd"
+ style="width: 220px"
+ placeholder="璇烽�夋嫨绛惧埌鏃ユ湡"
+ @change="selectTime"
+ :picker-options="setDisabled"
+ >
+ </el-date-picker>
+ </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-form-item>
+ </el-form>
+ <el-row :gutter="10" class="mb8" style="margin: 5px 20px">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ class="btn"
+ icon="el-icon-thumb"
+ size="mini"
+ @click="submitforms"
+ >
+ 鎵归噺鎾ら攢</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ class="btn"
+ icon="el-icon-thumb"
+ size="mini"
+ @click="submitForm"
+ >
+ 鎵归噺鎵撳嵃瀵兼鍗�</el-button
+ >
+ </el-col>
+ </el-row>
+ <div style="margin: 5px 20px">
+ <el-table
+ v-loading="loading"
+ :data="userList"
+ @selection-change="handleSelectionChange"
+ border
+ height="490"
+ >
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ fixed="left"
+ />
+ <el-table-column
+ label="鍗曚綅鍚嶇О"
+ align="center"
+ prop="company"
+ width="200"
+ />
+ <el-table-column label="宸ュ彿" align="center" prop="jobNo" width="80" />
+ <el-table-column label="濮撳悕" align="center" prop="name" width="75" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" width="75">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_user_sex"
+ :value="scope.row.sex"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="韬唤璇佸彿"
+ align="center"
+ prop="idCard"
+ width="200"
+ />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="75" />
+ <el-table-column
+ label="鍑虹敓鏃ユ湡"
+ align="center"
+ prop="birthday"
+ width="100"
+ />
+ <el-table-column label="鑱屼綅" align="center" prop="position" />
+ <el-table-column label="閮ㄩ棬" align="center" prop="department" />
+ <el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" />
+ <el-table-column
+ label="鑱旂郴鐢佃瘽"
+ align="center"
+ prop="phoe"
+ width="120"
+ />
+ <el-table-column label="鍦板潃" align="center" prop="address" />
+ <el-table-column
+ label="濠氬Щ鐘跺喌"
+ align="center"
+ prop="marriage"
+ key="marriage"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.dict_user_marry"
+ :value="scope.row.marriage"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="姘戞棌" align="center" prop="nation" key="nation">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.dict_user_national"
+ :value="scope.row.nation"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="鑱旂郴閭" align="center" prop="email" />
+ <!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
+ <el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
+ <el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
+ </el-table>
+
+ <div class="pag">
+ <div class="pag1">
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="objs.page"
+ :limit.sync="objs.pageSize"
+ @pagination="handleQuery"
+ />
+ </div>
+ </div>
+ </div>
+
+ <!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
+ <div class="dia">
+ <el-dialog
+ :title="title"
+ :visible.sync="open"
+ width="1000px"
+ append-to-body
+ >
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="100px"
+ :inline="true"
+ >
+ <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+ <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+ <el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+ <el-input
+ v-model="form.contactPhone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
+ </el-form-item>
+ <el-form-item label="绋庡彿" prop="taxNumber">
+ <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+ </el-form-item>
+ <el-form-item label="娉曚汉" prop="legalPerson">
+ <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+ </el-form-item>
+ <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+ <el-input
+ v-model="form.registerAddress"
+ placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
+ />
+ </el-form-item>
+ <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+ <el-input
+ v-model="form.mailingAddress"
+ placeholder="璇疯緭鍏ラ�氳鍦板潃"
+ />
+ </el-form-item>
+ <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+ <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ </el-form-item>
+ <el-form-item label="閾惰璐︽埛" prop="countNum">
+ <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+ </el-form-item>
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
+ </el-form-item>
+ <el-form-item label="璐熻矗浜�" prop="principal">
+ <el-input v-model="form.principal" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" />
+ </el-form-item>
+ <el-form-item label="缃戝潃" prop="url">
+ <el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+ </el-form-item>
+ <el-form-item label="浼犵湡" prop="faxNumber">
+ <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+ </el-form-item>
+ <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+ <el-input
+ v-model="form.areaName"
+ placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�"
+ />
+ </el-form-item>
+ <el-form-item label="鎺掑簭" prop="orderNum">
+ <el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
+ </el-form-item>
+ <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+ <el-date-picker
+ clearable
+ v-model="form.validTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
+ >
+ </el-date-picker> </el-form-item
+ ><br />
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input
+ v-model="form.remark"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ :rows="2"
+ label-width="400px"
+ style="width: 830px"
+ resize="none"
+ ></el-input>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer2">
+ <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
+
+
+ <el-dialog
+ title="PDF 棰勮"
+ :visible.sync="dialogVisible"
+ :close-on-click-modal="false"
+ >
+ <div class="main">
+ <iframe
+ id="printIframe"
+ :src="url"
+ frameborder="0"
+ style="width: 100%; height: 100%"
+ ></iframe>
+ </div>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import {
+ addComp,
+ plRevokeTjOrderByTjNum,
+ getListByCompId, makeTjPDF,
+} from "@/api/system/comp";
+import { getCompany, queryCompany } from "@/api/team/tuanti";
+
+export default {
+ dicts: [
+ "dict_user_national",
+ "dict_user_marry",
+ "sys_yes_no",
+ "sys_user_sex",
+ "dict_tjtype",
+ "reservation_pay_type",
+ "sys_normal_disable",
+ ],
+
+ name: "Grouprecords",
+ data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ console.log(value);
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback("");
+ } else if (value != undefined && value != "") {
+ return callback();
+ } else if (!patter.test(value)) {
+ return callback("");
+ }
+ };
+ return {
+ setDisabled: {
+ // 杩斿洖绂佺敤鏃堕棿
+ disabledDate(time) {
+ // return time.getTime() < Date.now()// 涓嶅彲閫夊巻鍙插ぉ銆佷笉鍙�夊綋鍓嶅ぉ銆佸彲閫夋湭鏉ュぉ
+ return time.getTime() < Date.now() - 8.64e7; // 涓嶅彲閫夊巻鍙插ぉ銆佸彲閫夊綋鍓嶅ぉ銆佸彲閫夋湭鏉ュぉ
+ },
+ },
+ CompanyList: [],
+ url: "",
+ dialogVisible: false,
+ form: {
+ company: "",
+ payType: "",
+ name: "",
+ phoe: "",
+ signingPic: "",
+ discount: "",
+ },
+ size: "",
+ objs: {
+ compId: null,
+ name: null,
+ reservationTime: null,
+ page: 1,
+ pageSize: 10,
+ },
+
+ // 鐢ㄦ埛琛ㄦ牸鏁版嵁
+ userList: [],
+
+ // 鏌ヨ鍙傛暟
+ queryParam: {
+ pageNum: 1,
+ pageSize: 10,
+ },
+ // 琛ㄥ崟鍙傛暟
+ forms: {},
+ // 琛ㄥ崟鏍￠獙
+
+ rules: {
+ drugManufacturerId: [
+ { required: true, validator: checkPhoneNum, trigger: "change" },
+ ],
+ reservationTime: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ dwDeptName: [
+ { required: true, validator: checkPhoneNum, trigger: "change" },
+ ],
+ signingPic: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ contactPerson: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ contactPhone: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ taxNumber: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ legalPerson: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ registerAddress: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ bankAccount: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ countNum: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ principal: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ faxNumber: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ mailingAddress: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ email: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+ pacName: [
+ { required: true, validator: checkPhoneNum, trigger: "change" },
+ ],
+ payType: [
+ { required: true, validator: checkPhoneNum, trigger: "change" },
+ ],
+ phoe: [
+ {
+ required: true,
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ validator: checkPhoneNum,
+ trigger: "blur",
+ },
+ ],
+
+ proPrice: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ createTime: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
+ businessLicenseNumber: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ createTime: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ updateTime: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
+ effective: [
+ {
+ required: true,
+ validator: checkPhoneNum,
+ trigger: "change",
+ },
+ ],
+ name: [{ required: true, validator: checkPhoneNum, trigger: "change" }],
+ contactPhone: [
+ { required: true, validator: checkPhoneNum, trigger: "change" },
+ ],
+ },
+ // 閬僵灞�
+ loading: true,
+ pacStatus: "鍚敤",
+
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ ids:[],
+ // 鎬绘潯鏁�
+ total: 0,
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ open: false,
+ };
+ },
+ created() {
+ this.getCompanyList();
+ },
+
+ watch: {
+ inputVal(newValue) {
+ if (newValue) {
+ this.searchData(true);
+ } else {
+ this.searchData(false);
+ }
+ },
+ },
+ methods: {
+ handleQuery() {
+ this.loading = true;
+ getListByCompId(this.objs).then((res) => {
+ if (res.data) {
+ this.userList = res.data.records;
+ this.total = res.data.total;
+ } else {
+ this.userList = [];
+ }
+ this.loading = false;
+ });
+ },
+ submitforms() {
+ if (this.ids.length != 0) {
+ plRevokeTjOrderByTjNum(this.ids).then((res) => {
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛");
+ this.handleQuery();
+ });
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鎾ら攢浜哄憳");
+ }
+ },
+
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map((item) => item.id);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+ },
+
+ // 鎼滅储
+ getRemoteData(query) {
+ if (query) {
+ let compName = query;
+ queryCompany(compName).then((response) => {
+ this.CompanyList = response.data;
+ this.CompanyList.forEach((item) => {
+ this.objs = item;
+ });
+ });
+ }
+ },
+
+ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+ getCompanyList() {
+ this.loading = true;
+ getCompany(this.queryParam).then((response) => {
+ this.CompanyList = response.data;
+ this.loading = false;
+ });
+ },
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.open = false;
+ this.reset();
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.reset();
+ this.open = true;
+ this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+ },
+
+ /** 鎻愪氦鎸夐挳 */
+ submitFormS() {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ addComp(this.form).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getCompanyList();
+ });
+ }
+ });
+ },
+
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ company: null,
+ payType: null,
+ name: null,
+ phoe: null,
+ signingPic: null,
+ pacStatus: "鍚敤",
+ };
+ this.resetForm("form");
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.objs.compId = "";
+ this.objs.name = "";
+ this.objs.reservationTime = "";
+ this.userList = [];
+ this.form = {};
+ },
+
+ //鑾峰彇鏃堕棿
+ selectTime(val) {
+ this.objs.reservationTime = val;
+ },
+
+ /** 纭鎸夐挳 */
+ submitForm() {
+ makeTjPDF().then((response) => {
+ if (response.size === 0) {
+ const loading = this.$loading({
+ lock: true,
+ text: "Loading",
+ spinner: "el-icon-loading",
+ background: "rgba(0, 0, 0, 0.7)",
+ });
+ setTimeout(() => {
+ loading.close();
+ }, 3000);
+ this.$message({
+ message: "鎶ュ憡姝ｅ湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�",
+ type: "warning",
+ });
+ } else {
+ this.dialogVisible = true;
+ const newBlob = [];
+ newBlob.push(response);
+ const blob = new Blob(newBlob, { type: "application/pdf" });
+ this.url = window.webkitURL.createObjectURL(blob); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
+ }
+ });
+ },
+ },
+};
+</script>
+
+
+<style>
+.pag {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.pag1 {
+ width: 30%;
+}
+
+.dialog-footer2 {
+ display: flex;
+ justify-content: center;
+}
+
+.main {
+ height: 700px;
+ overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index 3cbefa5..18d9250 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -716,43 +716,43 @@
sums[index] = this.ListObj.count;
return;
}
- if (index === 7) {
+ if (index === 6) {
sums[index] = "鐢风粍浜烘暟";
return;
}
- if (index === 8) {
+ if (index === 7) {
sums[index] = this.ListObj.manCount;
return;
}
- if (index === 9) {
+ if (index === 8) {
sums[index] = "鐢风粍閲戦";
return;
}
- if (index === 10) {
+ if (index === 9) {
sums[index] = this.ListObj.manMoney;
return;
}
- if (index === 12) {
+ if (index === 11) {
sums[index] = "濂崇粍浜烘暟";
return;
}
- if (index === 13) {
+ if (index === 12) {
sums[index] = this.ListObj.woManCount;
return;
}
- if (index === 14) {
+ if (index === 13) {
sums[index] = "濂崇粍閲戦";
return;
}
- if (index === 15) {
+ if (index === 14) {
sums[index] = this.ListObj.woManMoney;
return;
}
- if (index === 16) {
+ if (index === 15) {
sums[index] = "鍚堣閲戦";
return;
}
- if (index === 17) {
+ if (index === 16) {
sums[index] = this.ListObj.hjMoney;
return;
}
@@ -846,7 +846,7 @@
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
- if (this.data.dwId || this.data.dwDeptId) {
+ if (this.objs.drugManufacturerId && this.objs.reservationTime &&this.objs.dwDeptName) {
this.upload.title = "鐢ㄦ埛瀵煎叆";
this.upload.open = true;
} else {
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index abb6d00..265edb9 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -41,9 +41,9 @@
<el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鍋ュ悍妫�鏌ヨ〃鎵撳嵃</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="multiple" @click="jiankangReport">鎵归噺浣撴鎶ュ憡瀵煎嚭</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" size="mini" :disabled="single" @click="baogaoyulan">鎶ュ憡棰勮</el-button>
</el-col>
@@ -569,6 +569,7 @@
type: "warning",
});
} else {
+ console.log(response)
this.dialogVisible = true;
this.url = window.webkitURL.createObjectURL(response); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl
@@ -817,7 +818,6 @@
},
// 琛ㄥ崟閲嶇疆
reset() {
-
this.form = {
orderId: null,
tjType: null,
diff --git a/src/views/system/info/index.vue b/src/views/system/info/index.vue
index d7a1525..81b68b8 100644
--- a/src/views/system/info/index.vue
+++ b/src/views/system/info/index.vue
@@ -1,25 +1,50 @@
<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-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>
</el-form-item>
</el-col>
<el-col :span="6">
<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-col>
-
</el-row>
-
<!-- <el-form-item label="浜ゆ槗閲戦" prop="transactionAmount">
<el-input v-model="queryParams.transactionAmount" placeholder="璇疯緭鍏ヤ氦鏄撻噾棰�" clearable
@@ -41,7 +66,6 @@
<el-form-item label="鏀舵浜�" prop="payee">
<el-input v-model="queryParams.payee" placeholder="璇疯緭鍏ユ敹娆句汉" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
-
</el-form>
<!-- <el-row :gutter="10" class="mb8">
@@ -68,8 +92,15 @@
<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" />
@@ -77,37 +108,60 @@
<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" />
</el-table>
-
- <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px" label-width="100px">
+ <el-form
+ :inline="true"
+ :model="formInline"
+ class="demo-form-inline"
+ style="margin: 12px 6px"
+ label-width="100px"
+ >
<el-row>
<el-col :span="6">
- <el-form-item label="璐熻矗浜�" style="display: flex;">
- <el-input v-model="formInline.payer" placeholder="鍗曚綅璐熻矗浜�"></el-input>
+ <el-form-item label="璐熻矗浜�" style="display: flex">
+ <el-input
+ v-model="formInline.payer"
+ placeholder="鍗曚綅璐熻矗浜�"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="浜ゆ槗閲戦" style="display: flex;">
+ <el-form-item label="浜ゆ槗閲戦" style="display: flex">
<el-input v-model="formInline.price" placeholder="閲戦"></el-input>
</el-form-item>
</el-col>
<el-col :span="7">
- <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-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>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item>
- <el-button type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
- <el-button type="primary" size="mini" @click="handleDelete">閫�璐�</el-button>
+ <el-button type="primary" size="mini" @click="SubmitEvent"
+ >鏀惰垂</el-button
+ >
+ <el-button type="primary" size="mini" @click="handleDelete"
+ >閫�璐�</el-button
+ >
</el-form-item>
</el-col>
</el-row>
@@ -119,21 +173,39 @@
<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>
<el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="createTime" />
</el-table>
</el-col>
- <el-col :span="12" :xs="24" style="padding: 0px 20px;">
+ <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="loading"
+ :data="peopleList"
+ border
+ max-height="260px"
+ >
<el-table-column label="搴忓彿" align="center" prop="newID" />
<el-table-column label="濮撳悕" align="center" prop="name" />
<el-table-column label="鐘舵��" align="center" prop="tjStatus" />
@@ -147,7 +219,11 @@
<script>
import { getInfo } from "@/api/login";
-import { getCompany, queryCompany, getTeamTjPeopleList } from "@/api/team/tuanti";
+import {
+ getCompany,
+ queryCompany,
+ getTeamTjPeopleList,
+} from "@/api/team/tuanti";
import {
listInfo,
@@ -276,11 +352,11 @@
listInfo(this.compId).then((response) => {
this.infoList = response.data;
if (this.infoList.length != 0) {
- this.infoList.forEach((item) => {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item, true);
- });
+ // this.infoList.forEach((item) => {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(this.infoList[0], true);
});
+ // });
} else {
this.$refs.tb.clearSelection();
}
@@ -320,10 +396,18 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ console.log(2222)
+ if (selection.length > 1) {
+ let del_row = selection.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ // this.ids = selection.map((item) => item.id);
+ // this.single = selection.length !== 1;
+ // this.multiple = !selection.length;
this.tableList = selection;
- this.teamNo = ""
+ this.teamNo = "";
this.tableList.forEach((item) => {
- this.teamNo = item.teamNo
+ this.teamNo = item.teamNo;
this.copeWith = item.copeWith;
this.transactionAmount = item.transactionAmount;
this.formInline.price = item.copeWith - item.transactionAmount;
@@ -347,10 +431,11 @@
});
}
});
+ console.log(11111)
if (this.teamNo) {
- getTeamTjPeopleList(this.teamNo).then(res => {
+ getTeamTjPeopleList(this.teamNo).then((res) => {
if (res.data) {
- this.peopleList = res.data
+ this.peopleList = res.data;
res.data.forEach((item, index) => {
item.newID =
(this.queryParams.pageNum - 1) * this.queryParams.pageSize +
@@ -358,16 +443,8 @@
1;
});
}
-
- })
+ });
}
- if (selection.length > 1) {
- let del_row = selection.shift();
- this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
- }
- this.ids = selection.map((item) => item.id);
- this.single = selection.length !== 1;
- this.multiple = !selection.length;
},
/** 鏂板鎸夐挳鎿嶄綔 */
// handleAdd() {
@@ -377,12 +454,11 @@
// },
// 鍗曢�夋寜閽�
- radioChange(val) { },
+ radioChange(val) {},
/** 鏀惰垂鎻愪氦鎸夐挳 */
SubmitEvent() {
if (this.formInline.price != 0) {
-
let data = {
paymentMethod: this.formInline.payType,
transactionAmount: this.formInline.price,
@@ -398,7 +474,6 @@
const params = { viewNum, tjnumber };
this.$tab.openPage("鍥㈡灏忕エ", "/report/charge", params);
});
-
} else {
this.$message.error("浜ゆ槗閲戦涓嶈兘涓�0");
}
@@ -427,7 +502,7 @@
}
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() { },
+ handleExport() {},
},
};
</script>
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index a881c9e..ed88b5b 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -115,7 +115,7 @@
</el-form-item>
<el-form-item
- label="璇佷欢鍙�"
+ label="璇佷欢鍙风爜"
prop="cusIdcard"
:rules="[
{
@@ -141,7 +141,7 @@
style="display: inline-block; border-bottom: 2px solid blue"
@click="handleQuery"
>
- 璇佷欢鍙�
+ 璇佷欢鍙风爜
</span>
<el-input
:disabled="isDisabled"
@@ -207,6 +207,7 @@
type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡"
+ style="width: 93%"
>
</el-date-picker>
</el-form-item>
@@ -244,7 +245,7 @@
<el-select
:disabled="isDisabled"
v-model="form.ageUnit"
- style="width: 21%"
+ style="width: 20%"
>
<el-option
v-for="dict in dict.type.dict_ageunit"
@@ -258,47 +259,6 @@
<!-- <el-form-item prop="ageUnit">
</el-form-item> -->
- </el-form>
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
- <el-row :gutter="21">
- <el-col :span="19">
- <el-form-item label="鎴峰彛鍦板潃" prop="addr">
- <el-input
- v-model="form.addr"
- placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�"
- :disabled="isDisabled"
- />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
-
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
- <el-row :gutter="21">
- <el-col :span="19">
- <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
- <el-input
- v-model="form.cusAddr"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- :disabled="isDisabled"
- />
- </el-form-item>
- </el-col>
- </el-row>
</el-form>
<el-form
:inline="true"
@@ -333,6 +293,48 @@
/>
</el-form-item>
</el-form>
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ :label-position="labelPosition"
+ label-width="106px"
+ v-show="top"
+ >
+ <el-row :gutter="21">
+ <el-col :span="19">
+ <el-form-item label="鎴峰彛鍦板潃" prop="addr">
+ <el-input
+ v-model="form.addr"
+ placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�"
+ :disabled="isDisabled"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ :label-position="labelPosition"
+ label-width="106px"
+ v-show="top"
+ >
+ <el-row :gutter="21">
+ <el-col :span="19">
+ <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
+ <el-input
+ v-model="form.cusAddr"
+ placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
+ :disabled="isDisabled"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+
<el-row v-show="top">
<el-col :span="19">
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index adf5451..40989a3 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -9,356 +9,285 @@
ref="form"
:model="form"
:rules="rules"
- :label-position="labelPosition"
- class="demo-form-inline"
label-width="84px"
>
- <el-row>
- <el-col :span="5">
- <el-form-item
- style="display: flex"
- label="濮撳悕"
- prop="cusName"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusName) {
- callback('');
- } else if (form.cusName) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="璇佷欢绫诲瀷"
- prop="idType"
- style="display: flex"
- >
- <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
- <el-option
- v-for="dict in dict.type.dict_user_cardtype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item
- style="display: flex"
- label="璇佷欢鍙�"
- prop="cusIdcard"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusIdcard) {
- callback('');
- } else if (form.cusIdcard) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="handleQuery"
- >
- 璇佷欢鍙�
- </span>
- <el-input
- v-model="form.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="inputChange"
- />
- <!-- <i
+ <el-form-item
+ label="濮撳悕"
+ prop="cusName"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+ </el-form-item>
+ <el-form-item label="鎬у埆" prop="cusSex">
+ <el-select
+ v-model="form.cusSex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ @change="formchang"
+ style="width: 94%"
+ >
+ <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="idType">
+ <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.dict_user_cardtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-form
+ style="margin: 4px 8px"
+ :inline="true"
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="84px"
+ >
+ <el-form-item label="姘戞棌" prop="cusNational">
+ <el-select
+ filterable
+ v-model="form.cusNational"
+ placeholder="璇烽�夋嫨姘戞棌"
+ style="width: 96%"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_national"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="濠氬Щ" prop="cusMarryStatus">
+ <el-select
+ v-model="form.cusMarryStatus"
+ placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
+ style="width: 94%"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_marry"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="璇佷欢鍙风爜"
+ prop="cusIdcard"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusIdcard) {
+ callback('');
+ } else if (form.cusIdcard) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <span
+ slot="label"
+ style="display: inline-block; border-bottom: 2px solid blue"
+ @click="handleQuery"
+ >
+ 璇佷欢鍙风爜
+ </span>
+ <el-input
+ v-model="form.cusIdcard"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="inputChange"
+ />
+ <!-- <i
style="font-size: 17px; margin-left: 3px"
class="el-icon-search"
@click="handleQuery"
></i> -->
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="5">
- <el-form-item
- label="姘戞棌"
- prop="cusNational"
- style="display: flex"
- >
- <el-select
- filterable
- v-model="form.cusNational"
- placeholder="璇烽�夋嫨姘戞棌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_national"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎬у埆" prop="cusSex" style="display: flex">
- <el-select
- v-model="form.cusSex"
- placeholder="璇烽�夋嫨鎬у埆"
- @change="formchang"
- >
- <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-col>
- <el-col :span="5">
- <el-form-item label="骞撮緞" prop="age" style="display: flex">
- <el-input v-model="form.age" />
- </el-form-item>
- </el-col>
- <el-col :span="2">
- <el-form-item prop="ageUnit">
- <el-select
- v-model="form.ageUnit"
- @change="formchang"
- style="width: 80%"
- >
- <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-col>
- </el-row>
+ </el-form-item>
+ </el-form>
+ <el-form
+ style="margin: 4px 8px"
+ :inline="true"
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="84px"
+ >
+
+ <el-form-item
+ label="鐢佃瘽"
+ prop="cusPhone"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone) {
+ callback('');
+ } else if (form.cusPhone) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ョ數璇�" />
+ </el-form-item>
- <!-- <input name="ReadBlockBtn" type="button" size="5px" @click="readblock" value="璇诲崱" /> -->
- <!-- <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
- <el-date-picker style="width: 200px" clearable v-model="form.cusBrithday" type="date"
- value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
- </el-date-picker>
- </el-form-item> -->
+ <el-form-item label="閭" prop="cusEmail">
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
+ </el-form-item>
- <el-row>
- <el-col :span="5">
- <el-form-item
- label="濠氬Щ"
- prop="cusMarryStatus"
- style="display: flex"
- >
- <el-select
- v-model="form.cusMarryStatus"
- placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_marry"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
-
- <el-col :span="6">
- <el-form-item
- label="浣撴绫诲埆"
- prop="category"
- style="display: flex"
- >
- <el-select
- v-model="form.category"
- placeholder="璇烽�夋嫨浣撴绫诲埆"
- >
- <el-option
- v-for="dict in dict.type.dict_tjtype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item
- style="display: flex"
- label="鑱旂郴鐢佃瘽"
- prop="cusPhone"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusPhone) {
- callback('');
- } else if (form.cusPhone) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <el-input
- v-model="form.cusPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="5">
- <el-form-item
- label="浣撴绫诲瀷"
- prop="tjType"
- style="display: flex"
- >
- <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
- <el-option
- v-for="dict in dict.type.dict_team"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鑱屼笟" prop="career" style="display: flex">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="form.career"
- placeholder="璇疯緭鍏ヨ亴涓�"
- >
- <el-option
- v-for="dict in dict.type.dict_job"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item
- label="閭"
- prop="cusEmail"
- style="display: flex"
- >
- <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="5">
- <el-form-item
- label="鐜颁綇鍧�"
- prop="cusAddr"
- style="display: flex"
- >
- <el-input
- v-model="form.cusAddr"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="宸ヤ綔鍗曚綅"
- prop="company"
- style="display: flex"
- >
- <el-input
- v-model="form.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="鍗″彿" prop="indexCard">
- <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
- </el-form-item>
- </el-col>
- </el-row>
- <!-- <el-form-item label="鎴峰彛鍦板潃" prop="cusAddr">
- <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" />
- </el-form-item> -->
-
- <!-- <el-form-item label="閭斂缂栫爜" prop="cusPostcode">
+ <el-form-item label="骞撮緞" prop="age">
<el-input
- v-model="form.cusPostcode"
- placeholder="璇疯緭鍏ラ偖鏀跨紪鐮�"
+ v-model="form.age"
+ :disabled="isDisabled"
+ style="width: 30%"
/>
- </el-form-item> -->
- <!-- <el-form-item label="绱㈠紩鍗″彿" prop="indexCard">
- <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ョ储寮曞崱鍙�" />
- </el-form-item> -->
+ <el-select
+ :disabled="isDisabled"
+ v-model="form.ageUnit"
+ style="width: 20%"
+ >
+ <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>
+ <el-form
+ style="margin: 4px 8px"
+ :inline="true"
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="84px"
+ >
+ <el-form-item label="鍗″彿" prop="indexCard">
+ <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
+ </el-form-item>
+ <el-form-item label="鑱屼笟" prop="career">
+ <el-select
+ filterable
+ :disabled="isDisabled"
+ v-model="form.career"
+ placeholder="璇疯緭鍏ヨ亴涓�"
+ style="width: 94%"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_job"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
- <el-row>
- <el-col :span="5">
- <el-form-item
- label="閮ㄩ棬"
- prop="department"
- style="display: flex"
- >
- <el-input
- v-model="form.department"
- placeholder="璇疯緭鍏ラ儴闂�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item
- label="鏃堕棿"
- prop="timeRegion"
- style="display: flex"
- >
- <el-select
- v-model="form.timeRegion"
- placeholder="璇烽�夋嫨棰勭害鏃堕棿"
- >
- <el-option
- v-for="dict in dict.type.tj_time_region"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
- <el-date-picker
- v-model="form.reservationTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="setDisabled"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
+ <el-form-item label="浣撴绫诲瀷" prop="tjType">
+ <el-select
+ v-model="form.tjType"
+ placeholder="璇烽�夋嫨浣撴绫诲瀷"
+ style="width: 94%"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_team"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-form
+ style="margin: 4px 8px"
+ :inline="true"
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="84px"
+ >
+ <el-form-item label="鍗曚綅" prop="company">
+ <el-input v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+ </el-form-item>
+
+ <el-form-item label="閮ㄩ棬" prop="department">
+ <el-input v-model="form.department" placeholder="璇疯緭鍏ラ儴闂�" />
+ </el-form-item>
+ <el-form-item label="浣撴绫诲埆" prop="category">
+ <el-select v-model="form.category" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option
+ v-for="dict in dict.type.dict_tjtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+ </el-form-item>
+ </el-form>
+ <el-form
+ style="margin: 4px 8px"
+ :inline="true"
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="84px"
+ >
+ <el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" />
+ </el-form-item>
+ <el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
+ <el-date-picker
+ v-model="form.reservationTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled"
+ style="width: 94%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="棰勭害鏃堕棿" prop="timeRegion">
+ <el-select
+ v-model="form.timeRegion"
+ placeholder="璇烽�夋嫨棰勭害鏃堕棿"
+ style="width: 94%"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_time_region"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
</el-form>
</div>
</el-col>
@@ -475,7 +404,7 @@
@check-change="handleCurrentChecked">
</el-tree> -->
<!-- </div> -->
- <el-row :gutter="20">
+ <el-row :gutter="20">
<el-col :span="6">
<div
style="
@@ -531,14 +460,21 @@
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div style="text-align: center; margin-bottom: 10px;margin-top: 10px">
+ <div
+ style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ "
+ >
宸查�夐」鐩垪琛�
</div>
<el-table
:data="DataList"
border
style="width: 100%"
- height="400" :span-method="objectSpanMethod"
+ height="400"
+ :span-method="objectSpanMethod"
>
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
@@ -572,7 +508,13 @@
<el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
<el-table-column
prop="proName"
label="椤圭洰"
@@ -1612,12 +1554,12 @@
},
handleClick(tab, event) {
if (tab.label == "鍗曢」") {
- this.DataList =[]
+ this.DataList = [];
this.getDataList();
}
},
getDataList() {
- this.loading = true
+ this.loading = true;
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
if (this.tableData[0]) {
@@ -1740,9 +1682,9 @@
}
});
},
- // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
- objectSpanMethod({ row, column, rowIndex, columnIndex }) {
- console.log(row, column, rowIndex, columnIndex)
+ // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 }
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+ console.log(row, column, rowIndex, columnIndex);
let fields = ["propinName"];
let cellValue = row[column.property];
if (cellValue && fields.includes(column.property)) {
@@ -1968,14 +1910,11 @@
display: block;
}
-
-.tab3 {
+.tab3 {
max-height: 400px;
overflow-y: auto;
border: 1px solid #d9d9d9;
}
-
-
.el-col-8 {
width: 330px;
diff --git a/vue.config.js b/vue.config.js
index 2f2ec9c..d2b941f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
- target: `http://192.168.1.113:5011`,
+ target: `http://192.168.1.3: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