From 8315c3ff55eb53be82ac7ddbbc6cce5f447ffdfa Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 09 四月 2025 13:42:35 +0800
Subject: [PATCH] qx
---
src/views/system/tijian/index.vue | 1273 +++++++++++++-----------------------------------------
src/views/system/comp/index.vue | 85 +-
src/views/sampling/sampling/index.vue | 5
3 files changed, 366 insertions(+), 997 deletions(-)
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index a6c2af3..2e7f740 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -105,7 +105,7 @@
</div>
<div style="width: 50%">
<!-- v-if="this.rightTabShow" -->
- <el-table :row-key="getRowKey" v-if="tableList.length > 0" v-loading="loading" :data="tableList" @selection-change="handleChange"
+ <el-table :key="tableKey" :row-key="getRowKey" v-if="tableList.length > 0" v-loading="loading" :data="tableList" @selection-change="handleChange"
:span-method="objectSpanMethod" ref="tab1" :row-class-name="tableRowClassName" border height="520px">
<el-table-column type="selection" width="40" align="center" />
<!-- :selectable="selectEnable" -->
@@ -331,6 +331,7 @@
},
// 琛ㄥ崟鍙傛暟
form: {},
+ tableKey : "",
// 琛ㄥ崟鏍￠獙
rules: {},
// rightTabShow: false
@@ -673,6 +674,7 @@
.then((response) => {
if (response.data) {
this.tableList = response.data;
+ this.tableKey = Date.now()
this.$nextTick(() => {
if (this.$refs.tab1) {
this.$refs.tab1.doLayout(); // 淇敼涓烘纭殑 ref 鍚嶇О
@@ -680,6 +682,7 @@
}
});
resolve(this.tableList);
+ this.loading = false;
} else {
this.tableList = [];
this.selectList = [];
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index c4f13cb..5d2295e 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -117,7 +117,7 @@
</div>
<div>
- <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="opens" width="1350px" append-to-body :close-on-click-modal="true">
<el-row :gutter="20">
<el-col :span="7" :xs="24">
<div style="padding: 0 20px">
@@ -199,7 +199,7 @@
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleGroup">淇濆瓨</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh">椤圭洰缁存姢</el-button>
+ <el-button type="primary" icon="el-icon-edit" size="mini" @click="xiangmuWh" >椤圭洰缁存姢</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="singlegg"
@@ -324,7 +324,7 @@
</div>
<div>
- <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="openOne" width="1400px" append-to-body :close-on-click-modal="false" >
<el-row :gutter="24" v-if="!isTableVisible">
<el-col :span="15" :xs="24">
@@ -335,7 +335,7 @@
</el-form-item>
<el-form-item label="鎶樻墸">
<el-input-number ref="inputNumber" style="width: 150px" v-model="youhui" :precision="1" :step="0.1"
- :min="0" :max="20" @change="debounceNumberChange" :debounce="3000"></el-input-number>
+ :min="0" :max="10" @change="debounceNumberChange" :debounce="3000"></el-input-number>
</el-form-item>
<el-form-item label="鐜颁环">
<el-input ref="inputName" v-model="queryParams.xianprice" placeholder="鍚堣" clearable
@@ -355,10 +355,10 @@
<el-table-column label="鍘熶环" align="center" prop="proPrice" width="85"></el-table-column>
<el-table-column label="鎶樻墸" width="151">
<template slot-scope="scope">
- <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
- <el-input-number v-model.number="scope.row.limits" @input="validateDiscount(scope.row)"
+ <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 @input="validateDiscount(scope.row)"-->
+ <el-input-number v-model="scope.row.limits"
@change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="mini" type="number" :min="0"
- :step="0.1" :precision="1" :max="20">
+ :step="0.1" :precision="1" :max="10">
</el-input-number>
</template>
</el-table-column>
@@ -753,8 +753,8 @@
updateProPrice(row) {
const proPrice = new Big(row.proPrice);
const limits = new Big(row.limits);
- const result = proPrice.times(limits.div(10)); // ordPrice * (discount / 10)
- row.ysPrice = result.toNumber();
+ const result = proPrice.times(limits.div(10)).toNumber(); // ordPrice * (discount / 10)
+ row.ysPrice = result.toFixed(2);
this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
return sum.plus(new Big(item.ysPrice || '0'));
}, new Big(0)).toNumber();
@@ -763,8 +763,8 @@
updateProPrice1(row) {
const proPrice = new Big(row.proPrice);
const limits = new Big(row.limits);
- const result = proPrice.times(limits.div(10));
- row.ysPrice = result.toNumber();
+ const result = proPrice.times(limits.div(10)).toNumber(); // ordPrice * (discount / 10)
+ row.ysPrice = result.toFixed(2);
const totalYsPrice = this.OnenewpacName.reduce((sum, item) => {
return sum.plus(new Big(item.ysPrice || '0'));
}, new Big(0));
@@ -780,10 +780,11 @@
}
// Update youhui calculation
+
if (this.queryParams.price !== 0 && this.queryParams.xianprice !== 0) {
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
} else {
- this.youhui = 0;
+ this.youhui = 10;
}
},
debounceNumberChange(currentValue, oldValue) {
@@ -794,12 +795,9 @@
},
changeXianjia() {
// 鍘熷鎶樻墸鐜囪绠�
-
-
if (this.queryParams.price !== 0) {
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
}
-
},
getList() {
@@ -831,6 +829,7 @@
cancell() {
this.openss = false;
this.openOne = false;
+ this.youhui = 10
// this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -974,7 +973,7 @@
item.ysPrice = result.toNumber();
this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
return sum.plus(new Big(item.ysPrice || '0'));
- }, new Big(0));
+ }, new Big(0)).toNumber();
})
// ----------------------------------------------------------
@@ -1044,8 +1043,6 @@
this.loading = true;
if (this.forms.sex) {
deptTreeSelect(this.forms.sex).then((response) => {
- console.log('111', response.rows);
-
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1058,7 +1055,6 @@
});
} else {
deptTreeSelect().then((response) => {
- console.log('222', response.rows);
this.newpacName = response.rows;
this.loading = false;
response.rows.forEach((item, index) => {
@@ -1082,7 +1078,6 @@
handleSearch() {
if (this.queryParams.pacName) {
getPackageList(this.queryParams.pacName).then((response) => {
- console.log('333', response.data);
this.newpacName = response.data;
response.data.forEach((item, index) => {
item.newID =
@@ -1093,7 +1088,6 @@
});
} else {
deptTreeSelect().then((response) => {
- console.log('44', response.rows);
this.newpacName = response.rows;
response.rows.forEach((item, index) => {
item.newID =
@@ -1171,11 +1165,12 @@
// 閲嶆柊璁＄畻鎬讳环鍜岀幇浠�
this.OnenewpacName.forEach((item) => {
this.queryParams.price += item.proPrice; // 绱姞鍘熶环
- this.queryParams.xianprice += item.ysPrice || 0; // 绱姞鐜颁环锛屽鏋測sPrice涓簎ndefined鍒欑疮鍔�0
+ //this.queryParams.xianprice += item.ysPrice || 0; 绱姞鐜颁环锛屽鏋測sPrice涓簎ndefined鍒欑疮鍔�0
});
-
- // 璁＄畻浼樻儬锛岃繖閲屽亣璁句紭鎯犳槸鐜颁环涓庡師浠风殑宸鐧惧垎姣�
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
+ this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || '0'));
+ }, new Big(0)).toNumber();
+ this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
}
},
handledbelete(row) {
@@ -1189,14 +1184,16 @@
// 鐒跺悗鏇存柊鎬讳环鍜岀幇浠�
this.OnenewpacName.forEach((item) => {
this.queryParams.price += item.proPrice;
- this.queryParams.xianprice += item.ysPrice || 0; // 纭繚ysPrice瀛樺湪
+ this.queryParams.xianprice =this.OnenewpacName.reduce((sum, item) => {
+ return sum.plus(new Big(item.ysPrice || "0"));
+ }, new Big(0)).toNumber();
});
// 璁＄畻浼樻儬
if (this.queryParams.price > 0) {
this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10;
} else {
- this.youhui = 0;
+ this.youhui = 10;
}
},
@@ -1313,6 +1310,7 @@
this.forms.groupingName = item.groupingName;
this.forms.gtAge = item.gtAge;
this.forms.limits = item.limits;
+ this.youhui =item.limits
this.forms.ltAge = item.ltAge;
this.forms.pacName = item.pacName;
this.forms.payType = item.payType;
@@ -1329,6 +1327,11 @@
this.groupIds = selection.map((item) => item.id);
this.singlegg = !selection.length;
},
+ handleBeforeClose(done) {
+ this.$confirm('纭鍏抽棴锛�')
+ .then(() => done())
+ .catch(() => { /* 鍙栨秷鍏抽棴 */ });
+ },
xiangmuWh() {
if (!this.forms.groupingName ||
!this.forms.sex ||
@@ -1337,7 +1340,6 @@
return; // Stop execution if any required field is empty
}
this.openOne = true;
-
this.title = "鍒嗙粍椤圭洰缁存姢";
this.OnenewpacName = [];
this.queryParams.price = 0;
@@ -1346,13 +1348,19 @@
let id = this.groupList[0].id || '';
getDetails(id).then((res) => {
this.OnenewpacName = res.data.groupingProList;
- this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
- return sum.plus(new Big(item.ysPrice || '0'));
- }, new Big(0));
- this.OnenewpacName.forEach((item, index) => {
- this.queryParams.price += item.proPrice;
- });
- this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+ // this.queryParams.xianprice = this.OnenewpacName.reduce((sum, item) => {
+ // return sum.plus(new Big(item.ysPrice || '0'));
+ // }, new Big(0)).toNumber();
+
+ // this.OnenewpacName.forEach((item, index) => {
+ // this.queryParams.price += item.proPrice;
+ // });
+ //
+
+ // this.youhui = (Math.floor((this.queryParams.xianprice / this.queryParams.price) * 100) / 100) * 10
+ this.queryParams.xianprice = res.data.ysPrice
+ this.queryParams.price= res.data.price
+ this.youhui= res.data.limits
});
}
// console.log(this.groupList[0].id, 9966);
@@ -1368,7 +1376,6 @@
deptTreeSelect(this.forms.sex).then((response) => {
// 濂楅鍚嶇О
this.newpacName = response.rows;
- console.log('5', response.rows);
this.loading = false;
response.rows.forEach((item, index) => {
item.newID =
@@ -1382,7 +1389,6 @@
deptTreeSelect().then((response) => {
this.newpacName = response.rows;
- console.log('6', response.rows);
this.loading = false;
response.rows.forEach((item, index) => {
item.newID =
@@ -1394,7 +1400,6 @@
}
getProjectList().then((response) => {
this.Treedata = response.data;
- // console.log(this.Treedata,999888);
});
},
@@ -1408,9 +1413,6 @@
proPrice: item.proPrice,
});
});
-
-
-
let data = {
groupingName: this.forms.groupingName,
@@ -1443,7 +1445,6 @@
},
// 淇敼鍒嗙粍
GroupUpdate() {
- console.log(this.$refs.elTable)
this.$refs.tbs.clearSelection();
this.forms = {
groupingName: "",
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 25dd54c..cb456aa 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1,18 +1,7 @@
<template>
<div class="app-container">
- <el-dialog
- :title="title"
- :visible.sync="open1"
- width="1000px"
- append-to-body
- >
- <el-form
- ref="form1"
- :model="form1"
- :rules="rules1"
- label-width="100px"
- :inline="true"
- >
+ <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body>
+ <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px" :inline="true">
<el-form-item label="鍗曚綅鍚嶇О" prop="cnName">
<el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" />
</el-form-item>
@@ -29,16 +18,10 @@
<el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" />
</el-form-item>
<el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress">
- <el-input
- v-model="form1.registerAddress"
- placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�"
- />
+ <el-input v-model="form1.registerAddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" />
</el-form-item>
<el-form-item label="閫氳鍦板潃" prop="mailingAddress">
- <el-input
- v-model="form1.mailingAddress"
- placeholder="璇疯緭鍏ラ�氳鍦板潃"
- />
+ <el-input v-model="form1.mailingAddress" placeholder="璇疯緭鍏ラ�氳鍦板潃" />
</el-form-item>
<el-form-item label="寮�鎴烽摱琛�" prop="bankAccount">
<el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
@@ -65,25 +48,12 @@
<el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" />
</el-form-item>
<el-form-item label="鏈夋晥鏃堕棿" prop="validTime">
- <el-date-picker
- clearable
- v-model="form1.validTime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鏈夋晥鏃堕棿"
- >
- </el-date-picker> </el-form-item
- ><br />
+ <el-date-picker clearable v-model="form1.validTime" type="date" value-format="yyyy-MM-dd"
+ placeholder="璇烽�夋嫨鏈夋晥鏃堕棿">
+ </el-date-picker> </el-form-item><br />
<el-form-item label="澶囨敞" prop="remark">
- <el-input
- v-model="form1.remark"
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- :rows="2"
- label-width="400px"
- style="width: 830px"
- resize="none"
- ></el-input>
+ <el-input v-model="form1.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :rows="2" label-width="400px"
+ style="width: 830px" resize="none"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
@@ -94,160 +64,92 @@
<el-row :gutter="20">
<el-col :span="17">
<div class="grid-content bg-purple">
- <el-form
- :inline="true"
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
<el-form-item label="鍖垮悕" prop="isNow">
- <el-select
- v-model="isNow"
- placeholder="鏄惁鍖垮悕"
- @change="freezing(isNow)"
- >
- <el-option
- v-for="dict in dictType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="isNow" placeholder="鏄惁鍖垮悕" @change="freezing(isNow)">
+ <el-option v-for="dict in dictType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="濮撳悕"
- prop="cusName"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusName) {
- callback('');
- } else if (form.cusName) {
- callback();
- }
- },
- trigger: 'blur',
+ <el-form-item label="濮撳悕" prop="cusName" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusName) {
+ callback('');
+ } else if (form.cusName) {
+ callback();
+ }
},
- ]"
- >
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="openname"
- >
+ trigger: 'blur',
+ },
+ ]">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
濮撳悕
</span>
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- :disabled="isDisabled"
- @input="form.cusName = $event.replace(/\s/g, '')"
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled"
+ @input="form.cusName = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
- <el-select
- :disabled="isDisabled"
- v-model="form.idType"
- placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_user_cardtype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select :disabled="isDisabled" v-model="form.idType" placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_user_cardtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="姘戞棌" prop="cusNational">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="form.cusNational"
- placeholder="璇烽�夋嫨姘戞棌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_national"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select filterable :disabled="isDisabled" v-model="form.cusNational" placeholder="璇烽�夋嫨姘戞棌">
+ <el-option v-for="dict in dict.type.dict_user_national" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鎬у埆"
- prop="cusSex"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusSex && showHidden.has_sex === 'Y') {
- callback('');
- } else if (showHidden.has_sex === 'N') {
- callback();
- } else if (form.cusSex && showHidden.has_sex === 'Y') {
- callback();
- }
- },
- trigger: 'blur',
+ <el-form-item label="鎬у埆" prop="cusSex" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusSex && showHidden.has_sex === 'Y') {
+ callback('');
+ } else if (showHidden.has_sex === 'N') {
+ callback();
+ } else if (form.cusSex && showHidden.has_sex === 'Y') {
+ callback();
+ }
},
- ]"
- >
- <el-select
- :disabled="isDisabled"
- v-model="form.cusSex"
- placeholder="鎬у埆"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ trigger: 'blur',
+ },
+ ]">
+ <el-select :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="璇佷欢鍙风爜"
- prop="cusIdcard"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
- callback('');
- } else if (showHidden.has_idcard === 'N') {
- callback();
- } else if (
- form.cusIdcard &&
- showHidden.has_idcard === 'Y'
- ) {
- callback();
- }
- },
- trigger: 'blur',
+ <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusIdcard && showHidden.has_idcard === 'Y') {
+ callback('');
+ } else if (showHidden.has_idcard === 'N') {
+ callback();
+ } else if (
+ form.cusIdcard &&
+ showHidden.has_idcard === 'Y'
+ ) {
+ callback();
+ }
},
- ]"
- >
- <span
- slot="label"
- style="display: inline-block; border-bottom: 2px solid blue"
- @click="handleQuery"
- >
+ trigger: 'blur',
+ },
+ ]">
+ <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
璇佷欢鍙风爜
</span>
- <el-input
- :disabled="isDisabled"
- v-model="form.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="handleIdCardInput"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="handleIdCardInput" />
<!-- <i style="
font-size: 1rem;
position: absolute;
@@ -258,127 +160,64 @@
</el-form-item>
<el-form-item label="濠氬Щ" prop="cusMarryStatus">
- <el-select
- :disabled="isDisabled"
- v-model="form.cusMarryStatus"
- placeholder="濠氬Щ鐘跺喌"
- >
- <el-option
- v-for="dict in dict.type.dict_user_marry"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select :disabled="isDisabled" v-model="form.cusMarryStatus" placeholder="濠氬Щ鐘跺喌">
+ <el-option v-for="dict in dict.type.dict_user_marry" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鐢佃瘽"
- prop="cusPhone"
- :rules="[
- {
- required: true,
- validator: (rule, value, callback) => {
- if (!form.cusPhone && showHidden.is_phone === 'Y') {
- callback('');
- } else if (showHidden.is_phone === 'N') {
- callback();
- } else if (form.cusPhone && showHidden.is_phone === 'Y') {
- callback();
- }
- },
- trigger: 'blur',
+ <el-form-item label="鐢佃瘽" prop="cusPhone" :rules="[
+ {
+ required: true,
+ validator: (rule, value, callback) => {
+ if (!form.cusPhone && showHidden.is_phone === 'Y') {
+ callback('');
+ } else if (showHidden.is_phone === 'N') {
+ callback();
+ } else if (form.cusPhone && showHidden.is_phone === 'Y') {
+ callback();
+ }
},
- ]"
- >
- <el-input
- v-model="form.cusPhone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- :disabled="isDisabled"
- @input="form.cusPhone = $event.replace(/\s/g, '')"
- />
+ trigger: 'blur',
+ },
+ ]">
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled"
+ @input="form.cusPhone = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
- <el-date-picker
- :disabled="isDisabled"
- clearable
- v-model="form.cusBrithday"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡"
- style="width: 93%"
- >
+ <el-date-picker :disabled="isDisabled" clearable v-model="form.cusBrithday" type="date"
+ value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑虹敓鏃ユ湡" style="width: 93%">
</el-date-picker>
</el-form-item>
<el-form-item label="鑱屼笟" prop="career">
- <el-select
- filterable
- :disabled="isDisabled"
- v-model="form.career"
- placeholder="璇疯緭鍏ヨ亴涓�"
- >
- <el-option
- v-for="dict in dict.type.dict_job"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select filterable :disabled="isDisabled" v-model="form.career" placeholder="璇疯緭鍏ヨ亴涓�">
+ <el-option v-for="dict in dict.type.dict_job" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="閭" prop="cusEmail">
- <el-input
- v-model="form.cusEmail"
- placeholder="璇疯緭鍏ラ偖绠�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusEmail" placeholder="璇疯緭鍏ラ偖绠�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="骞撮緞" prop="age">
- <el-input
- v-model="form.age"
- :disabled="isDisabled"
- style="width: 30%"
- />
- <el-select
- :disabled="isDisabled"
- v-model="form.ageUnit"
- style="width: 20%"
- >
- <el-option
- v-for="dict in dict.type.dict_ageunit"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-input v-model="form.age" :disabled="isDisabled" style="width: 30%" />
+ <el-select :disabled="isDisabled" v-model="form.ageUnit" style="width: 20%">
+ <el-option v-for="dict in dict.type.dict_ageunit" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-form>
- <el-form
- :inline="true"
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form :inline="true" ref="form" :model="form" :rules="rules" :label-position="labelPosition"
+ label-width="106px" v-show="top">
<el-form-item label="浠嬬粛浜�" prop="cusIntroduce">
- <el-input
- :disabled="isDisabled"
- v-model="form.cusIntroduce"
- placeholder="璇疯緭鍏ヤ粙缁嶄汉"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" />
</el-form-item>
<el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px">
- <el-input
- :disabled="isDisabled"
- v-model="form.wenHua"
- placeholder="璇疯緭鍏ユ枃鍖栫▼搴�"
- />
+ <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" />
</el-form-item>
<el-form-item label="宸ラ緞" prop="gl">
<div>
@@ -388,43 +227,23 @@
</div>
</el-form-item>
</el-form>
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
+ v-show="top">
<el-row :gutter="21">
<el-col :span="19">
<el-form-item label="鎴峰彛鍦板潃" prop="addr">
- <el-input
- v-model="form.addr"
- placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.addr" placeholder="璇疯緭鍏ユ埛鍙ｅ湴鍧�" :disabled="isDisabled" />
</el-form-item>
</el-col>
</el-row>
</el-form>
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- :label-position="labelPosition"
- label-width="106px"
- v-show="top"
- >
+ <el-form ref="form" :model="form" :rules="rules" :label-position="labelPosition" label-width="106px"
+ v-show="top">
<el-row :gutter="21">
<el-col :span="19">
<el-form-item label="鐜颁綇鍦板潃" prop="cusAddr">
- <el-input
- v-model="form.cusAddr"
- placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusAddr" placeholder="璇疯緭鍏ョ幇灞呬綇鍦板潃" :disabled="isDisabled" />
</el-form-item>
</el-col>
</el-row>
@@ -433,35 +252,11 @@
<el-row v-show="top">
<el-col :span="19">
<div style="float: right; margin-bottom: 10px">
- <el-button
- v-show="lishi"
- type="primary"
- @click="cope"
- size="mini"
- >涓�閿鍒�</el-button
- >
- <el-button
- type="primary"
- @click="inputChanges"
- v-show="lishi"
- size="mini"
- :disabled="confirm"
- >鍘嗗彶浣撴璁板綍</el-button
- >
- <el-button
- :disabled="isDisabled"
- type="primary"
- size="mini"
- @click="submitForm"
- >鐧昏</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuery"
- @queryTable="getList"
- >閲嶇疆</el-button
- >
+ <el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
+ <el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
+ :disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
+ <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
</div>
</el-col>
</el-row>
@@ -469,132 +264,50 @@
</el-col>
<el-col :span="7" v-show="top">
<div class="content" v-show="showHidden.mall_hasPhoto == 'Y'">
- <div
- v-show="hide"
- style="border: 1px dashed #dcdfe6; width: 180px; height: 180px"
- >
+ <div v-show="hide" style="border: 1px dashed #dcdfe6; width: 180px; height: 180px">
<img v-if="imageUrl" :src="imageUrl" class="avatar" />
</div>
<div v-if="imgSrc" class="img_bg_camera">
- <img
- style="
+ <img style="
width: 200px;
height: 200px;
margin-left: -20px;
margin-top: 90px;
padding-top: 1px;
- "
- :src="imgSrc"
- alt=""
- class="tx_img"
- />
+ " :src="imgSrc" alt="" class="tx_img" />
</div>
- <video
- v-show="hides"
- id="videoCamera"
- :width="videoWidth"
- :height="videoHeight"
- autoplay
- style="margin-top: 1px"
- ></video>
- <canvas
- style="display: none"
- id="canvasCamera"
- :width="videoWidth"
- :height="videoHeight"
- ></canvas>
+ <video v-show="hides" id="videoCamera" :width="videoWidth" :height="videoHeight" autoplay
+ style="margin-top: 1px"></video>
+ <canvas style="display: none" id="canvasCamera" :width="videoWidth" :height="videoHeight"></canvas>
<div class="camera_outer" style="margin-top: 10px">
- <el-button type="primary" plain size="mini" @click="getCompetence()"
- >鎵撳紑鎽勫儚澶�</el-button
- >
- <el-button type="primary" plain size="mini" @click="setImage()"
- >鎷嶇収</el-button
- >
+ <el-button type="primary" plain size="mini" @click="getCompetence()">鎵撳紑鎽勫儚澶�</el-button>
+ <el-button type="primary" plain size="mini" @click="setImage()">鎷嶇収</el-button>
<br />
</div>
</div>
</el-col>
</el-row>
- <el-dialog
- title="閫夋嫨濂楅"
- :visible.sync="taocan"
- width="70%"
- height="700px"
- :close-on-click-modal="false"
- >
- <el-tabs
- type="border-card"
- style="height: 560px; margin: 0 10px; width: 100%"
- v-model="activeNames"
- @tab-click="handleClick"
- >
+ <el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
+ <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
+ @tab-click="handleClick">
<el-tab-pane label="濂楅" name="first">
- <el-form
- :model="queryParam"
- ref="queryForm"
- size="small"
- :inline="true"
- v-if="showSearch"
- label-width="auto"
- >
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
- <el-input
- v-model="queryParam.pacName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter.native="handle"
- />
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handle"
- >鏌ヨ</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
</el-form-item>
</el-form>
<div class="tab4">
- <div
- class="grid-content bg-purple"
- style="margin-left: 5px; width: 98%"
- >
- <el-table
- v-loading="loading"
- element-loading-text="姝ｅ湪鍔犺浇涓�..."
- element-loading-spinner="el-icon-loading"
- border
- :data="newpacName"
- @selection-change="handleSelectionChange"
- height="450px"
- ref="tb"
- >
- <el-table-column
- type="selection"
- width="40px"
- align="center"
- label="閫夋嫨"
- />
- <el-table-column
- label="濂楅鍚嶇О"
- align="center"
- prop="pacName"
- width="120px"
- />
- <el-table-column
- label="濂楅浠锋牸"
- align="center"
- prop="price"
- width="120px"
- />
- <el-table-column
- label="濂楅鏄庣粏"
- align="center"
- prop="allProName"
- :show-overflow-tooltip="true"
- />
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+ border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
+ <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+ <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
</el-table>
</div>
</div>
@@ -602,84 +315,50 @@
<el-tab-pane label="缁勫悎" name="third">
<el-row :gutter="20" style="width: 100%">
<el-col :span="6" style="min-width: 200px">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
椤圭洰鍒楄〃
</div>
<el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterage">
</el-input>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packageList"
- :props="defaultProp"
- show-checkbox
- node-key="id"
- @check="handlepackage"
- :default-checked-keys="checkedkeys"
- :filter-node-method="filterpackage"
- ref="treas"
- :render-content="renderContents"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="packageList" :props="defaultProp" show-checkbox
+ node-key="id" @check="handlepackage" :default-checked-keys="checkedkeys"
+ :filter-node-method="filterpackage" ref="treas" :render-content="renderContents">
</el-tree>
</div>
</el-col>
<el-col :span="6" style="min-width: 200px">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="packagedataList"
- node-key="proId"
- :props="defaultpackProps"
- :filter-node-method="filterpackage"
- @check-change="handlePackageChecked"
- :default-checked-keys="checkedListkey1"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="packagedataList" node-key="proId"
+ :props="defaultpackProps" :filter-node-method="filterpackage" @check-change="handlePackageChecked"
+ :default-checked-keys="checkedListkey1" :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
宸查�夐」鐩垪琛�
</div>
- <el-table
- :data="DataLists"
- border
- style="width: 100%"
- height="400"
- :span-method="objectspanmethod"
- >
+ <el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
@@ -687,21 +366,11 @@
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDel(scope.row)"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDel(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -714,109 +383,61 @@
<el-tab-pane label="鍗曢」" name="second">
<el-row :gutter="20" style="width: 100%">
<el-col :span="6" style="min-width: 200px">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
椤圭洰鍒楄〃
</div>
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="filterText"
- style="margin-bottom: 10px"
- >
+ <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="filterText" style="margin-bottom: 10px">
</el-input>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="Treedata"
- :props="defaultProps"
- show-checkbox
- node-key="proId"
- @check="handleCurrentChecked"
- :default-checked-keys="checkedkey"
- :filter-node-method="filterNode"
- ref="tree"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="Treedata" :props="defaultProps" show-checkbox
+ node-key="proId" @check="handleCurrentChecked" :default-checked-keys="checkedkey"
+ :filter-node-method="filterNode" ref="tree" :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="6" style="min-width: 200px">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
鏄庣粏椤圭洰鍒楄〃
</div>
<div class="tab3">
- <el-tree
- class="filter-tree"
- v-loading="loading"
- :data="TreedataList"
- node-key="proId"
- :props="defaultProps"
- :filter-node-method="filterNode"
- show-checkbox
- @check-change="handleCurrentChecked1"
- :default-checked-keys="checkedListkey"
- :render-content="renderContent"
- >
+ <el-tree class="filter-tree" v-loading="loading" :data="TreedataList" node-key="proId"
+ :props="defaultProps" :filter-node-method="filterNode" show-checkbox
+ @check-change="handleCurrentChecked1" :default-checked-keys="checkedListkey"
+ :render-content="renderContent">
</el-tree>
</div>
</el-col>
<el-col :span="11">
<div class="grid-content bg-purple">
- <div
- style="
+ <div style="
text-align: center;
margin-bottom: 10px;
margin-top: 10px;
- "
- >
+ ">
宸查�夐」鐩垪琛�
</div>
- <el-table
- :data="DataList"
- border
- style="width: 100%"
- height="400"
- :span-method="objectSpanMethod"
- >
+ <el-table :data="DataList" border style="width: 100%" height="400" :span-method="objectSpanMethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
</el-table-column>
- <el-table-column
- prop="proName"
- label="鏄庣粏椤圭洰"
- width="260px"
- >
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
</el-table-column>
<el-table-column prop="sl" label="鏁伴噺" width="56px">
</el-table-column>
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- fixed="right"
- class-name="small-padding fixed-width"
- width="50px"
- >
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width"
+ width="50px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- title="鍒犻櫎"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ title="鍒犻櫎"></el-button>
</template>
</el-table-column>
</el-table>
@@ -836,198 +457,81 @@
<el-col :span="15">
<div class="grid-content bg-purple">
<template>
- <el-form
- :model="form"
- :inline="true"
- label-width="75px"
- style="margin-left: 20px; width: 900px"
- >
+ <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px">
<el-form-item label="濮撳悕" prop="cusName">
<span slot="label"> 濮撳悕 </span>
- <el-input
- v-model="form.cusName"
- placeholder="璇疯緭鍏ュ鍚�"
- :disabled="isDisabled"
- />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" />
</el-form-item>
<el-form-item label="鎬у埆" prop="cusSex">
- <el-select
- :disabled="isDisabled"
- v-model="form.cusSex"
- placeholder="鎬у埆"
- style="width: 150px"
- >
- <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 :disabled="isDisabled" v-model="form.cusSex" placeholder="鎬у埆" style="width: 150px">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="璇佷欢鍙风爜" prop="cusIdcard">
<span slot="label"> 璇佷欢鍙风爜 </span>
- <el-input
- :disabled="isDisabled"
- v-model="form.cusIdcard"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
- @input="inputChange"
- />
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" />
</el-form-item>
<el-form-item label="鍗曚綅鍚嶇О" prop="firmName">
- <el-select
- v-model="form.firmName"
- remote
- default-first-option
- allow-create
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
- clearable
- @change="idFn1"
- @clear="clear"
- >
- <el-option
- v-for="dict in CompanyList"
- :key="dict.cnName"
- :label="dict.cnName"
- :value="dict.cnName"
- />
+ <el-select v-model="form.firmName" remote default-first-option allow-create filterable
+ style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @clear="clear">
+ <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" />
</el-select>
</el-form-item>
<el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName">
- <el-input
- v-model="form.firmDeptName"
- style="width: 150px"
- placeholder="璇疯緭鍏ュ崟浣嶉儴闂�"
- @input="inputChange"
- />
+ <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" />
</el-form-item>
<el-form-item label="浣撴绫诲瀷">
<el-select 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-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>
<el-form-item label="浣撴绫诲埆">
- <el-select
- style="width: 200px"
- v-model="tjCategory"
- placeholder="璇烽�夋嫨浣撴绫诲埆"
- >
- <el-option
- v-for="dict in dict.type.dict_tjtype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆">
+ <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
<!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> -->
</el-form-item>
<el-form-item label="搴旀敹閲戦">
- <el-input
- placeholder="搴旀敹閲戦"
- v-model="TotalPrice1"
- disabled
- style="width: 150px"
- ></el-input>
+ <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input>
</el-form-item>
<el-form-item label="鎶樻墸">
<!-- {{ discount }} -->
- <el-input-number
- ref="inputNumber"
- style="width: 150px"
- v-model="discount"
- :precision="1"
- :step="0.1"
- :max="10"
- :min="0"
- @change="debounceNumberChange"
- :disabled="isfalse"
- ></el-input-number>
+ <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1"
+ :max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input
- placeholder="瀹炴敹閲戦"
- v-model="TotalPrice"
- style="width: 206px"
- @input="changeXianjia"
- @blur="numberChangeXianPrice(discount, discount)"
- />
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
+ @blur="numberChangeXianPrice(discount, discount)" />
</el-form-item>
<br />
<el-form-item style="margin-left: 149px">
- <el-button
- type="primary"
- @click="Package"
- size="mini"
- style="margin-right: 20px"
- >閫夋嫨濂楅</el-button
- >
- <el-button
- type="primary"
- @click="resetpackage"
- size="mini"
- style="margin-right: 20px"
- >閲嶇疆濂楅</el-button
- >
- <el-button
- type="primary"
- @click="submitPrice"
- :loading="loadingSubmit"
- :disabled="loadingSubmit"
- v-if="showHidden.has_charge == 'N'"
- size="mini"
- >绛惧埌鐧昏</el-button
- >
- <el-button
- type="primary"
- @click="submitCheckinfee"
- :disabled="confirm"
- v-if="showHidden.has_charge == 'Y'"
- size="mini"
- >鐧昏鏀惰垂</el-button
- >
+ <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button>
+ <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button>
+ <el-button type="primary" @click="submitPrice" :loading="loadingSubmit" :disabled="loadingSubmit"
+ v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button>
+ <el-button type="primary" @click="submitCheckinfee" :disabled="confirm"
+ v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button>
</el-form-item>
<!-- </el-form> -->
<!-- </div> -->
</el-form>
</template>
- <el-dialog
- title="閭瘎"
- :visible.sync="malldisble"
- :close-on-click-modal="false"
- >
- <el-form
- :model="addAddress"
- :rules="rules"
- label-width="78px"
- style="margin-left: 7px"
- >
+ <el-dialog title="閭瘎" :visible.sync="malldisble" :close-on-click-modal="false">
+ <el-form :model="addAddress" :rules="rules" label-width="78px" style="margin-left: 7px">
<el-form-item label="濮撳悕">
- <el-input
- placeholder="濮撳悕"
- v-model="addAddress.getUser"
- ></el-input>
+ <el-input placeholder="濮撳悕" v-model="addAddress.getUser"></el-input>
</el-form-item>
<el-form-item label="鐢佃瘽">
- <el-input
- placeholder="鐢佃瘽"
- v-model="addAddress.phone"
- ></el-input>
+ <el-input placeholder="鐢佃瘽" v-model="addAddress.phone"></el-input>
</el-form-item>
<el-form-item label="鍦板潃">
- <el-input
- placeholder="鍦板潃"
- v-model="addAddress.address"
- ></el-input>
+ <el-input placeholder="鍦板潃" v-model="addAddress.address"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -1036,44 +540,36 @@
</div>
</el-dialog>
- <div
- style="
+ <div style="
display: flex;
align-items: center;
justify-content: flex-start;
width: 100%;
- "
- >
- <div
- style="
+ ">
+ <div style="
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin-left: 46px;
font-size: 16px;
margin-right: 20px;
- "
- >
+ ">
<span v-if="this.tableData1[0]">{{
this.tableData1[0].pacName || ""
}}</span>
- 宸查�夐」鐩潯鏁帮細<span
- style="font-weight: 700; color: red; margin-right: 5px"
- >{{ this.tableData1.length || 0 }}</span
- >鏉�
+ 宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
+ }}</span>鏉�
</div>
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 650%;
overflow: auto;
width: 916px;
margin-left: 35px;
- "
- >
+ ">
<el-table :data="tableData1" border style="width: 100%">
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
@@ -1081,10 +577,7 @@
<template slot-scope="scope">
<template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template>
<template v-else>
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.proType"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" />
</template>
</template>
</el-table-column>
@@ -1094,18 +587,9 @@
<el-table-column label="鎶樻墸">
<template slot-scope="scope">
<!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 -->
- <el-input-number
- v-model.number="scope.row.discount"
- @input="validateDiscount(scope.row)"
- @change="handleManualChange(scope.row)"
- placeholder="杈撳叆鎶樻墸"
- size="small"
- type="number"
- :precision="1"
- :step="0.1"
- :max="10"
- :min="0"
- >
+ <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)"
+ @change="handleManualChange(scope.row)" placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1"
+ :step="0.1" :max="10" :min="0">
</el-input-number>
</template>
</el-table-column>
@@ -1116,10 +600,7 @@
</el-table-column>
<el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_yes_no"
- :value="scope.row.proCheckMethod"
- />
+ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" />
</template>
</el-table-column>
<!-- <el-table-column prop="proCheckMethod" label="鍏垂">
@@ -1131,13 +612,7 @@
</el-table-column> -->
<el-table-column label="鎿嶄綔" align="center" width="80px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete1(scope.row)"
- title="鍒犻櫎"
- >
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎">
</el-button>
</template>
</el-table-column>
@@ -1147,163 +622,63 @@
</el-col>
</el-row>
- <el-dialog
- title="瀵兼鍗曢瑙�"
- :visible.sync="dialogVisibles"
- :close-on-click-modal="false"
- >
+ <el-dialog title="瀵兼鍗曢瑙�" :visible.sync="dialogVisibles" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<el-dialog title="鏀惰垂" :visible.sync="charge" width="59%" height="700px">
<div>
- <el-table
- id="sig"
- v-loading="loading"
- :data="feeitems"
- @selection-change="handleSelect"
- tooltip-effect="dark"
- ref="multipleTable"
- border
- >
+ <el-table id="sig" v-loading="loading" :data="feeitems" @selection-change="handleSelect" tooltip-effect="dark"
+ ref="multipleTable" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="tjName"
- width="100px"
- />
+ <el-table-column label="濮撳悕" align="center" prop="tjName" width="100px" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="90px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="scope.row.sex"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
- <el-table-column
- label="韬唤璇�"
- align="center"
- prop="idCard"
- width="150px"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="鎵嬫満鍙�"
- align="center"
- prop="tjPhone"
- width="120px"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- width="160px"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="tjFlowingWater.createTime"
- :show-overflow-tooltip="true"
- ></el-table-column>
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="tjComp"
- ></el-table-column>
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- >
+ <el-table-column label="韬唤璇�" align="center" prop="idCard" width="150px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鎵嬫満鍙�" align="center" prop="tjPhone" width="120px"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" width="160px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjFlowingWater.createTime"
+ :show-overflow-tooltip="true"></el-table-column>
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.dict_team"
- :value="scope.row.tjType"
- />
+ <dict-tag :options="dict.type.dict_team" :value="scope.row.tjType" />
</template>
</el-table-column>
- <el-table-column
- label="璁㈠崟娴佹按鍙�"
- align="center"
- prop="tjFlowingWater.waterId"
- width="200px"
- />
- <el-table-column
- label="鏀惰垂鍛�"
- align="center"
- prop="tjFlowingWater.updateBy"
- width="100px"
- />
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="200px" />
+ <el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
</el-table>
<el-row :gutter="10" class="mb8">
<el-col :span="20">
- <el-form
- :inline="true"
- :model="formInline"
- class="demo-form-inline"
- style="margin: 12px 6px"
- >
+ <el-form :inline="true" :model="formInline" class="demo-form-inline" style="margin: 12px 6px">
<el-form-item label="搴旀敹閲戦">
- <el-input
- style="width: 86px"
- :value="formInline.price + '.00'"
- placeholder="閲戦"
- :disabled="true"
- ></el-input>
+ <el-input style="width: 86px" :value="formInline.price + '.00'" placeholder="閲戦"
+ :disabled="true"></el-input>
</el-form-item>
<el-form-item label="浼樻儬">
- <el-input-number
- style="width: 140px"
- v-model="discount"
- :precision="1"
- :step="0.1"
- :max="10"
- :min="0"
- @change="debounceNumberChange"
- :disabled="isfalse"
- ></el-input-number>
+ <el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0"
+ @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input
- v-model="formInline.paidIn"
- placeholder="瀹炰粯"
- style="width: 94px"
- >
+ <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px">
</el-input>
</el-form-item>
<el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="formInline.payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 120px" v-model="formInline.payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- style="margin-left: 15px"
- type="primary"
- size="mini"
- @click="SubmitEvent"
- >鏀惰垂</el-button
- >
+ <el-button style="margin-left: 15px" type="primary" size="mini" @click="SubmitEvent">鏀惰垂</el-button>
</el-form-item>
</el-form>
</el-col>
@@ -1317,24 +692,15 @@
</el-table>
</div>
</el-dialog>
- <el-dialog
- title="鎻愮ず"
- :visible.sync="cardreader"
- width="30%"
- :close-on-press-escape="false"
- :close-on-click-modal="false"
- >
+ <el-dialog title="鎻愮ず" :visible.sync="cardreader" width="30%" :close-on-press-escape="false"
+ :close-on-click-modal="false">
<template>
<el-radio-group v-model="cardreaderradio" @input="changeradio">
<el-radio :label="3">韬唤璇�</el-radio>
<el-radio :label="6">鍋ュ悍鐮�</el-radio>
</el-radio-group>
<div style="margin-top: 10px" v-show="cardreaderradio == 6">
- <el-input
- v-model="inputSSS"
- ref="tableHeadFilterInp"
- placeholder="璇疯緭鍏ュ唴瀹�"
- ></el-input>
+ <el-input v-model="inputSSS" ref="tableHeadFilterInp" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</div>
</template>
<span slot="footer" class="dialog-footer">
@@ -1343,11 +709,7 @@
</span>
</el-dialog>
<div style="position: absolute; bottom: 100px; width: 360px; display: none">
- <div
- id="printBill"
- style="width: 280px; font-size: 1px"
- ref="printContent"
- >
+ <div id="printBill" style="width: 280px; font-size: 1px" ref="printContent">
<div style="font-size: 1px">
<div style="text-align: center">
<h3>{{ hospName }}灏忕エ</h3>
@@ -1793,7 +1155,7 @@
});
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
handleManualChange(row) {
this.updateProPrice(row);
@@ -2026,8 +1388,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
this.form.cusSex = sex;
@@ -2186,7 +1548,7 @@
_this.thisVideo.play();
};
})
- .catch((err) => {});
+ .catch((err) => { });
},
// 缁樺埗鍥剧墖锛堟媿鐓у姛鑳斤級
@@ -2221,12 +1583,12 @@
.then((_) => {
done();
})
- .catch((_) => {});
+ .catch((_) => { });
},
/** 鏌ヨ淇℃伅鍒楄〃 */
getList() {
- getInfo().then((response) => {});
+ getInfo().then((response) => { });
let cusSex = this.form.cusSex;
//鍏ㄩ儴濂楅
if (cusSex) {
@@ -2291,7 +1653,7 @@
pacId: "",
proIds: [],
};
- getaddtTransition(data).then((response) => {});
+ getaddtTransition(data).then((response) => { });
this.$tab.refreshPage();
});
} else {
@@ -2378,49 +1740,49 @@
/** 鐧昏鎻愪氦鎸夐挳 */
submitForm() {
let _this = this;
- if(!this.form.cusPhone || !this.form.cusName){
+ if (!this.form.cusPhone || !this.form.cusName) {
this.$message.warning("璇峰～鍐欏繀濉」");
- }else{
+ } else {
this.$refs["form"].validate((valid) => {
- if (valid) {
- // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
- const formData = { ...this.form };
- formData.cusName = formData.cusName
- ? formData.cusName.replace(/\s/g, "")
- : "";
- formData.cusPhone = formData.cusPhone
- ? formData.cusPhone.replace(/\s/g, "")
- : "";
- formData.cusIdcard = formData.cusIdcard
- ? formData.cusIdcard.replace(/\s/g, "")
- : "";
+ if (valid) {
+ // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
+ const formData = { ...this.form };
+ formData.cusName = formData.cusName
+ ? formData.cusName.replace(/\s/g, "")
+ : "";
+ formData.cusPhone = formData.cusPhone
+ ? formData.cusPhone.replace(/\s/g, "")
+ : "";
+ formData.cusIdcard = formData.cusIdcard
+ ? formData.cusIdcard.replace(/\s/g, "")
+ : "";
- // 澶勭悊鎬у埆鍊�
- if (formData.cusSex === "濂�") {
- formData.cusSex = 1;
- }
- if (formData.cusSex === "鐢�") {
- formData.cusSex = 0;
- }
- if (formData.cusSex === "鏈煡") {
- formData.cusSex = 2;
- }
- if (formData.tjType === "") {
- formData.tjType = this.dict.type.dict_team[0].value;
- }
+ // 澶勭悊鎬у埆鍊�
+ if (formData.cusSex === "濂�") {
+ formData.cusSex = 1;
+ }
+ if (formData.cusSex === "鐢�") {
+ formData.cusSex = 0;
+ }
+ if (formData.cusSex === "鏈煡") {
+ formData.cusSex = 2;
+ }
+ if (formData.tjType === "") {
+ formData.tjType = this.dict.type.dict_team[0].value;
+ }
- addCustomer(formData).then((response) => {
- this.responseList = response.data;
- this.form.tjType = this.dict.type.dict_team[0].value;
- this.$modal.msgSuccess("鏂板鎴愬姛");
- _this.tcShow = true;
- _this.isDisabled = true;
- _this.top = false;
- });
- }
- });
+ addCustomer(formData).then((response) => {
+ this.responseList = response.data;
+ this.form.tjType = this.dict.type.dict_team[0].value;
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.tcShow = true;
+ _this.isDisabled = true;
+ _this.top = false;
+ });
+ }
+ });
}
-
+
},
getmailType() {
@@ -2623,8 +1985,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
_this.form.age = age; // 璧嬪�艰绠楃殑骞撮緞
@@ -2771,8 +2133,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
@@ -2873,8 +2235,8 @@
d.getFullYear() -
birthdays.getFullYear() -
(d.getMonth() < birthdays.getMonth() ||
- (d.getMonth() == birthdays.getMonth() &&
- d.getDate() < birthdays.getDate())
+ (d.getMonth() == birthdays.getMonth() &&
+ d.getDate() < birthdays.getDate())
? 1
: 0);
@@ -3012,10 +2374,10 @@
Package() {
this.activeNames = "first";
if (this.form.cusSex == "鐢�") {
- this.form.cusSex = 0;
- } else if (this.form.cusSex == "濂�"){
- _this.form.cusSex = 1;
- }
+ this.form.cusSex = 0;
+ } else if (this.form.cusSex == "濂�") {
+ _this.form.cusSex = 1;
+ }
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
@@ -3050,7 +2412,7 @@
});
});
}
- } catch (error) {}
+ } catch (error) { }
this.loading = false;
});
} else {
@@ -3073,7 +2435,7 @@
});
});
}
- } catch (error) {}
+ } catch (error) { }
this.loading = false;
});
}
@@ -3097,7 +2459,7 @@
});
});
}
- } catch (error) {}
+ } catch (error) { }
this.loading = false;
});
}
@@ -3618,6 +2980,9 @@
let Price = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
+ if (typeof item.nowPrice === 'number') {
+ item.nowPrice = Number(item.nowPrice.toFixed(2));
+ }
if (item.tjCategory != null) {
this.tjCategory = item.tjCategory;
}
@@ -3634,7 +2999,7 @@
this.discount =
this.TotalPrice1 > 0
? (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) *
- 10
+ 10
: 0;
this.list1 = false;
@@ -3912,11 +3277,11 @@
listgetOrder(data) {
const loading = this.$loading({
- lock: true,
- text: '姝ｅ湪鍔犺浇涓紝璇风◢绛夛紒',
- spinner: 'el-icon-loading',
- background: 'rgba(0, 0, 0, 0.7)'
- });
+ lock: true,
+ text: '姝ｅ湪鍔犺浇涓紝璇风◢绛夛紒',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
getOrder(data).then((res) => {
loading.close();
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
--
Gitblit v1.8.0