From d747406e0eb22d47726916be55e85376c4aa2729 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期三, 04 十二月 2024 18:23:14 +0800
Subject: [PATCH] 12.04
---
src/views/doctor/check/index.vue | 2
src/views/system/tijian/index.vue | 14 ++--
vue.config.js | 6 +-
src/views/system/register/index.vue | 4 +
src/views/reservation/resercopy/index.vue | 41 +++++++++----
src/views/hosp/customer/index.vue | 13 +++-
src/api/team/tuanti.js | 7 ++
src/views/sampling/sampling/index.vue | 70 +++++++++++++++--------
8 files changed, 106 insertions(+), 51 deletions(-)
diff --git a/src/api/team/tuanti.js b/src/api/team/tuanti.js
index 024a847..8df59b8 100644
--- a/src/api/team/tuanti.js
+++ b/src/api/team/tuanti.js
@@ -38,7 +38,12 @@
})
}
-
+export function getconfigKey(configKey) {
+ return request({
+ url: "/system/config/configKey/" + configKey,
+ method: "get",
+ });
+}
//
export function getTeamTjPeopleList(teamNo) {
return request({
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index de9a182..4808d0a 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -1789,6 +1789,8 @@
this.loading = true;
this.queryParams.type = this.tjStatus;
getProList(this.queryParams).then((response) => {
+ console.log(response,1212);
+
if (response.code == 200) {
this.loading = false;
if (response.data) {
diff --git a/src/views/hosp/customer/index.vue b/src/views/hosp/customer/index.vue
index a783e3d..a67d25d 100644
--- a/src/views/hosp/customer/index.vue
+++ b/src/views/hosp/customer/index.vue
@@ -541,6 +541,13 @@
style="width: 200px"
/>
</el-form-item>
+ <!-- <el-form-item label="宸ヤ綔鍗曚綅" prop="">
+ <el-input
+ v-model="form."
+ placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
+ style="width: 820px"
+ />
+ </el-form-item> -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -947,9 +954,9 @@
cusBrithday: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
- cusAddr: [
- { required: true, validator: checkPhoneNum, trigger: "blur" },
- ],
+ // cusAddr: [
+ // { required: true, validator: checkPhoneNum, trigger: "blur" },
+ // ],
cusPhone: [
{ required: true, validator: checkPhoneNum, trigger: "blur" },
],
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index eedffce..fcb7661 100644
--- a/src/views/reservation/resercopy/index.vue
+++ b/src/views/reservation/resercopy/index.vue
@@ -67,7 +67,7 @@
</el-form-item>
<el-form-item label="鏈夋晥澶╂暟" prop="yxts">
<el-input
- style="width:100px"
+ style="width: 100px"
v-model="objs.yxts"
placeholder="鏈夋晥澶╂暟"
/>澶�(鍙嚜瀹氫箟)
@@ -90,7 +90,6 @@
icon="el-icon-upload2"
size="mini"
@click="handleImport"
-
>瀵煎叆</el-button
>
</el-col>
@@ -100,7 +99,6 @@
icon="el-icon-upload2"
size="mini"
@click="importTemplate"
-
>涓嬭浇妯℃澘</el-button
>
</el-col>
@@ -231,7 +229,7 @@
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitFileForm">淇濆瓨淇℃伅</el-button>
<el-button @click="upload.open = false">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -399,9 +397,13 @@
getDwAndDwDept,
newExcelImport,
} from "@/api/system/comp";
-import { newConfirm, getCompany, queryCompany } from "@/api/team/tuanti";
+import {
+ newConfirm,
+ getCompany,
+ queryCompany,
+ getconfigKey,
+} from "@/api/team/tuanti";
import { getToken } from "@/utils/auth";
-import { read, utils } from "xlsx";
export default {
dicts: [
@@ -475,7 +477,7 @@
objs: {
drugManufacturerId: "",
reservationTime: "",
- yxts: "30",
+ yxts: "",
},
DataList: [],
tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
@@ -769,6 +771,7 @@
},
// 鎼滅储
getRemoteData(query) {
+
if (query) {
let compName = query;
queryCompany(compName).then((response) => {
@@ -783,6 +786,10 @@
// 鑾峰彇鍗曚綅淇℃伅闆嗗悎
getCompanyList() {
this.loading = true;
+ getconfigKey('team_reservation_default_day').then((res) => {
+ console.log(res, 1111);
+ this.objs.yxts = res.msg;
+ });
getCompany(this.queryParam).then((response) => {
this.CompanyList = response.data;
this.total = response.total;
@@ -844,6 +851,7 @@
this.TotalPrice = "";
this.tableData[0] = [];
this.TotalPrice1 = "";
+ this.userList = []
// this.resetForm("form");
this.form = {};
},
@@ -852,7 +860,6 @@
selectTime(val) {
this.objs.reservationTime = val;
},
-
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
if (this.objs.drugManufacturerId && this.objs.reservationTime) {
@@ -876,14 +883,24 @@
},
// 鏂囦欢涓婁紶鎴愬姛澶勭悊
handleFileSuccess(response, file, fileList) {
- console.log(response,666666);
- if (response.code == 500) {
+ console.log(response, 666666);
+ if (response.code == 500) {
console.log(22222222222);
// Message.warning(response.msg);
- this.$modal.msgError(response.msg);
+ // this.$modal.msgError(response.msg);
+ // this.$modal.msgError("浜哄憳"+ response.data.list + "淇℃伅閿欒");
+ const errorList = response.data.list.join(", ");
+ this.$confirm(`${errorList}`, "浠ヤ笅浜哄憳淇℃伅鏈夎锛岃鏍稿鍚庡鍏ワ細", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "error",
+ center: true,
+ dangerouslyUseHTMLString: true,
+ });
}
this.ListObj = response.data;
this.userList = response.data.list;
+
this.userList.forEach((item) => {
this.CompanyList.forEach((item1) => {
if (item1.drugManufacturerId == this.objs.drugManufacturerId) {
@@ -896,7 +913,7 @@
this.$refs.upload.clearFiles();
this.leftList = response.msg;
console.log(response.code);
-
+
if (this.leftList == "鎿嶄綔澶辫触") {
this.isdisabled = true;
this.$alert(
diff --git a/src/views/sampling/sampling/index.vue b/src/views/sampling/sampling/index.vue
index 1d411b0..fa9158e 100644
--- a/src/views/sampling/sampling/index.vue
+++ b/src/views/sampling/sampling/index.vue
@@ -96,23 +96,18 @@
v-if="samplingList.length > 0 && tjStatus == 1"
>
<el-button type="primary" @click="Merging">鍚堝苟椤圭洰</el-button>
- <el-button
+ <!-- <el-button
type="primary"
icon="el-icon-thumb"
style="margin: 0 15px"
v-hasPermi="['hosp:detail:add']"
@click="Confirmreceipt"
>纭閲囨牱</el-button
- >
+ > -->
<el-button type="primary" :disabled="!disabled" @click="Cancellation"
>鎾ら攢鍚堝苟</el-button
>
- <el-button
- type="primary"
- :disabled="!selectList.length"
- @click="Collection"
- >閲囨牱鎵撶爜</el-button
- >
+ <el-button type="primary" @click="Confirmreceipt">閲囨牱鎵撶爜</el-button>
</el-col>
<el-col
:span="12"
@@ -190,15 +185,21 @@
</el-table>
</div>
<div style="width: 50%">
+ <!-- :default-sort="{ prop: 'specimenType', order: 'ascending' }" :default-sort="{ prop: 'specimenType', order: 'ascending' }"
+ @sort-change="handleSortChange"
+ :span-method="objectSpanMethod"
+ @selection-change="handleChange" ref="tab1"
+ :row-class-name="tableRowClassName"-->
<el-table
v-loading="loading"
:data="tableList"
- :span-method="objectSpanMethod"
+ @sort-change="handleSortChange"
@selection-change="handleChange"
- border
- height="520px"
+ :span-method="objectSpanMethod"
ref="tab1"
:row-class-name="tableRowClassName"
+ border
+ height="520px"
>
<el-table-column type="selection" width="40" align="center" />
<!-- :selectable="selectEnable" -->
@@ -291,8 +292,9 @@
</div>
<div class="tj">
<span>浣撴涓績</span>
- <span>{{ item.cardId.substring(0, 14) }}</span>
- <!-- <span>{{ item.cardId ? item.cardId.substring(0, 14) : '' }}</span> -->
+ <!-- <span>{{ item.cardId.slice(0, 14) }}</span> -->
+ <!-- <span>{{ item.cardId }}</span> -->
+ <span>{{ item.cardId ? item.cardId.substring(0, 14) : "" }}</span>
</div>
<div class="tj">
<span>{{ item.jyxh }}</span>
@@ -477,17 +479,34 @@
},
methods: {
+ handleSortChange({ prop, order }) {
+ if (order === null) return; // 鏃犳帓搴忔椂涓嶅鐞�
+
+ this.tableList.sort((a, b) => {
+ // 濡傛灉鏍囨湰绫诲瀷鐩稿悓锛岀户缁寜鐓ч噰鏍风紪鍙锋帓搴�
+ if (a.jyxh !== b.jyxh) {
+ return order === "ascending" ? a.jyxh - b.jyxh : b.jyxh - a.jyxh;
+ }
+
+ return 0;
+ });
+ },
getTruncatedName(proName) {
// 鍘绘帀鎵�鏈夌┖鏍�
const trimmedProName = proName.replace(/\s+/g, "");
+
const number = this.msg;
const truncated =
trimmedProName.length > number
? trimmedProName.slice(0, number)
: trimmedProName;
- const remaining =
+ let remaining =
trimmedProName.length > number ? trimmedProName.slice(number) : "";
+
+ if (remaining.length > number) {
+ remaining = remaining.slice(0, number) + "...";
+ }
return { truncated, remaining }; // 杩斿洖缁撴灉
},
@@ -717,8 +736,9 @@
getCusCyList(cusId, this.tjStatus) // 璋冪敤API鑾峰彇鏁版嵁
.then((response) => {
if (response.data) {
+ console.log(response, 2525);
+
this.tableList = response.data; // 纭 list 瀛樺湪鍚庡啀杩涜璧嬪��
- // console.log(this.tableList, 123);
} else {
// 濡傛灉娌℃湁鏁版嵁鎴� list 涓虹┖锛屾竻绌鸿〃鏍煎苟鎻愮ず
this.tableList = [];
@@ -963,24 +983,26 @@
// 纭閲囨牱
Confirmreceipt() {
let data = this.ids;
- if (data.length === 0) {
- // 濡傛灉娌℃湁宸插悎骞剁殑椤圭洰锛岀粰鍑烘彁绀轰俊鎭�
- this.$message.error("娌℃湁宸插悎骞剁殑椤圭洰鍙互鎾ら攢锛�");
- return;
- }
+ console.log(this.ids, 999);
+
const loadingInstance = this.$loading({
lock: true, // 閿佸畾灞忓箷
text: "鍔犺浇涓�...", // 鍔犺浇鏂囨湰
spinner: "el-icon-loading", // 鑷畾涔夊姞杞藉浘鏍�
background: "rgba(255, 255, 255, 0.7)", // 鑳屾櫙棰滆壊
});
- confirmSampling(data)
+ confirmSampling(this.ids)
.then((res) => {
- this.$modal.msgSuccess("閲囨牱鎴愬姛");
- this.getList();
+ if (res.code === 200) {
+ this.$modal.msgSuccess("閲囨牱鎴愬姛");
+ this.Collection();
+ }else{
+ this.$message.error(res.msg)
+ }
+ // this.getList();
})
.catch((error) => {
- this.$message.error("閲囨牱澶辫触");
+ this.$message.error(res.msg);
})
.finally(() => {
loadingInstance.close();
diff --git a/src/views/system/register/index.vue b/src/views/system/register/index.vue
index fa0a83f..d05d416 100644
--- a/src/views/system/register/index.vue
+++ b/src/views/system/register/index.vue
@@ -125,7 +125,7 @@
<span>{{ parseTime(scope.row.reservationTime) }}</span>
</template> -->
</el-table-column>
- <el-table-column label="鎾ら攢浜哄憳" align="center" prop="name" width="100px" height="10px" :show-overflow-tooltip="true">
+ <el-table-column label="鎾ら攢浜哄憳" align="center" prop="updateBy" width="100px" height="10px" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.reservationTime) }}</span>
</template> -->
@@ -497,6 +497,8 @@
this.loading = true;
let token = user.state.token;
getselectTj(token).then((response) => {
+ console.log(response,9999);
+
this.orderList = response.rows;
response.rows.forEach((item, index) => {
item.newID =
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 6f317e7..29f9479 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1653,12 +1653,13 @@
// 琛ㄥ崟鍙傛暟
// 琛ㄥ崟鍙傛暟
+ obj: {},
form: {
cusIdcard: "",
tjType: "3",
cusSex: 1,
cusNational: "1",
- cusMarryStatus: "1",
+ cusMarryStatus: "5",
idType: "1",
ageUnit: "0",
},
@@ -2278,7 +2279,6 @@
// this.$message.error("姝ょ敤鎴蜂笉瀛樺湪");
// });
} else {
-
let configKey = "getInfoFromSqlData";
getconfigKey(configKey).then((res) => {
console.log(res);
@@ -2326,7 +2326,7 @@
websocket.onmessage = function (event) {
var resultObj = eval("(" + event.data + ")");
//resultFlag涓�0浠ｈ〃璇诲崱鎴愬姛
-
+
if (
resultObj.name == "readCard" ||
resultObj.name == "readCert" ||
@@ -2972,10 +2972,10 @@
let proId = this.packagedataList[i].proId;
this.checkedListkey1.push(proId);
// this.DataLists.push(this.packagedataList[i]);
- getProSonDxList(proId).then((res) => {
+ getProSonDxList(proId).then((res) => {
this.TreedataList = res.data.list;
- console.log(this.TreedataList,888);
-
+ console.log(this.TreedataList, 888);
+
this.TreedataList.forEach((item) => {
// this.checkedListkey1.push(item.proId);
@@ -2985,7 +2985,7 @@
this.marryalls = 0;
this.DataLists.forEach((item1) => {
this.marryalls += item1.proPrice;
-
+
this.packagedataList.forEach((item3) => {
if (item1.proParentId == item3.proId) {
item1.propinName = item3.proName;
diff --git a/vue.config.js b/vue.config.js
index 8eb252c..b918948 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,9 +53,9 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
- target: `http://localhost:5011`,
- target: `http://192.168.1.3:5011`,
- // target: `http://192.168.1.113:5011`,
+ // target: `http://localhost:5011`,
+ // target: `http://192.168.1.3:5011`,
+ target: `http://192.168.1.113:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0