From 33b53ec9f9804067fa30fe0b8d5e16a0ae2368e1 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期一, 20 一月 2025 17:24:28 +0800
Subject: [PATCH] 111
---
src/views/system/tijian/index.vue | 9
src/views/hosp/order/index.vue | 44 ++-
vue.config.js | 4
src/views/doctor/examination/index.vue | 5
src/views/doctor/inspectCheck/index.vue | 457 ++++++++++++++++++++++++++++++++++++++
src/views/hosp/advicerules/index.vue | 63 ++--
src/views/system/biol/index.vue | 66 +++--
src/views/system/package/index.vue | 31 +-
src/views/system/Checkout/index.vue | 5
src/api/doctor/pacsCheck.js | 21 +
10 files changed, 612 insertions(+), 93 deletions(-)
diff --git a/src/api/doctor/pacsCheck.js b/src/api/doctor/pacsCheck.js
index 1b8c931..e7dd57e 100644
--- a/src/api/doctor/pacsCheck.js
+++ b/src/api/doctor/pacsCheck.js
@@ -29,3 +29,24 @@
data:data
})
}
+
+// 妫�楠岃褰�
+export function getlisList(data) {
+ return request({
+ url: '/api/His/lis/getList',
+ method: 'post',
+ data:data
+ })
+}
+
+// 妫�楠屼綋妫�璁板綍
+export function getJyTjList(code) {
+ return request({
+ url: '/api/His/getJyTjList',
+ method: 'get',
+ params:{
+ code:code
+ }
+ })
+}
+
diff --git a/src/views/doctor/examination/index.vue b/src/views/doctor/examination/index.vue
index 7cbcd70..3e35e8f 100644
--- a/src/views/doctor/examination/index.vue
+++ b/src/views/doctor/examination/index.vue
@@ -303,6 +303,7 @@
size="mini"
type="text"
:disabled="scope.row.type === 1"
+ :loading="scope.row.isLoading"
@click="qijian(scope.row)"
>{{ scope.row.type === 0 ? "寮冩" : "鎭㈠" }}</el-button
>
@@ -415,6 +416,7 @@
jieguoList: [],
jyjc: null,
dis: false,
+ isLoading:false,
createTimeList: "",
currentRow: null,
total: 0,
@@ -783,6 +785,7 @@
qijian(row) {
const tjNUm = this.selectedTjNumber;
const proId = row.proId;
+ row.isLoading = true;
if (row.type == "2") {
huifu(tjNUm, proId).then((res) => {
if (res.code == 200) {
@@ -790,6 +793,7 @@
if (res.code === 200) {
// 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
this.xiangmuList = res.data;
+ row.isLoading = false
}
});
}
@@ -801,6 +805,7 @@
if (res.code === 200) {
// 鏇存柊鍙宠竟琛ㄦ牸鐨勬暟鎹�
this.xiangmuList = res.data;
+ this.isLoading = false
}
});
}
diff --git a/src/views/doctor/inspectCheck/index.vue b/src/views/doctor/inspectCheck/index.vue
new file mode 100644
index 0000000..02ef381
--- /dev/null
+++ b/src/views/doctor/inspectCheck/index.vue
@@ -0,0 +1,457 @@
+<template>
+ <div class="app-container">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="浣撴鍙�" prop="reportDoctorCode">
+ <el-input
+ ref="inputName"
+ v-model="queryParams.tjNum"
+ placeholder="璇疯緭鍏ヤ綋妫�鍙�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ style="width: 170px"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ style="margin-right: 15px"
+ >鏌ヨ</el-button
+ >
+ <el-button
+ icon="el-icon-refresh"
+ type="primary"
+ size="mini"
+ @click="resetQuery"
+ >閲嶇疆</el-button
+ >
+ <el-button
+ icon="el-icon-check"
+ type="primary"
+ size="mini"
+ style="margin-right: 15px"
+ @click="tongbu"
+ :disabled="!selectedFirstTable"
+ >鍚屾</el-button
+ >
+ </el-form-item>
+ </el-form>
+
+ <div class="table-title">
+ <h3>妫�楠岃褰�</h3>
+ </div>
+ <el-table
+ id="ta"
+ ref="tb"
+ :data="exaLists"
+ v-loading="loading"
+ border
+ max-height="350"
+ @current-change="handleCurrentChange"
+ @selection-change="handleSelectionChange"
+ :row-class-name="tableRowClassName"
+ >
+ <el-table-column
+ fixed
+ type="selection"
+ align="center"
+ label="閫夋嫨"
+ width="40"
+ :selectable="isSelectable"
+ >
+ </el-table-column>
+
+ <el-table-column label="濮撳悕" align="center" prop="name" width="80px" />
+ <el-table-column label="鎬у埆" align="center" prop="gender" width="80px" />
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ prop="patientAge"
+ width="80px"
+ >
+ </el-table-column>
+ <el-table-column
+ label="閫佹绉戝"
+ align="center"
+ prop="deptName"
+ width="100px"
+ />
+
+ <el-table-column
+ label="妫�鏌ラ」鐩�"
+ align="center"
+ prop="checkParts"
+ width="150px"
+ />
+ <el-table-column
+ label="鎶ュ憡鏃堕棿"
+ align="center"
+ prop="examinationDate"
+ width="150px"
+ />
+
+ <el-table-column label="闂ㄨ瘖鍙�" align="center" prop="mzh" width="140px" />
+ <el-table-column
+ label="鐢宠鍗曞彿"
+ align="center"
+ prop="brid"
+ width="145px"
+ />
+ <el-table-column
+ label="缁撴灉鐘舵��"
+ align="center"
+ prop="diagnosis"
+ width="150"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鎶ュ憡鍖诲笀"
+ align="center"
+ prop="reportDoctorName"
+ width="120px"
+ />
+ <el-table-column
+ label="妫�鏌ュ尰甯堝悕"
+ align="center"
+ prop="checkDoctorName"
+ width="120px"
+ />
+
+ <el-table-column
+ label="缁撴灉琛ㄧ幇"
+ align="center"
+ prop="examination"
+ :show-overflow-tooltip="true"
+ />
+ </el-table>
+
+ <div class="table-title">
+ <h3>浣撴璁板綍</h3>
+ </div>
+ <el-table
+ border
+ max-height="280"
+ ref="tab1"
+ :data="checkList"
+ v-loading="loading"
+ @selection-change="handleSelectionChangeSecond"
+ >
+ <el-table-column type="selection" width="55"> </el-table-column>
+ <el-table-column
+ label="鐘舵��"
+ align="center"
+ prop="type"
+ :show-overflow-tooltip="true"
+ min-width="60"
+ >
+ <template slot-scope="scope">
+ <span v-if="scope.row.type == '0'">鏈</span>
+ <span v-if="scope.row.type == '1'">宸叉</span>
+ <span v-if="scope.row.type == '2'">寮冩</span>
+ <span v-if="scope.row.type == '3'">寤舵湡</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="绉戝"
+ align="center"
+ prop="deptName"
+ min-width="115"
+ />
+ <el-table-column
+ label="椤圭洰"
+ align="center"
+ prop="proName"
+ min-width="160"
+ />
+ <el-table-column
+ label="鏀惰垂鏂瑰紡"
+ align="center"
+ prop="sffs"
+ min-width="80"
+ />
+ <el-table-column
+ label="鏄惁鏀惰垂"
+ align="center"
+ prop="isPay"
+ min-width="80"
+ />
+ <el-table-column
+ label="妫�鏌ユ椂闂�"
+ align="center"
+ prop="bcupdateTime"
+ min-width="160"
+ />
+
+ <el-table-column
+ label="鏈�鍚庝慨鏀规椂闂�"
+ align="center"
+ prop="zhupdateTime"
+ min-width="160"
+ />
+ </el-table>
+ </div>
+</template>
+
+ <script>
+import { getlisList, getJyTjList, asyncPacs } from "@/api/doctor/pacsCheck";
+
+export default {
+ dicts: ["dict_tj_status"],
+ data() {
+ return {
+ dis: false,
+ code: null,
+ createTimeList: "",
+ total: 0,
+ loading: false,
+ isSyncing: false,
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ // page: 1,
+ // pageSize: 20,
+ name: null,
+ start: null,
+ end: null,
+ tjNum: null,
+ },
+ // 缁戝畾鍗曢�夋寜閽�
+ checkStatus: "0",
+ exaLists: [],
+ selectedFirstTable: null, // 绗竴涓〃鏍奸�変腑琛�
+ selectedSecondTable: [], // 绗簩涓〃鏍奸�変腑琛�
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ clearTimeSet: null,
+ tjNumbers: "",
+ multipleSelection: "",
+ tjnum: "",
+ xiangmuList: [],
+ checkList: [],
+ tg: true,
+ bh: true,
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "鏈�杩戜竴鍛�",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜竴涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "鏈�杩戜笁涓湀",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+ };
+ },
+
+ mounted() {
+ this.$nextTick(() => {
+ this.$refs.inputName.focus();
+ });
+ },
+ methods: {
+
+ handleDateChange(val){
+ if (val && val.length === 2) {
+ this.queryParams.start = val[0]; // 璁剧疆寮�濮嬫椂闂�
+ this.queryParams.end = val[1]; // 璁剧疆缁撴潫鏃堕棿
+ } else {
+ this.queryParams.start = null;
+ this.queryParams.end = null;
+ }
+ console.log('Query Params:', this.queryParams);
+
+ },
+ isSelectable(row) {
+ return !!row.mzh;
+ },
+ tableRowClassName({ row }) {
+ return !row.mzh ? "row-disabled" : "";
+ },
+
+ handleSelectionChange(val) {
+ console.log(val);
+ if (val.length > 1) {
+ let del_row = val.shift();
+ this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ console.log(val, 999);
+
+ if (val.length > 0) {
+ const selectedRow = val[0];
+ console.log(val[0], 555);
+
+ this.selectedFirstTable = selectedRow;
+ console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedFirstTable);
+ this.fetchRightTableData(selectedRow);
+ } else {
+ this.selectedFirstTable = null;
+ this.checkList = [];
+ }
+ },
+ // 鏍规嵁閫変腑鐨勮鏁版嵁璇锋眰鍙宠竟琛ㄦ牸鏁版嵁
+ fetchRightTableData(selectedRow) {
+ const code = selectedRow.mzh;
+ if (!code) return;
+ this.loading = true;
+ getJyTjList(code).then((response) => {
+ this.checkList = response.data;
+ this.loading = false;
+ });
+ },
+
+ handleSelectionChangeSecond(selectedRows) {
+ this.selectedSecondTable = selectedRows;
+ console.log("褰撳墠閫変腑鐨勮鏁版嵁:", this.selectedSecondTable);
+ },
+ getList() {
+ if (this.createTimeList) {
+ this.queryParams.start = this.createTimeList[0];
+ this.queryParams.end = this.createTimeList[1];
+ } else if (this.createTimeList == null) {
+ this.queryParams.start = null;
+ this.queryParams.end = null;
+ }
+ },
+
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ // this.queryParams.page = 1;
+ this.loading = true;
+ getlisList(this.queryParams)
+ .then((res) => {
+ console.log(res, 1111);
+ if (res.code == 200) {
+ this.loading = false;
+ this.exaLists = res.data;
+ this.code = this.exaLists.mzh;
+ }
+ })
+ .catch((error) => {
+ this.loading = false;
+ this.$message.error(res.msg || "鏌ヨ澶辫触锛岃绋嶅悗閲嶈瘯");
+ });
+ this.getList();
+ },
+
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.createTimeList = [];
+ this.resetForm("queryForm");
+ this.queryParams = {
+ name: null,
+ start: null,
+ end: null,
+ tjNum: null,
+ };
+
+ // 娓呯┖鍏朵粬渚濊禆鏁版嵁
+ this.checkList = [];
+ this.exaLists = [];
+ },
+
+ handleCurrentChange(row) {
+ this.currentRow = row;
+ // console.log('褰撳墠閫変腑鐨勮:', row);
+ },
+
+ setTime() {
+ //璁剧疆瀹氭椂鍣�
+ this.clearTimeSet = setInterval(() => {
+ this.$modal.closeLoading();
+ }, 300000);
+ },
+ tongbu(row) {
+ this.$modal.loading("姝ｅ湪鍚屾锛岃绋嶅��...");
+ this.setTime();
+ const requestData = {
+ pacs: this.selectedFirstTable, // 宸︿晶琛ㄦ牸閫変腑鏁版嵁
+ tj: this.selectedSecondTable[0], // 鍙充晶琛ㄦ牸閫変腑鏁版嵁
+ };
+
+ if (!this.selectedSecondTable || this.selectedSecondTable.length === 0) {
+ this.$message.error("鑷冲皯閫変竴鏉℃暟鎹紒");
+ return;
+ }
+
+ asyncPacs(requestData)
+ .then((res) => {
+ if (res.code == 200) {
+ this.fetchRightTableData(this.selectedFirstTable);
+ clearInterval(this.clearTimeSet);
+ this.clearTimeSet = null;
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("鍚屾鎴愬姛锛�");
+ } else {
+ this.$message.error(res.message || "鍚屾澶辫触锛岃绋嶅悗閲嶈瘯");
+ }
+ })
+ .catch((error) => {
+ clearInterval(this.clearTimeSet);
+ this.clearTimeSet = null;
+ this.$modal.closeLoading();
+ })
+ },
+ },
+};
+</script>
+
+ <style lang="scss" scoped>
+#ta .el-table__header-wrapper .el-checkbox {
+ display: none;
+}
+
+.el-table .warning-row {
+ background: #e5f3ff !important;
+}
+::v-deep .el-table__body tr.current-row > td {
+ background: #edf2fa !important;
+}
+
+.table-title {
+ text-align: center;
+ margin-bottom: 15px;
+}
+.row-disabled {
+ color: #ccc; /* 璁剧疆绂佺敤琛岀殑瀛椾綋棰滆壊 */
+ pointer-events: none; /* 绂佹榧犳爣鎿嶄綔 */
+ background-color: #f5f5f5; /* 璁剧疆绂佺敤琛岀殑鑳屾櫙鑹� */
+}
+
+.pag {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.pag1 {
+ width: 30%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/hosp/advicerules/index.vue b/src/views/hosp/advicerules/index.vue
index 5ffd937..57f406d 100644
--- a/src/views/hosp/advicerules/index.vue
+++ b/src/views/hosp/advicerules/index.vue
@@ -236,12 +236,13 @@
v-model="form.ks"
placeholder="璇烽�夋嫨绉戝"
style="width: 200"
+ @change="idFn"
>
<el-option
v-for="item in departmentOptions"
- :key="item.value"
+ :key="item.id"
:label="item.label"
- :value="item.value"
+ :value="item.label"
/>
</el-select>
</el-form-item>
@@ -596,16 +597,19 @@
this.total = response.total;
this.loading = false;
});
- deptTreeSelect().then((response) => {
- this.departmentOptions = response.data[0].children;
- console.log(response, 999);
+ },
+
+ idFn(value) {
+ console.log("Selected Value:", value);
+ this.departmentOptions.forEach((item) => {
+ console.log(this.departmentOptions, 333);
+ console.log(item, 555);
+
+ if (item.value == value) {
+ this.form.ks = item.label;
+ }
});
},
- /* getDeptTree() {
- deptTreeSelect().then((response) => {
- this.deptOption = response.data;
- });
- }, */
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -653,7 +657,7 @@
handleSelectionChange1(selection) {
this.ChangeList = selection;
- this.ids = selection.map((item) => item.aid);
+ this.ids = selection.map((item) => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
if (selection.length > 1) {
@@ -690,12 +694,9 @@
/* 寮规纭畾鎸夐挳 */
submit() {
- console.log(this.ChangeList, 123);
this.ChangeList.forEach((item) => {
- console.log(item.title, 6363);
this.form.jymc = item.title;
- console.log(this.form.adviceBt, 2525);
this.form.jynr = item.advice;
// this.sfxmId = parseInt(item.id);
@@ -715,6 +716,10 @@
this.reset();
this.open = true;
this.title = "娣诲姞浣撴椤圭洰寤鸿瑙勫垯鏂拌〃";
+ deptTreeSelect().then((response) => {
+ this.departmentOptions = response.data[0].children;
+ console.log(response, 999);
+ });
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -725,41 +730,39 @@
this.open = true;
this.title = "淇敼浣撴椤圭洰寤鸿瑙勫垯鏂拌〃";
});
+ deptTreeSelect().then((response) => {
+ this.departmentOptions = response.data[0].children;
+ console.log(response, 999);
+ });
},
+
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
- this.columns.forEach((column) => {
- if (column.htmlType === "checkbox") {
- // 灏嗛�変腑鐨� checkbox 鍊肩敤閫楀彿鍒嗛殧
- this.form[column.javaField] =
- this.form[column.javaField].join(",");
- }
- });
- if (this.table.sub) {
- this.form.subclassNameList = this.subclassNameList; // 鍋囪 subclassNameList 鏄瓙琛ㄦ牸鐨勬暟鎹�
- }
- if (this.form[pkColumn.javaField] != null) {
+ if (this.form.id != null) {
updateAdvicerules(this.form).then((response) => {
+ console.log(response, 1111333);
+
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
- this.getList(); // 鍒锋柊鍒楄〃
+ this.getList();
});
} else {
- // 濡傛灉涓婚敭瀛楁涓虹┖锛岃繘琛屾柊澧炴搷浣�
addAdvicerules(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
- this.getList(); // 鍒锋柊鍒楄〃
+ this.getList();
});
}
}
});
},
handleDelete(row) {
- const pkValue = row[pkColumn.javaField] || this.ids; // 鑾峰彇涓婚敭鍊硷紝濡傛灉row涓病鏈変富閿�硷紝鍒欎娇鐢╰his.ids
+ console.log(row,6677);
+
+ const pkValue = row.id; // 鑾峰彇涓婚敭鍊硷紝濡傛灉row涓病鏈変富閿�硷紝鍒欎娇鐢╰his.ids
this.$modal
- .confirm(`鏄惁纭鍒犻櫎${functionName}缂栧彿涓�"${pkValue}"鐨勬暟鎹」锛焋)
+ .confirm(`鏄惁纭鍒犻櫎${row.ks}缂栧彿涓�"${pkValue}"鐨勬暟鎹」锛焋)
.then(() => {
return delAdvicerules(pkValue); // 璋冪敤鍒犻櫎鎺ュ彛锛屼紶鍏ヤ富閿��
})
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 9d7b6c4..8aae299 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -177,6 +177,7 @@
type="primary"
size="mini"
@click="handleRevoke"
+ :loading="isLoading"
:disabled="single"
>鎾ら攢绛惧埌</el-button
>
@@ -658,7 +659,7 @@
width="260px"
>
</el-table-column>
-
+
<el-table-column prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
@@ -765,7 +766,7 @@
</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 prop="proPrice" label="鍘熶环" width="56px">
</el-table-column>
<el-table-column
prop="proName"
@@ -773,7 +774,6 @@
width="260px"
>
</el-table-column>
-
<el-table-column
label="鎿嶄綔"
@@ -865,6 +865,7 @@
type="primary"
@click="submitPrice"
:disabled="confirm"
+ :loading="isSubmit"
style="margin-top: 34px"
>鎻愪氦</el-button
>
@@ -1221,7 +1222,12 @@
<!-- 鎻愪氦鎸夐挳 -->
<el-form-item style="display: flex">
- <el-button type="primary" @click="submitPrice1" :disabled="confirm">
+ <el-button
+ type="primary"
+ :loading="isSubmit1"
+ @click="submitPrice1"
+ :disabled="confirm"
+ >
鎻愪氦
</el-button>
</el-form-item>
@@ -1659,6 +1665,9 @@
DataList3: [],
bldhid: "",
budadaozhen: false,
+ isLoading: false,
+ isSubmit: false,
+ isSubmit1: false,
huizongList: [],
DataLists: [],
infoList: [],
@@ -2085,6 +2094,7 @@
},
handleRevoke() {
+ this.isLoading = true;
this.$confirm("鎮ㄧ‘璁よ鎾ら攢锛�", "纭淇℃伅", {
distinguishCancelAndClose: true,
confirmButtonText: "纭",
@@ -2093,6 +2103,7 @@
.then(() => {
revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
this.$modal.msgSuccess("鎾ら攢鎴愬姛");
+ // this.isLoading = false;
this.getList();
});
})
@@ -2103,6 +2114,10 @@
message: "宸插彇娑�",
});
}
+ })
+ .finally(() => {
+ // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛�
+ this.isLoading = false;
});
},
/** 鐐瑰嚮鏄剧ず浣撴鎶ュ憡鎶ヨ〃*/
@@ -2466,10 +2481,10 @@
let datas = {
zhId: data.id,
};
-
+
getlistByZhId(datas).then((res) => {
this.packagedataList = res.data.tjProjectList;
-
+
for (var i = 0; i < this.packagedataList.length; i++) {
let proId = this.packagedataList[i].proId;
getProSonDxList(proId).then((res) => {
@@ -2631,7 +2646,6 @@
this.TotalPrice1 = 0;
if (this.DataList3.length != 0) {
this.DataList3.forEach((item) => {
-
this.TotalPrice1 += item.proPrice * item.sl;
});
}
@@ -2676,9 +2690,7 @@
this.DataList.splice(index, 1);
this.TotalPrice1 = 0;
this.DataList.forEach((item1) => {
-
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
-
});
if (this.marryalls != 0) {
this.TotalPrice1 += this.marryalls;
@@ -2695,9 +2707,9 @@
this.spliceData();
this.TotalPrice1 = 0;
this.DataList.forEach((item1) => {
- console.log(item1.proPrice,3322);
- console.log(this.TotalPrice1,1122);
-
+ console.log(item1.proPrice, 3322);
+ console.log(this.TotalPrice1, 1122);
+
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
if (this.marryalls != 0) {
@@ -2824,6 +2836,7 @@
// 鏀惰垂鎸夐挳
submitPrice() {
this.proIds = [];
+ this.isSubmit = true;
if (this.DataList.length != 0) {
this.DataList.forEach((item) => {
this.proIds.push(item.proId);
@@ -2859,6 +2872,7 @@
payType: this.payType,
};
getwater(data).then((res) => {
+ this.isSubmit = false;
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
this.mobanId = res.data.mobanId;
this.waterId = res.data.waterId;
@@ -2874,6 +2888,7 @@
// 鏀惰垂鎸夐挳
submitPrice1() {
this.proIds = [];
+ this.isSubmit1 = true;
if (this.DataList.length != 0) {
this.DataList.forEach((item) => {
this.proIds.push(item.proId);
@@ -2903,12 +2918,12 @@
discount,
copeWith,
tjType,
- payStasus:this.jsType,
+ payStasus: this.jsType,
orderId: this.orderIds,
tjProIds: this.proIds,
payType: this.payType,
};
-
+
getwater(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
this.mobanId = res.data.mobanId;
@@ -2918,6 +2933,7 @@
const params = { viewNum, tjnumber };
this.$tab.openPage("鏀舵灏忕エ", "/report/charge", params);
this.Projectopen1 = false;
+ this.isSubmit1 = false;
});
}
});
diff --git a/src/views/system/Checkout/index.vue b/src/views/system/Checkout/index.vue
index 1be7779..860a702 100644
--- a/src/views/system/Checkout/index.vue
+++ b/src/views/system/Checkout/index.vue
@@ -387,7 +387,7 @@
<!-- 寮冩2锛屽欢鏈�3 -->
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="cancel">寤舵湡</el-button> -->
- <el-button @click="canaffirm">纭绛剧</el-button>
+ <el-button :loading = isLoading @click="canaffirm">纭绛剧</el-button>
</div>
</el-dialog>
</div>
@@ -420,6 +420,7 @@
leave: false,
checked: false,
radioId1: false,
+ isLoading:false,
createTimeList: [],
cusId: "",
payType: "0",
@@ -973,11 +974,13 @@
domainVos: this.DataList,
tjNumber: this.tjNumber,
};
+ this.isLoading = true
gettjGoOut(data).then((res) => {
if (res.code === 200) {
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
this.open = false;
this.multiple = true;
+ this.isLoading = false
this.getList();
}
});
diff --git a/src/views/system/biol/index.vue b/src/views/system/biol/index.vue
index b465d14..81e2f80 100644
--- a/src/views/system/biol/index.vue
+++ b/src/views/system/biol/index.vue
@@ -13,7 +13,7 @@
v-model="queryParams.dyzt"
placeholder="璇烽�夋嫨"
@change="handleQuery"
- style="width: 100px;"
+ style="width: 100px"
>
<el-option
v-for="item in optionsOne"
@@ -137,6 +137,7 @@
type="primary"
size="mini"
:disabled="single"
+ :loading="isLoading"
@click="baogaoyulan"
>鎶ュ憡棰勮</el-button
>
@@ -146,6 +147,7 @@
type="primary"
size="mini"
:disabled="single"
+ :loading="isChexiao"
@click="chexiao"
>鎾ら攢鎶ュ憡</el-button
>
@@ -550,7 +552,7 @@
hasPrintCode,
getOrderListOO,
getNewDateList,
- getChexiao
+ getChexiao,
} from "@/api/hosp/order";
import moment from "moment";
import ViewPdf from "@/components/ViewPdf";
@@ -571,6 +573,8 @@
return {
radios: "1",
dialogVisiblese: false,
+ isLoading: false,
+ isChexiao:false,
createTimeList: "",
// printObj: {
// id: "box", //鎵撳嵃鐨勫尯鍩�
@@ -684,7 +688,7 @@
open: false,
// 鏃ユ湡鑼冨洿
datetimerange: [],
- seleList:[],
+ seleList: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -703,8 +707,8 @@
tjNum: undefined,
dyzt: "0",
compId: null,
- dw:null,
- tjCompName:''
+ dw: null,
+ tjCompName: "",
},
startTime: "",
// 琛ㄥ崟鍙傛暟
@@ -815,11 +819,13 @@
},
baogaoyulan() {
const tjNumber = this.report[0];
- console.log(tjNumber,5555);
-
+ console.log(tjNumber, 5555);
+ this.isLoading = true;
+
isPdfOrJimu(tjNumber).then((response) => {
if (response.data.flag == "0") {
const flag = true;
+ this.isLoading = false;
getPdf(tjNumber, flag).then((response) => {
if (response.size === 0) {
const loading = this.$loading({
@@ -852,20 +858,23 @@
params
);
}
+ this.isLoading = false;
});
},
// 鎾ら攢鎵撳嵃
- chexiao(){
+ chexiao() {
const tjNUms = this.seleList.map((item) => item.tjNumber);
- getChexiao(tjNUms).then((res)=>{
- console.log(res,6666);
- if(res.code === 200){
- this.$modal.msgSuccess('鎾ら攢鎴愬姛锛�')
- this.getList()
- }else{
- this.$modal.msgError('鎾ら攢澶辫触锛�')
+ this.isChexiao = true
+ getChexiao(tjNUms).then((res) => {
+ console.log(res, 6666);
+ if (res.code === 200) {
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛锛�");
+ this.getList();
+ } else {
+ this.$modal.msgError("鎾ら攢澶辫触锛�");
}
- })
+ this.isChexiao = false
+ });
},
//鎵撳嵃灏忕エ
printHandle() {
@@ -1109,8 +1118,7 @@
// 閫夋鏁版嵁
searchSelect(val) {
this.CheckBox = val;
- console.log(this.CheckBox,9999);
-
+ console.log(this.CheckBox, 9999);
},
// onSubmit() {
@@ -1121,13 +1129,13 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- console.log(this.CheckBox,2323);
-
+ console.log(this.CheckBox, 2323);
+
// this.queryParams.checkStatus = this.checkStatus;
-
+
this.queryParams.compId = this.CheckBox.drugManufacturerId;
this.queryParams.dw = this.CheckBox.cnName;
-
+
if (this.createTimeList) {
this.queryParams.djbeginTime = this.createTimeList[0];
this.queryParams.djendTime = this.createTimeList[1];
@@ -1143,8 +1151,8 @@
// 鑾峰彇鍗曚綅淇℃伅闆嗗悎
getCompany(this.queryParams).then((response) => {
this.CompanyList = response.data;
- console.log( this.CompanyList,555);
-
+ console.log(this.CompanyList, 555);
+
this.loading = false;
});
getOrderListOO(this.queryParams).then((response) => {
@@ -1238,9 +1246,9 @@
tjNum: undefined,
dyzt: "0",
compId: null,
- dw:null,
- tjCompName:''
- }
+ dw: null,
+ tjCompName: "",
+ };
this.createTimeList = [];
this.resetForm("queryForm");
this.handleQuery();
@@ -1249,8 +1257,8 @@
handleSelectionChange(selection) {
this.ids = selection.map((item) => item.orderId);
this.seleList = selection;
- console.log(this.seleList,222333);
-
+ console.log(this.seleList, 222333);
+
this.DataList1 = this.$refs.multipleTable.selection;
this.DataList1.forEach((item) => {
this.barcode = item.tjNumber;
diff --git a/src/views/system/package/index.vue b/src/views/system/package/index.vue
index 666f2ff..3319d86 100644
--- a/src/views/system/package/index.vue
+++ b/src/views/system/package/index.vue
@@ -560,7 +560,7 @@
<el-input
placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
@input="handleFilterInput"
- v-model="queryParams.nr"
+ v-model="queryParams1.nr"
clearable
/>
<div class="tab3" style="height: 365px">
@@ -580,11 +580,11 @@
</el-tree>
<pagination
small
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.page"
- :limit.sync="queryParams.pageSize"
- @pagination="handlePageChange"
+ v-show="total1 > 0"
+ :total="total1"
+ :page.sync="queryParams1.page"
+ :limit.sync="queryParams1.pageSize"
+ @pagination="getDataList"
/>
</div>
</el-col>
@@ -826,13 +826,18 @@
pacId: "",
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
// 鏌ヨ鍙傛暟
queryParams: {
- page: 1,
pageNum: 1,
pageSize: 10,
pacName: null,
pacRemark: null,
+
+ },
+ queryParams1: {
+ page: 1,
+ pageSize: 30,
nr: "",
},
// 琛ㄥ崟鍙傛暟
@@ -1267,9 +1272,9 @@
},
getDataList() {
this.loading = true;
- search(this.queryParams).then((response) => {
+ search(this.queryParams1).then((response) => {
this.Treedata = response.data.list; // 鏇存柊鏍戝舰鏁版嵁
- this.total = response.data.total; // 鏇存柊鎬绘潯鏁�
+ this.total1 = response.data.total; // 鏇存柊鎬绘潯鏁�
this.pics = this.DataList.reduce(
(total, item) => total + item.priceOrd,
0
@@ -1284,12 +1289,12 @@
// this.Treedata = response.data.list;
// /* if (this.form.tjProjectList) {
// this.form.tjProjectList.forEach((item) => {
- // this.Treedata.forEach((item1) => {
+ // this.Treedata.forEach((item1) => {
// if (item.proId == item1.proId) {
// this.checkedkey.push(item1.proId);
-
+
// this.DataList.push(item1);
-
+
// this.DataList.forEach((item1) => {
// item1.limits = 10;
// if (item1.limits > 10) {
@@ -1299,7 +1304,7 @@
// }
// this.updateProPrice(item1); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫
// });
-
+
// }
// });
// });
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 5fac4af..05460bd 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -2471,7 +2471,7 @@
});
} else {
let configKey = "getInfoFromSqlData";
- getconfigKey(configKey).then((res) => {
+ getconfigKey(configKey).then((res) => {
if (res.code == 200) {
if (res.msg == "N") {
var websocket = null;
@@ -2519,9 +2519,10 @@
alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�");
};
} else if (res.msg == "Y") {
- this.$refs.aaa.open = true;
+ /* this.$refs.aaa.open = true;
this.$refs.aaa.getAllList();
- this.$refs.aaa.title = "璇佷欢瀛楀吀";
+ this.$refs.aaa.title = "璇佷欢瀛楀吀"; */
+
} else if (res.msg == "S") {
this.cardreader = true;
_this.cardreaderradio = 3;
@@ -3733,8 +3734,8 @@
// 鏈�鍚庢彁浜ゆ寜閽�
submitPrice() {
let _this = this;
+ this.loadingSubmit = true;
if (_this.tjCategory !== "") {
- this.loadingSubmit = true;
let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
if (this.responseList.cusId) {
var userId = this.responseList.cusId;
diff --git a/vue.config.js b/vue.config.js
index 0e775f0..fd5ce6e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,8 +53,8 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://ltpeis.xaltjdkj.cn:5801/`,
- // target: `http://192.168.1.2:5011`,
- target: `http://192.168.1.113:5011`,
+ target: `http://192.168.1.2: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