From c5351e5f1d21b848bbaaa403726115d220443074 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期二, 31 十月 2023 15:36:24 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 36 ++-
src/views/index.vue | 2
vue.config.js | 1
src/views/reservation/resercopy/index.vue | 97 ++++++++++
src/views/reservation/reservation/index.vue | 12 +
src/views/system/tijianall/index.vue | 7
src/views/system/tijian/index.vue | 209 ++++++++++++++++++++--
src/views/doctor/checkAll/index.vue | 15 +
src/views/system/comp/index.vue | 40 ++-
src/main.js | 13 +
package.json | 3
src/views/system/package/index.vue | 24 ++
src/App.vue | 7
src/utils/devicePixelRatio.js | 61 ++----
14 files changed, 420 insertions(+), 107 deletions(-)
diff --git a/package.json b/package.json
index 5d89f3f..cc970c7 100644
--- a/package.json
+++ b/package.json
@@ -97,5 +97,6 @@
"browserslist": [
"> 1%",
"last 2 versions"
- ]
+ ],
+ "main": ".eslintrc.js"
}
diff --git a/src/App.vue b/src/App.vue
index 3194fbc..f37c0d8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,6 @@
<script>
import ThemePicker from "@/components/ThemePicker";
-import devPixelRatio from "@/utils/devicePixelRatio.js";
export default {
name: "App",
components: { ThemePicker },
@@ -21,7 +20,6 @@
}
},
created() {
- new devPixelRatio().init(); // 鍒濆鍖栭〉闈㈡瘮渚�
},
};
</script>
@@ -29,6 +27,11 @@
#app .theme-picker {
display: none;
}
+/* #app{
+ width:1920px;
+ height:1080px;
+} */
+
body {
margin: 0;
diff --git a/src/main.js b/src/main.js
index ccd2405..cc7942b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,6 +35,19 @@
import Pagination from "@/components/Pagination";
// 鍒嗛〉缁勪欢
+import { monitorZoom } from "@/utils/devicePixelRatio.js";
+const m = monitorZoom();
+console.log(window.screen.width)
+console.log(window.devicePixelRatio)
+if (window.screen.width * window.devicePixelRatio >= 3840) {
+ console.log(111111)
+ document.body.style.zoom = 100 / (Number(m) / 2); // 灞忓箷涓� 4k 鏃�
+} else {
+ console.log(22222)
+ document.body.style.zoom = 100 / Number(m);
+ console.log(document.body.style.zoom)
+}
+
// 鑷畾涔夎〃鏍煎伐鍏风粍浠�
import RightToolbar from "@/components/RightToolbar";
// 瀵屾枃鏈粍浠�
diff --git a/src/utils/devicePixelRatio.js b/src/utils/devicePixelRatio.js
index 73788f3..d1bba32 100644
--- a/src/utils/devicePixelRatio.js
+++ b/src/utils/devicePixelRatio.js
@@ -1,44 +1,21 @@
-class devicePixelRatio {
- /* 鑾峰彇绯荤粺绫诲瀷 */
- getSystem() {
- const agent = navigator.userAgent.toLowerCase();
- const isMac = /macintosh|mac os x/i.test(navigator.userAgent);
- if (isMac) return false;
- // 鐩墠鍙拡瀵� win 澶勭悊锛屽叾瀹冪郴缁熸殏鏃犺鎯呭喌锛岄渶瑕佸垯缁х画鍦ㄦ娣诲姞鍗冲彲
- if (agent.indexOf("windows") >= 0) return true;
+export const monitorZoom = () => {
+ let ratio = 0,
+ screen = window.screen,
+ ua = navigator.userAgent.toLowerCase();
+ if (window.devicePixelRatio !== undefined) {
+ ratio = window.devicePixelRatio;
+ } else if (~ua.indexOf("msie")) {
+ if (screen.deviceXDPI && screen.logicalXDPI) {
+ ratio = screen.deviceXDPI / screen.logicalXDPI;
}
- /* 鐩戝惉鏂规硶鍏煎鍐欐硶 */
- addHandler(element, type, handler) {
- if (element.addEventListener) {
- element.addEventListener(type, handler, false);
- } else if (element.attachEvent) {
- element.attachEvent("on" + type, handler);
- } else {
- element["on" + type] = handler;
- }
- }
- /* 鏍℃娴忚鍣ㄧ缉鏀炬瘮渚� */
- correct() {
- // 椤甸潰devicePixelRatio锛堣澶囧儚绱犳瘮渚嬶級鍙樺寲鍚庯紝璁＄畻椤甸潰body鏍囩zoom淇敼鍏跺ぇ灏忥紝鏉ユ姷娑坉evicePixelRatio甯︽潵鐨勫彉鍖�
- document.getElementsByTagName("body")[0].style.zoom =
- 1 / window.devicePixelRatio;
- }
- /* 鐩戝惉椤甸潰缂╂斁 */
- watch() {
- const that = this;
- // 娉ㄦ剰: 杩欎釜鏂规硶鏄В鍐冲叏灞�鏈変袱涓獁indow.resize
- that.addHandler(window, "resize", function () {
- that.correct(); // 閲嶆柊鏍℃娴忚鍣ㄧ缉鏀炬瘮渚�
- });
- }
- /* 鍒濆鍖栭〉闈㈡瘮渚� */
- init() {
- const that = this;
- // 鍒ゆ柇璁惧锛屽彧鍦� win 绯荤粺涓嬫牎姝ｆ祻瑙堝櫒缂╂斁姣斾緥
- if (that.getSystem()) {
- that.correct(); // 鏍℃娴忚鍣ㄧ缉鏀炬瘮渚�
- that.watch(); // 鐩戝惉椤甸潰缂╂斁
- }
- }
+ } else if (
+ window.outerWidth !== undefined &&
+ window.innerWidth !== undefined
+ ) {
+ ratio = window.outerWidth / window.innerWidth;
}
- export default devicePixelRatio;
\ No newline at end of file
+ if (ratio) {
+ ratio = Math.round(ratio * 100);
+ }
+ return ratio;
+};
\ No newline at end of file
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index bfb025b..8ee401a 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -714,11 +714,15 @@
this.proParentList = response.data;
this.loading = false;
this.value = [];
- if (this.proParentList.xiaoJie.length != 0) {
- this.proParentList.xiaoJie.forEach((item2) => {
- this.value.push(item2.id);
+ if(this.proParentList.xiaoJieIds != null){
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ this.proParentList.xiaoJieIds.forEach((item2) => {
+ let item = Number(item2)
+ this.value.push(item);
});
}
+ }
+
this.proParentList.sons.forEach((item) => {
this.doctorName = item.doctorName;
@@ -845,11 +849,14 @@
getParentId(data).then((response) => {
this.proParentList = response.data;
this.value = [];
- if (this.proParentList.xiaoJie.length != 0) {
- this.proParentList.xiaoJie.forEach((item2) => {
- this.value.push(item2.id);
- });
- }
+ if(this.proParentList.xiaoJieIds != null){
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ this.proParentList.xiaoJieIds.forEach((item2) => {
+ let item = Number(item2)
+ this.value.push(item);
+ });
+ }
+ }
this.proParentList.sons.forEach((item) => {
this.doctorName = item.doctorName;
if (item.isReturn == 1) {
@@ -896,11 +903,14 @@
getParentId(data).then((response) => {
this.proParentList = response.data;
this.value = [];
- if (this.proParentList.xiaoJie.length != 0) {
- this.proParentList.xiaoJie.forEach((item2) => {
- this.value.push(item2.id);
- });
- }
+ if(this.proParentList.xiaoJieIds != null){
+ if (this.proParentList.xiaoJieIds.length != 0) {
+ this.proParentList.xiaoJieIds.forEach((item2) => {
+ let item = Number(item2)
+ this.value.push(item);
+ });
+ }
+ }
this.proParentList.sons.forEach((item) => {
this.doctorName = item.doctorName;
if (item.isReturn == 1) {
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index acbb7c8..89401e0 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -232,7 +232,7 @@
>
<caption style="background-color: #f8f8f9">
{{
- item.parent
+ item.parent || ""
}}
</caption>
<tr
@@ -294,8 +294,19 @@
border-collapse: collapse;
width: 200px;
"
+ v-if="item1.project != null"
>
- {{ item1.project.proName }}
+ {{ item1.project.proName || "" }}
+ </td>
+ <td
+ style="
+ border: 1px solid #dfe6ec;
+ border-collapse: collapse;
+ width: 200px;
+ "
+ v-else
+ >
+ {{ "" }}
</td>
<td
style="
diff --git a/src/views/index.vue b/src/views/index.vue
index a59b0e9..ad92ae2 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -329,7 +329,7 @@
}
.img {
- width: 150px;
+ width: 60%;
height: 100%;
display: flex;
justify-content: center;
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index d2586ab..7f859be 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -58,10 +58,18 @@
<el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="120" />
<el-table-column label="鍦板潃" align="center" prop="address" />
- <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" />
- <el-table-column label="姘戞棌" align="center" prop="nation" />
+ <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
+ </template>
+ </el-table-column>
+ <el-table-column label="姘戞棌" align="center" prop="nation" key="nation" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
+ </template>
+ </el-table-column>
<el-table-column label="鑱旂郴閭" align="center" prop="email" />
- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" />
+ <!-- <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" /> -->
<el-table-column label="鍒嗙粍" align="center" prop="groupingName" />
<el-table-column label="椤圭洰鏀惰垂" align="center" prop="ysPrice" />
</el-table>
@@ -284,6 +292,7 @@
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
+
rules: {
drugManufacturerId: [
{ required: true, message: "鍗曚綅鍚嶇О涓嶈兘涓虹┖", trigger: "change" },
@@ -294,6 +303,88 @@
dwDeptName: [
{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" },
],
+ signingPic: [
+ { required: true, message: "棰勭害鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ contactPerson: [
+ { required: true, message: "鑱旂郴浜轰笉鑳戒负绌�", trigger: "blur" }
+ ],
+ contactPhone: [
+ { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ taxNumber: [
+ { required: true, message: "绋庡彿涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ legalPerson: [
+ { required: true, message: "娉曚汉涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ registerAddress: [
+ { required: true, message: "娉ㄥ唽鍦板潃涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ bankAccount: [
+ { required: true, message: "寮�鎴烽摱琛屼笉鑳戒负绌�", trigger: "blur" }
+ ],
+ countNum: [
+ { required: true, message: "閾惰璐︽埛涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ principal: [
+ { required: true, message: "璐熻矗浜轰笉鑳戒负绌�", trigger: "blur" }
+ ],
+ faxNumber: [
+ { required: true, message: "浼犵湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ mailingAddress: [
+ { required: true, message: "浼犵湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ email: [
+ { required: true, message: "浼犵湡涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ pacName: [
+ { required: true, message: "濂楅涓嶈兘涓虹┖", trigger: "change" },
+ ],
+ payType: [
+ { required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "change" },
+ ],
+ phoe: [
+ {
+ required: true,
+ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+ message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜",
+ trigger: "blur",
+ },
+ ],
+
+ proPrice: [
+ { required: true, message: "濂楅閲戦涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ createTime: [
+ { required: true, message: "鎶樻墸鐜囦笉鑳戒负绌�", trigger: "blur" },
+ ],
+ cnName: [
+ { required: true, message: "涓枃鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ businessLicenseNumber: [
+ { required: true, message: "缁忚惀璁稿彲璇佸彿涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ createTime: [
+ { required: true, message: "鍒涘缓鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ updateTime: [
+ { required: true, message: "淇敼鏃堕棿涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ effective: [
+ {
+ required: true,
+ message: "鏁版嵁鐘舵��(PT10.00.004)涓嶈兘涓虹┖",
+ trigger: "change",
+ },
+ ],
+ name: [
+ { required: true, message: "鑱旂郴浜轰笉鑳戒负绌�", trigger: "change" },
+ ],
+ contactPhone: [
+ { required: true, message: "鑱旂郴鐢佃瘽涓嶈兘涓虹┖", trigger: "change" },
+ ],
},
ListObj: {},
// 閬僵灞�
diff --git a/src/views/reservation/reservation/index.vue b/src/views/reservation/reservation/index.vue
index a643d47..651131f 100644
--- a/src/views/reservation/reservation/index.vue
+++ b/src/views/reservation/reservation/index.vue
@@ -113,8 +113,16 @@
<el-table-column label="閮ㄩ棬缂栧彿" align="center" prop="departmentId" key="departmentId" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" key="phoe" />
<el-table-column label="鍦板潃" align="center" prop="address" key="address" />
- <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage" />
- <el-table-column label="姘戞棌" align="center" prop="nation" key="nation" />
+ <el-table-column label="濠氬Щ鐘跺喌" align="center" prop="marriage" key="marriage" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_user_marry" :value="scope.row.marriage" />
+ </template>
+ </el-table-column>
+ <el-table-column label="姘戞棌" align="center" prop="nation" key="nation" >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.dict_user_national" :value="scope.row.nation" />
+ </template>
+ </el-table-column>
<el-table-column label="鑱旂郴閭" align="center" prop="email" key="email" />
<el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory" key="tjCategory" />
</el-table>
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 6d47385..572db2e 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" width="240px"/>
- <el-table-column label="缁熶竴淇＄敤浠ｇ爜" align="center" prop="taxNumber" width="180px"/>
+ <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" />
@@ -124,7 +124,7 @@
<el-input v-model="form.dwDeptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
</el-form-item>
<el-form-item label="绛剧害閲戦" prop="signingPrice">
- <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
+ <el-input v-model="form.signingPrice" placeholder="璇疯緭鍏ョ绾﹂噾棰�" />
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -304,10 +304,10 @@
<el-dialog :title="title" :visible.sync="open" width="1340px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="106px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
- <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" style="width: 520px;"/>
+ <el-input v-model="form.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" style="width: 520px;" />
</el-form-item>
<el-form-item label="缁熶竴淇＄敤浠ｇ爜" prop="taxNumber">
- <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜" style="width: 520px;"/>
+ <el-input v-model="form.taxNumber" placeholder="璇疯緭鍏ョ粺涓�淇＄敤浠ｇ爜" style="width: 520px;" />
</el-form-item>
<el-form-item label="娉曚汉浠ｈ〃" prop="legalPerson">
<el-input v-model="form.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
@@ -321,22 +321,22 @@
<el-form-item label="浼犵湡" prop="faxNumber">
<el-input v-model="form.faxNumber" 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="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px;"/>
+ <el-input v-model="form.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" style="width: 1157px;" />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" style="width: 1157px;"/>
+ <el-input v-model="form.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" style="width: 1157px;" />
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
- <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" style="width: 520px;"/>
+ <el-input v-model="form.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" style="width: 520px;" />
</el-form-item>
<el-form-item label="閾惰璐︽埛" prop="countNum">
- <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" style="width: 520px;"/>
+ <el-input v-model="form.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" style="width: 520px;" />
</el-form-item>
<el-form-item label="鑱旂郴閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" />
@@ -347,7 +347,7 @@
<el-form-item label="缃戝潃" prop="url">
<el-input v-model="form.url" placeholder="璇疯緭鍏ョ綉鍧�" />
</el-form-item>
-
+
<el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName">
<el-input v-model="form.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" />
</el-form-item>
@@ -738,6 +738,8 @@
changeName() {
this.openss = true;
this.title = "鍒嗙粍椤圭洰缁存姢";
+ this.OnenewpacName =[]
+ this.queryParams.price = 0
if (this.forms.sex) {
deptTreeSelect(this.forms.sex).then((response) => {
this.newpacName = response.rows;
@@ -917,7 +919,7 @@
dwName: this.form.cnName,
dwId: this.form.drugManufacturerId,
dwDeptName: this.form.dwDeptName,
- signingPrice:this.form.signingPrice,
+ signingPrice: this.form.signingPrice,
}
addDept(data).then((response) => {
if (response.code == 200) {
@@ -1042,7 +1044,7 @@
// 鍙屽嚮
dbclick(row, column, event) {
row.isOK = !row.isOK
- this.queryParams.price = 0
+
this.OnenewpacName[row.index] = JSON.parse(JSON.stringify(row)) // 澶嶅埗鏃х殑鏁版嵁锛屽彇娑堟椂鐢ㄥ埌
// 鍒ゆ柇鏄惁涓哄弻鍑荤浜屾淇敼锛岀浜屾鍙屽嚮鍒欐彁浜ゆ暟鎹繘琛屼慨鏀癸紝鎴栬�呭彲鐐瑰嚮鎸夐挳鍙栨秷
if (row.isOK == true) {
@@ -1053,9 +1055,15 @@
})
.then(() => {
this.OnenewpacName.splice(row.index, 1); //鍒犻櫎瀵瑰簲鐨勮〃澶�
- this.OnenewpacName.forEach(item => {
- this.queryParams.price += item.proPrice
- })
+ this.queryParams.price = 0
+ if (this.OnenewpacName.length >= 1) {
+ this.OnenewpacName.forEach(item => {
+ this.queryParams.price += item.proPrice
+ })
+ } else {
+ this.queryParams.price = 0
+ }
+
})
.catch(() => {
this.$message({
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 43c40ca..b349f5b 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -631,6 +631,30 @@
deleted: [
{ required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" },
],
+ pacName: [
+ { required: true, message: "濂楅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ pacStatus: [
+ { required: true, message: "璇烽�夋嫨濂楅鐘舵��", trigger: "change" },
+ ],
+ categoryId: [
+ { required: true, message: "璇烽�夋嫨鍟嗗搧绫荤洰", trigger: "change" },
+ ],
+ keywords: [
+ { required: true, message: "璇烽�夋嫨鍏抽敭瀛�", trigger: "change" },
+ ],
+ isOnSale: [
+ { required: true, message: "鏄惁涓婃灦", trigger: "change" },
+ ],
+ sort: [
+ { required: true, message: "璇疯緭鍏ユ帓搴�", trigger: "blur" },
+ ],
+ retailPrice: [
+ { required: true, message: "璇疯緭鍏ュ皬绋嬪簭浠锋牸", trigger: "blur" },
+ ],
+ counterPrice: [
+ { required: true, message: "璇疯緭鍏ュ師浠�", trigger: "blur" },
+ ],
},
};
},
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index ed25297..92b0160 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,20 +1,177 @@
<template>
<div class="app-container">
- <el-row class="container" v-show="top">
- <el-col style="width: 1050px">
- <div style="width: 1200px">
- <el-form style="margin: 4px 8px; width: 1200px" :inline="true" ref="form" :model="form" :rules="rules"
+ <!-- <div style="display: flex;">
+ <div style="width:76%;">
+ <el-form :inline="true" ref="form" :model="form" :rules="rules"
+ :label-position="labelPosition" class="demo-form-inline" label-width="auto" v-show="top">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏄惁鍖垮悕" prop="isNow">
+ <el-select style="width: 11rem" v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+ <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="濮撳悕" prop="cusName">
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" style="width: 13rem" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="璇佷欢绫诲瀷" prop="idType">
+ <el-select :disabled="isDisabled" style="width: 13rem" 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="6">
+ <el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
+ :required="showHidden.has_idcard === 'Y'">
+ <el-input :disabled="isDisabled" style="width: 16rem" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="inputChange" />
+ <i style="font-size: 1rem; margin-left: 3px" class="el-icon-search" @click="handleQuery"></i>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input style="width: 5rem" v-model="form.age" :disabled="isDisabled" />
+ </el-form-item>
+ <el-form-item prop="ageUnit">
+ <el-select :disabled="isDisabled" style="width: 5rem" v-model="form.ageUnit">
+ <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-col :span="6">
+ <el-form-item label="鎬у埆" prop="cusSex" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
+ :required="showHidden.has_sex === 'Y'">
+ <el-select :disabled="isDisabled" style="width: 13rem" v-model="form.cusSex" placeholder="鎬у埆">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
+ <el-date-picker :disabled="isDisabled" style="width: 13.4rem" clearable v-model="form.cusBrithday"
+ type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone" :rules="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
+ :required="showHidden.is_phone === 'Y'">
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" style="width: 16rem" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鎴峰彛鍦板潃" prop="addr">
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" style="width: 31.5rem" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐜颁綇鍧�" prop="cusAddr">
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 36.5rem" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鑱屼笟" prop="career">
+ <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�"
+ style="width: 11rem">
+ <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="6">
+ <el-form-item label="姘戞棌" prop="cusNational">
+ <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌"
+ style="width: 13rem">
+ <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="cusMarryStatus">
+ <el-select :disabled="isDisabled" style="width: 11rem" 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="company">
+ <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 18rem" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 11rem" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="閭" prop="cusEmail">
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" style="width: 13rem" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item style="margin-left: 24rem">
+ <el-button :disabled="isDisabled" style="margin-left: 5rem" type="primary" size="mini"
+ @click="submitForm">鐧昏</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
+ <div class="content">
+ <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
+ <img v-if="imageUrl" :src="imageUrl" class="avatar" />
+ </div>
+ <div v-if="imgSrc" class="img_bg_camera">
+ <img style="
+ width: 200px;
+ height: 200px;
+ margin-left: -20px;
+ margin-top: 90px;
+ padding-top: 1px;
+ " :src="imgSrc" alt="" class="tx_img" />
+ </div>
+ <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
+ style="margin-top: 1px"></video>
+ <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
+ <div class="camera_outer" style="margin-top: 10px">
+ <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
+ <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button><br />
+ </div>
+ </div>
+ </div> -->
+ <el-row v-show="top">
+ <el-col :span="18">
+ <div>
+ <el-form style="margin: 4px 8px;" :inline="true" ref="form" :model="form" :rules="rules"
:label-position="labelPosition" class="demo-form-inline" label-width="80px">
<el-form-item label="鏄惁鍖垮悕" prop="isNow">
- <el-select style="width: 130px" v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+ <el-select style="width: 11rem" v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
<el-option v-for="dict in dictType" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="濮撳悕" prop="cusName">
- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" style="width: 160px" />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" style="width: 13rem" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select :disabled="isDisabled" style="width: 160px" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-select :disabled="isDisabled" style="width: 13rem" 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>
@@ -22,63 +179,63 @@
<el-form-item label="璇佷欢鍙�" prop="cusIdcard" :rules="showHidden.has_idcard === 'Y' ? rules.cusIdcard : []"
:required="showHidden.has_idcard === 'Y'">
- <el-input :disabled="isDisabled" style="width: 186px" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ <el-input :disabled="isDisabled" style="width: 16rem" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
@input="inputChange" />
- <i style="font-size: 17px; margin-left: 3px" class="el-icon-search" @click="handleQuery"></i>
+ <i style="font-size: 1rem; margin-left: 3px" class="el-icon-search" @click="handleQuery"></i>
</el-form-item>
<br />
<el-form-item label="骞撮緞" prop="age">
- <el-input style="width: 60px" v-model="form.age" :disabled="isDisabled" />
+ <el-input style="width: 5rem" v-model="form.age" :disabled="isDisabled" />
</el-form-item>
<el-form-item prop="ageUnit">
- <el-select :disabled="isDisabled" style="width: 60px" v-model="form.ageUnit">
+ <el-select :disabled="isDisabled" style="width: 5rem" v-model="form.ageUnit">
<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" :rules="showHidden.has_sex === 'Y' ? rules.cusSex : []"
:required="showHidden.has_sex === 'Y'">
- <el-select :disabled="isDisabled" style="width: 160px" v-model="form.cusSex" placeholder="鎬у埆">
+ <el-select :disabled="isDisabled" style="width: 13rem" v-model="form.cusSex" placeholder="鎬у埆">
<el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
- <el-date-picker :disabled="isDisabled" style="width: 160px" clearable v-model="form.cusBrithday" type="date"
+ <el-date-picker :disabled="isDisabled" style="width: 13.4rem" clearable v-model="form.cusBrithday" type="date"
value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="鑱旂郴鐢佃瘽" prop="cusPhone" :rules="showHidden.is_phone === 'Y' ? rules.cusPhone : []"
:required="showHidden.is_phone === 'Y'">
- <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" style="width: 186px" />
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" style="width: 16rem" />
</el-form-item>
<el-form-item label="鎴峰彛鍦板潃" prop="addr">
- <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" style="width: 380px" />
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" style="width: 31.5rem" />
</el-form-item>
<el-form-item label="鐜颁綇鍧�" prop="cusAddr">
- <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 440px" />
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" style="width: 36.5rem" />
</el-form-item><br />
<el-form-item label="鑱屼笟" prop="career">
- <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�" style="width: 130px">
+ <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�" style="width: 11rem">
<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="cusNational">
<el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌"
- style="width: 160px">
+ style="width: 13rem">
<el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="濠氬Щ" prop="cusMarryStatus">
- <el-select :disabled="isDisabled" style="width: 130px" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
+ <el-select :disabled="isDisabled" style="width: 11rem" 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="company">
- <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 220px" />
+ <el-input :disabled="isDisabled" v-model="form.company" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" style="width: 18rem" />
</el-form-item><br />
<!-- <el-form-item label="閭斂缂栫爜" prop="cusPostcode">
@@ -89,10 +246,10 @@
</el-form-item> -->
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 130px" />
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" style="width: 11rem" />
</el-form-item>
<el-form-item label="閭" prop="cusEmail">
- <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" style="width: 160px" />
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" style="width: 13rem" />
</el-form-item>
<!-- <el-form-item label="绱㈠紩鍗″彿" prop="indexCard">
<el-input v-model="form.indexCard" placeholder="璇疯緭鍏ョ储寮曞崱鍙�" />
@@ -129,8 +286,8 @@
<el-radio label="涓汉" v-if="form.tjType == null"></el-radio>
</el-radio-group>
</el-form-item> -->
- <el-form-item style="margin-left: 260px">
- <el-button :disabled="isDisabled" style="margin-left: 50px" type="primary" size="mini"
+ <el-form-item style="margin-left: 24rem">
+ <el-button :disabled="isDisabled" style="margin-left: 5rem" type="primary" size="mini"
@click="submitForm">鐧昏</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
<!-- v-if="tcShows" -->
@@ -1645,6 +1802,10 @@
getfindTj(data).then((response) => {
if (response.data) {
this.feeitems = response.data;
+ this.loading = false;
+ }else{
+ this.feeitems = []
+ this.loading = false;
}
})
});
diff --git a/src/views/system/tijianall/index.vue b/src/views/system/tijianall/index.vue
index dbdf244..d3f7f1b 100644
--- a/src/views/system/tijianall/index.vue
+++ b/src/views/system/tijianall/index.vue
@@ -1,6 +1,8 @@
<template>
<div class="app-container">
- <div style="width: 1050px">
+ <el-row >
+ <el-col :span="18">
+ <div >
<el-form style="margin: 4px 8px" :inline="true" ref="form" :model="form" :rules="rules"
:label-position="labelPosition" class="demo-form-inline" label-width="78px">
<el-form-item label="濮撳悕" prop="cusName">
@@ -107,6 +109,9 @@
</el-form-item>
</el-form>
</div>
+ </el-col>
+ </el-row>
+
<el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="42%" height="700px">
<el-tabs type="border-card" style="height: 538px; margin: 0 10px; width: 100%">
diff --git a/vue.config.js b/vue.config.js
index 9718ca7..819023e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,6 +38,7 @@
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
target: `http://192.168.0.101:5011`,
// target: `http://192.168.0.99:8080/ltkj-admin`,
+ // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin `,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.8.0