From 84d7b5e9b0a31c1e18dc52b3d69b1cadf96938e7 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 06 十二月 2024 17:47:57 +0800
Subject: [PATCH] 报错提示
---
src/utils/request.js | 141 +++++-----
src/views/system/tijian/index.vue | 304 ++++++++++++++++++----
src/views/system/tijian/index copy.vue | 1
src/views/system/tijianall/index.vue | 218 ++++++++++++++++
src/views/hosp/customer/index.vue | 68 -----
5 files changed, 530 insertions(+), 202 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 3bef1d2..c8dfa70 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -14,22 +14,17 @@
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 鍒涘缓axios瀹炰緥
const service = axios.create({
- // axios涓姹傞厤缃湁baseURL閫夐」锛岃〃绀鸿姹俇RL鍏叡閮ㄥ垎
baseURL: process.env.VUE_APP_BASE_API,
- // 瓒呮椂
// timeout: 20000
})
// request鎷︽埅鍣�
service.interceptors.request.use(config => {
- // 鏄惁闇�瑕佽缃� token
const isToken = (config.headers || {}).isToken === false
- // 鏄惁闇�瑕侀槻姝㈡暟鎹噸澶嶆彁浜�
const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
if (getToken() && !isToken) {
- config.headers['Authorization'] = 'Bearer ' + getToken() // 璁╂瘡涓姹傛惡甯﹁嚜瀹氫箟token 璇锋牴鎹疄闄呮儏鍐佃嚜琛屼慨鏀�
+ config.headers['Authorization'] = 'Bearer ' + getToken()
}
- // get璇锋眰鏄犲皠params鍙傛暟
if (config.method === 'get' && config.params) {
let url = config.url + '?' + tansParams(config.params);
url = url.slice(0, -1);
@@ -43,18 +38,14 @@
time: new Date().getTime()
}
const sessionObj = cache.session.getJSON('sessionObj')
- if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+ if (!sessionObj || sessionObj === '') {
cache.session.setJSON('sessionObj', requestObj)
} else {
- const s_url = sessionObj.url; // 璇锋眰鍦板潃
- const s_data = sessionObj.data; // 璇锋眰鏁版嵁
- const s_time = sessionObj.time; // 璇锋眰鏃堕棿
- const interval = 1000; // 闂撮殧鏃堕棿(ms)锛屽皬浜庢鏃堕棿瑙嗕负閲嶅鎻愪氦
+ const s_url = sessionObj.url;
+ const s_data = sessionObj.data;
+ const s_time = sessionObj.time;
+ const interval = 1000;
if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
- // const message = '鏁版嵁姝ｅ湪澶勭悊锛岃鍕块噸澶嶆彁浜�';
- // const message = '';
- // console.warn(`[${s_url}]: ` + message)
- // return Promise.reject(new Error(message))
return Promise.reject()
} else {
cache.session.setJSON('sessionObj', requestObj)
@@ -63,29 +54,24 @@
}
return config
}, error => {
- // console.log(error)
- Promise.reject(error)
+ Promise.reject(error)
})
// 鍝嶅簲鎷︽埅鍣�
service.interceptors.response.use(res => {
- // 鏈缃姸鎬佺爜鍒欓粯璁ゆ垚鍔熺姸鎬�
- const code = res.data.code || 200;
- // 鑾峰彇閿欒淇℃伅
- const msg = errorCode[code] || res.data.msg || errorCode['default']
- // 浜岃繘鍒舵暟鎹垯鐩存帴杩斿洖
- if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
- return res.data
- }
- if (code === 401) {
- if (!isRelogin.show) {
- isRelogin.show = true;
- MessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', {
- confirmButtonText: '閲嶆柊鐧诲綍',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }
- ).then(() => {
+ const code = res.data.code || 200;
+ const msg = errorCode[code] || res.data.msg || errorCode['default']
+ if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
+ return res.data
+ }
+ if (code === 401) {
+ if (!isRelogin.show) {
+ isRelogin.show = true;
+ MessageBox.confirm('鐧诲綍鐘舵�佸凡杩囨湡锛屾偍鍙互缁х画鐣欏湪璇ラ〉闈紝鎴栬�呴噸鏂扮櫥褰�', '绯荤粺鎻愮ず', {
+ confirmButtonText: '閲嶆柊鐧诲綍',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
isRelogin.show = false;
store.dispatch('LogOut').then(() => {
location.href = '/index';
@@ -94,48 +80,61 @@
isRelogin.show = false;
});
}
- return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
- } else if (code === 500) {
- Message({
- message: msg,
- type: 'error'
- })
- return Promise.reject(new Error(msg))
- } else if (code === 601) {
- Message({
- message: msg,
- type: 'warning'
- })
- return Promise.reject('error')
- } else if (code !== 200) {
- Notification.error({
- title: msg
- })
- return Promise.reject('error')
+ return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
+ } else if (code === 500) {
+ // 淇敼姝ら儴鍒嗭紝纭繚璁块棶姝ｇ‘鐨刴sg瀛楁
+ if (res.data && res.data.msg) {
+ MessageBox.confirm(res.data.msg, '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ center: true
+ }).then(() => {
+ // 鎵ц鎴愬姛鍚庣殑鎿嶄綔
+ }).catch(() => {
+ // 鎵ц鍙栨秷鍚庣殑鎿嶄綔
+ });
} else {
- return res.data
+ MessageBox.confirm('鎿嶄綔澶辫触锛岃閲嶈瘯', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning',
+ center: true
+ }).then(() => {
+ // 鎵ц鎴愬姛鍚庣殑鎿嶄綔
+ }).catch(() => {
+ // 鎵ц鍙栨秷鍚庣殑鎿嶄綔
+ });
}
- },
- error => {
- // console.log('err' + error)
- let { message } = error;
- if (message == "Network Error") {
- message = "璇锋鏌ョ綉缁�!";
- }
- // else if (message.includes("timeout")) {
- // message = "鏁版嵁鍔犺浇澶辫触锛岃鍒锋柊椤甸潰";
- // }
- else if (message.includes("Request failed with status code")) {
- message = "绯荤粺鎺ュ彛寮傚父, "+"璇锋鏌ョ綉缁�!";
- }
+ return Promise.reject('鐗瑰畾鎺ュ彛鍙戠敓500閿欒');
+ } else if (code === 601) {
Message({
- message: message,
- type: 'error',
- duration: 5 * 1000
+ message: msg,
+ type: 'warning'
})
- return Promise.reject(error)
+ return Promise.reject('error')
+ } else if (code !== 200) {
+ Notification.error({
+ title: msg
+ })
+ return Promise.reject('error')
+ } else {
+ return res.data
}
-)
+}, error => {
+ let { message } = error;
+ if (message == "Network Error") {
+ message = "璇锋鏌ョ綉缁�!";
+ } else if (message.includes("Request failed with status code")) {
+ message = "绯荤粺鎺ュ彛寮傚父, 璇锋鏌ョ綉缁�!";
+ }
+ Message({
+ message: message,
+ type: 'error',
+ duration: 5 * 1000
+ })
+ return Promise.reject(error)
+})
// 閫氱敤涓嬭浇鏂规硶
export function download(url, params, filename, config) {
diff --git a/src/views/hosp/customer/index.vue b/src/views/hosp/customer/index.vue
index 709a9f3..8108ad8 100644
--- a/src/views/hosp/customer/index.vue
+++ b/src/views/hosp/customer/index.vue
@@ -637,7 +637,7 @@
:remote-method="getRemoteData"
v-model="form.compName"
remote
- filterable
+
style="width: 300px"
placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
clearable
@@ -952,7 +952,6 @@
import "quill/dist/quill.snow.css";
import "quill/dist/quill.bubble.css";
import {
- newConfirm,
getCompany,
queryCompany,
getconfigKey,
@@ -967,11 +966,7 @@
} from "@/api/hosp/customer";
import { getPdf, addCustomerBlack } from "@/api/hosp/order";
import {
- addDept,
addComp,
- Deptlist,
- getDwAndDwDept,
- newExcelImport,
} from "@/api/system/comp";
export default {
name: "Customer",
@@ -1120,67 +1115,6 @@
trigger: 'blur'
}
],
- // taxNumber: [
- // { required: true, message: '璇疯緭鍏ョ◣鍙�', trigger: 'blur' },
- // ],
- // legalPerson: [
- // { required: true, message: '璇疯緭鍏ユ硶浜�', trigger: 'blur' },
- // ],
- // registerAddress: [
- // { required: true, message: '璇疯緭鍏ユ敞鍐屽湴鍧�', trigger: 'blur' },
- // ],
- // mailingAddress: [
- // { required: true, message: '璇疯緭鍏ラ�氳鍦板潃', trigger: 'blur' },
- // ],
- // bankAccount: [
- // { required: true, message: '璇疯緭鍏ュ紑鎴烽摱琛�', trigger: 'blur' },
- // ],
- // countNum: [
- // { required: true, message: '璇疯緭鍏ラ摱琛岃处鎴�', trigger: 'blur' },
- // ],
- // email: [
- // {
- // required: true,
- // message: '璇疯緭鍏ラ偖绠�',
- // trigger: 'blur'
- // },
- // {
- // type: 'email',
- // message: '璇疯緭鍏ユ湁鏁堢殑閭鍦板潃',
- // trigger: 'blur'
- // }
- // ],
- // principal: [
- // { required: true, message: '璇疯緭鍏ヨ礋璐ｄ汉', trigger: 'blur' },
- // ],
- // url: [
- // { required: true, message: '璇疯緭鍏ョ綉鍧�', trigger: 'blur' },
- // {
- // type: 'url',
- // message: '璇疯緭鍏ユ湁鏁堢殑缃戝潃',
- // trigger: 'blur'
- // }
- // ],
- // faxNumber: [
- // { required: true, message: '璇疯緭鍏ヤ紶鐪�', trigger: 'blur' },
- // ],
- // areaName: [
- // { required: true, message: '璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�', trigger: 'blur' },
- // ],
- // orderNum: [
- // { required: true, message: '璇疯緭鍏ユ帓搴�', trigger: 'blur' },
- // {
- // pattern: /^[1-9]\d*$/,
- // message: '鎺掑簭蹇呴』鏄鏁存暟',
- // trigger: 'blur'
- // }
- // ],
- // validTime: [
- // { required: true, message: '璇烽�夋嫨鏈夋晥鏃堕棿', trigger: 'change' },
- // ],
- // remark: [
- // { required: false, message: '璇疯緭鍏ュ娉�', trigger: 'blur' },
- // ],
}
};
},
diff --git a/src/views/system/tijian/index copy.vue b/src/views/system/tijian/index copy.vue
index 7750fb1..f133bb8 100644
--- a/src/views/system/tijian/index copy.vue
+++ b/src/views/system/tijian/index copy.vue
@@ -1758,6 +1758,7 @@
// 椤圭洰鎻愪氦
submit() {
+ console.log('123')
if (this.form.cusIdcard) {
var cusId = this.form.cusIdcard;
} else {
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index b1f4f3f..7dcebe1 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,5 +1,96 @@
<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-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">
@@ -277,12 +368,25 @@
/>
</el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="company">
- <el-input
- :disabled="isDisabled"
- v-model="form.company"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- />
+ <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="form.compName"
+ remote
+ filterable
+ style="width: 300px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="idFn1"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.cnName"
+ :label="dict.cnName"
+ :value="dict.drugManufacturerId"
+ />
+ </el-select>
+ <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
</el-form-item>
<el-form-item label="鏂囧寲绋嬪害" prop="wenHua">
@@ -1014,7 +1118,6 @@
v-for="(item, index) in tableData1"
:key="'info1-' + index"
>
-
<el-collapse-item :name="index">
<template slot="title">
<div style="width: 70%">
@@ -1425,6 +1528,8 @@
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";
@@ -1452,6 +1557,7 @@
},
data() {
return {
+ open1: false,
filterage: "",
checkedkeys: [],
DataLists: [],
@@ -1656,6 +1762,7 @@
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
obj: {},
+ CompanyList: [],
form: {
cusIdcard: "",
tjType: "3",
@@ -1665,6 +1772,8 @@
idType: "1",
ageUnit: "0",
},
+ form1: {},
+ title: "",
// 琛ㄥ崟鏍￠獙
rules: {
cusName: [{ required: true, message: "", trigger: "blur" }],
@@ -1678,6 +1787,20 @@
// ],
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: {
@@ -1689,19 +1812,81 @@
},
},
created() {
+ this.getCompanyList();
+
this.getCurrentDateTime();
this.startTimer();
this.getList1();
// this.getData();
},
mounted() {
- console.log(this.dict.type.dict_user_marry, 555);
- console.log(this.dict.type.dict_user_national, 666);
-
},
methods: {
+ 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) {
+ this.form.dictCompId = value;
+ this.CompanyList.forEach((item) => {
+ if (item.drugManufacturerId == this.form.dictCompId) {
+ this.form.compName = item.cnName;
+ }
+ });
+ }
+ },
+ getRemoteData(query) {
+ if (query) {
+ let compName = query;
+ queryCompany(compName).then((response) => {
+ this.CompanyList = response.data;
+ this.CompanyList.forEach((item) => {
+ this.objs = item;
+ });
+ });
+ }
+ },
getCurrentDateTime() {
const currentDate = new Date();
@@ -2295,7 +2480,7 @@
} else {
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
- console.log(res);
+
if (res.code == 200) {
if (res.msg == "N") {
var websocket = null;
@@ -2305,7 +2490,7 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
+
}
if (websocket == null) {
@@ -2337,14 +2522,14 @@
};
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
- websocket.onmessage = (event)=> {
- console.log(event, "event");
+ websocket.onmessage = (event) => {
+
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
- console.log(resultObj);
+
// TODO 浠ヤ笅浠ｇ爜鍙兘鏄尘宸濅娇鐢ㄧ殑
// this.jingChuanHandlerWebSocketResult(resultObj)
- this.readCardWebSocket(resultObj)
+ this.readCardWebSocket(resultObj);
};
//杩炴帴鍏抽棴鐨勫洖璋冩柟娉�
@@ -2360,14 +2545,14 @@
_this.cardreaderradio = 3;
_this.inputSSS = "";
// let url = window.location.protocol + "//" + window.location.host;
- // console.log(url);
+
// axios
// .get("http://localhost:81/dev-api/readCertCardInfos")
// .then((res) => {
- // console.log(res);
+
// })
// .catch((err) => {
- // console.log(err);
+
// });
// readCertCardInfos().then((res) => {
@@ -2391,35 +2576,31 @@
}
},
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
- readCardWebSocket(resultObj){
+ readCardWebSocket(resultObj) {
let _this = this;
if (resultObj.code === 200 && resultObj.data.name != null) {
- console.log('213131');
-
- //鍥炴樉鐩稿叧鏁版嵁
- _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") {
+
+
+ //鍥炴樉鐩稿叧鏁版嵁
+ _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 {
@@ -2497,7 +2678,7 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
+
}
if (websocket == null) {
alert("11111");
@@ -2602,7 +2783,7 @@
} else if ("MozWebSocket" in window) {
websocket = new MozWebSocket(url);
} else {
- // console.log("SockJS");
+
}
if (websocket == null) {
alert("11111");
@@ -2900,7 +3081,6 @@
this.tableData.forEach((item) => {
this.tableData1.forEach((item1) => {
item.tjProjectList.forEach((item2) => {
- console.log(item1);
if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") {
this.$confirm(
"璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵",
@@ -2987,9 +3167,7 @@
}
},
// gaibian(val){
- // console.log(val);
// let pname = val;
- // console.log(pname);
// getProParentIdDxList(pname).then(response=>{
// this.Treedata = response.data.list;
// })
@@ -2998,7 +3176,7 @@
this.loading = true;
getProParentIdDxList().then((response) => {
this.Treedata = response.data.list;
- console.log(response, 77788);
+
if (this.tableData[0]) {
this.tableData[0].tjProjectList.forEach((selectionitem) => {
@@ -3022,7 +3200,7 @@
};
getlistByZhId(datas).then((res) => {
this.packagedataList = res.data.tjProjectList;
- console.log(this.packagedataList, 1122);
+
this.DataLists = [];
this.checkedListkey1 = [];
for (var i = 0; i < this.packagedataList.length; i++) {
@@ -3031,13 +3209,13 @@
// this.DataLists.push(this.packagedataList[i]);
getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
- console.log(this.TreedataList, 888);
+
this.TreedataList.forEach((item) => {
// this.checkedListkey1.push(item.proId);
this.DataLists.push(item);
- // console.log(this.DataLists,556644);
+
if (this.DataLists.length >= 1) {
this.marryalls = 0;
this.DataLists.forEach((item1) => {
@@ -3058,9 +3236,6 @@
this.DataLists = [];
this.marryalls = 0; // 娓呴浂鎬讳环
this.checkedListkey1 = [];
-
- // 浣犲彲浠ュ湪姝ゅ鏍规嵁闇�瑕佽繘琛屽叾浠栨搷浣滐紝濡傛洿鏂� UI
- console.log("鍙栨秷閫変腑锛屾暟鎹凡娓呯┖锛屾�讳环宸查噸缃�");
}
},
objectspanmethod({ row, column, rowIndex, columnIndex }) {
@@ -3291,6 +3466,7 @@
};
getaddtTransition(data).then((response) => {
if (response.code == 200) {
+
let cusId = this.form.cusIdcard;
this.proIds = [];
getTransitionList(cusId).then((response) => {
@@ -3320,13 +3496,14 @@
this.list1 = false;
this.list3 = true;
this.list2 = false;
- console.log(this.list1)
- console.log(this.list3)
} else {
this.list1 = true;
this.TotalPrice = "0.00";
}
});
+ } else {
+ console.log(澶辫触浜�);
+
}
});
this.taocan = false;
@@ -3807,7 +3984,12 @@
width: 300px;
height: 300px;
}
-
+.dialog-footer2 {
+ width: 960px;
+ height: 36px;
+ display: flex;
+ justify-content: center;
+}
.el-input--suffix .el-input__inner {
padding-right: 15px;
}
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index f7b3e84..2b15c48 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -1,5 +1,96 @@
<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-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>
<el-col :span="18">
<div>
@@ -202,7 +293,6 @@
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
<el-select
- filterable
:disabled="isDisabled"
v-model="form.career"
placeholder="璇疯緭鍏ヨ亴涓�"
@@ -240,8 +330,25 @@
:rules="rules"
label-width="106px"
>
- <el-form-item label="鍗曚綅" prop="company">
- <el-input v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+ <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="form.compName"
+ remote
+ filterable
+ style="width: 300px"
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="idFn1"
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.cnName"
+ :label="dict.cnName"
+ :value="dict.drugManufacturerId"
+ />
+ </el-select>
+ <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i>
</el-form-item>
<el-form-item label="浣撴绫诲埆" prop="category">
<el-select
@@ -976,6 +1083,7 @@
</template>
<script>
+
import printJS from "print-js";
import { getInfo } from "@/api/login";
import Packages from "@/components/Packages";
@@ -996,6 +1104,10 @@
} from "@/api/system/tijian";
import VTreeTransfer from "../tijian/TreeTransfer.vue";
import historyTj from "@/components/historyTj/index";
+import {
+ getCompany,
+ queryCompany,
+} from "@/api/team/tuanti";
export default {
components: {
VTreeTransfer,
@@ -1052,6 +1164,27 @@
// }
// };
return {
+ rules1: {
+ cnName: [
+ { required: true, trigger: 'blur' },
+ ],
+ contactPerson: [
+ { required: true, trigger: 'blur' },
+ ],
+ contactPhone: [
+ {
+ required: true,
+ trigger: 'blur'
+ },
+ {
+ pattern: /^1[3-9]\d{9}$/,
+ trigger: 'blur'
+ }
+ ],
+ },
+ title: '',
+ open1: false,
+ CompanyList: [],
marryall: 0,
marryalls: 0,
filterText: "",
@@ -1211,6 +1344,14 @@
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
+ form1: {
+ company: "",
+ payType: "",
+ name: "",
+ phoe: "",
+ signingPic: "",
+ discount: "",
+ },
form: {
cusIdcard: "",
tjType: "3",
@@ -1277,10 +1418,75 @@
},
},
created() {
+ this.getCompanyList();
+
this.getList1();
console.log(this.dict.type.dict_team, 999);
},
methods: {
+ 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) {
+ console.log(value);
+ if (value) {
+ this.form.dictCompId = value;
+ this.CompanyList.forEach((item) => {
+ if (item.drugManufacturerId == this.form.dictCompId) {
+ this.form.compName = item.cnName;
+ }
+ });
+ }
+ },
+ getRemoteData(query) {
+ if (query) {
+ let compName = query;
+ queryCompany(compName).then((response) => {
+ this.CompanyList = response.data;
+ this.CompanyList.forEach((item) => {
+ this.objs = item;
+ });
+ });
+ }
+ },
inputChange() {
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]$/;
@@ -2848,6 +3054,12 @@
display: flex;
flex-direction: column;
}
+.dialog-footer2 {
+ width: 960px;
+ height: 36px;
+ display: flex;
+ justify-content: center;
+}
</style>
\ No newline at end of file
--
Gitblit v1.8.0