From fb0f5d7ac6dabbfe9a1246ca07348d13a622d96c Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 13 九月 2023 15:52:48 +0800
Subject: [PATCH] qxtjxg
---
src/views/doctor/check/index.vue | 15
src/views/reservation/reservations/index.vue | 1405 ++++++++++++++---------------------------------------
src/views/system/tijian/index.vue | 19
src/views/login.vue | 2
src/views/system/comp/index.vue | 48
src/views/system/charge/index.vue | 5
src/views/system/tijianall/index.vue | 21
7 files changed, 452 insertions(+), 1,063 deletions(-)
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 97aa9f2..6e5fb1d 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -428,7 +428,7 @@
});
}
},
-
+
vale(datas) {
this.proResult = datas;
// this.$refs.aaa.open = true;
@@ -614,6 +614,7 @@
}
)
.then(() => {
+ // 浣撴鍙�
let tjNumber = this.tableAll.tjNumber;
this.proParentList.sons.forEach((item) => {
if (this.rows) {
@@ -621,17 +622,17 @@
if (item1 === item) {
item = item1;
}
- // if (item.exceptionDesc === true) {
- // item.exceptionDesc = 1;
+ // if (item.isReturn == true) {
+ // item.isReturn = 1;
// }
- // if (item.exceptionDesc === false) {
- // item.exceptionDesc = 0;
+ // if (item.isReturn == false) {
+ // item.isReturn = 0;
// }
});
}
-
this.tjOrderDetail.push({
proName: item.project.proName,
+ proId: item.project.proId,
orderDetailId: item.orderDetailId,
flowingWaterId: item.flowingWaterId,
proResult: item.proResult,
@@ -642,6 +643,7 @@
rulesList: item.rulesList
});
});
+
var data = [
{
tjNumber,
@@ -649,6 +651,7 @@
remark: this.proParentList.remark, // 澶囨敞
proName: this.proName, //鐖堕」
summaryList: this.value, //灏忕粨
+ doctorName: this.doctorName,
tjOrderDetailList: this.tjOrderDetail,
},
];
diff --git a/src/views/login.vue b/src/views/login.vue
index ba449a7..511cc79 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -55,7 +55,7 @@
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2022-2023璺嘲绉戞妧 All Rights Reserved.</span>
+ <span>Copyright 漏 2022-2023榫欑編缃戠粶 All Rights Reserved.</span>
</div>
</div>
</template>
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index b3b4a1c..a4eebcb 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -1,277 +1,99 @@
<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="name">
- <el-input
- style="width: 120px"
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input style="width: 120px" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="韬唤璇佸彿" prop="idCard">
- <el-input
- v-model="queryParams.idCard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input
- v-model="queryParams.phoe"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- clearable
- @keyup.enter.native="handleQuery"
- style="width: 140px"
- />
+ <el-input v-model="queryParams.phoe" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" clearable @keyup.enter.native="handleQuery"
+ style="width: 140px" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="company">
- <el-select
- :remote-method="getRemoteData"
- v-model="queryParams.company"
- value-key="drugManufacturerId"
- remote
- filterable
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @change="searchSelect"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.drugManufacturerId"
- :label="dict.cnName"
- :value="dict.cnName"
- />
+ <el-select :remote-method="getRemoteData" v-model="queryParams.company" value-key="drugManufacturerId" remote
+ filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect">
+ <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName"
+ :value="dict.cnName" />
</el-select>
</el-form-item>
<el-form-item label="棰勭害瓒呮湡" prop="isExpire">
- <el-select
- v-model="queryParams.isExpire"
- placeholder="璇烽�夋嫨鏄惁瓒呮湡"
- clearable
- style="width: 140px"
- >
- <el-option
- v-for="dict in options"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.isExpire" placeholder="璇烽�夋嫨鏄惁瓒呮湡" clearable style="width: 140px">
+ <el-option v-for="dict in options" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="batch"
- v-hasPermi="['reservation:reservation:remove']"
- >鎾ら攢棰勭害</el-button
- >
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="batch"
+ v-hasPermi="['reservation:reservation:remove']">鎾ら攢棰勭害</el-button>
</el-col>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <el-col :span="1.5">
+ <el-button type="primary" size="mini" :disabled="single" @click="receipt"
+ v-hasPermi="['reservation:reservation:remove']">琛ユ墦灏忕エ</el-button>
+ </el-col>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table
- border
- v-loading="loading"
- :data="reservationList"
- @selection-change="handleSelectionChange"
- :default-sort="{ prop: 'reservationTime', order: 'descending' }"
- highlight-current-row
- >
- <el-table-column
- type="selection"
- width="40px"
- align="center"
- fixed="left"
- :selectable="selectHandle"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="name"
- width="90px"
- :show-overflow-tooltip="true"
- fixed="left"
- />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="sex"
- width="60px"
- :show-overflow-tooltip="true"
- >
+ <el-table border v-loading="loading" :data="reservationList" @selection-change="handleSelectionChange"
+ :default-sort="{ prop: 'reservationTime', order: 'descending' }" highlight-current-row>
+ <el-table-column type="selection" width="40px" align="center" fixed="left" :selectable="selectHandle" />
+ <el-table-column label="濮撳悕" align="center" prop="name" width="90px" :show-overflow-tooltip="true" fixed="left" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" width="60px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.sex == '0'">鐢�</span>
<span v-if="scope.row.sex == '1'">濂�</span>
</template>
</el-table-column>
- <el-table-column
- label="骞撮緞"
- align="center"
- prop="age"
- width="60px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="韬唤璇佸彿"
- align="center"
- prop="idCard"
- width="170px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鍑虹敓鏃ユ湡"
- align="center"
- prop="birthday"
- width="100px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="骞撮緞" align="center" prop="age" width="60px" :show-overflow-tooltip="true" />
+ <el-table-column label="韬唤璇佸彿" align="center" prop="idCard" width="170px" :show-overflow-tooltip="true" />
+ <el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="birthday" width="100px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.birthday, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="phoe"
- width="110px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="閭"
- align="center"
- prop="email"
- :show-overflow-tooltip="true"
- width="160px"
- />
- <el-table-column
- label="鍦板潃"
- align="center"
- prop="address"
- :show-overflow-tooltip="true"
- width="160px"
- />
- <el-table-column
- label="棰勭害鏃堕棿"
- align="center"
- prop="reservationTime"
- width="100px"
- :show-overflow-tooltip="true"
- sortable
- >
+ <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="110px" :show-overflow-tooltip="true" />
+ <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" width="160px" />
+ <el-table-column label="鍦板潃" align="center" prop="address" :show-overflow-tooltip="true" width="160px" />
+ <el-table-column label="棰勭害鏃堕棿" align="center" prop="reservationTime" width="100px" :show-overflow-tooltip="true"
+ sortable>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reservationTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="濠氬Щ"
- align="center"
- prop="marriage"
- width="60px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true" />
+ <el-table-column label="濠氬Щ" align="center" prop="marriage" width="60px" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_user_marry"
- :value="scope.row.marriage"
- />
+ <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
</template>
</el-table-column>
- <el-table-column
- label="姘戞棌"
- align="center"
- prop="nation"
- width="60px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="姘戞棌" align="center" prop="nation" width="60px" :show-overflow-tooltip="true">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_user_national"
- :value="scope.row.nation"
- />
+ <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
</template>
</el-table-column>
<!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" width="100px" :show-overflow-tooltip="true" /> -->
<!-- <el-table-column label="閮ㄩ棬" align="center" prop="department" width="90px" :show-overflow-tooltip="true" /> -->
- <el-table-column
- label="棰勭害瓒呮湡"
- align="center"
- prop="isExpire"
- width="80px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="棰勭害瓒呮湡" align="center" prop="isExpire" width="80px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.isExpire == '1'">宸茶繃鏈�</span>
<span v-if="scope.row.isExpire == '2'">鏈繃鏈�</span>
</template>
</el-table-column>
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="company"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-s-order"
- @click="handleUpdate1(scope.row)"
- v-hasPermi="['reservation:reservation:edit']"
- title="棰勭害璇︾粏"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['reservation:reservation:edit']"
- title="淇敼"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- title="鎾ら攢棰勭害"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >
+ <el-button size="mini" type="text" icon="el-icon-s-order" @click="handleUpdate1(scope.row)"
+ v-hasPermi="['reservation:reservation:edit']" title="棰勭害璇︾粏"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['reservation:reservation:edit']" title="淇敼"></el-button>
+ <el-button size="mini" type="text" title="鎾ら攢棰勭害" icon="el-icon-delete" @click="handleDelete(scope.row)">
</el-button>
</template>
</el-table-column>
@@ -279,13 +101,8 @@
<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>
<!-- 棰勭害鐧昏璇︽儏瀵硅瘽妗� -->
@@ -293,284 +110,114 @@
<template>
<div>
<div style="width: 1000px">
- <el-form
- style="margin: 0px 8px"
- :inline="true"
- ref="formIn"
- :model="formIn"
- :rules="rules"
- :label-position="labelPosition"
- class="demo-form-inline"
- label-width="78px"
- >
+ <el-form style="margin: 0px 8px" :inline="true" ref="formIn" :model="formIn" :rules="rules"
+ :label-position="labelPosition" class="demo-form-inline" label-width="78px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="formIn.name"
- placeholder="璇疯緭鍏ュ鍚�"
- style="width: 160px"
- />
+ <el-input v-model="formIn.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 160px" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select
- style="width: 160px"
- v-model="formIn.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 style="width: 160px" v-model="formIn.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="idCard">
- <el-input
- style="width: 186px"
- v-model="formIn.idCard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- />
+ <el-input style="width: 186px" v-model="formIn.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
<el-input style="width: 55px" v-model="formIn.age" />
</el-form-item>
<el-form-item prop="ageUnit">
- <el-select
- style="width: 60px"
- v-model="formIn.ageUnit"
- @change="formchang"
- >
- <el-option
- v-for="dict in dict.type.dict_ageunit"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 60px" v-model="formIn.ageUnit" @change="formchang">
+ <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select
- style="width: 160px"
- v-model="formIn.sex"
- placeholder="璇烽�夋嫨鎬у埆"
- @change="formchang"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select style="width: 160px" v-model="formIn.sex" placeholder="璇烽�夋嫨鎬у埆" @change="formchang">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input
- v-model="formIn.phoe"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- style="width: 160px"
- />
+ <el-input v-model="formIn.phoe" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width: 160px" />
</el-form-item>
<el-form-item label="姘戞棌" prop="nation">
- <el-select
- v-model="formIn.nation"
- placeholder="璇烽�夋嫨姘戞棌"
- style="width: 160px"
- >
- <el-option
- v-for="dict in dict.type.dict_user_national"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select v-model="formIn.nation" placeholder="璇烽�夋嫨姘戞棌" style="width: 160px">
+ <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閭" prop="email">
- <el-input
- v-model="formIn.email"
- placeholder="璇疯緭鍏ラ偖绠�"
- style="width: 150px"
- />
+ <el-input v-model="formIn.email" placeholder="璇疯緭鍏ラ偖绠�" style="width: 150px" />
</el-form-item>
<el-form-item label="濠氬Щ" prop="marriage">
- <el-select
- style="width: 160px"
- v-model="formIn.marriage"
- placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_marry"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select style="width: 160px" v-model="formIn.marriage" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌">
+ <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="address">
- <el-input
- v-model="formIn.address"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- style="width: 410px"
- />
+ <el-input v-model="formIn.address" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" style="width: 410px" />
</el-form-item>
<el-form-item label="浣撴绫诲埆" prop="tjCategory">
- <el-select
- style="width: 150px"
- v-model="formIn.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="formIn.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="department">
- <el-input
- v-model="formIn.department"
- placeholder="璇疯緭鍏ラ儴闂�"
- style="width: 160px"
- />
+ <el-input v-model="formIn.department" placeholder="璇疯緭鍏ラ儴闂�" style="width: 160px" />
</el-form-item>
<el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
- v-model="formIn.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- style="width: 410px"
- />
+ <el-input v-model="formIn.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 410px" />
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="formIn.career"
- placeholder="璇疯緭鍏ヨ亴涓�"
- style="width: 150px"
- >
- <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="formIn.career" placeholder="璇疯緭鍏ヨ亴涓�"
+ style="width: 150px">
+ <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="reservationTime">
- <el-date-picker
- v-model="formIn.reservationTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="setDisabled"
- style="width: 160px"
- >
+ <el-date-picker v-model="formIn.reservationTime" type="date" value-format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled" style="width: 160px">
</el-date-picker>
</el-form-item>
<el-form-item label="鏃堕棿" prop="timeRegion">
- <el-select
- style="width: 130px"
- v-model="formIn.timeRegion"
- placeholder="璇烽�夋嫨棰勭害鏃堕棿"
- >
- <el-option
- v-for="dict in dict.type.tj_time_region"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 130px" v-model="formIn.timeRegion" placeholder="璇烽�夋嫨棰勭害鏃堕棿">
+ <el-option v-for="dict in dict.type.tj_time_region" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗″彿" prop="indexCard">
- <el-input
- v-model="formIn.indexCard"
- placeholder="璇疯緭鍏ュ崱鍙�"
- style="width: 190px"
- />
+ <el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
</el-form-item>
- <el-button
- type="primary"
- @click="taocan = true"
- size="mini"
- v-show="tijiao1"
- >閫夋嫨濂楅</el-button
- >
+ <el-button type="primary" @click="taocan = true" size="mini" v-show="tijiao1">閫夋嫨濂楅</el-button>
</el-form>
</div>
- <el-dialog
- title="閫夋嫨濂楅"
- :visible.sync="taocan"
- width="35%"
- append-to-body
- >
- <el-tabs
- type="border-card"
- style="height: 538px; margin-left: 10px; width: 600px"
- >
+ <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="35%" append-to-body>
+ <el-tabs type="border-card" style="height: 538px; margin-left: 10px; width: 600px">
<el-tab-pane label="濂楅">
- <el-form
- :model="queryParam"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="auto"
- @submit.native.prevent
- >
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+ label-width="auto" @submit.native.prevent>
<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-form-item>
</el-form>
<div class="tab4">
- <div
- class="grid-content bg-purple"
- style="margin-left: 5px; width: 100%"
- >
- <el-table
- v-loading="loading"
- element-loading-text="姝ｅ湪鍔犺浇涓�..."
- border
- element-loading-spinner="el-icon-loading"
- :data="newpacName"
- @select="handleSelectionChange1"
- height="430"
- ref="tb"
- style="width: 900px"
- >
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 100%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." border
+ element-loading-spinner="el-icon-loading" :data="newpacName" @select="handleSelectionChange1"
+ height="430" ref="tb" style="width: 900px">
<template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template>
- <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="allProName"
- :show-overflow-tooltip="true"
- />
+ <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="allProName" :show-overflow-tooltip="true" />
</el-table>
</div>
<!-- <el-button
@@ -594,31 +241,10 @@
<el-tab-pane label="鍗曢」">
<div class="tab3">
<div class="tab2">
- <el-tree
- :data="data"
- show-checkbox
- node-key="proId"
- :props="defaultProps"
- @check-change="handleCurrentChecked"
- >
+ <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps"
+ @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> -->
</div>
</el-tab-pane>
</el-tabs>
@@ -634,61 +260,29 @@
<template>
<el-form :model="form" :inline="true" label-width="68px">
<el-form-item label="浣撴绫诲瀷">
- <el-select
- style="width: 160px"
- 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: 160px" 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="搴旀敹閲戦"
- :value="TotalPrice1 + '.00'"
- disabled
- style="width: 160px"
- ></el-input>
+ <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></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: 130px"
- 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: 130px" 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: 120px"
- ></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px"></el-input>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- @click="submitPrice"
- :disabled="confirm"
- size="mini"
- v-show="tijiao1"
- >绛惧埌鐧昏</el-button
- >
+ <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini"
+ v-show="tijiao1">绛惧埌鐧昏</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
@@ -698,20 +292,14 @@
<div style="text-align: center; margin-bottom: 10px">
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- "
- >
+ ">
<el-collapse v-model="index" accordion v-if="list3">
- <div
- class="info1"
- v-for="(item, index) in tableData1"
- :key="'info1-' + index"
- >
+ <div class="info1" v-for="(item, index) in tableData1" :key="'info1-' + index">
<el-collapse-item :name="index">
<template slot="title">
{{
@@ -725,58 +313,37 @@
".00鍏�)"
}}
</template>
- <el-table
- :data="item.list"
- border
- style="width: 100%"
- height="270"
- >
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
+ <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="ordPrice" label="搴旀敹閲戦">
</el-table-column>
- <el-table-column
- prop="nowPrice"
- label="瀹炴敹閲戦"
- >
+ <el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
-
+
</el-table>
</el-collapse-item>
</div>
</el-collapse>
<el-collapse v-model="activeName" accordion v-if="list2">
- <div
- class="info"
- v-for="(item, index) in tableData1"
- :key="'info-' + index"
- >
+ <div class="info" v-for="(item, index) in tableData1" :key="'info-' + index">
<el-collapse-item>
<template slot="title">
{{ item.pacName }}
</template>
- <el-table
- :data="item.tjProjectList"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
- </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="isEat" label="绌鸿吂">
- </el-table-column>
-
+ <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proSex" label="鎬у埆" width="180">
+ </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="isEat" label="绌鸿吂">
+ </el-table-column>
+
</el-table>
</el-collapse-item>
</div>
@@ -787,16 +354,16 @@
<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="proSex" label="鎬у埆" width="180">
- </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="isEat" label="绌鸿吂">
- </el-table-column>
-
+ </el-table-column>
+ <el-table-column prop="proSex" label="鎬у埆" width="180">
+ </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="isEat" label="绌鸿吂">
+ </el-table-column>
+
</el-table>
</el-collapse-item>
</div>
@@ -806,303 +373,173 @@
</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>
</div>
</template>
</el-drawer>
+ <div style="
+ position: absolute;
+ bottom: 100px;
+ left: 500px;
+ width: 700px;
+ display: none;
+ ">
+ <div id="printBill">
+ <div style="font-size: 13px; color: #000000">
+ <div style="width: 48%; margin-top: 10px">
+ 濮撳悕锛歿{ fmobj.name }}
+ </div>
+ <div style="width: 48%; margin-top: 10px">
+ 鎬у埆锛歿{ fmobj.sex === 0 ? "鐢�" : "濂�" }}
+ </div>
+ <div style="width: 48%; margin-top: 10px">
+ 鐢佃瘽:{{ fmobj.phoe }}
+ </div>
+ <div style="width: 48%; margin-top: 10px">
+ 鏃ユ湡:{{ fmobj.reservationTime }}
+ </div>
+ <div style="width: 58%; margin-top: 10px">
+ 濂楅锛歿{ pacName }}
+ </div>
+ <div style="width: 100%; margin-top: 10px">娓╅Θ鎻愮ず锛�</div>
+ <div style="width: 100%">1銆侀噰琛�锛岃吂閮ㄥ僵瓒呮鏌ュ悗鏂瑰彲鐢ㄩ銆�</div>
+ <div style="width: 100%">
+ 2銆佽繎鏈熻嫢鏈夌敓鑲茶鍒掑強鏈垚骞翠汉锛屼笉瀹滆繘琛岃兏鐗囥�佸弻鑳介瀵嗗害绛夋斁灏勬鏌ャ��
+ </div>
+ <div style="width: 100%">
+ 3銆佹��瀛曟垨鍙兘宸插彈瀛曠殑濂冲＋锛岃繕搴旈伩鍏嶅绉戙�佹斁灏勭鍙婇槾寮忚秴澹版鏌ャ��
+ </div>
+ <div style="width: 100%">
+ 4銆佺粡鏈熷コ鎬т笉瀹滆繘琛屽绉戝強灏垮父瑙勬鏌ャ��
+ </div>
+ <div style="width: 100%">
+ 5銆佽嫢鎮ㄥ湪绛夊緟妫�鏌ヨ繃绋嬩腑鏈夌枒闂紝璇峰強鏃惰仈绯诲妫�鎶ゅ＋銆�
+ </div>
+ <div style="width: 100%">
+ 6銆佷綋妫�缁撴潫鍚庤灏嗗妫�鍗曚氦杩樿嚦鍓嶅彴銆�
+ </div>
+ </div>
+ </div>
+ </div>
+
<!-- 淇敼棰勭害鐧昏淇℃伅瀵硅瘽妗� -->
<el-drawer title="棰勭害淇℃伅缁存姢" :visible.sync="drawer" size="55%">
<template>
<div>
<div style="width: 1000px">
- <el-form
- style="margin: 0px 8px"
- :inline="true"
- ref="formIn"
- :model="formIn"
- :rules="rules"
- :label-position="labelPosition"
- class="demo-form-inline"
- label-width="78px"
- >
+ <el-form style="margin: 0px 8px" :inline="true" ref="formIn" :model="formIn" :rules="rules"
+ :label-position="labelPosition" class="demo-form-inline" label-width="78px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="formIn.name"
- placeholder="璇疯緭鍏ュ鍚�"
- style="width: 160px"
- />
+ <el-input v-model="formIn.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 160px" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select
- style="width: 160px"
- v-model="formIn.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 style="width: 160px" v-model="formIn.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="idCard">
- <el-input
- style="width: 186px"
- v-model="formIn.idCard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- />
+ <el-input style="width: 186px" v-model="formIn.idCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
<el-input style="width: 55px" v-model="formIn.age" />
</el-form-item>
<el-form-item prop="ageUnit">
- <el-select
- style="width: 60px"
- v-model="formIn.ageUnit"
- @change="formchang"
- >
- <el-option
- v-for="dict in dict.type.dict_ageunit"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 60px" v-model="formIn.ageUnit" @change="formchang">
+ <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select
- style="width: 160px"
- v-model="formIn.sex"
- placeholder="璇烽�夋嫨鎬у埆"
- @change="formchang"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select style="width: 160px" v-model="formIn.sex" placeholder="璇烽�夋嫨鎬у埆" @change="formchang">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="phoe">
- <el-input
- v-model="formIn.phoe"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- style="width: 160px"
- />
+ <el-input v-model="formIn.phoe" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" style="width: 160px" />
</el-form-item>
<el-form-item label="姘戞棌" prop="nation">
- <el-select
- v-model="formIn.nation"
- placeholder="璇烽�夋嫨姘戞棌"
- style="width: 160px"
- >
- <el-option
- v-for="dict in dict.type.dict_user_national"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select v-model="formIn.nation" placeholder="璇烽�夋嫨姘戞棌" style="width: 160px">
+ <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閭" prop="email">
- <el-input
- v-model="formIn.email"
- placeholder="璇疯緭鍏ラ偖绠�"
- style="width: 150px"
- />
+ <el-input v-model="formIn.email" placeholder="璇疯緭鍏ラ偖绠�" style="width: 150px" />
</el-form-item>
<el-form-item label="濠氬Щ" prop="marriage">
- <el-select
- style="width: 160px"
- v-model="formIn.marriage"
- placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_marry"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select style="width: 160px" v-model="formIn.marriage" placeholder="璇烽�夋嫨濠氬Щ鐘跺喌">
+ <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="address">
- <el-input
- v-model="formIn.address"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- style="width: 410px"
- />
+ <el-input v-model="formIn.address" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" style="width: 410px" />
</el-form-item>
<el-form-item label="浣撴绫诲埆" prop="tjCategory">
- <el-select
- style="width: 150px"
- v-model="formIn.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="formIn.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬" prop="department">
- <el-input
- v-model="formIn.department"
- placeholder="璇疯緭鍏ラ儴闂�"
- style="width: 160px"
- />
+ <el-input v-model="formIn.department" placeholder="璇疯緭鍏ラ儴闂�" style="width: 160px" />
</el-form-item>
<el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
- v-model="formIn.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- style="width: 410px"
- />
+ <el-input v-model="formIn.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 410px" />
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="formIn.career"
- placeholder="璇疯緭鍏ヨ亴涓�"
- style="width: 150px"
- >
- <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="formIn.career" placeholder="璇疯緭鍏ヨ亴涓�"
+ style="width: 150px">
+ <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="reservationTime">
- <el-date-picker
- v-model="formIn.reservationTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- :picker-options="setDisabled"
- style="width: 160px"
- >
+ <el-date-picker v-model="formIn.reservationTime" type="date" value-format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled" style="width: 160px">
</el-date-picker>
</el-form-item>
<el-form-item label="鏃堕棿" prop="timeRegion">
- <el-select
- style="width: 130px"
- v-model="formIn.timeRegion"
- placeholder="璇烽�夋嫨棰勭害鏃堕棿"
- >
- <el-option
- v-for="dict in dict.type.tj_time_region"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 130px" v-model="formIn.timeRegion" placeholder="璇烽�夋嫨棰勭害鏃堕棿">
+ <el-option v-for="dict in dict.type.tj_time_region" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗″彿" prop="indexCard">
- <el-input
- v-model="formIn.indexCard"
- placeholder="璇疯緭鍏ュ崱鍙�"
- style="width: 190px"
- />
+ <el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
</el-form-item>
- <el-button type="primary" @click="taocan = true" size="mini"
- >閫夋嫨濂楅</el-button
- >
+ <el-button type="primary" @click="taocan = true" size="mini">閫夋嫨濂楅</el-button>
</el-form>
</div>
- <el-dialog
- title="閫夋嫨濂楅"
- :visible.sync="taocan"
- width="35%"
- append-to-body
- >
- <el-tabs
- type="border-card"
- style="height: 538px; margin-left: 10px; width: 600px"
- >
+ <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="35%" append-to-body>
+ <el-tabs type="border-card" style="height: 538px; margin-left: 10px; width: 600px">
<el-tab-pane label="濂楅">
- <el-form
- :model="queryParam"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="auto"
- @submit.native.prevent
- >
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+ label-width="auto" @submit.native.prevent>
<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-form-item>
</el-form>
<div class="tab4">
- <div
- class="grid-content bg-purple"
- style="margin-left: 5px; width: 100%"
- >
- <el-table
- v-loading="loading"
- element-loading-text="姝ｅ湪鍔犺浇涓�..."
- border
- element-loading-spinner="el-icon-loading"
- :data="newpacName"
- @select="handleSelectionChange1"
- height="430"
- ref="tb"
- style="width: 900px"
- >
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 100%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." border
+ element-loading-spinner="el-icon-loading" :data="newpacName" @select="handleSelectionChange1"
+ height="430" ref="tb" style="width: 900px">
<template slot="empty">鏁版嵁姝ｅ湪鍔犺浇涓�</template>
- <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="allProName"
- :show-overflow-tooltip="true"
- />
+ <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="allProName" :show-overflow-tooltip="true" />
</el-table>
</div>
<!-- <el-button
@@ -1126,13 +563,8 @@
<el-tab-pane label="鍗曢」">
<div class="tab3">
<div class="tab2">
- <el-tree
- :data="data"
- show-checkbox
- node-key="proId"
- :props="defaultProps"
- @check-change="handleCurrentChecked"
- >
+ <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps"
+ @check-change="handleCurrentChecked">
</el-tree>
</div>
<!-- <el-button
@@ -1166,60 +598,28 @@
<template>
<el-form :model="form" :inline="true" label-width="68px">
<el-form-item label="浣撴绫诲瀷">
- <el-select
- style="width: 160px"
- 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: 160px" 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="搴旀敹閲戦"
- :value="TotalPrice1 + '.00'"
- disabled
- style="width: 160px"
- ></el-input>
+ <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></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: 130px"
- 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: 130px" 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: 120px"
- ></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px"></el-input>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- @click="submitPrice"
- :disabled="confirm"
- size="mini"
- >绛惧埌鐧昏</el-button
- >
+ <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">绛惧埌鐧昏</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
@@ -1229,20 +629,14 @@
<div style="text-align: center; margin-bottom: 10px">
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- "
- >
+ ">
<el-collapse v-model="index" accordion v-if="list3">
- <div
- class="info1"
- v-for="(item, index) in tableData1"
- :key="'info1-' + index"
- >
+ <div class="info1" v-for="(item, index) in tableData1" :key="'info1-' + index">
<el-collapse-item :name="index">
<template slot="title">
{{
@@ -1256,55 +650,41 @@
".00鍏�)"
}}
</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="proSex" label="鎬у埆" width="180">
- </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="isEat" label="绌鸿吂">
- </el-table-column>
-
+ <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="proSex" label="鎬у埆" width="180">
+ </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="isEat" label="绌鸿吂">
+ </el-table-column>
+
</el-table>
</el-collapse-item>
</div>
</el-collapse>
<el-collapse v-model="activeName" accordion v-if="list2">
- <div
- class="info"
- v-for="(item, index) in tableData1"
- :key="'info-' + index"
- >
+ <div class="info" v-for="(item, index) in tableData1" :key="'info-' + index">
<el-collapse-item>
<template slot="title">
{{ item.pacName }}
</template>
- <el-table
- :data="item.tjProjectList"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column prop="proName" label="椤圭洰" width="180">
- </el-table-column>
- <el-table-column prop="proSex" label="鎬у埆" width="180">
- </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="isEat" label="绌鸿吂">
- </el-table-column>
-
+ <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proSex" label="鎬у埆" width="180">
+ </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="isEat" label="绌鸿吂">
+ </el-table-column>
+
</el-table>
</el-collapse-item>
</div>
@@ -1314,17 +694,17 @@
<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="proSex" label="鎬у埆" width="180">
- </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="isEat" label="绌鸿吂">
- </el-table-column>
-
+ <el-table-column prop="proName" label="椤圭洰" width="180">
+ </el-table-column>
+ <el-table-column prop="proSex" label="鎬у埆" width="180">
+ </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="isEat" label="绌鸿吂">
+ </el-table-column>
+
</el-table>
</el-collapse-item>
</div>
@@ -1334,18 +714,9 @@
</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>
</div>
@@ -1355,44 +726,19 @@
</template>
<script>
-import {
- listReservation,
- gettjCancel,
- tjReappoint,
- tjCancelTj,
-} from "@/api/reservation/reservation";
+import { listReservation, gettjCancel, tjReappoint, tjCancelTj, } from "@/api/reservation/reservation";
import printJS from "print-js";
-import {
- deptTreeSelect,
- projectGetList,
- getOrder,
- getCusIdcard,
- getPackageListName,
- getaddtTransition,
- getTransitionList,
- getGuide,
- getaddTj,
-} from "@/api/system/tijian";
+import { deptTreeSelect, projectGetList, getPackageListName, getaddtTransition, getTransitionList, } from "@/api/system/tijian";
import { getCompany, queryCompany } from "@/api/team/tuanti";
import user from "@/store/modules/user";
export default {
name: "Reservation",
- dicts: [
- "dict_user_national",
- "dict_user_national",
- "dict_user_marry",
- "sys_yes_no",
- "sys_user_sex",
- "dict_team",
- "tj_time_region",
- "dict_tjtype",
- "dict_job",
- "dict_user_cardtype",
- "dict_ageunit",
- ],
+ dicts: ["dict_user_national", "dict_user_national", "dict_user_marry", "sys_yes_no",
+ "sys_user_sex", "dict_team", "tj_time_region", "dict_tjtype", "dict_job",
+ "dict_user_cardtype", "dict_ageunit",],
data() {
return {
- isfalse:false,
+ isfalse: false,
tijiao1: true,
index: 0,
proIds: "",
@@ -1512,6 +858,7 @@
cusIsvip: null,
},
formIn: {},
+ fmobj: {},
// 琛ㄥ崟鏍￠獙
rules: {
cusName: [{ required: true, message: "濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
@@ -1723,6 +1070,10 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ selection.forEach(item =>{
+ this.fmobj = item
+ })
+ console.log(this.fmobj)
this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
@@ -1846,85 +1197,85 @@
if (row.timeRegion === 3) {
this.formIn.timeRegion = "11:00-12:00";
}
- if (this.formIn.isExpire === 1) {
- this.tijiao1 = false;
- }
- this.drawer1 = true;
- this.discount = this.formIn.discount;
- //鍏ㄩ儴濂楅
- if (this.formIn.sex != null) {
- let cusSex = this.formIn.sex;
- deptTreeSelect(cusSex).then((response) => {
- this.newpacName = response.rows;
- 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();
- }
- });
+ if (this.formIn.isExpire === 1) {
+ this.tijiao1 = false;
+ }
+ this.drawer1 = true;
+ this.discount = this.formIn.discount;
+ //鍏ㄩ儴濂楅
+ if (this.formIn.sex != null) {
+ let cusSex = this.formIn.sex;
+ deptTreeSelect(cusSex).then((response) => {
+ this.newpacName = response.rows;
+ 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.loading = false;
});
- } else {
- deptTreeSelect().then((response) => {
- this.newpacName = response.rows;
- 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.loading = false;
+ });
+ } else {
+ deptTreeSelect().then((response) => {
+ this.newpacName = response.rows;
+ 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.loading = false;
});
- }
- let cusId = this.formIn.idCard;
- this.list1 = true;
- (this.tableData1 = []),
- (this.newpacName = []),
- getTransitionList(cusId).then((response) => {
- if (response.data) {
- this.tableData1 = response.data;
- if (this.tableData1.length != 0) {
- this.TotalPrice1 = 0;
- this.tableData1.forEach((item) => {
- this.TotalPrice1 += item.nowPrice;
- this.TotalPrice = (
- this.TotalPrice1 *
- (this.discount / 10)
- ).toFixed(2);
- if (item.pacName === null) {
- item.pacName = "鍗曢」";
- }
- });
- this.list1 = false;
- this.list3 = true;
- } else {
- this.list1 = true;
- }
+ this.loading = false;
+ });
+ }
+ let cusId = this.formIn.idCard;
+ this.list1 = true;
+ (this.tableData1 = []),
+ (this.newpacName = []),
+ getTransitionList(cusId).then((response) => {
+ if (response.data) {
+ this.tableData1 = response.data;
+ if (this.tableData1.length != 0) {
+ this.TotalPrice1 = 0;
+ this.tableData1.forEach((item) => {
+ this.TotalPrice1 += item.nowPrice;
+ this.TotalPrice = (
+ this.TotalPrice1 *
+ (this.discount / 10)
+ ).toFixed(2);
+ if (item.pacName === null) {
+ item.pacName = "鍗曢」";
+ }
+ });
+ this.list1 = false;
+ this.list3 = true;
} else {
- this.tableData1 = [];
- this.list3 = false;
this.list1 = true;
}
- });
-
- /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- projectGetList().then((response) => {
- this.data = response.data;
- this.dXData = response.data;
- return;
+ } else {
+ this.tableData1 = [];
+ this.list3 = false;
+ this.list1 = true;
+ }
});
+
+ /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
+ projectGetList().then((response) => {
+ this.data = response.data;
+ this.dXData = response.data;
+ return;
+ });
},
// 鎶樻墸
@@ -2007,6 +1358,21 @@
} else {
this.proIds = [];
}
+ },
+
+ receipt() {
+ setTimeout(function () {
+ const style =
+ "@media print { @page{margin:0 10mm,size:4mm 6mm;}};"; //鎵撳嵃鏃跺幓鎺夌湁椤电湁灏�
+ printJS({
+ printable: "printBill", // 鏍囩鍏冪礌id
+ type: "html",
+ header: "",
+ targetStyles: ["*"],
+ scanStyles: false, //鎵撳嵃蹇呴』鍔犱笂锛屼笉鐒堕〉闈笂鐨刢ss鏍峰紡鏃犳晥
+ style,
+ });
+ }, 100);
},
// 椤圭洰鎻愪氦
@@ -2259,7 +1625,7 @@
this.$modal.msgSuccess("鎾ら攢鎴愬姛");
this.getList();
})
- .catch(() => {});
+ .catch(() => { });
},
//鎵归噺鎾ら攢
@@ -2398,6 +1764,7 @@
width: 300px;
height: 300px;
}
+
.tj1 {
width: 230px;
display: flex;
diff --git a/src/views/system/charge/index.vue b/src/views/system/charge/index.vue
index ad6e229..535d6da 100644
--- a/src/views/system/charge/index.vue
+++ b/src/views/system/charge/index.vue
@@ -379,7 +379,7 @@
orderId: this.OrderId,
};
getwater(data).then((res) => {
- if (res.code == 200) {
+ if (res.msg !="璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯") {
this.mobanId = res.data.mobanId;
this.waterId = res.data.waterId;
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
@@ -390,10 +390,9 @@
const params = { viewNum, tjnumber };
this.$tab.openPage("鏀舵灏忕エ", "/report/charge", params);
} else{
- console.log(111)
this.$message({
type: "warning ",
- message: "璇烽噸鏂伴绾�!",
+ message: "鏌ヨ鍒版偍宸查��娆撅紝璇锋偍閲嶆柊棰勭害!",
});
}
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index f8c325d..6d47385 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -38,8 +38,8 @@
<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" :show-overflow-tooltip="true" fixed="left" />
- <el-table-column label="绋庡彿" align="center" prop="taxNumber" :show-overflow-tooltip="true" />
+ <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" />
@@ -301,10 +301,16 @@
<!-- 娣诲姞鎴栦慨鏀逛綋妫�鍗曚綅淇℃伅缁存姢瀵硅瘽妗� -->
<div class="dia">
- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px" :inline="true">
+ <el-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="璇疯緭鍏ヤ腑鏂囧悕绉�" />
+ <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-form-item>
+ <el-form-item label="娉曚汉浠ｈ〃" prop="legalPerson">
+ <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
</el-form-item>
<el-form-item label="鑱旂郴浜�" prop="contactPerson">
<el-input v-model="form.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
@@ -312,29 +318,27 @@
<el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone">
<el-input v-model="form.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
- <el-form-item label="绋庡彿" prop="taxNumber">
- <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" />
+ <el-form-item label="浼犵湡" prop="faxNumber">
+ <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
</el-form-item>
- <el-form-item label="娉曚汉" prop="legalPerson">
- <el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
- </el-form-item>
+
<!-- <el-form-item label="缂栫爜" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ョ紪鐮�" />
</el-form-item> -->
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
+ <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="璇疯緭鍏ラ�氳鍦板潃" />
+ <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="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ <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="璇疯緭鍏ラ摱琛岃处鎴�" />
+ <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" style="width: 520px;"/>
</el-form-item>
- <el-form-item label="閭" prop="email">
+ <el-form-item label="鑱旂郴閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
</el-form-item>
<el-form-item label="璐熻矗浜�" prop="principal">
@@ -343,9 +347,7 @@
<el-form-item label="缃戝潃" prop="url">
<el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
</el-form-item>
- <el-form-item label="浼犵湡" prop="faxNumber">
- <el-input v-model="form.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" />
- </el-form-item>
+
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
<el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
</el-form-item>
@@ -401,9 +403,9 @@
<!-- <el-form-item label="GMP璇佷功鍥剧墖(base64缂栫爜)">
<image-upload v-model="form.gmpPhoto"/>
</el-form-item> -->
- <el-form-item label="鎺掑簭" prop="orderNum">
+ <!-- <el-form-item label="鎺掑簭" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
- </el-form-item>
+ </el-form-item> -->
<!-- <el-form-item label="鏁版嵁鐘舵��(PT10.00.004)" prop="effective">
<el-select v-model="form.effective" placeholder="璇烽�夋嫨鏁版嵁鐘舵��(PT10.00.004)">
<el-option
@@ -417,11 +419,11 @@
<!-- <el-form-item label="鎷奸煶" prop="spell">
<el-input v-model="form.spell" placeholder="璇疯緭鍏ユ嫾闊�" />
</el-form-item> -->
- <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
+ <!-- <el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
<el-date-picker clearable v-model="form.validTime" type="date" value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
</el-date-picker>
- </el-form-item><br>
+ </el-form-item><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>
@@ -1124,7 +1126,7 @@
}
.dialog-footer {
- width: 960px;
+ width: 1300px;
height: 36px;
display: flex;
justify-content: center;
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 594ee0c..1eee7b0 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -354,7 +354,10 @@
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
- <template slot-scope="scope">
+ <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>
@@ -377,9 +380,12 @@
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
- </template>
+ <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>
@@ -400,7 +406,10 @@
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proType" label="鎬у埆" width="180">
- <template slot-scope="scope">
+ <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>
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index 8f57b44..9a4104d 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -228,13 +228,13 @@
<el-form-item label="搴旀敹閲戦" style="margin-right: 20px">
<el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 150px"></el-input>
</el-form-item>
- <el-form-item label="浼樻儬鎶樻墸" style="margin-right: 20px">
- <!-- <el-input style="width: 100px" text="number" v-model="discount" :value="discount/100"></el-input> -->
+ <!-- <el-form-item label="浼樻儬鎶樻墸" style="margin-right: 20px">
+ <el-input style="width: 100px" text="number" v-model="discount" :value="discount/100"></el-input>
<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> -->
<el-form-item label="瀹炴敹閲戦" style="margin-right: 20px">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 94px"></el-input>
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" disabled style="width: 190px"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitPrice" size="mini" :disabled="confirm">棰勭害鐧昏</el-button>
@@ -271,13 +271,22 @@
<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="proSex" label="鎬у埆" width="180">
+ <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="isEat" label="绌鸿吂">
+ <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>
--
Gitblit v1.8.0