From ab91bbc86844f8452d27c5d0405b9011b685c10f Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期四, 02 一月 2025 17:59:30 +0800
Subject: [PATCH] 12
---
src/components/jianceResult/index.vue | 79
src/views/doctor/check/index.vue | 1060 ++-------
src/views/system/tijian/index.vue | 1704 ++++-----------
src/views/system/comp/index.vue | 838 +------
src/api/system/tijian.js | 11
src/views/system/tijian/index copy.vue | 2548 +++++++++++++++++------
src/views/sampling/sampling/index.vue | 29
123.rar | 0
src/api/system/package.js | 8
9 files changed, 2,794 insertions(+), 3,483 deletions(-)
diff --git a/123.rar b/123.rar
index 871316f..582a840 100644
--- a/123.rar
+++ b/123.rar
Binary files differ
diff --git a/src/api/system/package.js b/src/api/system/package.js
index 53e1f3f..024bd2c 100644
--- a/src/api/system/package.js
+++ b/src/api/system/package.js
@@ -122,7 +122,13 @@
params: query
})
}
-
+export function selectZT(query) {
+ return request({
+ url: '/system/dept/getxmjgz',
+ method: 'get',
+ params: query
+ })
+}
export function Packagestlist(query) {
return request({
url: '/hosp/packageHis/list',
diff --git a/src/api/system/tijian.js b/src/api/system/tijian.js
index bbe87d9..2b8bdf3 100644
--- a/src/api/system/tijian.js
+++ b/src/api/system/tijian.js
@@ -136,7 +136,16 @@
},
});
}
-
+// 鏌ヨ杩囨浮琛ㄦ暟鎹�
+export function getTransitionList1(cusId) {
+ return request({
+ url: "/hosp/order/newgetTransitionList",
+ method: "get",
+ params: {
+ cusId: cusId,
+ },
+ });
+}
// 鐧昏鎴愬姛鍚庣敓鎴愬璇婂崟
export function getGuide(tjNumber) {
return request({
diff --git a/src/components/jianceResult/index.vue b/src/components/jianceResult/index.vue
new file mode 100644
index 0000000..24e0585
--- /dev/null
+++ b/src/components/jianceResult/index.vue
@@ -0,0 +1,79 @@
+<template>
+ <div>
+ <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+ <el-table :data="dataList" ref="elTable" v-loading="loading" border @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="40" align="center" />
+ <el-table-column label="鏍囧彿" prop="aid" align="center" />
+ <el-table-column label="缁撹鍊�" prop="ruleStr" align="center" />
+ <el-table-column label="鍙傝�冭寖鍥�" prop="reference" align="center" />
+ <el-table-column label="绠�鐮�" prop="jm" align="center" />
+ </el-table>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="open = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleOk">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { selectZT } from "@/api/system/package";
+export default {
+ name: "Packages",
+ props: {
+ baogao: {
+ type: Array,
+ },
+ },
+ data() {
+ return {
+ open: false,
+ proId: '',
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ dataList: [],
+ // 閬僵灞�
+ loading: false,
+ form: {
+ desc: "",
+ },
+ list: [],
+ fList: {},
+ };
+ },
+ mounted() {
+ },
+ methods: {
+ handleOk() {
+ this.open = false
+ this.$emit('add', this.list);
+ },
+ handleQuery() {
+ this.getList();
+ },
+ handleSelectionChange(selection) {
+ if (selection.length > 1) {
+ // 濡傛灉閫夋嫨浜嗗琛岋紝淇濈暀鏈�鍚庝竴琛�
+ this.$refs.elTable.clearSelection(); // 娓呯┖鎵�鏈夐�夋嫨
+ this.$refs.elTable.toggleRowSelection(selection[selection.length - 1]); // 閲嶆柊閫夋嫨鏈�鍚庝竴椤�
+ }
+
+ // 鑾峰彇鏈�鍚庨�夋嫨鐨勮
+ this.list = [selection[selection.length - 1]];
+ },
+ getList() {
+ this.loading = true;
+ selectZT({
+ proId: this.proId
+ }).then((res) => {
+ if (res.data) {
+ this.dataList = res.data;
+ this.loading = false;
+ }
+ });
+ },
+ },
+};
+</script>
+
+<style scoped></style>
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 696d582..5c097d8 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1,77 +1,32 @@
<template>
<div>
- <el-form
- :model="queryParams"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin-top: 10px"
- >
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- style="width: 116px"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input v-model="queryParams.name" style="width: 116px" placeholder="璇疯緭鍏ュ鍚�" clearable
+ @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNumber"
- style="width: 240px"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- clearable
- @blur="hb"
- @keyup.enter.native="submitForm"
- ></el-input>
+ <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 240px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable
+ @blur="hb" @keyup.enter.native="submitForm"></el-input>
</el-form-item>
<el-form-item>
- <el-button
- size="mini"
- type="primary"
- @click="submitForm"
- style="margin-right: 15px"
- >鎼滅储</el-button
- >
+ <el-button size="mini" type="primary" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button>
<el-button size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<div style="display: flex">
- <el-radio-group
- v-model="tjStatus"
- @input="radioChange"
- style="margin-left: 30px"
- >
+ <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 30px">
<el-radio-button label="0">鏈</el-radio-button>
<el-radio-button label="1">宸叉</el-radio-button>
</el-radio-group>
</div>
<template>
- <el-table
- :data="tableList"
- v-loading="loading"
- ref="table"
- height="536px"
- style="margin: 20px; width: 98%"
- border
- :cell-class-name="myclass"
- >
+ <el-table :data="tableList" v-loading="loading" ref="table" height="536px" style="margin: 20px; width: 98%" border
+ :cell-class-name="myclass">
<!-- <template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template> -->
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="cusName"
- width="90px"
- />
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="濮撳悕" align="center" prop="cusName" width="90px" />
<el-table-column label="鎬у埆" align="center" prop="cusSex" width="60px">
<template slot-scope="scope">
<span v-if="scope.row.cusSex == '0'">鐢�</span>
@@ -80,119 +35,50 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</el-table-column>
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="cusBrithday"
- width="100px"
- />
- <el-table-column
- label="鐢佃瘽"
- align="center"
- prop="cusPhone"
- width="100px"
- />
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjTime"
- width="160px"
- >
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" width="100px" />
+ <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" width="100px" />
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" width="160px">
</el-table-column>
- <el-table-column
- label="浣撴鏃堕棿"
- align="center"
- prop="tjTime"
- width="100px"
- >
+ <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" width="100px">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.tjTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鏈椤�"
- prop="notCheckeds"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鏈椤�" prop="notCheckeds" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔" align="center" width="130px">
<template slot-scope="scope">
- <el-button
- type="primary"
- icon="el-icon-first-aid-kit"
- size="mini"
- @click="Changeapplyfor(scope.row)"
- title="浼氳瘖鐢宠"
- v-if="tjStatus == '1'"
- ></el-button>
- <el-button
- type="primary"
- icon="el-icon-share"
- size="mini"
- @click="handleClick(scope.row)"
- title="璇︽儏"
- ></el-button>
+ <el-button type="primary" icon="el-icon-first-aid-kit" size="mini" @click="Changeapplyfor(scope.row)"
+ title="浼氳瘖鐢宠" v-if="tjStatus == '1'"></el-button>
+ <el-button type="primary" icon="el-icon-share" size="mini" @click="handleClick(scope.row)"
+ title="璇︽儏"></el-button>
</template>
</el-table-column>
</el-table>
<div class="pag">
<div class="pag1">
- <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" />
</div>
</div>
</template>
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1000px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-row>
<el-col :span="9" v-if="hzlogList.length >= 1">
<h3>浼氳瘖鐢宠璁板綍</h3>
<el-table :data="hzlogList" style="width: 100%" border>
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="hzDoctorName"
- width="100px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="hzDoctorName" width="100px" />
<el-table-column label="绉戝" align="center" prop="hzDeptName" />
<el-table-column label="鎿嶄綔" align="center" width="150px">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click="hadleedit(scope.row)"
- v-if="
- scope.row.hzReplyLogsList.length == 0 &&
- scope.row.hzDoctorId == info.userId
- "
- >淇敼</el-button
- >
- <el-button
- type="primary"
- size="mini"
- v-if="
- scope.row.hzReplyLogsList.length == 0 &&
- scope.row.hzDoctorId == info.userId
- "
- @click="handledele(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" size="mini" @click="hadleedit(scope.row)" v-if="scope.row.hzReplyLogsList.length == 0 &&
+ scope.row.hzDoctorId == info.userId
+ ">淇敼</el-button>
+ <el-button type="primary" size="mini" v-if="scope.row.hzReplyLogsList.length == 0 &&
+ scope.row.hzDoctorId == info.userId
+ " @click="handledele(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -201,18 +87,10 @@
<h3 style="text-align: center">浼氳瘖璁板綍鐢宠</h3>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="濮撳悕" prop="cusName">
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- disabled
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" disabled />
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNumber">
- <el-input
- v-model="form.tjNumber"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- disabled
- />
+ <el-input v-model="form.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" disabled />
</el-form-item>
<el-form-item label="浼氳瘖绉戝" prop="hzType">
<el-radio-group v-model="form.hzType">
@@ -220,42 +98,15 @@
<el-radio-button label="1">绉戝浼氳瘖</el-radio-button>
</el-radio-group>
</el-form-item>
- <el-form-item
- label="閫夋嫨绉戝"
- v-if="form.hzType == '1'"
- style="margin-top: 22px"
- >
- <el-select
- v-model="form.hzDeptId"
- multiple
- filterable
- style="width: 100%"
- >
- <el-option
- v-for="item in deptList"
- :key="item.deptId"
- :label="item.deptName"
- :value="item.deptId"
- ></el-option>
+ <el-form-item label="閫夋嫨绉戝" v-if="form.hzType == '1'" style="margin-top: 22px">
+ <el-select v-model="form.hzDeptId" multiple filterable style="width: 100%">
+ <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName"
+ :value="item.deptId"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鐢宠浜�"
- prop="hzDoctorId"
- style="margin-top: 22px"
- >
- <el-select
- v-model="form.hzDoctorId"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ <el-form-item label="鐢宠浜�" prop="hzDoctorId" style="margin-top: 22px">
+ <el-select v-model="form.hzDoctorId" placeholder="璇烽�夋嫨" style="width: 100%" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId">
</el-option>
</el-select>
</el-form-item>
@@ -272,56 +123,27 @@
</div>
</el-dialog>
- <el-dialog
- :title="title"
- :visible.sync="foropen"
- width="1000px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="foropen" width="1000px" append-to-body>
<el-row>
<el-col :span="8" v-if="hasdeptList.length >= 1">
<h3 style="text-align: center">浼氳瘖鐢宠璁板綍</h3>
- <el-table
- :data="hasdeptList"
- style="width: 100%"
- border
- ref="tab"
- @selection-change="handleSelectionChange"
- >
+ <el-table :data="hasdeptList" style="width: 100%" border ref="tab" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center" />
- <el-table-column
- label="鐢宠浜�"
- align="center"
- prop="hzDoctorName"
- width="100px"
- />
- <el-table-column
- label="绉戝"
- align="center"
- prop="hzDeptName"
- width="260px"
- />
+ <el-table-column label="鐢宠浜�" align="center" prop="hzDoctorName" width="100px" />
+ <el-table-column label="绉戝" align="center" prop="hzDeptName" width="260px" />
</el-table>
</el-col>
<el-col :span="16" style="padding: 0 10px">
<h3 style="text-align: center">浼氳瘖鎰忚</h3>
<div v-if="hzReplyLogsList.length >= 1" style="margin-bottom: 10px">
- <div
- v-for="(item, index) in hzReplyLogsList"
- :key="index"
- style="padding-bottom: 5px; border-bottom: 1px solid black"
- >
+ <div v-for="(item, index) in hzReplyLogsList" :key="index"
+ style="padding-bottom: 5px; border-bottom: 1px solid black">
<!-- <div>浼氳瘖绉戝锛歿{ item.replyDeptName }}</div> -->
<div>鍖荤敓锛歿{ item.hzDoctorName }}</div>
<div>鍥炲锛歿{ item.replyContent }}</div>
</div>
</div>
- <el-input
- type="textarea"
- :rows="2"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="textarea"
- >
+ <el-input type="textarea" :rows="2" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea">
</el-input>
<div style="padding: 10px 10px">
<el-button type="primary" @click="submitFormreply">鍥炲</el-button>
@@ -334,12 +156,7 @@
</div> -->
</el-dialog>
- <el-dialog
- title="濉啓鏄惁閲嶅ぇ闃虫��"
- :visible.sync="checkval"
- width="800px"
- append-to-body
- >
+ <el-dialog title="濉啓鏄惁閲嶅ぇ闃虫��" :visible.sync="checkval" width="800px" append-to-body>
<el-form ref="form" :model="formIn" label-width="100px">
<el-form-item label="濮撳悕">
<el-input v-model="formIn.cusName" disabled></el-input>
@@ -360,18 +177,8 @@
</el-radio-group>
</el-form-item>
<el-form-item label="绛夌骇">
- <el-select
- v-model="formIn.level"
- placeholder="璇烽�夋嫨"
- filterable
- style="width: 100%"
- >
- <el-option
- v-for="item in dict.type.lj_positive"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-select v-model="formIn.level" placeholder="璇烽�夋嫨" filterable style="width: 100%">
+ <el-option v-for="item in dict.type.lj_positive" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -385,31 +192,16 @@
</div>
</el-dialog>
- <el-dialog
- title="PDF 棰勮"
- :visible.sync="dialogVisible"
- :close-on-click-modal="false"
- >
+ <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>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<!-- 鐐瑰嚮鍙宠竟寮瑰嚭灞� -->
- <el-drawer
- :visible.sync="drawer"
- :with-header="false"
- size="70%"
- :before-close="handleClose"
- >
+ <el-drawer :visible.sync="drawer" :with-header="false" size="70%" :before-close="handleClose">
<div style="font-size: 14px">
- <table
- style="
+ <table style="
width: 96%;
height: 70px;
margin: 10px 10px;
@@ -417,19 +209,14 @@
border: 1px solid #dfe6ec;
border-collapse: collapse;
font-size: 16px;
- "
- cellspacing="4"
- >
+ " cellspacing="4">
<caption style="background-color: #f8f8f9; font-size: 18px">
濉啓{{
- tableAll.cusName
- }}鐨勪綋妫�璧勬枡
+ tableAll.cusName
+ }}鐨勪綋妫�璧勬枡
</caption>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
濮撳悕锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -441,36 +228,27 @@
<span v-if="scope.row.cusSex == '9'">鏈鏄庢�у埆</span>
</template>
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
鎬у埆锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
{{
- tableAll.cusSex == 0
- ? "鐢�"
- : tableAll.cusSex == 1
- ? "濂�"
- : "鏈煡"
- }}
+ tableAll.cusSex == 0
+ ? "鐢�"
+ : tableAll.cusSex == 1
+ ? "濂�"
+ : "鏈煡"
+ }}
</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
浣撴鍗曞彿锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
{{ tableAll.tjNumber }}
</td>
- <td
- style="border: 1px solid #dfe6ec; border-collapse: collapse"
- align="right"
- >
+ <td style="border: 1px solid #dfe6ec; border-collapse: collapse" align="right">
浣撴鏃堕棿锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
@@ -481,166 +259,80 @@
</div>
<div style="display: flex">
<div style="margin: 10px 10px" v-if="hasdeptList.length >= 1">
- <el-button type="primary" size="mini" @click="Changeapply()"
- >浼氳瘖鐢宠</el-button
- >
+ <el-button type="primary" size="mini" @click="Changeapply()">浼氳瘖鐢宠</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="historicalreport()"
- >鍘嗗彶鎶ュ憡</el-button
- >
+ <el-button type="primary" size="mini" @click="historicalreport()">鍘嗗彶鎶ュ憡</el-button>
</div>
<div style="margin: 10px 10px">
- <el-button type="primary" size="mini" @click="jianqian"
- >妫�鍓嶉棶璇�</el-button
- >
+ <el-button type="primary" size="mini" @click="jianqian">妫�鍓嶉棶璇�</el-button>
</div>
</div>
<el-row>
<el-col v-show="baogaoqian">
<template>
- <el-tabs
- v-model="radio"
- type="border-card"
- @tab-click="handleTabClick"
- style="margin-left: 10px"
- >
- <el-tab-pane
- :label="item.proName"
- :name="item.proId"
- v-for="(item, index) in Parent"
- :key="index"
- >
- <el-table
- class="bgc"
- v-loading="loading"
- :data="proParentList.sons"
- border
- height="460px"
- style="width: 96%; margin: 10px 10px"
- :row-class-name="tableRowClassName"
- >
- <el-table-column
- prop="project.proName"
- label="妫�娴嬮」鐩�"
- width="150"
- >
+ <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
+ <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index">
+ <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
+ style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
+ <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="150">
<!-- <template slot-scope="scope">
{{ scope.row.project.proName }}
</template> -->
</el-table-column>
- <el-table-column
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="150"
- >
+ <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
<template slot-scope="scope">
- <el-input
- type="textarea"
- autosize
- size="mini"
- v-model="scope.row.proResult"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- @blur="handleInputConfirm(scope.row)"
- @input="vale"
- ></el-input>
+ <el-input type="textarea" autosize size="mini" v-model="scope.row.proResult" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" @focus="handleFocus(scope.row)" @blur="handleInputConfirm(scope.row)"
+ @input="vale"></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="exceptionDesc"
- label="寮傚父"
- width="55px"
- align="center"
- >
+ <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
<template slot-scope="scope">
- <el-checkbox
- v-model="scope.row.exceptionDesc"
- ></el-checkbox>
+ <el-checkbox v-model="scope.row.exceptionDesc"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="瑙勫垯" width="70">
<template slot-scope="scope">
- <el-button
- class="blue-button"
- @click="handleguize(scope.row)"
- >...</el-button
- >
+ <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="project.proMetering"
- label="鍗曚綅"
- width="55"
- >
+ <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
<!-- <template slot-scope="scope">
{{ scope.row.standard.company }}
</template> -->
</el-table-column>
- <el-table-column
- prop="project.proScope"
- label="鍙傝�冭寖鍥�"
- width="70"
- >
+ <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�" width="70">
</el-table-column>
- <el-table-column
- prop="conclusion"
- label="缁撴灉缁撹"
- width="200"
- >
+ <el-table-column prop="conclusion" label="缁撴灉缁撹" width="200">
<template slot-scope="scope">
- <el-input
- size="mini"
- type="textarea"
- autosize
- v-model="scope.row.conclusion"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- disabled
- ></el-input>
+ <el-input size="mini" type="textarea" autosize v-model="scope.row.conclusion" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" disabled></el-input>
</template>
</el-table-column>
- <el-table-column
- prop="isReturn"
- label="澶嶈瘖"
- width="60px"
- align="center"
- >
+ <el-table-column prop="isReturn" label="澶嶈瘖" width="60px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isReturn"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isPositive"
- label="閲嶅ぇ闃虫��"
- width="55"
- >
+ <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.isPositive"
- active-value="1"
- inactive-value="0"
- @change="checkboxchange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+ @change="checkboxchange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column prop="resultType" label="缁撴灉寤鸿">
+ <el-table-column prop="proAdvice" label="缁撴灉寤鸿">
<template slot-scope="scope">
<el-popover placement="top" trigger="hover" width="400">
<div>
{{ scope.row.proAdvice }}
</div>
<div slot="reference" class="jianyi">
- <el-input
- type="textarea"
- autosize
- v-model="scope.row.proAdvice"
- placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
- :disabled="true"
- ></el-input>
+ <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+ :disabled="true"></el-input>
</div>
</el-popover>
</template>
@@ -648,42 +340,27 @@
</el-table>
<div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table
- style="
+ <table style="
width: 96%;
margin: 4px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
- <tr
- style="
+ " cellspacing="4">
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <td
- style="
+ ">
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
鐥呯閫夋嫨锛�
</td>
- <td
- @click="bzxz"
- style="
+ <td @click="bzxz" style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-input
- type="textarea"
- placeholder="璇烽�夋嫨鍐呭"
- v-model="titles"
- rows="2"
- >
+ ">
+ <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
</el-input>
<!-- <el-select
v-model="value"
@@ -703,79 +380,45 @@
</el-option>
</el-select> -->
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
涓绘鍖诲笀锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-select
- v-model="doctorName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- v-if="deptAdviceList"
- @change="selName"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ ">
+ <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+ @change="selName" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
+ :value="item.userId">
</el-option>
</el-select>
</td>
</tr>
- <tr
- style="
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <td
- style="
+ ">
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
寤鸿锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- colspan="2"
- >
+ " colspan="2">
<div style="margin: 0 0px 10px 15px">
- <el-button
- type="primary"
- @click="propoChange"
- style="margin-top: 10px; height: 37px"
- >蹇嵎寤鸿</el-button
- >
- <el-button
- type="primary"
- @click="proposalChange"
- style="margin-top: 10px; height: 37px"
- >鐢熸垚寤鸿</el-button
- >
+ <el-button type="primary" @click="propoChange"
+ style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
+ <el-button type="primary" @click="proposalChange"
+ style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
</div>
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="proParentList.remark"
- rows="7"
- >
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
</el-input>
</td>
</tr>
@@ -789,9 +432,7 @@
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <el-button type="primary" @click="determine"
- >鎻� 浜�</el-button
- >
+ <el-button type="primary" @click="determine">鎻� 浜�</el-button>
</div>
</div>
</el-tab-pane>
@@ -814,130 +455,60 @@
</el-col>
<el-col :span="18" v-show="baogaohou">
<template>
- <el-tabs
- v-model="radio"
- type="border-card"
- @tab-click="handleTabClick"
- style="margin-left: 10px"
- >
- <el-tab-pane
- :label="item.proName"
- :name="item.proId"
- v-for="(item, index) in Parent"
- :key="index"
- >
- <el-table
- class="bgc"
- v-loading="loading"
- :data="proParentList.sons"
- border
- height="460px"
- style="width: 96%; margin: 10px 10px"
- :row-class-name="tableRowClassName"
- >
- <el-table-column
- prop="project.proName"
- label="妫�娴嬮」鐩�"
- width="100"
- >
+ <el-tabs v-model="radio" type="border-card" @tab-click="handleTabClick" style="margin-left: 10px">
+ <el-tab-pane :label="item.proName" :name="item.proId" v-for="(item, index) in Parent" :key="index">
+ <el-table class="bgc" v-loading="loading" :data="proParentList.sons" border height="460px"
+ style="width: 96%; margin: 10px 10px" :row-class-name="tableRowClassName">
+ <el-table-column prop="project.proName" label="妫�娴嬮」鐩�" width="100">
<!-- <template slot-scope="scope">
{{ scope.row.project.proName }}
</template> -->
</el-table-column>
- <el-table-column
- prop="proResult"
- label="妫�娴嬬粨鏋�"
- width="150"
- >
+ <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150">
<template slot-scope="scope">
- <el-input
- type="textarea"
- autosize
- size="mini"
- v-model="scope.row.proResult"
- autocomplete="off"
- placeholder="璇疯緭鍏ユ娴嬬粨鏋�"
- @blur="handleInputConfirm(scope.row)"
- @input="vale"
- ></el-input>
+ <el-input type="textarea" autosize size="mini" v-model="scope.row.proResult" autocomplete="off"
+ placeholder="璇疯緭鍏ユ娴嬬粨鏋�" @focus="handleFocus(scope.row)" @blur="handleInputConfirm(scope.row)" @input="vale"></el-input>
</template>
</el-table-column>
<el-table-column label="瑙勫垯" width="70">
<template slot-scope="scope">
- <el-button
- class="blue-button"
- @click="handleguize(scope.row)"
- >...</el-button
- >
+ <el-button class="blue-button" @click="handleguize(scope.row)">...</el-button>
</template>
</el-table-column>
- <el-table-column
- prop="project.proMetering"
- label="鍗曚綅"
- width="55"
- >
+ <el-table-column prop="project.proMetering" label="鍗曚綅" width="55">
<!-- <template slot-scope="scope">
{{ scope.row.standard.company }}
</template> -->
</el-table-column>
- <el-table-column
- prop="project.proScope"
- label="鍙傝�冭寖鍥�"
- width="80"
- >
+ <el-table-column prop="project.proScope" label="鍙傝�冭寖鍥�" width="80">
</el-table-column>
- <el-table-column
- prop="exceptionDesc"
- label="寮傚父"
- width="55px"
- align="center"
- >
+ <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center">
<template slot-scope="scope">
- <el-checkbox
- v-model="scope.row.exceptionDesc"
- ></el-checkbox>
+ <el-checkbox v-model="scope.row.exceptionDesc"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isReturn"
- label="澶嶈瘖"
- width="55px"
- align="center"
- >
+ <el-table-column prop="isReturn" label="澶嶈瘖" width="55px" align="center">
<template slot-scope="scope">
<el-checkbox v-model="scope.row.isReturn"></el-checkbox>
</template>
</el-table-column>
- <el-table-column
- prop="isPositive"
- label="閲嶅ぇ闃虫��"
- width="55"
- >
+ <el-table-column prop="isPositive" label="閲嶅ぇ闃虫��" width="55">
<template slot-scope="scope">
- <el-switch
- v-model="scope.row.isPositive"
- active-value="1"
- inactive-value="0"
- @change="checkboxchange(scope.row)"
- ></el-switch>
+ <el-switch v-model="scope.row.isPositive" active-value="1" inactive-value="0"
+ @change="checkboxchange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column prop="resultType" label="缁撴灉寤鸿">
+ <el-table-column prop="proAdvice" label="缁撴灉寤鸿">
<template slot-scope="scope">
<el-popover placement="top" trigger="hover" width="400">
<div>
{{ scope.row.proAdvice }}
</div>
<div slot="reference" class="jianyi">
- <el-input
- type="textarea"
- autosize
- v-model="scope.row.proAdvice"
- placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
- :disabled="true"
- ></el-input>
+ <el-input type="textarea" autosize v-model="scope.row.proAdvice" placeholder="璇疯緭鍏ョ粨鏋滃缓璁�"
+ :disabled="true"></el-input>
</div>
</el-popover>
</template>
@@ -945,41 +516,27 @@
</el-table>
<div style="font-size: 14px; overflow-y: auto; height: 286px">
- <table
- style="
+ <table style="
width: 96%;
margin: 4px 10px;
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- cellspacing="4"
- >
- <tr
- style="
+ " cellspacing="4">
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <td
- style="
+ ">
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
鐥呯閫夋嫨锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-input
- type="textarea"
- placeholder="璇烽�夋嫨鍐呭"
- v-model="titles"
- rows="2"
- >
+ ">
+ <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2">
</el-input>
<!-- <el-select
v-model="value"
@@ -999,79 +556,45 @@
</el-option>
</el-select> -->
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
涓绘鍖诲笀锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
- <el-select
- v-model="doctorName"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- v-if="deptAdviceList"
- @change="selName"
- filterable
- >
- <el-option
- v-for="item in userList"
- :key="item.userId"
- :label="item.nickName"
- :value="item.userId"
- >
+ ">
+ <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList"
+ @change="selName" filterable>
+ <el-option v-for="item in userList" :key="item.userId" :label="item.nickName"
+ :value="item.userId">
</el-option>
</el-select>
</td>
</tr>
- <tr
- style="
+ <tr style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
<div style="margin: 0 0px 10px 15px">
- <el-button
- type="primary"
- @click="propoChange"
- style="margin-top: 10px; height: 37px"
- >蹇嵎寤鸿</el-button
- >
- <el-button
- type="primary"
- @click="proposalChange"
- style="margin-top: 10px; height: 37px"
- >鐢熸垚寤鸿</el-button
- >
+ <el-button type="primary" @click="propoChange"
+ style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button>
+ <el-button type="primary" @click="proposalChange"
+ style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button>
</div>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- >
+ ">
寤鸿锛�
</td>
- <td
- style="
+ <td style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
- "
- colspan="2"
- >
- <el-input
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- v-model="proParentList.remark"
- rows="7"
- >
+ " colspan="2">
+ <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7">
</el-input>
</td>
</tr>
@@ -1085,9 +608,7 @@
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
<!-- v-show="tjStatus == '0'" -->
- <el-button type="primary" @click="determine"
- >鎻� 浜�</el-button
- >
+ <el-button type="primary" @click="determine">鎻� 浜�</el-button>
</div>
</div>
</el-tab-pane>
@@ -1105,10 +626,7 @@
</template> -->
</el-col>
<el-col :span="6" style="margin-top: 15px">
- <Historicalreport
- v-show="lishi"
- :reportHistorydata="reportHistorydata"
- ></Historicalreport>
+ <Historicalreport v-show="lishi" :reportHistorydata="reportHistorydata"></Historicalreport>
</el-col>
</el-row>
@@ -1154,17 +672,9 @@
</div> -->
</el-drawer>
<Public ref="aaa" :row="row" @add="handleChanges" />
-
- <el-dialog
- title="鎻愮ず"
- :visible.sync="jianqians"
- width="1000px"
- :before-close="handleClose1"
- >
- <jianqianwenzhen
- :jianqianwenzhendata="jianqianwenzhendata"
- v-if="flags"
- ></jianqianwenzhen>
+ <jianceResult ref="bbb" @add="handleChangesZt" />
+ <el-dialog title="鎻愮ず" :visible.sync="jianqians" width="1000px" :before-close="handleClose1">
+ <jianqianwenzhen :jianqianwenzhendata="jianqianwenzhendata" v-if="flags"></jianqianwenzhen>
<span slot="footer" class="dialog-footer">
<el-button @click="jianqians = false">鍙� 娑�</el-button>
</span>
@@ -1172,77 +682,31 @@
<proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
<createproposal ref="createproposal" :creatobj="creatobj" />
- <el-dialog
- title="閫夋嫨鐥呯"
- :visible.sync="taocan"
- width="80%"
- height="700px"
- :close-on-click-modal="false"
- >
- <el-tabs
- type="border-card"
- style="min-height: 538px; margin: 0 10px; width: 100%"
- @tab-click="handleClick"
- v-model="activeNames"
- >
+ <el-dialog title="閫夋嫨鐥呯" :visible.sync="taocan" width="80%" height="700px" :close-on-click-modal="false">
+ <el-tabs type="border-card" style="min-height: 538px; margin: 0 10px; width: 100%" @tab-click="handleClick"
+ v-model="activeNames">
<el-tab-pane label="鐥呯" name="first">
<div class="tab8">
<div class="tab3">
- <el-form
- :model="queryParam1"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin-top: 10px"
- >
+ <el-form :model="queryParam1" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px">
<el-form-item>
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="queryParam1.nr"
- clearable
- >
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="queryParam1.nr" clearable>
</el-input>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuerys"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuerys">鎼滅储</el-button>
</el-form-item>
</el-form>
- <el-table
- ref="multipleTable"
- border
- :data="deptAdviceList"
- height="430px"
- @selection-change="handleSelectionChanges"
- >
+ <el-table ref="multipleTable" border :data="deptAdviceList" height="430px"
+ @selection-change="handleSelectionChanges">
<el-table-column type="selection" width="40"> </el-table-column>
- <el-table-column
- prop="title"
- label="鐥呯鍚嶇О"
- align="center"
- width="130px"
- ></el-table-column>
- <el-table-column
- prop="advice"
- label="寤鸿"
- align="center"
- :show-overflow-tooltip="true"
- >
+ <el-table-column prop="title" label="鐥呯鍚嶇О" align="center" width="130px"></el-table-column>
+ <el-table-column prop="advice" label="寤鸿" align="center" :show-overflow-tooltip="true">
</el-table-column>
</el-table>
- <pagination
- v-show="total1 > 0"
- :total="total1"
- :page.sync="queryParam1.page"
- :limit.sync="queryParam1.pageSize"
- @pagination="getbzlist"
- />
+ <pagination v-show="total1 > 0" :total="total1" :page.sync="queryParam1.page"
+ :limit.sync="queryParam1.pageSize" @pagination="getbzlist" />
</div>
<div class="tab4">
<div class="tab4_txt">
@@ -1252,21 +716,11 @@
<el-table border :data="deptAdviceList1" height="430px">
<el-table-column prop="title" label="鐥呯鍚嶇О" align="center">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
<template slot-scope="scope">
- <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-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -1343,6 +797,7 @@
<script>
+import jianceResult from "@/components/jianceResult";
import proposal from "@/components/proposal";
import createproposal from "@/components/createproposal";
import { getInfoById } from "@/api/hosp/history";
@@ -1376,6 +831,7 @@
jianqianwenzhen,
createproposal,
proposal,
+ jianceResult
},
data() {
return {
@@ -1458,6 +914,7 @@
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
// 鐖堕」鐩垪琛�
+ curindex: {},
Parent: [],
hzReplyLogsList: [],
hasdeptList: [],
@@ -1531,6 +988,23 @@
},
methods: {
+
+ handleFocus(row) {
+ console.log(row)
+ if (!row.resultType || row.resultType == 2) {
+ return
+ } else {
+ this.curindex = row
+ this.$refs.bbb.open = true;
+ this.$refs.bbb.title = "閫夋嫨妫�娴嬬粨鏋�";
+ this.$refs.bbb.proId = row.proId;
+ this.$refs.bbb.getList();
+ }
+
+ },
+ handleChangesZt(params) {
+ this.curindex.proResult = params[0].ruleStr
+ },
tableRowClassName({ row }) {
if (row.exceptionDesc) {
return "warning-row";
@@ -1582,7 +1056,7 @@
const del_row = selection.shift();
this.$refs.multipleTable.toggleRowSelection(del_row, false);
}
- console.log(selection);
+
// this.selectArr = selection;
selection.forEach((item) => {
this.deptAdviceList2.push(item);
@@ -1605,7 +1079,7 @@
// !this.proParentList.remark.includes(item.title)
// ) {
if (this.proParentList.remark != null) {
- console.log(this.proParentList.remark);
+
this.titles += item1.title + ",";
this.remakes += item1.advice + ",";
this.proParentList.remark =
@@ -1628,9 +1102,7 @@
// this.proParentList.remark = "";
this.titles = "";
this.remakes = "";
- console.log(this.deptAdviceList1, 888888888888888888888888888);
- // this.deptAdviceList.forEach((item) => {
- // this.ids = item.id;
+
this.deptAdviceList1.forEach((item) => {
this.titles += item.title + ",";
this.remakes += item.advice + ",";
@@ -1639,9 +1111,9 @@
});
if (this.proParentList.remark != null) {
- console.log(this.remakes);
+
this.proParentList.remark = "";
- console.log(this.proParentList.remark);
+
let data = {
tjNumber: this.tjNumber,
proParentId: this.nums,
@@ -1654,32 +1126,7 @@
} else {
this.proParentList.remark = this.remakes;
}
- // this.deptAdviceList1.forEach((item1) => {
- // // if (item1.id === item.id) {
- // if (this.proParentList.remark != null) {
- // console.log(this.proParentList.remark,10101010);
- // console.log(66666666666);
- // this.titles += item1.title + ",";
- // // this.proParentList.remark += item1.advice + ",";
- // this.remakes += item1.advice + ",";
- // this.proParentList.remark = this.remakes + this.proParentList.remark;
- // // this.proParentList.remark ;
- // // this.value += item1.title + ",";
- // this.vaids.push(item1.id);
- // this.vaids1 = this.vaids.concat(this.idss);
- // return
- // } else {
- // console.log(77777777777);
- // this.titles += item1.title + ",";
- // this.proParentList.remark = item1.advice + ",";
- // // this.value += item1.title + ",";
- // this.vaids.push(item1.id);
- // this.vaids1 = this.vaids.concat(this.idss);
- // }
- // // }
- // });
- // });
this.taocan = false;
}
},
@@ -1768,7 +1215,6 @@
this.focusrow = datas;
this.proResult = datas;
var pattern3 = new RegExp("[0-9]+");
- console.log(typeof this.proResult.proResult);
if (pattern3.test(this.proResult)) {
let data = {
proId: this.focusrow.proId,
@@ -1799,7 +1245,8 @@
});
}
});
- } else {
+ }
+ else {
let data = {
proId: this.focusrow.proId,
cusId: this.tableAll.cusId,
@@ -1834,7 +1281,6 @@
}
this.rows.push(datas);
- console.log(this.rows, 5522);
},
handleguize(row) {
@@ -1853,7 +1299,6 @@
this.loading = true;
this.queryParams.type = this.tjStatus;
getProList(this.queryParams).then((response) => {
- console.log(response, 1212);
if (response.code == 200) {
this.loading = false;
@@ -2059,16 +1504,7 @@
hadleedit(row) {
this.form.hzType = row.hzType;
this.form.id = row.id;
- // this.form.hzDeptId = row.hzDeptNameList;
- // row.hzDeptIdList.forEach(item=>{
- // console.log(item,222);
- // this.deptList.forEach(items=>{
- // console.log(item,333);
- // if(item == items.deptId){
- // this.form.hzDeptNameList =
- // }
- // })
- // })
+
},
submitFormapply() {
@@ -2079,35 +1515,7 @@
}
});
if (this.form.hzType != undefined) {
- // if (this.form.hzDeptId && this.form.id) {
- // console.log(111);
- // // let hzDeptId = ""
- // // this.form.hzDeptId.forEach(item => {
- // // hzDeptId += item + ','
- // // })
- // data = {
- // tjNumber: this.form.tjNumber,
- // userId: this.form.cusId,
- // userName: this.form.cusName,
- // hzDeptIdList: this.form.hzDeptId,
- // hzDoctorId: this.form.hzDoctorId,
- // hzType: this.form.hzType,
- // orderId: this.form.orderId,
- // hzDoctorName: this.form.hzDoctorName,
- // id: this.form.id,
- // };
- // } else {
- // console.log(222);
- // data = {
- // tjNumber: this.form.tjNumber,
- // userId: this.form.cusId,
- // userName: this.form.cusName,
- // hzDoctorId: this.form.hzDoctorId,
- // hzType: this.form.hzType,
- // orderId: this.form.orderId,
- // hzDoctorName: this.form.hzDoctorName,
- // };
- // }
+
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
@@ -2259,12 +1667,7 @@
return false;
}
});
- // this.allList = []
- // if(newRows[0].hzReplyLogsList){
- // this.hzReplyLogsList = newRows[0].hzReplyLogsList
- // }
- // console.log(this.hzReplyLogsList)
- // this.allList = newRows
+
} else {
this.allList = [];
if (selection[0]) {
@@ -2428,8 +1831,7 @@
},
handleTabClick(tab, event) {
- // console.log(tab, event);
- // console.log(tab.name);
+
this.Parent.forEach((item) => {
if (tab.name == item.proId) {
this.Parentcheck = item;
@@ -2913,35 +2315,40 @@
.el-message * {
color: var(--white) !important;
}
+
.tab8 {
width: 100%;
display: flex;
justify-content: space-between;
}
+
.tab3 {
width: 68%;
}
+
.tab4 {
margin-top: 6px;
width: 30%;
}
+
.tab4_txt {
display: flex;
justify-content: center;
}
::v-deep .el-table .warning-row {
- background: #ffe6e6 !important; /* 杞诲井鐨勭孩鑹茶儗鏅� */
+ background: #ffe6e6 !important;
+ /* 杞诲井鐨勭孩鑹茶儗鏅� */
}
-/* .el-table--enable-row-hover .el-table__body tr:hover>td{
- background-color: #ffe6e6 !important;
-} */
-::v-deep .bgc .el-table__body tr:hover > td {
+
+::v-deep .bgc .el-table__body tr:hover>td {
background-color: #ffe6e6 !important;
}
+
::v-deep .bgc .el-table__cell {
padding: 5px 0 !important;
}
+
.jianyi {
display: -webkit-box;
-webkit-box-orient: vertical;
@@ -2951,6 +2358,7 @@
cursor: pointer;
font-size: 12px;
}
+
::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
background-color: #66cc66;
border-color: #66cc66;
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index ba8ecc1..ab8a88c 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -324,26 +324,7 @@
/>
</div>
- <!-- 娣诲姞鎴栦慨鏀逛綋妫�閲囨牱绠＄悊瀵硅瘽妗� -->
- <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="鐢宠鏃堕棿" prop="applicationTime">
- <el-date-picker clearable v-model="form.applicationTime" type="date" value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鐢宠鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="椤圭洰id鐖堕」" prop="proId">
- <el-input v-model="form.proId" placeholder="璇疯緭鍏ラ」鐩甶d鐖堕」" />
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О" prop="proName">
- <el-input v-model="form.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </el-dialog> -->
+
</div>
</template>
@@ -971,10 +952,6 @@
this.ids = array.map((item) => item.id);
},
-
- // 纭畾鎸夐挳
- submitForm() {},
-
buda() {
var websocket = null;
var url = this.valueUrl;
@@ -1019,10 +996,6 @@
// 纭閲囨牱
Confirmreceipt() {
- console.log(this.selectList, 999);
-
- console.log(1111);
-
const loadingInstance = this.$loading({
lock: true, // 閿佸畾灞忓箷
text: "鍔犺浇涓�...", // 鍔犺浇鏂囨湰
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index bd31423..d43c277 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -1,183 +1,59 @@
<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="cnName">
- <el-input
- ref="inputName"
- v-model="queryParams.cnName"
- placeholder="璇疯緭鍏ュ崟浣嶅悕绉�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input ref="inputName" v-model="queryParams.cnName" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<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-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:comp:add']"
- >鏂板</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['system:comp:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:comp:edit']"
- >淇敼</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['system:comp: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:comp:remove']"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['system:comp: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:comp:export']"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['system:comp:export']">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="mainDepartment"
- v-hasPermi="['system:comp:edit']"
- >缁存姢閮ㄩ棬</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="mainDepartment"
+ v-hasPermi="['system:comp:edit']">缁存姢閮ㄩ棬</el-button>
</el-col>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table
- border
- v-loading="loading"
- :data="compList"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
- fixed="left"
- type="selection"
- width="40px"
- align="center"
- />
- <el-table-column
- label="搴忓彿"
- align="center"
- prop="newID"
- :show-overflow-tooltip="true"
- width="50px"
- fixed="left"
- />
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="cnName"
- width="240px"
- />
- <el-table-column
- label="缁熶竴淇＄敤浠ｇ爜"
- align="center"
- prop="taxNumber"
- width="180px"
- />
- <el-table-column
- label="鑱旂郴浜�"
- align="center"
- prop="contactPerson"
- :show-overflow-tooltip="true"
- width="90px"
- />
- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="contactPhone"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="娉ㄥ唽鍦板潃"
- align="center"
- prop="registerAddress"
- :show-overflow-tooltip="true"
- />
+ <el-table border v-loading="loading" :data="compList" @selection-change="handleSelectionChange">
+ <el-table-column fixed="left" type="selection" width="40px" align="center" />
+ <el-table-column label="搴忓彿" align="center" prop="newID" :show-overflow-tooltip="true" width="50px" fixed="left" />
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="cnName" width="240px" />
+ <el-table-column label="缁熶竴淇＄敤浠ｇ爜" align="center" prop="taxNumber" width="180px" />
+ <el-table-column label="鑱旂郴浜�" align="center" prop="contactPerson" :show-overflow-tooltip="true" width="90px" />
+ <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="contactPhone" :show-overflow-tooltip="true" />
+ <el-table-column label="娉ㄥ唽鍦板潃" align="center" prop="registerAddress" :show-overflow-tooltip="true" />
<!-- <el-table-column label="浼佷笟绫诲瀷" align="center" prop="typeOfEnterprise" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag :options="dict.type.dict_comp_type" :value="scope.row.typeOfEnterprise"/>
</template>
- </el-table-column> -->
- <el-table-column
- label="琛屾斂鍖哄垝"
- align="center"
- prop="areaName"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="閫氳鍦板潃"
- align="center"
- prop="mailingAddress"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="閭"
- align="center"
- prop="email"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="寮�鎴烽摱琛�"
- align="center"
- prop="bankAccount"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="閾惰璐﹀彿"
- align="center"
- prop="countNum"
- :show-overflow-tooltip="true"
- />
+</el-table-column> -->
+ <el-table-column label="琛屾斂鍖哄垝" align="center" prop="areaName" :show-overflow-tooltip="true" />
+ <el-table-column label="閫氳鍦板潃" align="center" prop="mailingAddress" :show-overflow-tooltip="true" />
+ <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" />
+ <el-table-column label="寮�鎴烽摱琛�" align="center" prop="bankAccount" :show-overflow-tooltip="true" />
+ <el-table-column label="閾惰璐﹀彿" align="center" prop="countNum" :show-overflow-tooltip="true" />
<!-- <el-table-column label="GMP鍙戣瘉鏃ユ湡" align="center" prop="gmpissueDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.gmpissueDate, '{y}-{m}-{d}') }}</span>
@@ -199,42 +75,19 @@
<image-preview :src="scope.row.gmpPhoto" :width="50" :height="50"/>
</template>
</el-table-column> -->
- <el-table-column
- label="澶囨敞"
- align="center"
- prop="remark"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="澶囨敞" align="center" prop="remark" :show-overflow-tooltip="true" />
<!-- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
- <el-table-column
- label="淇敼浜�"
- align="center"
- prop="updateBy"
- :show-overflow-tooltip="true"
- width="100px"
- />
- <el-table-column
- label="淇敼鏃堕棿"
- align="center"
- prop="updateTime"
- width="100px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="淇敼浜�" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100px" />
+ <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="100px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鎺掑簭"
- align="center"
- prop="orderNum"
- :show-overflow-tooltip="true"
- width="55px"
- />
+ <el-table-column label="鎺掑簭" align="center" prop="orderNum" :show-overflow-tooltip="true" width="55px" />
<!-- <el-table-column label="鏁版嵁鐘舵��(PT10.00.004)" align="center" prop="effective">
<template slot-scope="scope">
<dict-tag :options="dict.type.dict_data_status" :value="scope.row.effective"/>
@@ -245,148 +98,64 @@
<span>{{ parseTime(scope.row.validTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- width="70px"
- >
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="70px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:comp:edit']"
- title="淇敼"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:comp:remove']"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:comp:edit']" title="淇敼"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['system:comp:remove']" title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
<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>
<div>
- <el-dialog
- :title="title"
- :visible.sync="opens"
- width="1350px"
- append-to-body
- :close-on-click-modal="false"
- >
+ <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="false">
<el-row :gutter="20">
<el-col :span="7" :xs="24">
<div style="padding: 0 20px">
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="80px"
- :inline="true"
- >
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
<el-form-item label="閮ㄩ棬鍚嶇О" prop="dwDeptName">
- <el-input
- v-model="form.dwDeptName"
- placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
- />
+ <el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
</el-form-item>
<el-form-item label="绛剧害閲戦" prop="signingPrice">
- <el-input
- v-model="form.signingPrice"
- placeholder="璇疯緭鍏ョ绾﹂噾棰�"
- />
+ <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
</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="handleAddDept"
- v-hasPermi="['system:comp:add']"
- >淇濆瓨閮ㄩ棬</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddDept"
+ v-hasPermi="['system:comp:add']">淇濆瓨閮ㄩ棬</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="singleg"
- @click="handledeleDept"
- v-hasPermi="['system:comp:edit']"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singleg" @click="handledeleDept"
+ v-hasPermi="['system:comp:edit']">鍒犻櫎</el-button>
</el-col>
</el-row>
- <el-table
- ref="tb"
- v-loading="loading"
- :data="deptList"
- @selection-change="handleSelection"
- border
- style="width: 320px"
- height="350"
- >
+ <el-table ref="tb" v-loading="loading" :data="deptList" @selection-change="handleSelection" border
+ style="width: 320px" height="350">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column
- label="閮ㄩ棬鍚嶇О"
- align="center"
- prop="dwDeptName"
- />
+ <el-table-column label="閮ㄩ棬鍚嶇О" align="center" prop="dwDeptName" />
</el-table>
</div>
</el-col>
<el-col :span="17" :xs="24">
- <el-form
- ref="form"
- :model="forms"
- :rules="rules"
- label-width="78px"
- :inline="true"
- >
+ <el-form ref="form" :model="forms" :rules="rules" label-width="78px" :inline="true">
<el-form-item label="鍒嗙粍鍚嶇О" prop="groupingName">
- <el-input
- v-model="forms.groupingName"
- placeholder="璇疯緭鍏ュ垎缁勫悕绉�"
- style="width: 130px"
- @focus="changegroupingName"
- />
+ <el-input v-model="forms.groupingName" placeholder="璇疯緭鍏ュ垎缁勫悕绉�" style="width: 130px"
+ @focus="changegroupingName" />
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select
- v-model="forms.sex"
- placeholder="璇烽�夋嫨鎬у埆"
- style="width: 120px"
- clearable
- :disabled="isSexDisabled"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="forms.sex" placeholder="璇烽�夋嫨鎬у埆" style="width: 120px" clearable
+ :disabled="isSexDisabled">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="濂楅鍚嶇О" prop="pacName">
@@ -397,19 +166,21 @@
style="width: 130px"
/>
</el-form-item> -->
+ <el-form-item label="鍘熶环" prop="price">
+ <el-input v-model="forms.price" placeholder="璇疯緭鍏ュ師浠�" style="width: 130px" />
+ </el-form-item>
+ <el-form-item label="鎶樻墸" prop="limits">
+ <el-input v-model="forms.limits" placeholder="璇疯緭鍏ユ姌鎵�" style="width: 130px" @change="numberChange" />
+ <!-- :disabled="isfalse" -->
+ </el-form-item>
+
+ <el-form-item label="浼樻儬浠�" prop="ysPrice">
+ <el-input v-model="forms.ysPrice" placeholder="璇疯緭鍏ュ簲鏀�" style="width: 120px" />
+ </el-form-item>
<el-form-item label="缁撶畻鏂瑰紡" prop="payType">
- <el-select
- v-model="forms.payType"
- placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
- style="width: 130px"
- clearable
- >
- <el-option
- v-for="dict in dict.type.reservation_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="forms.payType" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" style="width: 130px" clearable>
+ <el-option v-for="dict in dict.type.reservation_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="骞撮緞娈�">
@@ -450,78 +221,33 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-plus"
- size="mini"
- @click="handleGroup"
- >淇濆瓨</el-button
- >
+ <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGroup">淇濆瓨</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="singlegg"
- @click="xiangmuWh"
- >椤圭洰缁存姢</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
+ @click="xiangmuWh">椤圭洰缁存姢</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="singlegg"
- @click="GroupUpdate"
- >閲嶇疆</el-button
- >
- <el-button
- type="primary"
- icon="el-icon-edit"
- size="mini"
- :disabled="singlegg"
- @click="deleteGroup"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
+ @click="GroupUpdate">閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
+ @click="deleteGroup">鍒犻櫎</el-button>
</el-col>
</el-row>
- <el-table
- border
- ref="tbs"
- v-loading="loading"
- :data="groupingList"
- @selection-change="handleChange"
- height="350"
- >
+ <el-table border ref="tbs" v-loading="loading" :data="groupingList" @selection-change="handleChange"
+ height="350">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column
- label="搴忓彿"
- align="center"
- prop="newID"
- width="50px"
- />
- <el-table-column
- label="鍒嗙粍鍚嶇О"
- align="center"
- prop="groupingName"
- />
+ <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+ <el-table-column label="鍒嗙粍鍚嶇О" align="center" prop="groupingName" />
<el-table-column label="鎬у埆" align="center" prop="sex">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
<el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" />
<el-table-column label="缁撶畻鏂瑰紡" align="center" prop="payType">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.reservation_pay_type"
- :value="scope.row.payType"
- />
+ <dict-tag :options="dict.type.reservation_pay_type" :value="scope.row.payType" />
</template>
</el-table-column>
<el-table-column label="鎶樻墸" align="center" prop="limits" />
@@ -535,63 +261,24 @@
<!-- 濂楅 -->
<div>
- <el-dialog
- :title="title"
- :visible.sync="openss"
- width="1400px"
- append-to-body
- :close-on-click-modal="false"
- >
+ <el-dialog :title="title" :visible.sync="openss" width="1400px" append-to-body :close-on-click-modal="false">
<el-row :gutter="24">
<el-col :span="8" :xs="24">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="68px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input
- ref="inputName"
- v-model="queryParams.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter.native="handleSearch"
- style="width: 140px"
- />
+ <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
+ @keyup.enter.native="handleSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleSearch"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
</el-form-item>
</el-form>
- <el-table
- ref="tbone"
- border
- v-loading="loading"
- :data="newpacName"
- @selection-change="handleChangeOne"
- height="478"
- >
+ <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
+ height="478">
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column
- label="搴忓彿"
- align="center"
- prop="newID"
- width="50px"
- />
- <el-table-column
- label="濂楅鍚嶇О/浠锋牸/鍏�"
- align="center"
- prop="pacName"
- >
+ <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+ <el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
<template slot-scope="scope">
{{ scope.row.pacName + "/" + scope.row.price }}
</template>
@@ -599,48 +286,21 @@
</el-table>
</el-col>
<el-col :span="6" :xs="24">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="46px"
- style="height: 35px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+ style="height: 35px">
<el-form-item label="鍚堣" prop="price">
- <el-input
- ref="inputName"
- v-model="queryParams.price"
- placeholder="鍚堣"
- clearable
- style="width: 140px"
- />
+ <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
</el-form-item>
<el-form-item>
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuerys"
- >閲嶇疆</el-button
- >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
</el-form>
<!-- <div style="color: red; font-size: 8px">
娉ㄩ噴锛氶紶鏍囧乏閿弻鍑婚�変腑琛屽彲鍒犻櫎
</div> -->
<!-- @row-dblclick="dbclick" -->
- <el-table
- border
- v-loading="loading"
- :data="OnenewpacName"
- :row-class-name="tableRowClassName"
- height="478"
- >
- <el-table-column
- label="椤圭洰鍚嶇О/浠锋牸/鍏�"
- align="center"
- prop="proName"
- >
+ <el-table border v-loading="loading" :data="OnenewpacName" :row-class-name="tableRowClassName" height="478">
+ <el-table-column label="椤圭洰鍚嶇О/浠锋牸/鍏�" align="center" prop="proName">
<template slot-scope="scope">
{{ scope.row.proName + "/" + scope.row.proPrice }}
</template>
@@ -648,72 +308,33 @@
<el-table-column label="鎿嶄綔" align="center" width="68">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handledbelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="handledbelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
<el-col :span="2" :xs="24">
- <div style="margin: 240% 6%">
- <el-button
- type="primary"
- size="medium "
- icon="el-icon-back"
- @click="resetright"
- >纭� 璁�</el-button
- >
+ <div style="margin: 240% 16%">
+ <el-button type="primary" size="medium " icon="el-icon-back" @click="resetright">纭� 璁�</el-button>
</div>
</el-col>
<el-col :span="8" :xs="24">
- <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="proName">
- <el-input
- ref="inputName"
- v-model="queryParams.proName"
- placeholder="璇疯緭鍏ラ」鐩悕绉�"
- clearable
- @keyup.enter.native="handleSearchFor"
- style="width: 140px"
- />
+ <el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+ @keyup.enter.native="handleSearchFor" style="width: 140px" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleSearchFor"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
</el-form-item>
</el-form>
- <el-table
- border
- v-loading="loading"
- ref="tre"
- :data="Treedata"
- @selection-change="handleChangesingle"
- height="478"
- >
+ <el-table border v-loading="loading" ref="tre" :data="Treedata" @selection-change="handleChangesingle"
+ height="478">
<el-table-column type="selection" width="40px" align="center" />
<el-table-column label="椤圭洰鍚嶇О" align="center" prop="proName" />
- <el-table-column
- label="椤圭洰浠锋牸/鍏�"
- align="center"
- prop="proPrice"
- />
+ <el-table-column label="椤圭洰浠锋牸/鍏�" align="center" prop="proPrice" />
</el-table>
</el-col>
</el-row>
@@ -725,63 +346,24 @@
</div>
<div>
- <el-dialog
- :title="title"
- :visible.sync="openOne"
- width="1400px"
- append-to-body
- :close-on-click-modal="false"
- >
+ <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false">
<el-row :gutter="24">
<el-col :span="8" :xs="24">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="68px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input
- ref="inputName"
- v-model="queryParams.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter.native="handleSearch"
- style="width: 140px"
- />
+ <el-input ref="inputName" v-model="queryParams.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable
+ @keyup.enter.native="handleSearch" style="width: 140px" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleSearch"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearch">鎼滅储</el-button>
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button> -->
</el-form-item>
</el-form>
- <el-table
- ref="tbone"
- border
- v-loading="loading"
- :data="newpacName"
- @selection-change="handleChangeOne"
- height="478"
- >
+ <el-table ref="tbone" border v-loading="loading" :data="newpacName" @selection-change="handleChangeOne"
+ height="478" v-if="isTableVisible" >
<el-table-column type="selection" width="40px" align="center" />
- <el-table-column
- label="搴忓彿"
- align="center"
- prop="newID"
- width="50px"
- />
- <el-table-column
- label="濂楅鍚嶇О/浠锋牸/鍏�"
- align="center"
- prop="pacName"
- >
+ <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" />
+ <el-table-column label="濂楅鍚嶇О/浠锋牸/鍏�" align="center" prop="pacName">
<template slot-scope="scope">
{{ scope.row.pacName + "/" + scope.row.price }}
</template>
@@ -789,30 +371,13 @@
</el-table>
</el-col>
<el-col :span="6" :xs="24">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- label-width="46px"
- style="height: 35px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="46px"
+ style="height: 35px">
<el-form-item label="鍚堣" prop="price">
- <el-input
- ref="inputName"
- v-model="queryParams.price"
- placeholder="鍚堣"
- clearable
- style="width: 140px"
- />
+ <el-input ref="inputName" v-model="queryParams.price" placeholder="鍚堣" clearable style="width: 140px" />
</el-form-item>
<el-form-item>
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuerys"
- >閲嶇疆</el-button
- >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuerys">閲嶇疆</el-button>
</el-form-item>
</el-form>
<!-- <div style="color: red; font-size: 8px">
@@ -843,55 +408,28 @@
></el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="68">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handledbelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="handledbelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</el-col>
<el-col :span="2" :xs="24">
<div style="margin: 240% 6%">
- <el-button
- type="primary"
- size="medium "
- icon="el-icon-back"
- @click="resetright"
- ></el-button
- >
+ <el-button type="primary" size="medium " icon="el-icon-back"
+ style="writing-mode: vertical-rl; text-align: center;letter-spacing: 10px;"
+ @click="resetright">纭</el-button>
</div>
</el-col>
<el-col :span="8" :xs="24">
- <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="proName">
- <el-input
- ref="inputName"
- v-model="queryParams.proName"
- placeholder="璇疯緭鍏ラ」鐩悕绉�"
- clearable
- @keyup.enter.native="handleSearchFor"
- style="width: 140px"
- />
+ <el-input ref="inputName" v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable
+ @keyup.enter.native="handleSearchFor" style="width: 140px" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleSearchFor"
- >鎼滅储</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSearchFor">鎼滅储</el-button>
</el-form-item>
</el-form>
<el-table
@@ -923,32 +461,13 @@
<!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
<div class="dia">
- <el-dialog
- :title="title"
- :visible.sync="open"
- width="1340px"
- append-to-body
- >
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- label-width="106px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open" width="1340px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
- <el-input
- v-model="form.cnName"
- placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�"
- style="width: 520px"
- />
+ <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" style="width: 520px" />
</el-form-item>
<el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="taxNumber">
- <el-input
- v-model="form.taxNumber"
- placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜"
- style="width: 520px"
- />
+ <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜" style="width: 520px" />
</el-form-item>
<el-form-item label="娉曚汉浠ｈ〃" prop="legalPerson">
<el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
@@ -957,10 +476,7 @@
<el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
- <el-input
- v-model="form.contactPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
+ <el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
<el-form-item label="浼犵湡" prop="faxNumber">
<el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
@@ -971,32 +487,16 @@
</el-form-item> -->
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input
- v-model="form.registerAddress"
- placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
- style="width: 1157px"
- />
+ <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px" />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input
- v-model="form.mailingAddress"
- placeholder="璇疯緭鍏ラ�氳鍦板潃"
- style="width: 1157px"
- />
+ <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" style="width: 1157px" />
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
- <el-input
- v-model="form.bankAccount"
- placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
- style="width: 520px"
- />
+ <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" style="width: 520px" />
</el-form-item>
<el-form-item label="閾惰璐︽埛" prop="countNum">
- <el-input
- v-model="form.countNum"
- placeholder="璇疯緭鍏ラ摱琛岃处鎴�"
- style="width: 520px"
- />
+ <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" style="width: 520px" />
</el-form-item>
<el-form-item label="鑱旂郴閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
@@ -1009,10 +509,7 @@
</el-form-item>
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
- <el-input
- v-model="form.areaName"
- placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�"
- />
+ <el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
</el-form-item>
<!-- <el-form-item label="浼佷笟绫诲瀷" prop="typeOfEnterprise">
<el-select v-model="form.typeOfEnterprise" placeholder="璇烽�夋嫨浼佷笟绫诲瀷">
@@ -1088,15 +585,8 @@
</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-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-item label="浜旂瑪绠�鐮�" prop="wbm">
<el-input v-model="form.wbm" placeholder="璇疯緭鍏ヤ簲绗旂畝鐮�" />
@@ -1112,6 +602,7 @@
</template>
<script>
+
import {
listComp,
getComp,
@@ -1129,7 +620,7 @@
delegrouping,
getDetails,
} from "@/api/system/comp";
-import { deptTreeSelect, projectGetList } from "@/api/system/tijian";
+import { deptTreeSelect, projectGetList, getconfigKey } from "@/api/system/tijian";
import { getInfo } from "@/api/login";
export default {
name: "Comp",
@@ -1212,7 +703,7 @@
payType: "",
sex: "",
},
-
+ sfzs: '',
// 琛ㄥ崟鏍￠獙
rules: {
cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }],
@@ -1270,11 +761,17 @@
},
};
},
+ computed: {
+ // 鏍规嵁 sfzs 瀛楁鐨勫�兼潵鎺у埗琛ㄦ牸鏄惁鏄剧ず
+ isTableVisible() {
+ return this.sfzs === 'Y';
+ }
+ },
created() {
this.getList();
},
methods: {
- /** 鏌ヨ浣撴鍗曚綅淇℃伅缁存姢鍒楄〃 */
+
getList() {
this.$nextTick(() => {
this.$refs.inputName.focus();
@@ -1808,7 +1305,11 @@
this.loading = true;
let id = this.groupList[0].id;
// console.log(this.groupList[0].id, 9966);
-
+ getconfigKey("sfzstc").then((res) => {
+ this.sfzs = res.msg;
+
+
+ });
getDetails(id).then((res) => {
this.OnenewpacName = res.data.groupingProList;
this.OnenewpacName.forEach((item, index) => {
@@ -2075,8 +1576,8 @@
this.$modal
.confirm(
'鏄惁纭鍒犻櫎浣撴鍗曚綅淇℃伅缁存姢缂栧彿涓�"' +
- drugManufacturerIds +
- '"鐨勬暟鎹」锛�'
+ drugManufacturerIds +
+ '"鐨勬暟鎹」锛�'
)
.then(function () {
return delComp(drugManufacturerIds);
@@ -2085,7 +1586,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -2129,4 +1630,9 @@
justify-content: center;
margin: auto;
}
+
+.btnback {
+ width: 50px;
+ height: 100px;
+}
</style>
diff --git a/src/views/system/tijian/index copy.vue b/src/views/system/tijian/index copy.vue
index 9251022..35877a2 100644
--- a/src/views/system/tijian/index copy.vue
+++ b/src/views/system/tijian/index copy.vue
@@ -1,238 +1,273 @@
<template>
<div class="app-container">
- <div style="display: flex">
- <div style="width: 76%">
- <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
- label-width="106px" v-show="top">
- <el-row>
- <el-col :span="5">
- <el-form-item label="鍖垮悕" prop="isNow" style="display: flex">
- <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
- <el-option v-for="dict in dictType" :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="cusName" style="display: flex" :rules="[
- {
- required: true, validator: (rule, value, callback) => {
- if (!form.cusName) {
- callback('')
- } else if (form.cusName) {
- callback()
- }
+ <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+ <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
+ <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴浜�" prop="contactPerson">
+ <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ </el-form-item>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
+ <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ <el-form-item label="绋庡彿" prop="taxNumber">
+ <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+ </el-form-item>
+ <el-form-item label="娉曚汉" prop="legalPerson">
+ <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
+ </el-form-item>
+ <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
+ <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
+ </el-form-item>
+ <el-form-item label="閫氳鍦板潃" prop="mailingAddress">
+ <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
+ </el-form-item>
+ <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
+ <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ </el-form-item>
+ <el-form-item label="閾惰璐︽埛" prop="countNum">
+ <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" />
+ </el-form-item>
+ <el-form-item label="閭" prop="email">
+ <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" />
+ </el-form-item>
+ <el-form-item label="璐熻矗浜�" prop="principal">
+ <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" />
+ </el-form-item>
+ <el-form-item label="缃戝潃" prop="url">
+ <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" />
+ </el-form-item>
+ <el-form-item label="浼犵湡" prop="faxNumber">
+ <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
+ </el-form-item>
+ <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
+ <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
+ </el-form-item>
+ <el-form-item label="鎺掑簭" prop="orderNum">
+ <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
+ </el-form-item>
+ <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+ <el-date-picker clearable v-model="form1.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="form1.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="cancel1">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <el-row :gutter="20">
+ <el-col :span="17">
+ <div class="grid-content bg-purple">
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
+ <el-form-item label="鍖垮悕" prop="isNow">
+ <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+ <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
- }, trigger: 'blur'
- }]">
- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
- </el-form-item>
- </el-col>
- <el-col :span="9">
- <el-form-item label="璇佷欢绫诲瀷" prop="idType" style="display: flex">
- <el-select :disabled="isDisabled" 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-row>
- </el-form>
- <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
- label-width="106px" v-show="top">
- <el-row>
- <el-col :span="5">
- <el-form-item label="姘戞棌" prop="cusNational" style="display: flex">
- <el-select filterable :disabled="isDisabled" 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="7">
- <el-form-item label="鎬у埆" prop="cusSex" :rules="[
- {
- required: true, validator: (rule, value, callback) => {
- if (!form.cusSex && showHidden.has_sex === 'Y') {
- callback('')
- } else if (showHidden.has_sex === 'N') {
- callback()
- } else if (form.cusSex && showHidden.has_sex === 'Y') {
- callback()
- }
+ <el-form-item label="濮撳悕" prop="cusName" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
- }, trigger: 'blur'
- }]" style="display: flex">
- <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
- <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>
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
+ 濮撳悕
+ </span>
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
+ </el-form-item>
- <el-col :span="9">
- <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="[
- {
- required: true, validator: (rule, value, callback) => {
- if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
- callback('')
- } else if (showHidden.has_idcard === 'N') {
- callback()
- } else if (form.cusIdcard && showHidden.has_idcard === 'Y') {
- callback()
- }
+ <el-form-item label="璇佷欢绫诲瀷" prop="idType">
+ <el-select :disabled="isDisabled" 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-item label="姘戞棌" prop="cusNational">
+ <el-select filterable :disabled="isDisabled" 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>
- }, trigger: 'blur'
- }]" style="display: flex">
- <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="inputChange" />
- <!-- <i style="
+ <el-form-item label="鎬у埆" prop="cusSex" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusSex && showHidden.has_sex === 'Y') {
+ callback('');
+ } else if (showHidden.has_sex === 'N') {
+ callback();
+ } else if (form.cusSex && showHidden.has_sex === 'Y') {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
+ <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
+ <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="cusIdcard" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+ callback('');
+ } else if (showHidden.has_idcard === 'N') {
+ callback();
+ } else if (
+ form.cusIdcard &&
+ showHidden.has_idcard === 'Y'
+ ) {
+ callback();
+ }
+ },
+ 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="inputChange" />
+ <!-- <i style="
font-size: 1rem;
position: absolute;
right: -20px;
top: 10px;
cursor: pointer;
" class="el-icon-search" @click="handleQuery"></i> -->
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
- label-width="106px" v-show="top">
- <el-row>
- <el-col :span="5">
- <el-form-item label="濠氬Щ" prop="cusMarryStatus" style="display: flex">
- <el-select :disabled="isDisabled" 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="7">
- <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
- {
- required: true, validator: (rule, value, callback) => {
- if (!form.cusPhone && showHidden.is_phone === 'Y') {
- callback('')
- } else if (showHidden.is_phone === 'N') {
- callback()
- } else if (form.cusPhone && showHidden.is_phone === 'Y') {
- callback()
- }
+ </el-form-item>
- }, trigger: 'blur'
- }]" style="display: flex">
- <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
- </el-form-item>
- </el-col>
+ <el-form-item label="濠氬Щ" prop="cusMarryStatus">
+ <el-select :disabled="isDisabled" 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 :span="9">
- <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday" style="display: flex">
- <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
- value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
- label-width="106px" v-show="top">
- <el-row>
- <el-col :span="5">
- <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-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone && showHidden.is_phone === 'Y') {
+ callback('');
+ } else if (showHidden.is_phone === 'N') {
+ callback();
+ } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
+ </el-form-item>
- <el-col :span="7">
- <el-form-item label="閭" prop="cusEmail" style="display: flex">
- <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="骞撮緞 " prop="age" style="display: flex" label-width="150px
- ">
- <el-input v-model="form.age" :disabled="isDisabled" style="padding-left: 10%" />
- </el-form-item>
- </el-col>
- <el-col :span="3">
- <el-form-item prop="ageUnit">
- <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 94%">
- <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>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition" v-show="top">
- <el-row>
- <el-col :span="20">
- <el-form-item label="鎴峰彛鍦板潃" prop="addr">
- <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" style="width: 103%" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :label-position="labelPosition" v-show="top">
- <el-row>
- <el-col :span="20">
- <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
- <el-input v-model="form.cusAddr" style="width: 103%" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="98px"
- v-show="top">
- <el-row>
- <el-col :span="7">
- <el-form-item label="浠嬬粛浜�" prop="cusIntroduce" style="display: flex">
- <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="宸ヤ綔鍗曚綅" prop="company" style="display: flex">
- <el-input style="width: 100%" :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" style="display: flex">
- <el-input style="width: 100%" :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
- <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
- :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
- </el-col>
- </el-row>
- </el-form>
- <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="80px"
- v-show="top">
- <el-row>
- <el-col :span="24">
- <el-form-item>
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
+ <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
+ value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%">
+ </el-date-picker>
+ </el-form-item>
+
+ <el-form-item label="鑱屼笟" prop="career">
+ <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-form-item label="閭" prop="cusEmail">
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
+ </el-form-item>
+
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" :disabled="isDisabled" style="width: 30%" />
+ <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-item prop="ageUnit">
+
+ </el-form-item> -->
+ </el-form>
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
+ <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
+ </el-form-item>
+
+ <el-form-item label="鍗曚綅鍚嶇О" prop="compName">
+ <el-select :disabled="isDisabled" v-model="form.compName" 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" :value="dict.cnName" />
+ </el-select>
+ <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
+ </el-form-item>
+
+ <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
+ <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
+ </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">
+ <div style="float: right; margin-bottom: 10px">
+ <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
+ <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
+ :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
<el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
- </el-form-item>
+ </div>
</el-col>
</el-row>
- </el-form>
- </div>
- <div v-show="top">
+ </div>
+ </el-col>
+ <el-col :span="7" v-show="top">
<div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
- <div v-show="hide" style="
- border: 1px dashed #dcdfe6;
- width: 180px;
- height: 180px;
- margin-left: 5%;
- ">
+ <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
<img v-if="imageUrl" :src="imageUrl" class="avatar" />
</div>
<div v-if="imgSrc" class="img_bg_camera">
@@ -249,16 +284,18 @@
<canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
<div class="camera_outer" style="margin-top: 10px">
<el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
- <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button><br />
+ <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
+ <br />
</div>
</div>
- </div>
- </div>
+ </el-col>
+ </el-row>
- <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="50%" height="700px">
- <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%">
- <el-tab-pane label="濂楅">
- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="auto">
+ <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+ <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
+ @tab-click="handleClick">
+ <el-tab-pane label="濂楅" name="first">
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
<el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
</el-form-item>
@@ -270,8 +307,7 @@
<div class="tab4">
<div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
<el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
- border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb"
- style="width: 850px">
+ border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
<el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
<el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
<el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
@@ -283,7 +319,7 @@
v-hasPermi="['system:package:Seach']">濂楅璇︽儏
</el-button>
</template>
- </el-table-column> -->
+</el-table-column> -->
</el-table>
</div>
<!-- <el-button
@@ -301,28 +337,150 @@
></el-button> -->
</div>
</el-tab-pane>
- <el-tab-pane label="鍗曢」">
- <div class="tab3">
- <!-- <div class="tab2"> -->
- <v-tree-transfer :treeData="treedataList" :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
- :defaultKeys="defaultKeys" @changeKeys="changeCategoryKeys" :key="datekey"></v-tree-transfer>
- <!-- <el-tree ref="tree" :data="treedataList" show-checkbox node-key="proId" :props="defaultProps"
- :default-expanded-keys="treeId" :default-checked-keys="treeList" @check-change="handleCurrentChecked">
+ <el-tab-pane label="缁勫悎" name="third">
+ <!-- <div class="tab3"> -->
+ <el-row :gutter="20" style="width: 100%">
+ <el-col :span="6">
+ <div style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ ">
+ 椤圭洰鍒楄〃
+ </div>
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
+ </el-input>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox
+ node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ ">
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
+ :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1" :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <div style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ ">
+ 宸查�夐」鐩垪琛�
+ </div>
+ <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
+ title="鍒犻櫎"></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryalls }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
+ <!-- </div> -->
+ </el-tab-pane>
+ <el-tab-pane label="鍗曢」" name="second">
+ <div class="tab8">
+ <!-- <div class="tab7">
+ <v-tree-transfer
+ :treeData="treedataList"
+ :defaultProps="{ children: 'tjProjectList', label: 'proName' }"
+ :defaultKeys="defaultKeys"
+ @changeKeys="changeCategoryKeys"
+ :key="datekey"
+ ></v-tree-transfer> -->
+ <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList"
+ @check-change="handleCurrentChecked">
</el-tree> -->
<!-- </div> -->
- <!-- <el-button
- style="
- width: 20px;
- height: 100px;
- margin-left: 10px;
- margin-top: 20%;
- font-size: 10px;
- "
- type="primary"
- size="mini"
- @click="submit"
- ><i style="font-size: 18px" class="el-icon-d-arrow-right"></i
- ></el-button> -->
+ <el-row :gutter="20">
+ <el-col :span="6">
+ <div style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ ">
+ 椤圭洰鍒楄〃
+ </div>
+ <!-- @input="gaibian" -->
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
+ </el-input>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+ node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="6">
+ <div style="
+ text-align: center;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ ">
+ 鏄庣粏椤圭洰鍒楄〃
+ </div>
+ <div class="tab3">
+ <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+ :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+ @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+ :render-content="renderContent">
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="11">
+ <div class="grid-content bg-purple">
+ <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">
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
+ <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>
+ <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3>
+ </div>
+ </el-col>
+ </el-row>
</div>
</el-tab-pane>
</el-tabs>
@@ -331,9 +489,9 @@
<el-button type="primary" @click="submit">纭� 瀹�</el-button>
</span>
</el-dialog>
-
- <el-row type="flex" class="row-bg" justify="space-around" v-if="tcShow">
- <el-col>
+ <!-- -->
+ <el-row v-if="tcShow">
+ <el-col :span="15">
<div class="grid-content bg-purple">
<!-- <el-table :data="fData" border height="220px" style="width: 100%; ">
<el-table-column prop="proName" label="缁勫悎椤圭洰" align="center" width="200px">
@@ -377,9 +535,9 @@
</div> -->
<template>
- <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 7px">
+ <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px">
<el-form-item label="浣撴绫诲瀷">
- <el-select style="width: 100px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+ <el-select style="width: 150px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
<el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
@@ -388,33 +546,36 @@
<!-- <div class="tab1"> -->
<!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 126px"></el-input>
+ <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
<!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
- <el-input-number ref="inputNumber" style="width: 126px" v-model="discount" :precision="2" :step="0.1"
+ <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="2" :step="0.1"
:max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 126px"></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 150px"></el-input>
</el-form-item>
+ <br />
<!-- 140828199805050012 -->
<el-form-item label="棰嗗彇鏂瑰紡">
<!-- <el-input style="width: 100%;" v-model="form.getType" placeholder="璇烽�夋嫨棰嗗彇鏂瑰紡" /> -->
- <el-select v-model="getType" style="width: 94%" @change="getmailType">
+ <el-select v-model="getType" style="width: 150px" @change="getmailType">
<el-option v-for="dict in dict.type.report_get_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浣撴绫诲埆">
- <el-select style="width: 140px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-select style="width: 150px" v-model="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-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
</el-form-item>
- <el-form-item>
- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+
+ <el-form-item style="margin-left: 149px">
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+ <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button>
<el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'"
size="mini">绛惧埌鐧昏</el-button>
<el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
@@ -443,7 +604,23 @@
</div>
</el-dialog>
- <div style="text-align: center; margin-bottom: 10px">
+ <div style="
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ width: 100%;
+ ">
+ <div style="
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-left: 46px;
+ font-size: 16px;
+ margin-right: 20px;
+ ">
+ <span v-if="this.tableData1[0]">{{ this.tableData1[0].pacName || "" }}</span> 宸查�夐」鐩潯鏁帮細<span
+ style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0 }}</span>鏉�
+ </div>
宸查�夐」鐩垪琛�
</div>
<div style="
@@ -451,54 +628,43 @@
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- width: 980px;
+ width: 916px;
margin-left: 35px;
">
- <el-collapse v-model="index" accordion v-if="list3">
- <div class="info1" v-for="(item, index) in tableData1" :key="'info1-' + index">
- <el-collapse-item :name="index">
- <template slot="title">
- {{
- item.pacName +
- ":" +
- item.parentName +
- " (搴旀敹閲戦:" +
- item.ordPrice +
- "鍏� / 瀹炴敹閲戦:" +
- item.nowPrice +
- "鍏�)"
- }}
- </template>
- <el-table :data="item.list" border style="width: 100%" height="270">
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template slot-scope="scope" v-if="scope.row.proType == ''">
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
- </template>
- </el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
- </template>
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
-
+ <el-table :data="item.list" border style="width: 100%" height="270">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proType" label="鎬у埆" width="180">
+ <template slot-scope="scope" v-if="scope.row.proType == ''">
+ {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
+ </template>
+ <template slot-scope="scope" v-else>
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="搴旀敹閲戦">
+ </el-table-column>
+ <el-table-column label="鎶樻墸">
+ <template slot-scope="scope">
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+ <el-input v-model.number="scope.row.discount" @input="updateProPrice1(scope.row)" placeholder="杈撳叆鎶樻墸"
+ size="small" type="number" min="0" step="1" max="10">
+ </el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+ </el-table-column>
+ <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
+ </template>
+ </el-table-column>
+ </el-table>
<div v-if="list2 == true">
<el-table :data="tableData1" border style="width: 100%" height="250">
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
+ <el-table-column prop="proType" label="鎬у埆" width="50">
<template slot-scope="scope" v-if="scope.row.proType == ''">
{{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
</template>
@@ -507,6 +673,14 @@
</template>
</el-table-column>
<el-table-column prop="ysPrice" label="搴旀敹閲戦">
+ </el-table-column>
+ <el-table-column label="鎶樻墸">
+ <template slot-scope="scope">
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+ <el-input v-model.number="scope.row.discount" @input="updateProPrice(scope.row)" placeholder="杈撳叆鎶樻墸"
+ size="small" type="number" min="0" step="1" max="10">
+ </el-input>
+ </template>
</el-table-column>
<el-table-column prop="proPrice" label="瀹炴敹閲戦">
</el-table-column>
@@ -517,7 +691,6 @@
</el-table-column>
</el-table>
</div>
-
<el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
@@ -532,7 +705,15 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
</template>
</el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦">
+ <el-table-column prop="ordPrice" label="搴旀敹閲戦 ">
+ </el-table-column>
+ <el-table-column label="鎶樻墸">
+ <template slot-scope="scope">
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+ <el-input v-model.number="scope.row.discount" @input="updateProPrice(scope.row)"
+ placeholder="杈撳叆鎶樻墸" size="small" type="number" min="0" step="1" max="10">
+ </el-input>
+ </template>
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
@@ -620,6 +801,22 @@
</el-table>
</div>
</el-dialog>
+ <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
+ :close-on-click-modal="false">
+ <template>
+ <el-radio-group v-model="cardreaderradio" @input="changeradio">
+ <el-radio :label="3">韬唤璇�</el-radio>
+ <el-radio :label="6">鍋ュ悍鐮�</el-radio>
+ </el-radio-group>
+ <div style="margin-top: 10px" v-show="cardreaderradio == 6">
+ <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </div>
+ </template>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="cardreader = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="cardreadercopes">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
<div style="position: absolute; bottom: 100px; width: 360px; display: none">
<div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
<div style="font-size: 1px">
@@ -651,7 +848,7 @@
</span> -->
<!-- </el-dialog> -->
<historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
- <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%" :before-close="handleClose">
+ <el-dialog title="鎻愮ず" :visible.sync="dialogVisiblese" width="30%">
<span>鏄惁澶嶅埗鏈�杩戜竴娆＄殑浣撴椤圭洰锛�</span>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiblese = false">鍙� 娑�</el-button>
@@ -659,10 +856,12 @@
</span>
</el-dialog>
<Packages ref="aaa" @add="handleChanges" />
+ <selectName ref="bbb" @add="handleChangesName" />
</div>
</template>
<script>
+import selectName from "@/components/selectName";
import { dataURLtoFile, random } from "./file";
import { getInfo } from "@/api/login";
import {
@@ -672,23 +871,33 @@
getByTjNum,
} from "@/api/hosp/customer";
import { getPrintSetUp } from "@/api/system/examcharge";
-
import {
+ tuantiSelect,
deptTreeSelect,
projectGetList,
getOrder,
+ getProParentIdDxList,
+ getProSonDxList,
getCusIdcard,
getPackageListName,
getaddtTransition,
+ tuantiqueren,
getTransitionList,
+ getTransitionList1,
getByTeamNo,
+ delTbBycusCardIdAndProId,
getLoadFile,
- getIsRequired, getconfigKey,
+ getIsRequired,
+ getconfigKey,
getHistryTjOrderProByCusIdCard,
+ readCertCardInfos,
} from "@/api/system/tijian";
+import { addComp } from "@/api/system/comp";
+import { getCompany, queryCompany } from "@/api/team/tuanti";
import Packages from "@/components/Packages";
import { MessageBox } from "element-ui";
import VTreeTransfer from "./TreeTransfer.vue";
+import { getZhList, getlistByZhId } from "@/api/system/package";
import historyTj from "@/components/historyTj/index";
export default {
dicts: [
@@ -708,17 +917,32 @@
components: {
VTreeTransfer,
historyTj,
- Packages
+ Packages,
+ selectName,
},
data() {
return {
+ open1: false,
+ filterage: "",
+ checkedkeys: [],
+ DataLists: [],
+ marryalls: 0,
+ packagedataList: [],
+ packageList: [],
+ zhxqList: [],
+ zhList: [],
+ pname: "",
+ filterText: "",
proIdList: [],
tableDatas: [],
dialogVisiblese: false,
+ cardreaderradio: 3,
lishi: false,
table: false,
HistoryList: {},
- index: 0,
+ index: [],
+ names: "",
+ inputSSS: "",
dictType: [
{
value: 0,
@@ -730,6 +954,7 @@
},
],
isNow: 1,
+ marryall: 0,
treeId: [],
treeList: [],
defaultKeys: [],
@@ -747,7 +972,7 @@
hospName: "",
currentDate: "",
currentTime: "",
- tjCategory: "",
+ tjCategory: "12",
formIn: {
tjPro: "浣撴璐�",
},
@@ -823,6 +1048,7 @@
ids: [],
// 闈炲崟涓鐢�
single: true,
+ cardreader: false,
// 闈炲涓鐢�
multiple: true,
nodeobj: {},
@@ -834,10 +1060,25 @@
proIds: [],
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
+ activeNames: "first",
// 鏍戠姸褰㈢姸
+ Treedata: [],
+ TreedataList: [],
+ TreedataLists: [],
treedataList: [],
+ checkedkey: [],
+ checkedListkey: [],
+ checkedListkey1: [],
defaultProps: {
- children: "tjProjectList",
+ children: [],
+ label: "proName",
+ },
+ defaultProp: {
+ children: [],
+ label: "zhmc",
+ },
+ defaultpackProps: {
+ children: [],
label: "proName",
},
formPacId: "",
@@ -850,8 +1091,12 @@
pacName: null,
pacRemark: null,
},
- valueUrl: "ws://127.0.0.1:18890",
- WebSocket: null,
+ // valueUrl: "ws://127.0.0.1:18890",
+ // valueUrl: "ws://192.168.1.3:6789/websocket",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
+ valueUrls: "ws://127.0.0.1:6789/websocket",
+ // valueUrls: "ws://"+getIp() +":6789/websocket",
+ webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
// value: 1,
@@ -881,46 +1126,137 @@
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
+ obj: {},
+ CompanyList: [],
form: {
cusIdcard: "",
- tjType: "2",
+ tjType: "",
cusSex: 1,
cusNational: "1",
- cusMarryStatus: "1",
+ cusMarryStatus: "5",
idType: "1",
ageUnit: "0",
},
+ form1: {},
+ title: "",
// 琛ㄥ崟鏍￠獙
rules: {
cusName: [{ required: true, message: "", trigger: "blur" }],
- cusSex: [
- { required: true, message: "", trigger: "change" },
- ],
+ cusSex: [{ required: true, message: "", trigger: "change" }],
address: [{ required: true, message: "", trigger: "blur" }],
phone: [{ required: true, message: "", trigger: "blur" }],
- cusPhone: [
- { required: true, message: "", trigger: "change" },
- ],
- cusBrithday: [
- { required: true, message: "", trigger: "change" },
- ],
+ cusPhone: [{ required: true, message: "", trigger: "change" }],
+ cusBrithday: [{ required: true, message: "", trigger: "change" }],
// cusNational: [
// { required: true, message: "姘戞棌涓嶈兘涓虹┖", trigger: "change" },
// ],
- cusIdcard: [
- { required: true, message: "", trigger: "change" },
+ cusIdcard: [{ required: true, message: "", trigger: "change" }],
+ },
+ rules1: {
+ cnName: [{ required: true, trigger: "blur" }],
+ contactPerson: [{ required: true, trigger: "blur" }],
+ contactPhone: [
+ {
+ required: true,
+ trigger: "blur",
+ },
+ {
+ pattern: /^1[3-9]\d{9}$/,
+ trigger: "blur",
+ },
],
},
};
},
+ watch: {
+ filterText(val) {
+ this.$refs.tree.filter(val);
+ },
+ filterage(val) {
+ this.$refs.treas.filter(val);
+ },
+ },
created() {
- this.getCurrentDateTime();
+ this.getCompanyList();
+ this.getCurrentDateTime();
this.startTimer();
this.getList1();
- this.getData();
+
+ // this.getData();
},
+ mounted() { },
+
methods: {
+ // 鏇存柊瀹炴敹閲戦
+ updateProPrice1(row) {
+ row.nowPrice = row.ordPrice * (row.discount / 10);
+ },
+ updateProPrice(row) {
+ row.proPrice = row.ysPrice * (row.discount / 10);
+ },
+ openname() {
+
+ this.$refs.bbb.open = true;
+ this.$refs.bbb.title = "鎼滅储濮撳悕";
+ this.$refs.bbb.getList();
+ },
+ getCompanyList() {
+ this.loading = true;
+ getconfigKey("team_reservation_default_day").then((res) => {
+ this.queryParams.yxts = res.msg;
+ });
+ getCompany(this.queryParam).then((response) => {
+ this.CompanyList = response.data;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+ cancel1() {
+ this.open1 = false;
+ this.reset1();
+ },
+ submitFormS() {
+ this.$refs["form1"].validate((valid) => {
+ if (valid) {
+ addComp(this.form1).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open1 = false;
+ this.getCompanyList();
+ });
+ }
+ });
+ },
+ reset1() {
+ this.form1 = {
+ company: "",
+ payType: "",
+ name: "",
+ phoe: "",
+ signingPic: "",
+ discount: "",
+ };
+ },
+ handleAdd1() {
+ this.reset1();
+ this.open1 = true;
+ this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
+ },
+ idFn1(value) {
+ if (value) {
+ const originalCompId = this.form.dictCompId;
+ this.form.compName = value;
+ this.CompanyList.forEach((item) => {
+ if (item.cnName == this.form.compName) {
+ this.form.dictCompId = item.drugManufacturerId;
+ }
+ });
+
+ if (this.form.dictCompId === originalCompId) {
+ this.form.dictCompId = "";
+ }
+ }
+ },
getCurrentDateTime() {
const currentDate = new Date();
@@ -950,7 +1286,23 @@
this.getCurrentDateTime();
}, 1000); //姣忕閽熸洿鏂颁竴娆�
},
-
+ filterNode(value, data) {
+ if (!value) return true;
+ // return data.proName.indexOf(value) !== -1;
+ if (data.proName.indexOf(value) !== -1) {
+ return data.proName.indexOf(value) !== -1;
+ } else {
+ return data.proEngName.indexOf(value) !== -1;
+ }
+ },
+ filterpackage(value, data) {
+ if (!value) return true;
+ if (data.zhmc.indexOf(value) !== -1) {
+ return data.zhmc.indexOf(value) !== -1;
+ } else {
+ return data.pym.indexOf(value) !== -1;
+ }
+ },
beforeDestroy() {
clearInterval(this.timer);
}, //娓呴櫎瀹氭椂鍣紝浠ラ伩鍏嶅唴瀛樻硠闇层��
@@ -1016,6 +1368,48 @@
inputChanges() {
this.$refs.historyTj.getlist();
},
+
+ candelete(item) {
+ let data = {
+ cusCardId: this.form.cusIdcard,
+ proId: item.proPrantId,
+ };
+ delTbBycusCardIdAndProId(data).then((res) => {
+ getTransitionList1(this.form.cusIdcard).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.nowPrice;
+ if (item.pacName === null) {
+ item.pacName = "鍗曢」";
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.pacName = item.pacName;
+ });
+
+ const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
+ let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+ if (r.test(TotalPrice)) {
+ this.TotalPrice = TotalPrice + ".00";
+ } else {
+ this.TotalPrice = TotalPrice;
+ }
+
+ this.list1 = false;
+ this.list3 = true;
+ } else {
+ this.list1 = true;
+
+ this.TotalPrice = "0.00";
+ }
+ });
+ });
+ },
cope() {
this.tcShow = true;
let cusIdCard = this.form.cusIdcard;
@@ -1046,7 +1440,6 @@
} else {
item.list.forEach((items) => {
_this.proIdList.push(items.proId);
-
});
}
});
@@ -1062,9 +1455,8 @@
if (response.code === 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
-
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
@@ -1326,16 +1718,15 @@
if (this.form.cusSex === "鏈煡") {
this.form.cusSex = 2;
}
+ if (this.form.tjType === '') {
+ this.form.tjType = this.dict.type.dict_team[0].value;
+ }
+
addCustomer(this.form).then((response) => {
this.responseList = response.data;
+
this.$modal.msgSuccess("鏂板鎴愬姛");
- // let cusSex = this.form.cusSex;
- // //鍏ㄩ儴濂楅
- // deptTreeSelect(cusSex).then((response) => {
- // this.newpacName = response.rows;
- // this.loading = false;
- // });
- // this.handleQuery();
+
_this.tcShow = true;
_this.tcShows = true;
_this.isDisabled = true;
@@ -1371,6 +1762,12 @@
if (this.form.tjType === null) {
this.form.tjType = this.dict.type.dict_team[0].value;
}
+ if (this.form.cusMarryStatus === "null") {
+ this.form.cusMarryStatus = "5";
+ }
+ if (this.form.cusNational === "null") {
+ this.form.cusNational = "1";
+ }
if (this.form.reservationId != null) {
if (this.form.groupingId) {
_this.tcShow = true;
@@ -1395,9 +1792,11 @@
this.list1 = false;
this.list2 = true;
this.list3 = false;
+ this.top = false;
} else {
this.list1 = true;
this.TotalPrice = "0.00";
+ this.top = false;
}
});
} else {
@@ -1406,7 +1805,7 @@
_this.tcShows = true;
_this.formPacId = this.form.pacId;
let cusId = this.form.cusIdcard;
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
if (this.tableData1) {
this.TotalPrice1 = 0;
@@ -1439,18 +1838,17 @@
} else {
_this.tcShow = true;
this.$message.warning("鏆傛棤棰勭害淇℃伅");
+ _this.resetpackage();
}
+ this.top = false;
_this.isDisabled = true;
} else {
this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�");
}
});
- // .catch((error) => {
- // this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
- // });
} else {
- let configKey = "getInfoFromSqlData"
- getconfigKey(configKey).then(res => {
+ let configKey = "getInfoFromSqlData";
+ getconfigKey(configKey).then((res) => {
if (res.code == 200) {
if (res.msg == "N") {
var websocket = null;
@@ -1460,7 +1858,6 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
-
}
if (websocket == null) {
@@ -1477,75 +1874,24 @@
this.websocket = websocket;
// 杩炴帴璁惧
var jsonObj = {
- name: "connect",
+ // name: "connect",
+ type: "1",
};
var jStr = JSON.stringify(jsonObj);
this.websocket.send(jStr);
- alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
+ // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�");
var jsonObj = {
- name: "readCert",
+ // name: "readCert",
};
- var jStr = JSON.stringify(jsonObj);
- this.websocket.send(jStr);
+
this.dialogVisible = false;
};
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
- websocket.onmessage = function (event) {
+ websocket.onmessage = (event) => {
var resultObj = eval("(" + event.data + ")");
-
- //resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
- if (
- resultObj.name == "readCard" ||
- resultObj.name == "readCert" ||
- resultObj.name == "PushWithImg" ||
- resultObj.name == "PushWithOutImg"
- ) {
- if (resultObj.resultFlag == "0") {
- //鍥炴樉鐩稿叧鏁版嵁
- _this.form.cusName = resultObj.resultContent.partyName;
- _this.form.cusSex =
- resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
- _this.form.cusNational = resultObj.resultContent.nation;
- _this.form.cusBrithday = resultObj.resultContent.bornDay;
- if (_this.form.cusBrithday) {
- _this.form.cusBrithday = _this.form.cusBrithday.replace(
- /^(\d{4})(\d{2})(\d{2})$/,
- "$1-$2-$3"
- );
- }
- _this.form.cusAddr = resultObj.resultContent.certAddress;
- _this.form.cusIdcard = resultObj.resultContent.certNumber;
- _this.imageUrl =
- "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
- if (
- resultObj.name == "readCert" ||
- resultObj.name == "PushWithImg"
- ) {
- this.imageUrl =
- "data:image/jpeg;base64," +
- resultObj.resultContent.identityPrintPic;
- }
- } else if (resultObj.resultFlag == "-1") {
- if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
- //alert("璇诲崱鍣ㄦ湭杩炴帴");
- } else {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.resultFlag == "-2") {
- //alert(resultObj.errorMsg);
- }
- } else if (resultObj.name == "getStatus") {
- if (resultObj.resultFlag == "0") {
- if (resultObj.status == "0") {
- } else {
- alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
- }
- }
- }
+ this.readCardWebSocket(resultObj);
};
-
- //杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
websocket.onclose = function () {
alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
};
@@ -1553,10 +1899,312 @@
this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
this.$refs.aaa.title = "璇佷欢瀛楀吀";
+ } else if (res.msg == "S") {
+ this.cardreader = true;
+ _this.cardreaderradio = 3;
+ _this.inputSSS = "";
}
}
- })
+ });
+ }
+ },
+ // 鏈�鏂颁娇鐢╳ebSocket閫氫俊
+ readCardWebSocket(resultObj) {
+ let _this = this;
+ if (resultObj.code === 200 && resultObj.data.name != null) {
+ //鍥炴樉鐩稿叧鏁版嵁
+ _this.form.cusName = resultObj.data.name;
+ _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+ _this.form.cusNational = resultObj.data.mz;
+ _this.form.cusBrithday = resultObj.data.csrq;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusAddr = resultObj.data.addres;
+ _this.form.cusIdcard = resultObj.data.card;
+ _this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
+ if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+ this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img;
+ }
+ } else {
+ this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇");
+ } /* if (resultObj.resultFlag == "-1") {
+ if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+ //alert("璇诲崱鍣ㄦ湭杩炴帴");
+ } else {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.resultFlag == "-2") {
+ //alert(resultObj.errorMsg);
+ } */
+ },
+ // TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
+ jingChuanHandlerWebSocketResult(resultObj) {
+ let _this = this;
+ if (
+ resultObj.name == "readCard" ||
+ resultObj.name == "readCert" ||
+ resultObj.name == "PushWithImg" ||
+ resultObj.name == "PushWithOutImg"
+ ) {
+ if (resultObj.resultFlag == "0") {
+ //鍥炴樉鐩稿叧鏁版嵁
+ _this.form.cusName = resultObj.resultContent.partyName;
+ _this.form.cusSex =
+ resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+ _this.form.cusNational = resultObj.resultContent.nation;
+ _this.form.cusBrithday = resultObj.resultContent.bornDay;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusAddr = resultObj.resultContent.certAddress;
+ _this.form.cusIdcard = resultObj.resultContent.certNumber;
+ _this.imageUrl =
+ "data:image/jpeg;base64," + resultObj.resultContent.identityPic;
+ if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") {
+ this.imageUrl =
+ "data:image/jpeg;base64," +
+ resultObj.resultContent.identityPrintPic;
+ }
+ } else if (resultObj.resultFlag == "-1") {
+ if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") {
+ //alert("璇诲崱鍣ㄦ湭杩炴帴");
+ } else {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.resultFlag == "-2") {
+ //alert(resultObj.errorMsg);
+ }
+ } else if (resultObj.name == "getStatus") {
+ if (resultObj.resultFlag == "0") {
+ if (resultObj.status == "0") {
+ } else {
+ alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴");
+ }
+ }
+ }
+ },
+ changeradio() {
+ if (this.cardreaderradio != 3) {
+ this.$nextTick(() => {
+ this.$refs.tableHeadFilterInp.focus();
+ });
+ }
+ },
+ cardreadercopes() {
+ let _this = this;
+
+ if (this.cardreaderradio == 3) {
+ var websocket = null;
+ var url = this.valueUrls;
+ // var url = 'ws://'+ getIp() +':6789/websocket'
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ } else {
+ }
+ if (websocket == null) {
+ alert("11111");
+ }
+ websocket.onopen = function () {
+ try {
+ // 杩炴帴璁惧
+ var jsonObjs = {
+ type: 1,
+ data: {},
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ } catch (err) {
+ var tryTime = 0;
+ // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+ if (tryTime < 1) {
+ var t1 = setTimeout(function () {
+ tryTime++;
+ var jsonObjs = {
+ type: 1,
+ data: {},
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ }, 1 * 1000);
+ } else {
+ console.error("閲嶈繛澶辫触.");
+ }
+ }
+ };
+ websocket.onclose = function () {
+ alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+ };
+ websocket.onmessage = function (event) {
+ var resultObj = JSON.parse(event.data);
+ _this.form.cusName = resultObj.data.name;
+ _this.form.cusSex = resultObj.data.sex;
+ _this.form.cusNational = resultObj.data.mz;
+ _this.form.cusBrithday = resultObj.data.csrq;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusIdcard = resultObj.data.card;
+ if (_this.form.cusIdcard) {
+ const reg =
+ /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+ if (reg.test(_this.form.cusIdcard)) {
+ var org_birthday = _this.form.cusIdcard.substring(6, 14);
+ var birthday =
+ org_birthday.substring(0, 4) +
+ "-" +
+ org_birthday.substring(4, 6) +
+ "-" +
+ org_birthday.substring(6, 8);
+ var birthdays = new Date(birthday.replace(/-/g, "-"));
+ let d = new Date();
+ let age =
+ d.getFullYear() -
+ birthdays.getFullYear() -
+ (d.getMonth() < birthdays.getMonth() ||
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
+ ? 1
+ : 0);
+
+ _this.form.age = age;
+ }
+ }
+ _this.form.cusAddr = resultObj.data.addres;
+
+ _this.cardreader = false;
+ };
+
+ //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
+ };
+ } else {
+ // if (_this.inputSSS.indexOf(":1") != -1) {
+
+ // var str1 = _this.inputSSS.indexOf(":1");
+ // var result1 = _this.inputSSS.substring(0, str1);
+
+ // var str2 = _this.inputSSS.indexOf(":1");
+ // var result2 = _this.inputSSS.substring(
+ // str2 + 2,
+ // _this.inputSSS.length
+ // );
+
+ // _this.inputSSS = result1 + result2;
+ // }
+ _this.inputSSS = _this.inputSSS.replace(":1", "");
+ var websocket = null;
+ var url = this.valueUrls;
+ // var url = 'ws://'+ getIp() +':6789/websocket'
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ } else {
+ }
+ if (websocket == null) {
+ alert("11111");
+ }
+ websocket.onopen = function () {
+ try {
+ // 杩炴帴璁惧
+ var jsonObjs = {
+ type: 2,
+ data: {
+ qrcode: _this.inputSSS,
+ },
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ } catch (err) {
+ var tryTime = 0;
+ // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+ if (tryTime < 1) {
+ var t1 = setTimeout(function () {
+ tryTime++;
+ var jsonObjs = {
+ type: 2,
+ data: {
+ qrcode: _this.inputSSS,
+ },
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ }, 1 * 1000);
+ } else {
+ console.error("閲嶈繛澶辫触.");
+ }
+ }
+ };
+ websocket.onclose = function () {
+ alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
+ };
+ websocket.onmessage = function (event) {
+ var resultObj = JSON.parse(event.data);
+ _this.form.cusName = resultObj.data.name;
+
+ if (resultObj.data.nation == "姹夋棌") {
+ _this.form.cusNational = "1";
+ }
+ if (resultObj.data.gender == "鐢�") {
+ _this.form.cusSex = 0;
+ } else {
+ _this.form.cusSex = 1;
+ }
+ _this.form.cusBrithday = resultObj.data.birthday;
+ if (_this.form.cusBrithday) {
+ _this.form.cusBrithday = _this.form.cusBrithday.replace(
+ /^(\d{4})(\d{2})(\d{2})$/,
+ "$1-$2-$3"
+ );
+ }
+ _this.form.cusPhone = resultObj.data.phone;
+ _this.form.cusIdcard = resultObj.data.idenno;
+ if (_this.form.cusIdcard) {
+ const reg =
+ /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+ if (reg.test(_this.form.cusIdcard)) {
+ var org_birthday = _this.form.cusIdcard.substring(6, 14);
+ var birthday =
+ org_birthday.substring(0, 4) +
+ "-" +
+ org_birthday.substring(4, 6) +
+ "-" +
+ org_birthday.substring(6, 8);
+ var birthdays = new Date(birthday.replace(/-/g, "-"));
+ let d = new Date();
+ let age =
+ d.getFullYear() -
+ birthdays.getFullYear() -
+ (d.getMonth() < birthdays.getMonth() ||
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
+ ? 1
+ : 0);
+
+ _this.form.age = age;
+ }
+ }
+ _this.cardreader = false;
+ };
+
+ //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝ｅ父");
+ };
}
},
@@ -1566,28 +2214,12 @@
} else {
this.form.cusIdcard = param1[0].pacCode;
}
-
- // this.form.cusName = param1[0].pacName;
- // this.form.cusPhone = param1[0].pacRemark;
-
+ },
+ handleChangesName(params) {
+ this.form.cusIdcard = params[0].sfzh
+ this.handleQuery()
},
- // selected(row, index) {
- // if (this.formPacId !== null) {
- // if (row.pacId == this.formPacId) {
- // setTimeout(() => {
- // if (this.$refs.tb) {
- // this.$refs.tb.toggleRowSelection(row, true);
- // }
- // }, 10);
- // return true;
- // } else {
- // return false;
- // }
- // } else {
- // return this.newpacName;
- // }
- // },
// 涓婁紶澶村儚
handleAvatarSuccess(res, file) {
@@ -1611,10 +2243,10 @@
this.taocan = false;
this.malldisble = false;
this.defaultKeys = [];
+ this.DataLists = [];
},
cancell() {
-
if (this.addAddress.address) {
this.malldisble = false;
} else {
@@ -1626,17 +2258,180 @@
handle() {
this.loading = true;
this.name = this.queryParam.pacName;
+ let param = {
+ sex: this.form.cusSex,
+ dwId: this.form.dictCompId
+ }
if (this.name) {
getPackageListName(this.name).then((response) => {
this.newpacName = response.data;
this.loading = false;
});
} else {
- deptTreeSelect().then((response) => {
+ if (this.form.tjType == 1) {
+ tuantiSelect(param).then((response) => {
+ this.newpacName = response.data;
+ this.loading = false;
+ })
+ } else {
+ deptTreeSelect().then((response) => {
+ this.newpacName = response.rows;
+ this.loading = false;
+ });
+ }
+ }
+ },
+
+ // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
+ // handleSelectionChange(selection, row) {
+ // this.tableData = selection;
+ // if (selection.length > 1) {
+ // let del_row = selection.shift();
+ // this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ // }
+ // this.single = selection.length !== 1;
+ // this.multiple = !selection.length;
+ // this.tableData.forEach((item) => {
+ // this.fData = item.tjProjectList;
+ // });
+ // if (selection[0]) {
+ // this.DataList = [];
+ // this.data = JSON.parse(JSON.stringify(this.dXData));
+ // if (selection[0].tjProjectList) {
+ // selection[0].tjProjectList.forEach((selectionitem) => {
+ // this.treedataList.forEach((item) => {
+ // if (selectionitem.proName == item.proName) {
+ // item.disabled = true;
+ // item.tjProjectList = [];
+ // }
+ // if (item.tjProjectList) {
+ // item.tjProjectList.forEach((item1) => {
+ // if (selectionitem.proName == item1.proName) {
+ // item1.disabled = true;
+ // item1.tjProjectList = [];
+ // }
+ // if (item1.tjProjectList) {
+ // item1.tjProjectList.forEach((item2) => {
+ // if (selectionitem.proName == item2.proName) {
+ // item2.disabled = true;
+ // item2.tjProjectList = [];
+ // }
+ // });
+ // }
+ // });
+ // }
+ // });
+ // });
+ // }
+ // } else {
+ // this.treedataList = JSON.parse(JSON.stringify(this.dXData));
+ // return;
+ // }
+ // },
+
+ resetpackage() {
+ if (this.form.cusIdcard) {
+ var cusId = this.form.cusIdcard;
+ } else {
+ this.$message.warning("璇峰厛濉啓淇℃伅锛屽啀閫変綋妫�鍐呭");
+ }
+ let _this = this;
+ _this.pacId = "";
+ this.proIds = [];
+ this.tjCategory = "12";
+ let data = {
+ cusId,
+ pacId: _this.pacId,
+ proIds: this.proIds,
+ };
+ getaddtTransition(data).then((response) => {
+ if (response.code === 200) {
+ let cusId = this.form.cusIdcard;
+ this.proIds = [];
+ getTransitionList1(cusId).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1.length >= 1) {
+ this.list1 = false;
+ this.list3 = true;
+ } else {
+ this.list1 = true;
+
+ this.TotalPrice = "0.00";
+ }
+ });
+ }
+ });
+ },
+
+ Package() {
+
+ this.activeNames = "first";
+ let cusSex = this.form.cusSex;
+ this.datekey = Date.now();
+ //鍏ㄩ儴濂楅
+
+ let param = {
+ sex: cusSex,
+ dwId: this.form.dictCompId || ''
+ }
+ if (this.form.tjType == 1) {
+ if (!this.form.dictCompId) {
+ this.$message({
+ type: "warning",
+ message: "璇峰厛缁存姢鍗曚綅锛�",
+ });
+
+ } else {
+ this.taocan = true;
+ this.loading = true;
+ tuantiSelect(param).then((res) => {
+ this.newpacName = res.data;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
+ });
+ });
+ });
+ }
+ } catch (error) { }
+ this.loading = false;
+ })
+ }
+ } else {
+ this.taocan = true;
+ this.loading = true;
+ deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
+ });
+ });
+ });
+ }
+ } catch (error) { }
this.loading = false;
});
}
+
+
},
// 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
@@ -1646,119 +2441,362 @@
let del_row = selection.shift();
this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
}
- // this.single = selection.length !== 1;
- // this.multiple = !selection.length;
- // this.tableData.forEach((item) => {
- // this.fData = item.tjProjectList;
- // });
-
- if (selection[0]) {
- this.DataList = [];
- // this.data = JSON.parse(JSON.stringify(this.dXData));
- if (selection[0].tjProjectList) {
- selection[0].tjProjectList.forEach((selectionitem) => {
- this.treedataList.forEach((item) => {
- if (selectionitem.proName == item.proName) {
- item.disabled = true;
- item.tjProjectList = [];
- }
- if (item.tjProjectList) {
- item.tjProjectList.forEach((item1) => {
- if (selectionitem.proName == item1.proName) {
- item1.disabled = true;
- item1.tjProjectList = [];
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+ if (this.tableData1.length != 0) {
+ this.tableData.forEach((item) => {
+ this.tableData1.forEach((item1) => {
+ item.tjProjectList.forEach((item2) => {
+ if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") {
+ this.$confirm(
+ "璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵",
+ "纭淇℃伅",
+ {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
}
- if (item1.tjProjectList) {
- item1.tjProjectList.forEach((item2) => {
- if (selectionitem.proName == item2.proName) {
- item2.disabled = true;
- item2.tjProjectList = [];
- }
+ )
+ .then(() => {
+ this.$message({
+ type: "success",
+ message: "璇锋敞鎰忔煡鐪嬩环鏍�",
});
- }
- });
+ })
+ .catch((action) => {
+ if (action === "cancel") {
+ let del_row = selection.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false);
+ this.$message({
+ type: "warning",
+ message: "宸插彇娑�",
+ });
+ }
+ });
+ // this.$message.warning("璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鑻ラ�夋嫨璇ュ椁愶紝璇峰厛鍒犻櫎鍗曢」");
}
});
});
- }
+ });
+ }
+ if (selection[0]) {
+ // this.DataList = [];
+ // this.data = JSON.parse(JSON.stringify(this.dXData));
+ // selection[0].tjProjectList.forEach((selectionitem) => {
+ // this.Treedata.forEach((item) => {
+ // if (selectionitem.proName == item.proName) {
+ // item.disabled = true;
+ // item.tjProjectList = [];
+ // }
+ // if (item.tjProjectList) {
+ // item.tjProjectList.forEach((item1) => {
+ // if (selectionitem.proName == item1.proName) {
+ // item1.disabled = true;
+ // item1.tjProjectList = [];
+ // }
+ // if (item1.tjProjectList) {
+ // item1.tjProjectList.forEach((item2) => {
+ // if (selectionitem.proName == item2.proName) {
+ // item2.disabled = true;
+ // item2.tjProjectList = [];
+ // }
+ // });
+ // }
+ // });
+ // }
+ // });
+ // this.TreedataList.forEach((item3) => {
+ // if (item3.proParentId == selectionitem.proId) {
+ // item.disabled = true;
+ // }
+ // });
+ // });
} else {
this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
}
},
-
- Package() {
- this.taocan = true;
- let cusSex = this.form.cusSex;
- this.datekey = Date.now();
- //鍏ㄩ儴濂楅
+ handleClick(tab, event) {
+ if (this.activeNames == "second") {
+ this.DataList = [];
+ this.checkedkey = [];
+ this.getDataList();
+ } else if (this.activeNames == "third") {
+ this.DataLists = [];
+ this.checkedkeys = [];
+ getZhList().then((response) => {
+ if (response.data) {
+ this.packageList = response.data;
+ }
+ this.loading = false;
+ });
+ }
+ },
+ // gaibian(val){
+ // let pname = val;
+ // getProParentIdDxList(pname).then(response=>{
+ // this.Treedata = response.data.list;
+ // })
+ // },
+ getDataList() {
this.loading = true;
- deptTreeSelect(cusSex).then((response) => {
- this.newpacName = response.rows;
-
- try {
- if (this.tableData1.length >= 1) {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
+ getProParentIdDxList().then((response) => {
+ this.Treedata = response.data.list;
+
+ if (this.tableData[0]) {
+ this.tableData[0].tjProjectList.forEach((selectionitem) => {
+ this.Treedata.forEach((item) => {
+ if (selectionitem.proId == item.proId) {
+ item.disabled = true;
+ }
+ });
+ });
+ }
+ this.loading = false;
+ });
+ },
+
+ handlepackage(data, checked, checkedNodes) {
+ this.dataObj = data;
+ if (checked.checkedNodes.length != 0) {
+ this.$refs.treas.setCheckedKeys([data.id]);
+ let datas = {
+ zhId: data.id,
+ };
+ getlistByZhId(datas).then((res) => {
+ this.packagedataList = res.data.tjProjectList;
+
+ this.DataLists = [];
+ this.checkedListkey1 = [];
+ for (var i = 0; i < this.packagedataList.length; i++) {
+ let proId = this.packagedataList[i].proId;
+ this.checkedListkey1.push(proId);
+ // this.DataLists.push(this.packagedataList[i]);
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+
+ this.TreedataList.forEach((item) => {
+ // this.checkedListkey1.push(item.proId);
+
+ this.DataLists.push(item);
+
+ if (this.DataLists.length >= 1) {
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+
+ this.packagedataList.forEach((item3) => {
+ if (item1.proParentId == item3.proId) {
+ item1.propinName = item3.proName;
+ }
});
- throw Error();
- }
- });
+ });
+ }
});
});
}
-
- } catch (error) { }
- this.loading = false;
- });
- this.getData();
+ });
+ } else if (checked.checkedNodes.length == 0) {
+ this.DataLists = [];
+ this.marryalls = 0; // 娓呴浂鎬讳环
+ this.checkedListkey1 = [];
+ }
},
+ objectspanmethod({ row, column, rowIndex, columnIndex }) {
+ let fields = ["propinName"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.DataLists[rowIndex - 1];
+ let nextRow = this.DataLists[rowIndex + 1];
+ if (prevRow && prevRow[column.property] === cellValue) {
+ return { rowspan: 0, colspan: 0 };
+ } else {
+ let countRowspan = 1;
+ while (nextRow && nextRow[column.property] === cellValue) {
+ nextRow = this.DataLists[++countRowspan + rowIndex];
+ }
- // checkSelectable(row, index) {
- // if (!row) { return }
- // if (this.tableData1) {
- // if (this.tableData1.length != 0){
- // for (let j = 0; j < this.tableData1.length; j++) {
- // for (let i = 0; i < row.tjProjectList.length; i++) {
- // if (this.tableData1[j].pacName == "鍗曢」") {
- // if (row.tjProjectList[i].proName === this.tableData1[j].parentName) {
- // return false
- // }
- // }
- // }
- // return true
- // }
- // }
- // } else {
- // return true
- // }
- // },
-
- // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
- handleCurrentChecked(data, checked, checkedNodes) {
- if (checked === true) {
- this.DataList.push(data);
- } else {
- this.DataList.pop(data);
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
}
- this.proIds = [];
- if (this.DataList.length != 0) {
- this.DataList.forEach((item) => {
- this.proIds.push(item.proId);
+ // if (columnIndex == 3) {
+ // let rowspan = 0;
+ // this.DataLists.forEach((element) => {
+ // if (element.propinName === row.propinName) {
+ // rowspan++;
+ // }
+ // });
+ // return [rowspan, 1];
+ // }
+ },
+ handlePackageChecked(data, checked, checkedNodes) {
+ if (checked == false) {
+ this.DataLists.forEach((item, index) => {
+ if (item.proId == data.proId) {
+ this.DataLists.splice(index, 1);
+ this.marryalls = 0; // 閲嶇疆鍚堣閲戦
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice; // 閲嶆柊璁＄畻鍚堣閲戦
+ });
+ }
});
- } else {
- this.proIds = [];
+ } else if (checked == true) {
+ this.DataLists.push(data); // 娣诲姞鏁版嵁鍒板凡閫夊垪琛�
+ this.DataLists.forEach((item1) => {
+ if (item1.proParentId == this.dataObj.proId) {
+ item1.propinName = this.dataObj.proName; // 璁剧疆鐖剁骇鍚嶇О
+ }
+ });
+ // this.spliceData();
+ this.marryalls = 0; // 閲嶇疆鍚堣閲戦
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice; // 閲嶆柊璁＄畻鍚堣閲戦
+ });
+ }
+ },
+ // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
+ handleCurrentChecked(data, checked, checkedNodes) {
+ this.dataObj = data;
+ if (checked.checkedNodes.length != 0) {
+ this.$refs.tree.setCheckedKeys([data.proId]);
+
+ let proId = data.proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.TreedataList.forEach((item) => {
+ this.checkedListkey.push(item.proId);
+
+ this.DataList.push(item);
+ this.spliceData();
+ this.DataList.forEach((item1) => {
+ if (item1.proParentId == data.proId) {
+ item1.propinName = data.proName;
+ }
+ });
+ });
+ this.TotalPrice1 = 0;
+ this.marryall = 0;
+ if (this.DataList.length != 0) {
+ this.list1 = false;
+ this.DataList.forEach((item) => {
+ // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+ this.marryall += item.proPrice;
+ });
+ }
+ });
+ } else if (checked.checkedNodes.length == 0) {
+ let proId = data.proId;
+ getProSonDxList(proId).then((res) => {
+ this.TreedataList = res.data.list;
+ this.checkedListkey = [];
+ });
+ }
+ },
+
+ spliceData() {
+ for (var i = 0; i < this.DataList.length; i++) {
+ for (var j = i + 1; j < this.DataList.length; j++) {
+ if (this.DataList[i].proId == this.DataList[j].proId) {
+ //濡傛灉绗竴涓瓑浜庣浜屼釜锛宻plice鏂规硶鍒犻櫎绗簩涓�
+ this.DataList.splice(j, 1);
+ j--;
+ }
+ }
+ }
+ return this.DataList;
+ },
+
+ renderContent(h, { node, data, store }) {
+ return (
+ <span class="custom-tree-node">
+ <span>{node.label}</span>
+ <span>({data.proPrice}鍏�)</span>
+ </span>
+ );
+ },
+ renderContents(h, { node, data, store }) {
+ return (
+ <span class="custom-tree-node">
+ <span>{node.label}</span>
+ <span>({data.price}鍏�)</span>
+ </span>
+ );
+ },
+ // 鐐瑰嚮鑾峰彇姣忎釜鏍戣妭鐐�
+ handleCurrentChecked1(data, checked, checkedNodes) {
+ if (checked == false) {
+ this.DataList.forEach((item, index) => {
+ if (item.proId == data.proId) {
+ this.DataList.splice(index, 1);
+ this.marryall = 0;
+ this.DataList.forEach((item1) => {
+ this.marryall += item1.proPrice;
+ });
+ }
+ });
+ } else if (checked == true) {
+ this.DataList.push(data);
+ this.DataList.forEach((item1) => {
+ if (item1.proParentId == this.dataObj.proId) {
+ item1.propinName = this.dataObj.proName;
+ }
+ });
+ this.spliceData();
+ this.marryall = 0;
+ this.DataList.forEach((item1) => {
+ this.marryall += item1.proPrice;
+ });
+ }
+ },
+
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ this.DataList.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataList.splice(index, 1);
+ this.marryall = 0;
+ this.DataList.forEach((item1) => {
+ this.marryall += item1.proPrice;
+ });
+ }
+ });
+ },
+ handleDel(row) {
+ this.DataLists.forEach((item, index) => {
+ if (item.proId == row.proId) {
+ this.DataLists.splice(index, 1);
+ this.marryalls = 0;
+ this.DataLists.forEach((item1) => {
+ this.marryalls += item1.proPrice;
+ });
+ }
+ });
+ },
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+ let fields = ["propinName"];
+ let cellValue = row[column.property];
+ if (cellValue && fields.includes(column.property)) {
+ let prevRow = this.DataList[rowIndex - 1];
+ let nextRow = this.DataList[rowIndex + 1];
+ if (prevRow && prevRow[column.property] === cellValue) {
+ return { rowspan: 0, colspan: 0 };
+ } else {
+ let countRowspan = 1;
+ while (nextRow && nextRow[column.property] === cellValue) {
+ nextRow = this.DataList[++countRowspan + rowIndex];
+ }
+ if (countRowspan > 1) {
+ return { rowspan: countRowspan, colspan: 1 };
+ }
+ }
}
},
// 椤圭洰鎻愪氦
submit() {
- console.log('123')
if (this.form.cusIdcard) {
var cusId = this.form.cusIdcard;
} else {
@@ -1773,165 +2811,214 @@
} else {
_this.pacId = "";
}
+ this.proIds = [];
+ if (this.DataList.length != 0) {
+ this.DataList.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
+ if (this.DataLists.length != 0) {
+ this.DataLists.forEach((item) => {
+ this.proIds.push(item.proId);
+ });
+ }
let data = {
cusId,
pacId: _this.pacId,
proIds: this.proIds,
};
- getaddtTransition(data).then((response) => {
- if (response.code === 200) {
- let cusId = this.form.cusIdcard;
- this.proIds = [];
- getTransitionList(cusId).then((response) => {
- this.tableData1 = response.data;
-
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- if (item.pacName === null) {
- item.pacName = "鍗曢」";
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.pacName = item.pacName;
- });
+ if (this.form.tjType == 1) {
+ tuantiqueren(data).then((response) => {
+ if (response.code == 200) {
+ let cusId = this.form.cusIdcard;
+ this.proIds = [];
+ getTransitionList1(cusId).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.nowPrice;
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.pacName = item.pacName;
+ });
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
+ const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
+ let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+ if (r.test(TotalPrice)) {
+ this.TotalPrice = TotalPrice + ".00";
+ } else {
+ this.TotalPrice = TotalPrice;
+ }
+ this.list1 = false;
+ this.list3 = true;
+ this.list2 = false;
} else {
- this.TotalPrice = TotalPrice;
+ this.list1 = true;
+ this.TotalPrice = "0.00";
}
+ });
+ } else {
+ console.log(澶辫触浜�);
+ }
+ });
+ } else {
+ getaddtTransition(data).then((response) => {
+ if (response.code == 200) {
+ let cusId = this.form.cusIdcard;
+ this.proIds = [];
+ getTransitionList1(cusId).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.nowPrice;
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.pacName = item.pacName;
+ });
- this.list1 = false;
- this.list3 = true;
- } else {
- this.list1 = true;
+ const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
+ let TotalPrice = this.TotalPrice1 * (this.discount / 10);
+ if (r.test(TotalPrice)) {
+ this.TotalPrice = TotalPrice + ".00";
+ } else {
+ this.TotalPrice = TotalPrice;
+ }
+ this.list1 = false;
+ this.list3 = true;
+ this.list2 = false;
+ } else {
+ this.list1 = true;
+ this.TotalPrice = "0.00";
+ }
+ });
+ } else {
+ console.log(澶辫触浜�);
+ }
+ });
+ }
- this.TotalPrice = "0.00";
- }
- });
- }
- });
+
this.taocan = false;
this.defaultKeys = [];
- },
- changeCategoryKeys(val) {
- this.proIds = [];
- this.proIds = val;
- // if (this.DataList.length != 0) {
- // this.DataList.forEach((item) => {
- // this.proIds.push(item.proId);
- // });
- // } else {
- // this.proIds = [];
- // }
+ this.DataLists = [];
},
submitCheckinfee() {
let _this = this;
- let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
- if (this.responseList.cusId) {
- var userId = this.responseList.cusId;
- } else {
- var userId = _this.form.cusId;
- }
- let tjType = _this.form.tjType;
- if (this.tableData[0]) {
- var pacId = this.tableData[0].pacId;
- }
-
- //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
- List.forEach((item) => {
- if (item.list) {
- item.list.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.nowPrice,
- proId: item1.proId,
- });
- });
- } else if (item.tjProjectList) {
- item.tjProjectList.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.priceNow,
- proId: item1.proId,
- });
- });
+ if (_this.tjCategory !== "") {
+ let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+ if (this.responseList.cusId) {
+ var userId = this.responseList.cusId;
} else {
- this.tjOrderList.push({
- proName: item.proName,
- proPrice: item.ysPrice,
- proId: item.proId,
- });
+ var userId = _this.form.cusId;
}
- });
- let copeWith = this.TotalPrice1;
- let paidIn = this.TotalPrice.toString();
- let discount = this.discount;
- this.tjFlowingWater = { copeWith, paidIn, discount };
+ let tjType = _this.form.tjType;
+ if (this.tableData[0]) {
+ var pacId = this.tableData[0].pacId;
+ }
- let data;
- if (pacId || this.getType == "2") {
- data = {
- photo: this.srcUrl,
- pacId,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- getType: this.getType,
- addAddress: this.addAddress,
- tjCategory: this.tjCategory,
- };
- } else {
- data = {
- photo: this.srcUrl,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- getType: this.getType,
- tjCategory: this.tjCategory,
- };
- }
- getOrder(data).then((res) => {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- this.tjNumbers = res.msg;
- this.charge = true;
- let data = {
- tjNum: res.msg,
- };
- getfindTj(data).then((response) => {
- if (response.data) {
- this.feeitems = response.data;
- if (this.feeitems.length != 0) {
- this.$nextTick(() => {
- this.$refs.multipleTable.toggleRowSelection(
- this.feeitems[0],
- true
- );
+ //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+ List.forEach((item) => {
+ if (item.list) {
+ item.list.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.nowPrice,
+ proId: item1.proId,
});
- } else {
- this.$refs.multipleTable.clearSelection();
- }
- this.loading = false;
+ });
+ } else if (item.tjProjectList) {
+ item.tjProjectList.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.priceNow,
+ proId: item1.proId,
+ });
+ });
} else {
- this.feeitems = [];
- this.loading = false;
+ this.tjOrderList.push({
+ proName: item.proName,
+ proPrice: item.ysPrice,
+ proId: item.proId,
+ });
}
});
- });
+ let copeWith = this.TotalPrice1;
+ let paidIn = this.TotalPrice.toString();
+ let discount = this.discount;
+ this.tjFlowingWater = { copeWith, paidIn, discount };
+
+ let data;
+ if (pacId || this.getType == "2") {
+ data = {
+ photo: this.srcUrl,
+ pacId,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ getType: this.getType,
+ addAddress: this.addAddress,
+ tjCategory: this.tjCategory,
+ };
+ } else {
+ data = {
+ photo: this.srcUrl,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ getType: this.getType,
+ tjCategory: this.tjCategory,
+ };
+ }
+ getOrder(data).then((res) => {
+ this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ this.tjNumbers = res.msg;
+ this.charge = true;
+ let data = {
+ tjNum: res.msg,
+ };
+ getfindTj(data).then((response) => {
+ if (response.data) {
+ this.feeitems = response.data;
+ if (this.feeitems.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.multipleTable.toggleRowSelection(
+ this.feeitems[0],
+ true
+ );
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ this.loading = false;
+ } else {
+ this.feeitems = [];
+ this.loading = false;
+ }
+ });
+ });
+ } else {
+ this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
+ }
},
// 琛ㄦ牸鍗曢��
handleSelect(selection, val) {
-
this.selectionList = this.$refs.multipleTable.selection;
this.selectionList.forEach((item) => {
this.formIn.name = item.tjName;
@@ -2083,7 +3170,7 @@
const viewNum = "792931586196398080";
const params = { viewNum, tjNumber };
this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
- _this.confirm = true;
+ this.confirm = true;
});
this.$tab.refreshPage();
},
@@ -2091,86 +3178,92 @@
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice() {
let _this = this;
- let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
- if (this.responseList.cusId) {
- var userId = this.responseList.cusId;
- } else {
- var userId = _this.form.cusId;
- }
- let tjType = _this.form.tjType;
- if (this.tableData[0]) {
- var pacId = this.tableData[0].pacId;
- }
-
- //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
- List.forEach((item) => {
- if (item.list) {
- item.list.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.nowPrice,
- proId: item1.proId,
- });
- });
- } else if (item.tjProjectList) {
- item.tjProjectList.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.priceNow,
- proId: item1.proId,
- });
- });
+ if (_this.tjCategory !== "") {
+ let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+ if (this.responseList.cusId) {
+ var userId = this.responseList.cusId;
} else {
- this.tjOrderList.push({
- proName: item.proName,
- proPrice: item.ysPrice,
- proId: item.proId,
+ var userId = _this.form.cusId;
+ }
+ let tjType = _this.form.tjType;
+ if (this.tableData[0]) {
+ var pacId = this.tableData[0].pacId;
+ }
+
+ //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+ List.forEach((item) => {
+ if (item.list) {
+ item.list.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.nowPrice,
+ proId: item1.proId,
+ });
+ });
+ } else if (item.tjProjectList) {
+ item.tjProjectList.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.priceNow,
+ proId: item1.proId,
+ });
+ });
+ } else {
+ this.tjOrderList.push({
+ proName: item.proName,
+ proPrice: item.ysPrice,
+ proId: item.proId,
+ });
+ }
+ });
+ let copeWith = this.TotalPrice1;
+ let paidIn = this.TotalPrice.toString();
+ let discount = this.discount;
+ this.tjFlowingWater = { copeWith, paidIn, discount };
+
+ let data;
+ if (pacId || this.tjOrderList.length > 0) {
+ data = {
+ photo: this.srcUrl,
+ pacId,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ tjCategory: this.tjCategory,
+ };
+ this.listgetOrder(data);
+ } else if (pacId || this.tjOrderList.length > 0) {
+ data = {
+ photo: this.srcUrl,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ tjCategory: this.tjCategory,
+ };
+ this.listgetOrder(data);
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇烽�夋嫨濂楅!",
});
}
- });
- let copeWith = this.TotalPrice1;
- let paidIn = this.TotalPrice.toString();
- let discount = this.discount;
- this.tjFlowingWater = { copeWith, paidIn, discount };
-
- let data;
- if (pacId || this.tjOrderList.length > 0) {
- data = {
- photo: this.srcUrl,
- pacId,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- tjCategory: this.tjCategory
- };
- this.listgetOrder(data)
- } else if (pacId || this.tjOrderList.length > 0) {
- data = {
- photo: this.srcUrl,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- tjCategory: this.tjCategory
- };
- this.listgetOrder(data)
} else {
- this.$message({
- type: "warning ",
- message: "璇烽�夋嫨濂楅!",
- });
+ this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
}
-
},
},
};
</script>
-
-<style >
+<style>
.el-form-item__error {
display: none;
+}
+
+.el-col-19 {
+ width: 80.166667%;
}
.el-table__header-wrapper .el-checkbox {
@@ -2210,8 +3303,16 @@
}
.tab3 {
- width: 100%;
- display: flex;
+ border: 1px solid #dcdfe6;
+}
+
+.filter-tree {
+ /* max-height: 360px;
+ overflow-y: auto;
+ border: 1px solid #d9d9d9; */
+ overflow: auto;
+ flex: 1;
+ height: 350px;
}
.tab2 {
@@ -2279,6 +3380,13 @@
height: 300px;
}
+.dialog-footer2 {
+ width: 960px;
+ height: 36px;
+ display: flex;
+ justify-content: center;
+}
+
.el-input--suffix .el-input__inner {
padding-right: 15px;
}
@@ -2309,5 +3417,9 @@
.content {
margin-bottom: 25px;
}
-</style>
+.tab8 {
+ width: 100%;
+ display: flex;
+}
+</style>
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index e7eaf3c..a9fa3d6 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,18 +1,7 @@
<template>
<div class="app-container">
- <el-dialog
- :title="title"
- :visible.sync="open1"
- width="1000px"
- append-to-body
- >
- <el-form
- ref="form1"
- :model="form1"
- :rules="rules1"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+ <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
<el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
</el-form-item>
@@ -29,16 +18,10 @@
<el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
</el-form-item>
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input
- v-model="form1.registerAddress"
- placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
- />
+ <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input
- v-model="form1.mailingAddress"
- placeholder="璇疯緭鍏ラ�氳鍦板潃"
- />
+ <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
<el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
@@ -65,25 +48,12 @@
<el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
- <el-date-picker
- clearable
- v-model="form1.validTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
- >
- </el-date-picker> </el-form-item
- ><br />
+ <el-date-picker clearable v-model="form1.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="form1.remark"
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- :rows="2"
- label-width="400px"
- style="width: 830px"
- resize="none"
- ></el-input>
+ <el-input v-model="form1.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">
@@ -94,160 +64,91 @@
<el-row :gutter="20">
<el-col :span="17">
<div class="grid-content bg-purple">
- <el-form
- :inline="true"
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
<el-form-item label="鍖垮悕" prop="isNow">
- <el-select
- v-model="isNow"
- placeholder="鏄惁鍖垮悕"
- @change="freezing(isNow)"
- >
- <el-option
- v-for="dict in dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+ <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="濮撳悕"
- prop="cusName"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusName) {
- callback('');
- } else if (form.cusName) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
-
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="openname"
- >
+ <el-form-item label="濮撳悕" prop="cusName" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
+
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
濮撳悕
</span>
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select
- :disabled="isDisabled"
- 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 :disabled="isDisabled" 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-item label="姘戞棌" prop="cusNational">
- <el-select
- filterable
- :disabled="isDisabled"
- 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 filterable :disabled="isDisabled" 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-form-item
- label="鎬у埆"
- prop="cusSex"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusSex && showHidden.has_sex === 'Y') {
- callback('');
- } else if (showHidden.has_sex === 'N') {
- callback();
- } else if (form.cusSex && showHidden.has_sex === 'Y') {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <el-select
- :disabled="isDisabled"
- v-model="form.cusSex"
- placeholder="鎬у埆"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-form-item label="鎬у埆" prop="cusSex" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusSex && showHidden.has_sex === 'Y') {
+ callback('');
+ } else if (showHidden.has_sex === 'N') {
+ callback();
+ } else if (form.cusSex && showHidden.has_sex === 'Y') {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
+ <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
+ <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="cusIdcard"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
- callback('');
- } else if (showHidden.has_idcard === 'N') {
- callback();
- } else if (
- form.cusIdcard &&
- showHidden.has_idcard === 'Y'
- ) {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="handleQuery"
- >
+ <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+ callback('');
+ } else if (showHidden.has_idcard === 'N') {
+ callback();
+ } else if (
+ form.cusIdcard &&
+ showHidden.has_idcard === 'Y'
+ ) {
+ callback();
+ }
+ },
+ 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="inputChange"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
<!-- <i style="
font-size: 1rem;
position: absolute;
@@ -258,100 +159,52 @@
</el-form-item>
<el-form-item label="濠氬Щ" prop="cusMarryStatus">
- <el-select
- :disabled="isDisabled"
- 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 :disabled="isDisabled" 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-form-item
- label="鐢佃瘽"
- prop="cusPhone"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusPhone && showHidden.is_phone === 'Y') {
- callback('');
- } else if (showHidden.is_phone === 'N') {
- callback();
- } else if (form.cusPhone && showHidden.is_phone === 'Y') {
- callback();
- }
- },
- trigger: 'blur',
- },
- ]"
- >
- <el-input
- v-model="form.cusPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- :disabled="isDisabled"
- />
+ <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone && showHidden.is_phone === 'Y') {
+ callback('');
+ } else if (showHidden.is_phone === 'N') {
+ callback();
+ } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]">
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
- <el-date-picker
- :disabled="isDisabled"
- clearable
- v-model="form.cusBrithday"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡"
- style="width: 93%"
- >
+ <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
+ value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%">
</el-date-picker>
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <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 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-form-item label="閭" prop="cusEmail">
- <el-input
- v-model="form.cusEmail"
- placeholder="璇疯緭鍏ラ偖绠�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
- <el-input
- v-model="form.age"
- :disabled="isDisabled"
- style="width: 30%"
- />
- <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-input v-model="form.age" :disabled="isDisabled" style="width: 30%" />
+ <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>
@@ -359,91 +212,41 @@
</el-form-item> -->
</el-form>
- <el-form
- :inline="true"
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input
- :disabled="isDisabled"
- v-model="form.cusIntroduce"
- placeholder="璇疯緭鍏ヤ粙缁嶄汉"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="compName">
- <el-select
- :disabled="isDisabled"
- v-model="form.compName"
- 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"
- :value="dict.cnName"
- />
+ <el-select :disabled="isDisabled" v-model="form.compName" 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" :value="dict.cnName" />
</el-select>
<!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> -->
</el-form-item>
<el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
- <el-input
- :disabled="isDisabled"
- v-model="form.wenHua"
- placeholder="璇疯緭鍏ユ枃鍖栫▼搴�"
- />
+ <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
</el-form-item>
</el-form>
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <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-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-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-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
</el-form-item>
</el-col>
</el-row>
@@ -452,35 +255,11 @@
<el-row v-show="top">
<el-col :span="19">
<div style="float: right; margin-bottom: 10px">
- <el-button
- v-show="lishi"
- type="primary"
- @click="cope"
- size="mini"
- >涓�閿鍒�</el-button
- >
- <el-button
- type="primary"
- @click="inputChanges"
- v-show="lishi"
- size="mini"
- :disabled="confirm"
- >鍘嗗彶浣撴璁板綍</el-button
- >
- <el-button
- :disabled="isDisabled"
- type="primary"
- size="mini"
- @click="submitForm"
- >鐧昏</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuery"
- @queryTable="getList"
- >閲嶇疆</el-button
- >
+ <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
+ <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
+ :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
+ <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
</div>
</el-col>
</el-row>
@@ -488,133 +267,51 @@
</el-col>
<el-col :span="7" v-show="top">
<div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
- <div
- v-show="hide"
- style="border: 1px dashed #dcdfe6; width: 180px; height: 180px"
- >
+ <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
<img v-if="imageUrl" :src="imageUrl" class="avatar" />
</div>
<div v-if="imgSrc" class="img_bg_camera">
- <img
- style="
+ <img style="
width: 200px;
height: 200px;
margin-left: -20px;
margin-top: 90px;
padding-top: 1px;
- "
- :src="imgSrc"
- alt=""
- class="tx_img"
- />
+ " :src="imgSrc" alt="" class="tx_img" />
</div>
- <video
- v-show="hides"
- id="videoCamera"
- :width="videoWidth"
- :height="videoHeight"
- autoplay
- style="margin-top: 1px"
- ></video>
- <canvas
- style="display: none"
- id="canvasCamera"
- :width="videoWidth"
- :height="videoHeight"
- ></canvas>
+ <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
+ style="margin-top: 1px"></video>
+ <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
<div class="camera_outer" style="margin-top: 10px">
- <el-button type="primary" plain size="mini" @click="getCompetence()"
- >鎵撳紑鎽勫儚澶�</el-button
- >
- <el-button type="primary" plain size="mini" @click="setImage()"
- >鎷嶇収</el-button
- >
+ <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
+ <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
<br />
</div>
</div>
</el-col>
</el-row>
- <el-dialog
- title="閫夋嫨濂楅"
- :visible.sync="taocan"
- width="70%"
- height="700px"
- :close-on-click-modal="false"
- >
- <el-tabs
- type="border-card"
- style="height: 560px; margin: 0 10px; width: 100%"
- v-model="activeNames"
- @tab-click="handleClick"
- >
+ <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+ <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
+ @tab-click="handleClick">
<el-tab-pane label="濂楅" name="first">
- <el-form
- :model="queryParam"
- ref="queryForm"
- size="small"
- :inline="true"
- v-if="showSearch"
- label-width="auto"
- >
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input
- v-model="queryParam.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter.native="handle"
- />
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handle"
- >鏌ヨ</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
<!-- <el-button type="primary" size="mini" @click="submit">纭</el-button> -->
</el-form-item>
</el-form>
<div class="tab4">
- <div
- class="grid-content bg-purple"
- style="margin-left: 5px; width: 98%"
- >
- <el-table
- v-loading="loading"
- element-loading-text="姝ｅ湪鍔犺浇涓�..."
- element-loading-spinner="el-icon-loading"
- border
- :data="newpacName"
- @selection-change="handleSelectionChange"
- height="450px"
- ref="tb"
- >
- <el-table-column
- type="selection"
- width="40px"
- align="center"
- label="閫夋嫨"
- />
- <el-table-column
- label="濂楅鍚嶇О"
- align="center"
- prop="pacName"
- width="120px"
- />
- <el-table-column
- label="濂楅浠锋牸"
- align="center"
- prop="price"
- width="120px"
- />
- <el-table-column
- label="濂楅鏄庣粏"
- align="center"
- prop="allProName"
- :show-overflow-tooltip="true"
- />
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+ border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
+ <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+ <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
<!-- :selectable="checkSelectable" -->
<!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -644,103 +341,59 @@
<!-- <div class="tab3"> -->
<el-row :gutter="20" style="width: 100%">
<el-col :span="6">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
椤圭洰鍒楄〃
</div>
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
</el-input>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packageList"
- :props="defaultProp"
- show-checkbox
- node-key="id"
- @check="handlepackage"
- :default-checked-keys="checkedkeys"
- :filter-node-method="filterpackage"
- ref="treas"
- :render-content="renderContents"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox
+ node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
</el-tree>
</div>
</el-col>
<el-col :span="6">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packagedataList"
- node-key="proId"
- :props="defaultpackProps"
- :filter-node-method="filterpackage"
- @check-change="handlePackageChecked"
- :default-checked-keys="checkedListkey1"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
+ :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1" :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
宸查�夐」鐩垪琛�
</div>
- <el-table
- :data="DataLists"
- border
- style="width: 100%"
- height="400"
- :span-method="objectspanmethod"
- >
+ <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDel(scope.row)"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -767,108 +420,60 @@
<!-- </div> -->
<el-row :gutter="20">
<el-col :span="6">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
椤圭洰鍒楄〃
</div>
<!-- @input="gaibian" -->
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText">
</el-input>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+ node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="6">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+ :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+ @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+ :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div
- style="
+ <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"
- >
+ <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
- <el-table-column
- prop="proPrice"
- label="鍘熶环"
- width="56px"
- ></el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px"></el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
<template slot-scope="scope">
- <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-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -888,198 +493,65 @@
<el-row v-if="tcShow">
<el-col :span="15">
<div class="grid-content bg-purple">
- <!-- <el-table :data="fData" border height="220px" style="width: 100%; ">
- <el-table-column prop="proName" label="缁勫悎椤圭洰" align="center" width="200px">
- </el-table-column>
- <el-table-column prop="proPrice" label="閲戦" align="center" width="150px">
- </el-table-column>
- <el-table-column prop="allSonProName" label="鍗曚釜椤圭洰" align="center" :show-overflow-tooltip="true">
- </el-table-column>
- </el-table>
-
- <div class="tab">
- <el-table :data="DataList" border height="220" style="width: 350px; margin-top: 20px">
- <el-table-column prop="proName" label="鍗曚釜椤圭洰" align="center">
- </el-table-column>
- <el-table-column prop="proPrice" label="閲戦" align="center"></el-table-column>
- </el-table>
- </div> -->
-
- <!-- <div style="height:480px;overflow:scroll;background-color: #ffffff;
- font-size: 12.5px;">
- <table style="width: 96%; margin: 4px 10px; border: 1px solid white" cellspacing="4" border="2"
- v-for="(item, index) in tableData1" :key="index">
- <caption style="background-color: #f8f8f9">
- {{
- item.parentName
- }}
- </caption>
- <tr align="center">
- <th style="width:200px">椤圭洰</th>
- <th>鐜颁环</th>
- <th>鍘熶环</th>
- </tr>
- <tr v-for="item1 in item.list" :key="item1.proId">
- <td>{{ item1.proName }}</td>
- <td>
- {{ item1.nowPrice }}
- </td>
- <td>{{ item1.ordPrice }}</td>
- </tr>
- </table>
- </div> -->
-
<template>
- <el-form
- :model="form"
- :inline="true"
- label-width="75px"
- style="margin-left: 20px"
- >
+ <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px">
<el-form-item label="浣撴绫诲瀷">
- <el-select
- style="width: 150px"
- v-model="form.tjType"
- placeholder="璇烽�夋嫨浣撴绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_team"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 150px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
-
- <!-- <div class="tab1"> -->
- <!-- <el-form :inline="true" class="tab1"> -->
<el-form-item label="搴旀敹閲戦">
- <el-input
- placeholder="搴旀敹閲戦"
- v-model="TotalPrice1"
- disabled
- style="width: 150px"
- ></el-input>
+ <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
- <!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
- <el-input-number
- ref="inputNumber"
- style="width: 150px"
- v-model="discount"
- :precision="2"
- :step="0.1"
- :max="10"
- :min="1"
- @change="numberChange"
- :disabled="isfalse"
- ></el-input-number>
+
+ <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="2" :step="0.1"
+ :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input
- placeholder="瀹炴敹閲戦"
- v-model="TotalPrice"
- style="width: 150px"
- ></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 150px"></el-input>
</el-form-item>
<br />
- <!-- 140828199805050012 -->
+
<el-form-item label="棰嗗彇鏂瑰紡">
- <!-- <el-input style="width: 100%;" v-model="form.getType" placeholder="璇烽�夋嫨棰嗗彇鏂瑰紡" /> -->
- <el-select
- v-model="getType"
- style="width: 150px"
- @change="getmailType"
- >
- <el-option
- v-for="dict in dict.type.report_get_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+
+ <el-select v-model="getType" style="width: 150px" @change="getmailType">
+ <el-option v-for="dict in dict.type.report_get_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="浣撴绫诲埆">
- <el-select
- style="width: 150px"
- v-model="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 style="width: 150px" v-model="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-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
</el-form-item>
<el-form-item style="margin-left: 149px">
- <el-button
- type="primary"
- @click="Package"
- size="mini"
- style="margin-right: 20px"
- >閫夋嫨濂楅</el-button
- >
- <el-button
- type="primary"
- @click="resetpackage"
- size="mini"
- style="margin-right: 20px"
- >閲嶇疆濂楅</el-button
- >
- <el-button
- type="primary"
- @click="submitPrice"
- :disabled="confirm"
- v-if="showHidden.has_charge == 'N'"
- size="mini"
- >绛惧埌鐧昏</el-button
- >
- <el-button
- type="primary"
- @click="submitCheckinfee"
- :disabled="confirm"
- v-if="showHidden.has_charge == 'Y'"
- size="mini"
- >鐧昏鏀惰垂</el-button
- >
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+ <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button>
+ <el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'"
+ size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
+ v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
</el-form>
</template>
- <el-dialog
- title="閭瘎"
- :visible.sync="malldisble"
- :close-on-click-modal="false"
- >
- <el-form
- :model="addAddress"
- :rules="rules"
- label-width="78px"
- style="margin-left: 7px"
- >
+ <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
+ <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
<el-form-item label="濮撳悕">
- <el-input
- placeholder="濮撳悕"
- v-model="addAddress.getUser"
- ></el-input>
+ <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
</el-form-item>
<el-form-item label="鐢佃瘽">
- <el-input
- placeholder="鐢佃瘽"
- v-model="addAddress.phone"
- ></el-input>
+ <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
</el-form-item>
<el-form-item label="鍦板潃">
- <el-input
- placeholder="鍦板潃"
- v-model="addAddress.address"
- ></el-input>
+ <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -1088,341 +560,129 @@
</div>
</el-dialog>
- <div
- style="
+ <div style="
display: flex;
align-items: center;
justify-content: flex-start;
width: 100%;
- "
- >
- <div
- style="
+ ">
+ <div style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-left: 46px;
font-size: 16px;
margin-right: 20px;
- "
- >
+ ">
<span v-if="this.tableData1[0]">{{ this.tableData1[0].pacName || "" }}</span> 宸查�夐」鐩潯鏁帮細<span
- style="font-weight: 700; color: red; margin-right: 5px"
- >{{ this.tableData1.length || 0 }}</span
- >鏉�
+ style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0 }}</span>鏉�
</div>
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
width: 916px;
margin-left: 35px;
- "
- >
- <el-collapse v-model="index" accordion v-if="list3">
- <div
- class="info1"
- v-for="(item, index) in tableData1"
- :key="'info1-' + index"
- >
- <el-collapse-item :name="index">
- <template slot="title">
- <div style="width: 70%">
- {{
- item.parentName +
- " (搴旀敹閲戦:" +
- item.ordPrice +
- "鍏� / 瀹炴敹閲戦:" +
- item.nowPrice +
- "鍏�)"
- }}
- </div>
+ ">
- <div style="width: 20%">
- <el-button
- type="primary"
- @click.stop="candelete(item)"
- style="float: right"
- >鍒� 闄�</el-button
- >
- </div>
+ <el-table :data="tableData1" border style="width: 100%" height="250">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proType" label="鎬у埆" width="50">
+ <template slot-scope="scope">
+ <template v-if="isAll(scope.row.proType)">
+ 鍏ㄩ儴
</template>
- <el-table
- :data="item.list"
- border
- style="width: 100%"
- height="270"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template
- slot-scope="scope"
- v-if="scope.row.proType == ''"
- >
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.proType"
- />
- </template>
- </el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_yes_no"
- :value="scope.row.proCheckMethod"
- />
- </template>
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
+ <template v-else>
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
+ </template>
+ </template>
+ </el-table-column>
- <div v-if="list2 == true">
- <el-table
- :data="tableData1"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template slot-scope="scope" v-if="scope.row.proType == ''">
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.proType"
- />
- </template>
- </el-table-column>
- <el-table-column prop="ysPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="proPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_yes_no"
- :value="scope.row.proCheckMethod"
- />
- </template>
- </el-table-column>
- </el-table>
- </div>
+ <el-table-column prop="ordPrice" label="搴旀敹閲戦">
+ </el-table-column>
+ <el-table-column label="鎶樻墸">
+ <template slot-scope="scope">
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
+ <el-input v-model.number="scope.row.discount" @input="validateDiscount(scope.row)" placeholder="杈撳叆鎶樻墸"
+ size="small" type="number" min="0" step="1" max="10">
+ </el-input>
+ </template>
+ </el-table-column>
+ <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
+ </el-table-column>
+ <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
+ </template>
+ </el-table-column>
+ </el-table>
- <el-collapse v-model="activeName" accordion v-if="list1">
- <div>
- <el-collapse-item title="璇烽�夋嫨椤圭洰">
- <el-table :data="list" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="180">
- <template
- slot-scope="scope"
- v-if="scope.row.proType == ''"
- >
- {{ scope.row.proType == "" ? "鍏ㄩ儴" : "" }}
- </template>
- <template slot-scope="scope" v-else>
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.proType"
- />
- </template>
- </el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦">
- </el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
- </el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_yes_no"
- :value="scope.row.proCheckMethod"
- />
- </template>
- </el-table-column>
- </el-table>
- </el-collapse-item>
- </div>
- </el-collapse>
</div>
</div>
</el-col>
</el-row>
- <el-dialog
- title="瀵兼鍗曢瑙�"
- :visible.sync="dialogVisibles"
- :close-on-click-modal="false"
- >
+ <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
<div>
- <el-table
- id="sig"
- v-loading="loading"
- :data="feeitems"
- @selection-change="handleSelect"
- tooltip-effect="dark"
- ref="multipleTable"
- border
- >
+ <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
+ ref="multipleTable" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="tjName"
- width="100px"
- />
+ <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
+ <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="150px"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="鎵嬫満鍙�"
- align="center"
- prop="tjPhone"
- width="120px"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjFlowingWater.createTime"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="tjComp"
- ></el-table-column>
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- >
+ <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_team"
- :value="scope.row.tjType"
- />
+ <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
</template>
</el-table-column>
- <el-table-column
- label="璁㈠崟娴佹按鍙�"
- align="center"
- prop="tjFlowingWater.waterId"
- width="200px"
- />
- <el-table-column
- label="鏀惰垂鍛�"
- align="center"
- prop="tjFlowingWater.updateBy"
- width="100px"
- />
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
+ <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
</el-table>
<el-row :gutter="10" class="mb8">
<el-col :span="20">
- <el-form
- :inline="true"
- :model="formInline"
- class="demo-form-inline"
- style="margin: 12px 6px"
- >
+ <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
<el-form-item label="搴旀敹閲戦">
- <el-input
- style="width: 86px"
- :value="formInline.price + '.00'"
- placeholder="閲戦"
- :disabled="true"
- ></el-input>
+ <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
+ :disabled="true"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
- <el-input-number
- style="width: 140px"
- v-model="discount"
- :precision="2"
- :step="0.1"
- :max="10"
- :min="1"
- @change="numberChange"
- :disabled="isfalse"
- ></el-input-number>
+ <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="1"
+ @change="numberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input
- v-model="formInline.paidIn"
- placeholder="瀹炰粯"
- style="width: 94px"
- >
+ <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
</el-input>
</el-form-item>
<el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- 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 style="width: 120px" 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-form-item>
- <el-button
- style="margin-left: 15px"
- type="primary"
- size="mini"
- @click="SubmitEvent"
- >鏀惰垂</el-button
- >
+ <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -1436,24 +696,15 @@
</el-table>
</div>
</el-dialog>
- <el-dialog
- title="鎻愮ず"
- :visible.sync="cardreader"
- width="30%"
- :close-on-press-escape="false"
- :close-on-click-modal="false"
- >
+ <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
+ :close-on-click-modal="false">
<template>
<el-radio-group v-model="cardreaderradio" @input="changeradio">
<el-radio :label="3">韬唤璇�</el-radio>
<el-radio :label="6">鍋ュ悍鐮�</el-radio>
</el-radio-group>
<div style="margin-top: 10px" v-show="cardreaderradio == 6">
- <el-input
- v-model="inputSSS"
- ref="tableHeadFilterInp"
- placeholder="璇疯緭鍏ュ唴瀹�"
- ></el-input>
+ <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</div>
</template>
<span slot="footer" class="dialog-footer">
@@ -1462,11 +713,7 @@
</span>
</el-dialog>
<div style="position: absolute; bottom: 100px; width: 360px; display: none">
- <div
- id="printBill"
- style="width: 280px; font-size: 1px"
- ref="printContent"
- >
+ <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
<div style="font-size: 1px">
<div style="text-align: center">
<h3>{{ hospName }}灏忕エ</h3>
@@ -1504,7 +751,7 @@
</span>
</el-dialog>
<Packages ref="aaa" @add="handleChanges" />
- <selectName ref="bbb" @add="handleChangesName"/>
+ <selectName ref="bbb" @add="handleChangesName" />
</div>
</template>
@@ -1531,6 +778,7 @@
getaddtTransition,
tuantiqueren,
getTransitionList,
+ getTransitionList1,
getByTeamNo,
delTbBycusCardIdAndProId,
getLoadFile,
@@ -1662,10 +910,9 @@
isDisabled: false,
size: "",
tcShow: false,
- tcShows: false,
// 濂楅鎻愪氦鎸夐挳
confirm: false,
- TotalPrice: "0.00",
+ TotalPrice: 0,
TotalPrice1: 0,
discount: 10,
newpacName: [],
@@ -1829,14 +1076,29 @@
this.getCurrentDateTime();
this.startTimer();
this.getList1();
-
+
// this.getData();
},
- mounted() {},
+ mounted() { },
methods: {
+ validateDiscount(row) {
+ if (row.discount > 10) {
+ row.discount = 10; // 寮哄埗灏嗗�艰缃负鏈�澶у��
+ } else if (row.discount < 0) {
+ row.discount = 0; // 寮哄埗灏嗗�艰缃负鏈�灏忓��
+ }
+ this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
+ },
+ isAll(value) {
+ return value === '' || value === null;
+ },
+ // 鏇存柊瀹炴敹閲戦
+ updateProPrice(row) {
+ row.nowPrice = Number(row.ordPrice) * (Number(row.discount) / 10);
+ },
openname() {
-
+
this.$refs.bbb.open = true;
this.$refs.bbb.title = "鎼滅储濮撳悕";
this.$refs.bbb.getList();
@@ -1985,8 +1247,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
this.form.cusSex = sex;
@@ -2015,12 +1277,13 @@
proId: item.proPrantId,
};
delTbBycusCardIdAndProId(data).then((res) => {
- getTransitionList(this.form.cusIdcard).then((response) => {
+ getTransitionList1(this.form.cusIdcard).then((response) => {
this.tableData1 = response.data;
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2032,20 +1295,14 @@
this.pacName = item.pacName;
});
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
- } else {
- this.TotalPrice = TotalPrice;
- }
+
this.list1 = false;
this.list3 = true;
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
+ this.TotalPrice = 0;
}
});
});
@@ -2095,12 +1352,13 @@
if (response.code === 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
this.TotalPrice1 = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2112,20 +1370,14 @@
this.pacName = item.pacName;
});
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
- } else {
- this.TotalPrice = TotalPrice;
- }
+
this.list1 = false;
this.list3 = true;
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
+ this.TotalPrice = 0;
}
});
}
@@ -2191,7 +1443,7 @@
_this.thisVideo.play();
};
})
- .catch((err) => {});
+ .catch((err) => { });
},
// 缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級
@@ -2245,7 +1497,7 @@
.then((_) => {
done();
})
- .catch((_) => {});
+ .catch((_) => { });
},
/** 鏌ヨ淇℃伅鍒楄〃 */
@@ -2325,7 +1577,7 @@
pacId: "",
proIds: [],
};
- getaddtTransition(data).then((response) => {});
+ getaddtTransition(data).then((response) => { });
this.$tab.refreshPage();
});
} else {
@@ -2361,14 +1613,13 @@
if (this.form.tjType === '') {
this.form.tjType = this.dict.type.dict_team[0].value;
}
-
+
addCustomer(this.form).then((response) => {
this.responseList = response.data;
-
+
this.$modal.msgSuccess("鏂板鎴愬姛");
-
+
_this.tcShow = true;
- _this.tcShows = true;
_this.isDisabled = true;
_this.top = false;
});
@@ -2411,20 +1662,13 @@
if (this.form.reservationId != null) {
if (this.form.groupingId) {
_this.tcShow = true;
- _this.tcShows = false;
- let data = {
- // teamNo: this.form.teamNo,
- groupingId: this.form.groupingId,
- };
- getByTeamNo(data).then((res) => {
+
+ getTransitionList1(this.form.cusIdcard).then((res) => {
this.tableData1 = res.data;
if (this.tableData1) {
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.ysPrice;
- this.TotalPrice = (
- this.TotalPrice1 *
- (this.discount / 10)
- ).toFixed(2);
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2435,26 +1679,22 @@
this.top = false;
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
+ this.TotalPrice =0;
this.top = false;
}
});
} else {
if (this.form) {
_this.tcShow = true;
- _this.tcShows = true;
_this.formPacId = this.form.pacId;
let cusId = this.form.cusIdcard;
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
if (this.tableData1) {
this.TotalPrice1 = 0;
this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- this.TotalPrice = (
- this.TotalPrice1 *
- (this.discount / 10)
- ).toFixed(2);
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
if (item.pacName === null) {
item.pacName = "鍗曢」";
}
@@ -2480,6 +1720,7 @@
this.$message.warning("鏆傛棤棰勭害淇℃伅");
_this.resetpackage();
}
+ this.top = false;
_this.isDisabled = true;
} else {
this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�");
@@ -2713,8 +1954,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
@@ -2829,8 +2070,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
@@ -2853,30 +2094,12 @@
} else {
this.form.cusIdcard = param1[0].pacCode;
}
-
- // this.form.cusName = param1[0].pacName;
- // this.form.cusPhone = param1[0].pacRemark;
},
- handleChangesName(params){
+ handleChangesName(params) {
this.form.cusIdcard = params[0].sfzh
this.handleQuery()
},
- // selected(row, index) {
- // if (this.formPacId !== null) {
- // if (row.pacId == this.formPacId) {
- // setTimeout(() => {
- // if (this.$refs.tb) {
- // this.$refs.tb.toggleRowSelection(row, true);
- // }
- // }, 10);
- // return true;
- // } else {
- // return false;
- // }
- // } else {
- // return this.newpacName;
- // }
- // },
+
// 涓婁紶澶村儚
handleAvatarSuccess(res, file) {
@@ -2925,16 +2148,16 @@
this.loading = false;
});
} else {
- if(this.form.tjType == 1) {
+ if (this.form.tjType == 1) {
tuantiSelect(param).then((response) => {
- this.newpacName = response.data;
- this.loading = false;
- })
- } else{
+ this.newpacName = response.data;
+ this.loading = false;
+ })
+ } else {
deptTreeSelect().then((response) => {
- this.newpacName = response.rows;
- this.loading = false;
- });
+ this.newpacName = response.rows;
+ this.loading = false;
+ });
}
}
},
@@ -3005,7 +2228,7 @@
if (response.code === 200) {
let cusId = this.form.cusIdcard;
this.proIds = [];
- getTransitionList(cusId).then((response) => {
+ getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
this.TotalPrice1 = 0;
if (this.tableData1.length >= 1) {
@@ -3014,7 +2237,7 @@
} else {
this.list1 = true;
- this.TotalPrice = "0.00";
+ this.TotalPrice = 0;
}
});
}
@@ -3022,72 +2245,72 @@
},
Package() {
-
+
this.activeNames = "first";
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
-
+
let param = {
sex: cusSex,
dwId: this.form.dictCompId || ''
}
- if(this.form.tjType == 1) {
- if(!this.form.dictCompId) {
- this.$message({
- type: "warning",
- message: "璇峰厛缁存姢鍗曚綅锛�",
- });
+ if (this.form.tjType == 1) {
+ if (!this.form.dictCompId) {
+ this.$message({
+ type: "warning",
+ message: "璇峰厛缁存姢鍗曚綅锛�",
+ });
- } else {
- this.taocan = true;
- this.loading = true;
- tuantiSelect(param).then((res) => {
- this.newpacName = res.data;
- try {
- if (this.tableData1.length >= 1) {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
+ } else {
+ this.taocan = true;
+ this.loading = true;
+ tuantiSelect(param).then((res) => {
+ this.newpacName = res.data;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
});
- throw Error();
- }
+ });
});
- });
- });
- }
- } catch (error) {}
- this.loading = false;
- })
- }
+ }
+ } catch (error) { }
+ this.loading = false;
+ })
+ }
} else {
this.taocan = true;
this.loading = true;
deptTreeSelect(cusSex).then((response) => {
- this.newpacName = response.rows;
- try {
- if (this.tableData1.length >= 1) {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
- });
- throw Error();
- }
+ this.newpacName = response.rows;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
+ });
+ throw Error();
+ }
+ });
});
});
- });
- }
- } catch (error) {}
- this.loading = false;
- });
+ }
+ } catch (error) { }
+ this.loading = false;
+ });
}
-
+
},
@@ -3339,7 +2562,7 @@
if (this.DataList.length != 0) {
this.list1 = false;
this.DataList.forEach((item) => {
- // this.TotalPrice1 = item.proPrice + this.TotalPrice1;
+
this.marryall += item.proPrice;
});
}
@@ -3369,7 +2592,7 @@
renderContent(h, { node, data, store }) {
return (
<span class="custom-tree-node">
- 聽 <span>{node.label}</span>
+ <span>{node.label}</span>
<span>({data.proPrice}鍏�)</span>
</span>
);
@@ -3484,91 +2707,82 @@
pacId: _this.pacId,
proIds: this.proIds,
};
- if (this.form.tjType == 1){
+ if (this.form.tjType == 1) {
tuantiqueren(data).then((response) => {
- if (response.code == 200) {
- let cusId = this.form.cusIdcard;
- this.proIds = [];
- getTransitionList(cusId).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- if (item.tjCategory != null) {
- this.tjCategory = item.tjCategory;
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.pacName = item.pacName;
- });
+ if (response.code == 200) {
+ let cusId = this.form.cusIdcard;
+ this.proIds = [];
+ getTransitionList1(cusId).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.pacName = item.pacName;
+ });
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
+
+ this.list1 = false;
+ this.list3 = true;
+ this.list2 = false;
} else {
- this.TotalPrice = TotalPrice;
+ this.list1 = true;
+ this.TotalPrice = 0;
}
- this.list1 = false;
- this.list3 = true;
- this.list2 = false;
- } else {
- this.list1 = true;
- this.TotalPrice = "0.00";
- }
- });
- } else {
- console.log(澶辫触浜�);
- }
- });
+ });
+ } else {
+ console.log(澶辫触浜�);
+ }
+ });
} else {
getaddtTransition(data).then((response) => {
- if (response.code == 200) {
- let cusId = this.form.cusIdcard;
- this.proIds = [];
- getTransitionList(cusId).then((response) => {
- this.tableData1 = response.data;
- this.TotalPrice1 = 0;
- if (this.tableData1) {
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- if (item.tjCategory != null) {
- this.tjCategory = item.tjCategory;
- }
- if (item.pacName == "鍗曢」") {
- item.list.forEach((item9) => {
- this.treeList.push(item9.proId);
- });
- }
- this.pacName = item.pacName;
- });
+ if (response.code == 200) {
+ let cusId = this.form.cusIdcard;
+ this.proIds = [];
+ getTransitionList1(cusId).then((response) => {
+ this.tableData1 = response.data;
+ this.TotalPrice1 = 0;
+ if (this.tableData1) {
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.ordPrice;
+ this.TotalPrice += item.nowPrice;
+ if (item.tjCategory != null) {
+ this.tjCategory = item.tjCategory;
+ }
+ if (item.pacName == "鍗曢」") {
+ item.list.forEach((item9) => {
+ this.treeList.push(item9.proId);
+ });
+ }
+ this.pacName = item.pacName;
+ });
- const r = /^\+?[0-9][0-9]*$/; //姝ｆ暣鏁帮紙鍙互0鎵撳ご锛�
- let TotalPrice = this.TotalPrice1 * (this.discount / 10);
- if (r.test(TotalPrice)) {
- this.TotalPrice = TotalPrice + ".00";
+
+
+ this.list1 = false;
+ this.list3 = true;
+ this.list2 = false;
} else {
- this.TotalPrice = TotalPrice;
+ this.list1 = true;
+ this.TotalPrice = 0;
}
- this.list1 = false;
- this.list3 = true;
- this.list2 = false;
- } else {
- this.list1 = true;
- this.TotalPrice = "0.00";
- }
- });
- } else {
- console.log(澶辫触浜�);
- }
- });
+ });
+ } else {
+ console.log(澶辫触浜�);
+ }
+ });
}
-
-
+
+
this.taocan = false;
this.defaultKeys = [];
this.DataLists = [];
@@ -3958,6 +3172,7 @@
width: 100%;
display: flex;
}
+
.tab3 {
border: 1px solid #dcdfe6;
}
@@ -4035,12 +3250,14 @@
width: 300px;
height: 300px;
}
+
.dialog-footer2 {
width: 960px;
height: 36px;
display: flex;
justify-content: center;
}
+
.el-input--suffix .el-input__inner {
padding-right: 15px;
}
@@ -4071,6 +3288,7 @@
.content {
margin-bottom: 25px;
}
+
.tab8 {
width: 100%;
display: flex;
--
Gitblit v1.8.0