From 6cbbc9d82214c42996d622f22c8ccab3a8123d60 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 19:07:21 +0800
Subject: [PATCH] qxtj
---
src/views/system/tijianall/index.vue | 624 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 363 insertions(+), 261 deletions(-)
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index df77394..970ab55 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -11,74 +11,145 @@
:rules="rules"
:label-position="labelPosition"
class="demo-form-inline"
- label-width="78px"
+ label-width="84px"
>
- <el-form-item label="濮撳悕" prop="cusName">
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- style="width: 160px"
- />
- </el-form-item>
- <el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select
- style="width: 160px"
- 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="cusIdcard">
- <el-input
- style="width: 186px"
- v-model="form.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="inputChange"
- />
- <i
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ style="display: flex"
+ label="濮撳悕"
+ prop="cusName"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ label="璇佷欢绫诲瀷"
+ prop="idType"
+ style="display: flex"
+ >
+ <el-select v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.dict_user_cardtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item
+ style="display: flex"
+ label="璇佷欢鍙�"
+ prop="cusIdcard"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusIdcard) {
+ callback('');
+ } else if (form.cusIdcard) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <span
+ slot="label"
+ style="display: inline-block; border-bottom: 2px solid blue"
+ @click="handleQuery"
+ >
+ 璇佷欢鍙�
+ </span>
+ <el-input
+ v-model="form.cusIdcard"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="inputChange"
+ />
+ <!-- <i
style="font-size: 17px; margin-left: 3px"
class="el-icon-search"
@click="handleQuery"
- ></i>
- </el-form-item>
- <el-form-item label="骞撮緞" prop="age">
- <el-input style="width: 55px" v-model="form.age" />
- </el-form-item>
- <el-form-item prop="ageUnit">
- <el-select
- style="width: 60px"
- v-model="form.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="cusSex">
- <el-select
- style="width: 160px"
- v-model="form.cusSex"
- placeholder="璇烽�夋嫨鎬у埆"
- @change="formchang"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
- </el-form-item>
+ ></i> -->
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label="姘戞棌"
+ prop="cusNational"
+ style="display: flex"
+ >
+ <el-select
+ filterable
+ v-model="form.cusNational"
+ placeholder="璇烽�夋嫨姘戞棌"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_national"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎬у埆" prop="cusSex" style="display: flex">
+ <el-select
+ v-model="form.cusSex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ @change="formchang"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="骞撮緞" prop="age" style="display: flex">
+ <el-input v-model="form.age" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="2">
+ <el-form-item prop="ageUnit">
+ <el-select
+ v-model="form.ageUnit"
+ @change="formchang"
+ style="width: 80%"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_ageunit"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- <input name="ReadBlockBtn" type="button" size="5px" @click="readblock" value="璇诲崱" /> -->
<!-- <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
@@ -86,56 +157,149 @@
value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
</el-date-picker>
</el-form-item> -->
- <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone">
- <el-input
- v-model="form.cusPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- style="width: 160px"
- />
- </el-form-item>
- <el-form-item label="姘戞棌" prop="cusNational">
- <el-select
- filterable
- v-model="form.cusNational"
- placeholder="璇烽�夋嫨姘戞棌"
- style="width: 130px"
- >
- <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="cusEmail">
- <el-input
- v-model="form.cusEmail"
- placeholder="璇疯緭鍏ラ偖绠�"
- style="width: 200px"
- />
- </el-form-item>
- <el-form-item label="濠氬Щ" prop="cusMarryStatus">
- <el-select
- style="width: 160px"
- 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="cusAddr">
- <el-input
- v-model="form.cusAddr"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- style="width: 440px"
- />
- </el-form-item>
+
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label="濠氬Щ"
+ prop="cusMarryStatus"
+ style="display: flex"
+ >
+ <el-select
+ v-model="form.cusMarryStatus"
+ placeholder="璇烽�夋嫨濠氬Щ鐘跺喌"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_user_marry"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6">
+ <el-form-item
+ label="浣撴绫诲埆"
+ prop="category"
+ style="display: flex"
+ >
+ <el-select
+ v-model="form.category"
+ placeholder="璇烽�夋嫨浣撴绫诲埆"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_tjtype"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item
+ style="display: flex"
+ label="鑱旂郴鐢佃瘽"
+ prop="cusPhone"
+ :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone) {
+ callback('');
+ } else if (form.cusPhone) {
+ callback();
+ }
+ },
+ trigger: 'blur',
+ },
+ ]"
+ >
+ <el-input
+ v-model="form.cusPhone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label="浣撴绫诲瀷"
+ prop="tjType"
+ style="display: flex"
+ >
+ <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷">
+ <el-option
+ v-for="dict in dict.type.dict_team"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱屼笟" prop="career" style="display: flex">
+ <el-select
+ filterable
+ :disabled="isDisabled"
+ v-model="form.career"
+ placeholder="璇疯緭鍏ヨ亴涓�"
+ >
+ <el-option
+ v-for="dict in dict.type.dict_job"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item
+ label="閭"
+ prop="cusEmail"
+ style="display: flex"
+ >
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label="鐜颁綇鍧�"
+ prop="cusAddr"
+ style="display: flex"
+ >
+ <el-input
+ v-model="form.cusAddr"
+ placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ label="宸ヤ綔鍗曚綅"
+ prop="company"
+ style="display: flex"
+ >
+ <el-input
+ v-model="form.company"
+ placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鍗″彿" prop="indexCard">
+ <el-input v-model="form.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
<!-- <el-form-item label="鎴峰彛鍦板潃" prop="cusAddr">
<el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" />
</el-form-item> -->
@@ -149,101 +313,52 @@
<!-- <el-form-item label="绱㈠紩鍗″彿" prop="indexCard">
<el-input v-model="form.indexCard" placeholder="璇疯緭鍏ョ储寮曞崱鍙�" />
</el-form-item> -->
- <el-form-item label="浣撴绫诲埆" prop="category">
- <el-select
- style="width: 140px"
- v-model="form.category"
- placeholder="璇烽�夋嫨浣撴绫诲埆"
- >
- <el-option
- v-for="dict in dict.type.dict_tjtype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
- </el-form-item>
- <el-form-item label="閮ㄩ棬" prop="department">
- <el-input
- v-model="form.department"
- placeholder="璇疯緭鍏ラ儴闂�"
- style="width: 160px"
- />
- </el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
- v-model="form.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- style="width: 440px"
- />
- </el-form-item>
- <el-form-item label="鑱屼笟" prop="career">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="form.career"
- placeholder="璇疯緭鍏ヨ亴涓�"
- style="width: 140px"
- >
- <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="form.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: 160px"
- v-model="form.timeRegion"
- placeholder="璇烽�夋嫨棰勭害鏃堕棿"
- >
- <el-option
- v-for="dict in dict.type.tj_time_region"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍗″彿" prop="indexCard">
- <el-input
- v-model="form.indexCard"
- placeholder="璇疯緭鍏ュ崱鍙�"
- style="width: 190px"
- />
- </el-form-item>
- <el-form-item
- label="浣撴绫诲瀷"
- prop="tjType"
- style="margin-right: 20px"
- >
- <el-select
- style="width: 145px"
- v-model="form.tjType"
- placeholder="璇烽�夋嫨浣撴绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_team"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
- </el-form-item>
+
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label="閮ㄩ棬"
+ prop="department"
+ style="display: flex"
+ >
+ <el-input
+ v-model="form.department"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ label="鏃堕棿"
+ prop="timeRegion"
+ style="display: flex"
+ >
+ <el-select
+ v-model="form.timeRegion"
+ placeholder="璇烽�夋嫨棰勭害鏃堕棿"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_time_region"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="棰勭害鏃ユ湡" prop="reservationTime">
+ <el-date-picker
+ v-model="form.reservationTime"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鏃ユ湡"
+ :picker-options="setDisabled"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
</div>
</el-col>
@@ -469,7 +584,7 @@
>
<el-button
type="primary"
- @click="inputChange"
+ @click="inputChanges"
v-show="lishi"
size="mini"
:disabled="confirm"
@@ -557,7 +672,7 @@
</el-table-column>
<el-table-column prop="nowPrice" label="瀹炴敹閲戦">
</el-table-column>
- <el-table-column prop="isEat" label="绌鸿吂">
+ <el-table-column prop="proCheckMethod" label="绌鸿吂">
</el-table-column>
</el-table>
</el-collapse-item>
@@ -639,39 +754,6 @@
></iframe>
</div>
</el-dialog>
- <el-drawer
- title="鍘嗗彶浣撴璁板綍"
- :visible.sync="table"
- direction="rtl"
- size="50%"
- >
- <el-table :data="HistoryList" style="width: 95%; margin-left: 20px">
- <el-table-column
- property="tjNum"
- label="浣撴鍙�"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- property="userName"
- label="濮撳悕"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- property="tjTime"
- label="浣撴鏃堕棿"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- property="tjProName"
- label="浣撴椤圭洰"
- align="center"
- :show-overflow-tooltip="true"
- ></el-table-column>
- </el-table>
- </el-drawer>
<el-dialog
title="鎻愮ず"
:visible.sync="dialogVisiblese"
@@ -684,6 +766,7 @@
<el-button type="primary" @click="copes">纭� 瀹�</el-button>
</span>
</el-dialog>
+ <historyTj :cusIdCard="form.cusIdcard" ref="historyTj"></historyTj>
</div>
</template>
@@ -704,9 +787,11 @@
} from "@/api/system/tijian";
import { MessageBox } from "element-ui";
import VTreeTransfer from "../tijian/TreeTransfer.vue";
+import historyTj from "@/components/historyTj/index";
export default {
components: {
VTreeTransfer,
+ historyTj,
},
dicts: [
"dict_user_national",
@@ -723,6 +808,17 @@
name: "Tijian",
data() {
+ let checkPhoneNum = (rule, value, callback) => {
+ console.log(value);
+ let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/);
+ if (value == "" && value == undefined && !value) {
+ return callback("");
+ } else if (value != undefined && value != "") {
+ return callback();
+ } else if (!patter.test(value)) {
+ return callback("");
+ }
+ };
// const isCnNewID = (rule, value, callback) => {
// var arrExp = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]; //鍔犳潈鍥犲瓙
// var arrValid = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2]; //鏍￠獙鐮�
@@ -893,24 +989,26 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- cusName: [{ required: true, message: "濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
+ cusName: [
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
+ ],
cusSex: [
- { required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
cusBrithday: [
- { required: true, message: "鍑虹敓鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// cusAddr: [
// { required: true, message: "鐜板眳浣忓湴鍧�涓嶈兘涓虹┖", trigger: "blur" },
// ],
cusPhone: [
- { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
reservationTime: [
- { required: true, message: "棰勭害鏃ユ湡涓嶈兘涓虹┖", trigger: "change" },
+ { required: true, validator: checkPhoneNum, trigger: "change" },
],
timeRegion: [
- { required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
],
// cusIdcard: [
// { required: true, message: "璇疯緭鍏ヨ韩浠借瘉鍙�", trigger: "blur" },
@@ -921,10 +1019,10 @@
// },
// ],
cusIdcard: [
- { required: true, message: "韬唤璇佸彿涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, validator: checkPhoneNum, trigger: "blur" },
{
pattern: /^(\d{15}$|^\d{18}$|^\d{17}(\d|X|x))$/,
- message: "璇疯緭鍏ユ纭殑韬唤璇佸彿",
+ validator: checkPhoneNum,
trigger: "blur",
validator: this.validSjh,
},
@@ -971,23 +1069,27 @@
this.form.cusBrithday = birthday;
this.form.age = age;
}
- let cusIdCard = this.form.cusIdcard;
- getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
- if (res.code == 200) {
- this.table = true;
- this.lishi = true;
- this.HistoryList = res.data;
- }
- });
+
+ // let cusIdCard = this.form.cusIdcard;
+ // getHistryTjOrderByCusIdCard(cusIdCard).then((res) => {
+ // if (res.code == 200) {
+ this.table = true;
+ this.lishi = true;
+ // this.HistoryList = res.data;
+ // }
+ // });
} else {
// return this.$message.error("璇疯緭鍏ユ纭殑韬唤璇佸彿锛�");;
}
+ },
+ inputChanges() {
+ this.$refs.historyTj.getlist();
},
cope() {
let cusIdCard = this.form.cusIdcard;
getHistryTjOrderProByCusIdCard(cusIdCard).then((res) => {
this.copeList = res.data;
- if (res.data.length != 0) {
+ if (res.msg != "鏆傛棤鍘嗗彶璁板綍") {
this.dialogVisiblese = true;
} else {
this.$message.warning("鏆傛棤鍘嗗彶浣撴璁板綍锛�");
--
Gitblit v1.8.0