From 2ab2dcd91a6ee60fa907fd3c667ed174f17f13b5 Mon Sep 17 00:00:00 2001
From: su1124 <1583764726@qq.com>
Date: 星期四, 15 八月 2024 09:01:59 +0800
Subject: [PATCH] su
---
src/views/doctor/check/index.vue | 377 ++++++++++++++++++++++++++---
src/views/jmreport/jmreport/view.vue | 105 ++++---
dist.zip | 0
src/views/hosp/order/index.vue | 179 ++++++++++++-
src/api/doctor/check.js | 14
src/views/reservation/resercopy/index.vue | 16
src/views/jmreport/jmreport/budadaozhendan.vue | 57 ++++
src/router/index.js | 6
8 files changed, 646 insertions(+), 108 deletions(-)
diff --git a/dist.zip b/dist.zip
index 4a05d16..a1c57a4 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/doctor/check.js b/src/api/doctor/check.js
index 1391be0..bf7890d 100644
--- a/src/api/doctor/check.js
+++ b/src/api/doctor/check.js
@@ -86,11 +86,12 @@
})
}
- export function getDeptAdvice(proId) {
+ export function getDeptAdvice(data) {
return request({
- url: '/system/dept/getDeptAdvice/' + proId,
+ url: '/system/dept/getDeptAdvice',
method: 'get',
// params:proId
+ params:data
})
}
@@ -130,4 +131,13 @@
method: 'get',
params:data
})
+}
+
+//鐐瑰嚮鐖堕」鐩樉绀哄瓙椤圭洰璇︽儏
+export function getAdviceByTjNumAndPro(data) {
+ return request({
+ url: '/system/dept/getAdviceByTjNumAndPro',
+ method: 'get',
+ params:data
+ })
}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 1aa1504..4a05f71 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -92,6 +92,12 @@
meta: { title: '瀵兼鍗�', activeMenu: '/bre/DailyReport' },
},
{
+ path: 'budabreDailyReport',
+ component: () => import('@/views/jmreport/jmreport/budadaozhendan'),
+ name: 'DailyReportReport',
+ meta: { title: '琛ユ墦瀵兼鍗�', activeMenu: '/bre/DailyReport' },
+ },
+ {
path: 'viewReport',
component: () => import('@/views/jmreport/jmreport/view'),
name: 'DailyReportReport',
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 50a6d96..20e4c0c 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -648,12 +648,20 @@
鐥呯閫夋嫨锛�
</td>
<td
+ @click="bzxz"
style="
border: 1px solid #dfe6ec;
border-collapse: collapse;
"
>
- <el-select
+ <el-input
+ type="textarea"
+ placeholder="璇烽�夋嫨鍐呭"
+ v-model="proParentList.remark"
+ rows="2"
+ >
+ </el-input>
+ <!-- <el-select
v-model="value"
multiple
placeholder="璇烽�夋嫨"
@@ -669,7 +677,7 @@
:value="item.id"
>
</el-option>
- </el-select>
+ </el-select> -->
</td>
<td
style="
@@ -757,10 +765,7 @@
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <el-button
- type="primary"
- @click="determine"
-
+ <el-button type="primary" @click="determine"
>鎻� 浜�</el-button
>
</div>
@@ -938,7 +943,14 @@
border-collapse: collapse;
"
>
- <el-select
+ <el-input
+ type="textarea"
+ placeholder="璇烽�夋嫨鍐呭"
+ v-model="proParentList.remark"
+ rows="2"
+ >
+ </el-input>
+ <!-- <el-select
v-model="value"
multiple
placeholder="璇烽�夋嫨"
@@ -954,7 +966,7 @@
:value="item.id"
>
</el-option>
- </el-select>
+ </el-select> -->
</td>
<td
style="
@@ -1041,10 +1053,8 @@
v-hasPermi="['system:notice:add']"
v-show="tjStatus == '1'"
>浼氳瘖鐢宠</el-button> -->
- <!-- v-show="tjStatus == '0'" -->
- <el-button
- type="primary"
- @click="determine"
+ <!-- v-show="tjStatus == '0'" -->
+ <el-button type="primary" @click="determine"
>鎻� 浜�</el-button
>
</div>
@@ -1130,6 +1140,167 @@
</el-dialog>
<proposal ref="proposal" :cusobj="cusobj" @event1="eventchange($event)" />
<createproposal ref="createproposal" :creatobj="creatobj" />
+
+ <el-dialog
+ title="閫夋嫨鐥呯"
+ :visible.sync="taocan"
+ width="80%"
+ height="700px"
+ :close-on-click-modal="false"
+ >
+ <el-tabs
+ type="border-card"
+ style="min-height: 538px; margin: 0 10px; width: 100%"
+ @tab-click="handleClick"
+ v-model="activeNames"
+ >
+ <el-tab-pane label="鐥呯" name="first">
+ <div class="tab8">
+ <div class="tab3">
+ <el-form
+ :model="queryParam1"
+ ref="tableList"
+ :inline="true"
+ label-width="76px"
+ style="margin-top: 10px"
+ >
+ <el-form-item>
+ <el-input
+ placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+ v-model="queryParam1.nr"
+ clearable
+ >
+ </el-input>
+ </el-form-item>
+
+ <el-form-item>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuerys"
+ >鎼滅储</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <el-table
+ ref="multipleTable"
+ border
+ :data="deptAdviceList"
+ height="430px"
+ @selection-change="handleSelectionChanges"
+ >
+ <el-table-column type="selection" width="40"> </el-table-column>
+ <el-table-column prop="title" label="鐥呯鍚嶇О" align="center" width="130px"></el-table-column>
+ <el-table-column prop="advice" label="寤鸿" align="center" :show-overflow-tooltip="true">
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total1 > 0"
+ :total="total1"
+ :page.sync="queryParam1.page"
+ :limit.sync="queryParam1.pageSize"
+ @pagination="getbzlist"
+ />
+ </div>
+ <div class="tab4">
+ <div class="tab4_txt">
+ <h4>宸查�夌梾绉�</h4>
+ </div>
+
+ <el-table
+ border
+ :data="deptAdviceList1"
+ height="430px"
+ >
+ <el-table-column prop="title" label="鐥呯鍚嶇О" align="center">
+ </el-table-column>
+ <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>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- <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>
+ <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"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ title="鍒犻櫎"
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table> -->
+
+ <!-- <el-collapse v-model="activeName" accordion v-if="list1">
+ <div>
+ <el-collapse-item title="璇烽�夋嫨椤圭洰">
+ <el-table
+ :data="DataList"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod"
+ >
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ >
+ </el-table-column>
+ <el-table-column prop="ordPrice" label="鍘熶环">
+ </el-table-column>
+ </el-table>
+ </el-collapse-item>
+ </div>
+ </el-collapse> -->
+ </div>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="taocan = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="queding">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -1152,6 +1323,7 @@
getParentId,
getDeptAdvice,
reportHistory,
+ getAdviceByTjNumAndPro,
} from "@/api/doctor/check";
import { addBigPositive } from "@/api/doctor/bigPositive";
import { addReplylog, hzHasDept } from "@/api/hosp/replylog";
@@ -1170,6 +1342,11 @@
},
data() {
return {
+ idss:[],
+ vaids: [],
+ vaids1: [],
+ activeNames: "first",
+ taocan: false,
creatobj: {},
dataText: [],
propform: {},
@@ -1201,11 +1378,15 @@
rows: [],
id: [],
deptAdviceList: [],
- value: [],
+ deptAdviceList1: [],
+ deptAdviceList2: [],
+ deptAdviceList3: [],
+ value: {},
remark: "", //澶囨敞
remarks: "",
// 鎬绘潯鏁�
total: 0,
+ total1: 0,
// 缁戝畾鍗曢�夋寜閽�
tjStatus: "0",
// 鎶藉眽鎵撳紑鏂瑰紡
@@ -1267,6 +1448,11 @@
type: "",
name: null,
},
+ queryParam1: {
+ nr: null,
+ page: 1,
+ pageSize: 10,
+ },
queryParam: {
page: 1,
pageSize: 1000,
@@ -1304,9 +1490,117 @@
},
methods: {
+ getbzlist() {
+ getDeptAdvice(this.queryParam1).then((response) => {
+ this.deptAdviceList = response.data.list;
+ this.total1 = response.data.total;
+ });
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuerys() {
+ this.queryParam1.page = 1;
+ this.getbzlist();
+ },
+ bzxz() {
+ this.taocan = true;
+ let data = {
+ proId: this.proId,
+ tjNum: this.tableAll.tjNumber,
+ };
+ getAdviceByTjNumAndPro(data).then((res) => {
+ console.log(res);
+ if (res.data) {
+ this.deptAdviceList3 = res.data;
+ this.deptAdviceList1 = [
+ ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
+ ];
+ this.deptAdviceList3.forEach(items=>{
+ this.idss.push(items.id)
+ })
+ }
+ });
+ },
+ handleSelectionChanges(val) {
+ // this.deptAdviceList1 = val;
+ if (val.length > 1) {
+ let del_row = val.shift();
+ this.$refs.multipleTable.toggleRowSelection(del_row, false);
+ val.forEach((item) => {
+ this.deptAdviceList2.push(item);
+ });
+ } else if ((val.length = 1)) {
+ val.forEach((item) => {
+ this.deptAdviceList2.push(item);
+ });
+ }
+ this.deptAdviceList1 = [
+ ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)),
+ ];
+ },
+ queding() {
+ if (this.proParentList.xiaoJie.length != 0) {
+ // this.proParentList.remark = "";
+ console.log(this.deptAdviceList,111);
+ this.deptAdviceList.forEach((item) => {
+ this.ids = item.id;
+ console.log(this.deptAdviceList1,222);
+ this.deptAdviceList1.forEach((item1) => {
+ if (
+ item1.id === item.id &&
+ !this.proParentList.remark.includes(item.title)
+ ) {
+ if (this.proParentList.remark) {
+ this.proParentList.remark += item.title + ",";
+ this.value += item.title + ",";
+ this.vaids.push(item1.id);
+ this.vaids1 = this.vaids.concat(this.idss)
+ } else {
+ this.proParentList.remark = item.title + ",";
+ this.value += item.title + ",";
+ this.vaids.push(item1.id);
+ this.vaids1 = this.vaids.concat(this.idss)
+ }
+ }
+ });
+ });
+ this.taocan = false;
+ } else {
+ this.proParentList.remark = "";
+ this.deptAdviceList.forEach((item) => {
+ this.ids = item.id;
+ this.deptAdviceList1.forEach((item1) => {
+ if (
+ item1.id === item.id &&
+ !this.proParentList.remark.includes(item.title)
+ ) {
+ if (this.proParentList.remark) {
+ this.proParentList.remark += item.title + ",";
+ this.value += item.title + ",";
+ console.log(item);
+ this.vaids.push(item1.id);
+ this.vaids1 = this.vaids.concat(this.idss)
+ } else {
+ this.proParentList.remark = item.title + ",";
+ this.value += item.title + ",";
+ this.vaids.push(item1.id);
+ this.vaids1 = this.vaids.concat(this.idss)
+ }
+ }
+ });
+ });
+ this.taocan = false;
+ }
+ },
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ this.deptAdviceList1.forEach((item, index) => {
+ if (item.id == row.id) {
+ this.deptAdviceList1.splice(index, 1);
+ }
+ });
+ },
/** 鏌ヨ鐢ㄦ埛鍒楄〃 */
getListUser() {
-
getlistUser().then((response) => {
this.userList = response.data;
this.userList.forEach((element) => {
@@ -1903,9 +2197,7 @@
// this.radioChange1(item.proId, item);
this.getParentIdsss();
- getDeptAdvice(this.proId).then((response) => {
- this.deptAdviceList = response.data;
- });
+ this.getbzlist();
}
num = num + 1;
});
@@ -1915,9 +2207,7 @@
this.$modal.msgError("璇ョ瀹や笅鏃犻」鐩紒");
}
});
- getDeptAdvice().then((response) => {
- this.deptAdviceList = response.data;
- });
+ this.getbzlist();
// getSons(this.tjNumber).then((response) => {
// response.data.forEach(item1 => {
@@ -1985,10 +2275,10 @@
this.proParentList.remark = item3.remark;
}
});
- }
- }else {
- this.proParentList.remark = "";
}
+ } else {
+ this.proParentList.remark = "";
+ }
});
},
@@ -2135,15 +2425,13 @@
this.remark = this.Parentcheck.remark;
}
});
- }
- }else {
- this.remark = "";
}
+ } else {
+ this.remark = "";
+ }
});
- getDeptAdvice(this.proId).then((response) => {
- this.deptAdviceList = response.data;
- });
+ this.getbzlist();
})
.catch((action) => {
if (action === "cancel") {
@@ -2208,9 +2496,7 @@
}
});
- getDeptAdvice(this.proId).then((response) => {
- this.deptAdviceList = response.data;
- });
+ this.getbzlist();
});
},
@@ -2329,9 +2615,7 @@
}
});
- getDeptAdvice(this.proId).then((response) => {
- this.deptAdviceList = response.data;
- });
+ this.getbzlist();
})
.catch((action) => {
if (action === "cancel") {
@@ -2393,9 +2677,7 @@
}
});
- getDeptAdvice(this.proId).then((response) => {
- this.deptAdviceList = response.data;
- });
+ this.getbzlist();
});
},
handleInConfirm(row) {
@@ -2448,7 +2730,7 @@
proId: this.proId,
remark: this.proParentList.remark, // 澶囨敞
proName: this.proName, //鐖堕」
- summaryList: this.value, //灏忕粨
+ summaryList: this.vaids1, //灏忕粨
doctorName: this.doctorName,
tjOrderDetailList: this.tjOrderDetail,
},
@@ -2518,4 +2800,21 @@
.el-message * {
color: var(--white) !important;
}
+.tab8 {
+ width: 100%;
+ display: flex;
+ justify-content: space-between;
+}
+.tab3 {
+ width: 68%;
+}
+.tab4 {
+ margin-top: 6px;
+ width: 30%;
+
+}
+.tab4_txt{
+ display: flex;
+ justify-content: center;
+}
</style>
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 9cdd148..1603b44 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -157,6 +157,16 @@
>璁㈠崟鏄庣粏</el-button
>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="budadzd"
+ :disabled="single"
+ v-hasPermi="['hosp:order:export']"
+ >鎵撳嵃琛ュ綍鍗�</el-button
+ >
+ </el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
@@ -1082,7 +1092,13 @@
</el-dialog>
<!-- 娣诲姞鎴栦慨鏀逛綋妫�璁板綍瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="950px" append-to-body :close-on-click-modal="false">
+ <el-dialog
+ :title="title"
+ :visible.sync="open"
+ width="950px"
+ append-to-body
+ :close-on-click-modal="false"
+ >
<el-tabs v-model="activeName1" type="card">
<!-- <el-tab-pane label="璁㈠崟娴佹按" name="first">
<el-table :data="numberList" style="width: 100%">
@@ -1123,7 +1139,7 @@
<el-table :data="huizongList" style="width: 100%" max-height="200">
<el-table-column
align="center"
- type="index"
+ type="index"
label="搴忓彿"
width="50"
>
@@ -1277,6 +1293,100 @@
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</el-dialog>
+
+ <el-dialog
+ :title="title1"
+ :visible.sync="budadaozhen"
+ width="1100px"
+ style="height: 860px"
+ append-to-body
+ :close-on-click-modal="false"
+ >
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="13">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
+ 琛ュ綍鍒楄〃
+ </div>
+
+ <div class="tab3">
+ <el-table
+ :data="DataLists"
+ border
+ style="width: 100%"
+ height="400"
+ @selection-change="handleProjectssChange"
+ >
+ <el-table-column type="selection" width="40" align="center" />
+ <el-table-column
+ type="index"
+ label="搴忓彿"
+ align="center"
+ width="49px"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="blje"
+ label="琛ュ綍閲戦"
+ align="center"
+ width="74px"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="bldh"
+ label="琛ュ綍鍗曞彿"
+ align="center"
+ width="155px"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="blsj"
+ label="琛ュ綍鏃堕棿"
+ align="center"
+ width="156px"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="blrmc"
+ label="琛ュ綍浜�"
+ align="center"
+ width="96px"
+ >
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+
+ <el-col :span="10">
+ <div class="grid-content bg-purple">
+ <div
+ style="text-align: center; margin-bottom: 10px; margin-top: 10px"
+ >
+ 琛ュ綍椤圭洰
+ </div>
+ <el-table
+ :data="DataListss"
+ border
+ style="width: 100%"
+ height="400"
+ :span-method="objectSpanMethod2"
+ >
+ <el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
+ </el-table-column>
+ <el-table-column prop="proPrice" label="鍘熶环" width="56px">
+ </el-table-column>
+ <el-table-column prop="proName" label="鏄庣粏椤圭洰" width="260px">
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-col>
+ </el-row>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="dayin">鎵� 鍗�</el-button>
+ <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+ </div>
+ </el-dialog>
</div>
</template>
@@ -1302,6 +1412,7 @@
getProParentIdDxList,
getProSonDxList,
} from "@/api/system/tijian";
+import { createLogger } from "vuex";
export default {
components: {
ViewPdf,
@@ -1310,6 +1421,8 @@
name: "Order",
data() {
return {
+ bldhid: "",
+ budadaozhen: false,
huizongList: [],
DataLists: [],
infoList: [],
@@ -1404,7 +1517,7 @@
tjNum: null,
bgbeginTime: null,
bgendTime: null,
- xmmc:null,
+ xmmc: null,
},
startTime: "",
startTime1: "",
@@ -1843,7 +1956,6 @@
discount: discount,
});
- console.log(this.bill);
this.title = "璁㈠崟娴佹按";
});
getTransitionInfo(tjNumber).then((res) => {
@@ -1863,6 +1975,44 @@
});
});
},
+ budadzd() {
+ this.bldhs =[];
+ getBlproByTjh(this.tjnumbers).then((res) => {
+ if (res.data) {
+ this.DataLists = res.data;
+ this.budadaozhen = true;
+ this.title1 = "琛ユ墦瀵艰瘖鍗�";
+ } else {
+ this.$message({
+ type: "warning ",
+ message: "璇ュ鎴锋病鏈夎ˉ褰曢」鐩�",
+ });
+ }
+ });
+ },
+ dayin() {
+ console.log(this.bldhs);
+ this.bldhid.toString(this.bldhs);
+ this.bldhs.forEach((item) => {
+ console.log(item, 666);
+ this.bldhid += item + ",";
+ });
+ // this.bldhid = this.bldhs.toString()
+ console.log(this.bldhid);
+ const tjNumber = this.tjnumbers;
+ const viewNum = "983185234038140928";
+ const jxbz = this.bldhid;
+ const params = { viewNum, tjNumber, jxbz };
+ console.log(params);
+ hasReport(tjNumber).then((res) => {
+ if (res == 1) {
+ this.$tab.openPage("瀵艰瘖鍗�", "/report/budabreDailyReport", params);
+ this.budadaozhen = false;
+ } else {
+ this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
+ }
+ });
+ },
handleClick(tab, event) {
if (this.activeNames == "first") {
@@ -1876,10 +2026,9 @@
this.loading = false;
});
} else {
- console.log(111)
this.TotalPrice1 = 0;
- this.checkedkey =[]
- this.DataList = []
+ this.checkedkey = [];
+ this.DataList = [];
this.getDataList();
if (this.marryalls != 0) {
this.TotalPrice1 += this.marryalls;
@@ -1950,7 +2099,7 @@
this.activeNames = "first";
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
this.handleClick();
-
+
this.Projectopen = true;
this.title = "琛ュ綍椤圭洰";
},
@@ -2011,7 +2160,7 @@
this.activeNames = "first";
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
this.handleClick();
-
+
this.Projectopen1 = true;
this.title = "琛ュ綍椤圭洰";
},
@@ -2041,8 +2190,8 @@
this.TotalPrice1 = item.proPrice + this.TotalPrice1;
});
if (this.marryalls != 0) {
- this.TotalPrice1 += this.marryalls;
- }
+ this.TotalPrice1 += this.marryalls;
+ }
}
});
} else if (checked.checkedNodes.length == 0) {
@@ -2078,8 +2227,8 @@
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
if (this.marryalls != 0) {
- this.TotalPrice1 += this.marryalls;
- }
+ this.TotalPrice1 += this.marryalls;
+ }
}
});
} else if (checked == true) {
@@ -2120,8 +2269,8 @@
this.TotalPrice1 = item1.proPrice + this.TotalPrice1;
});
if (this.marryalls != 0) {
- this.TotalPrice1 += this.marryalls;
- }
+ this.TotalPrice1 += this.marryalls;
+ }
}
});
},
diff --git a/src/views/jmreport/jmreport/budadaozhendan.vue b/src/views/jmreport/jmreport/budadaozhendan.vue
new file mode 100644
index 0000000..957cf9a
--- /dev/null
+++ b/src/views/jmreport/jmreport/budadaozhendan.vue
@@ -0,0 +1,57 @@
+<template>
+ <div v-loading="loading" :style="'height:' + height" class="app-container">
+ <!-- <el-row style="margin-bottom: 10px;">
+ <el-col :span="1.5">
+ <el-button type="primary" plain icon="el-icon-refresh-right" size="mini" @click="handleRefresh">鍒锋柊</el-button>
+ </el-col>
+ </el-row> -->
+
+ <iframe
+ :src="src"
+ id="reportView"
+ frameborder="no"
+ style="width: 100%; height: 100%"
+ scrolling="auto"
+ />
+ </div>
+</template>
+ <script>
+import { getToken } from "@/utils/auth";
+import { view } from "@/api/jmreport/jimu";
+export default {
+ name: "Ureport",
+ data() {
+ return {
+ src: "",
+ height: document.documentElement.clientHeight - 94.5 + "px;",
+ loading: true,
+ viewNum: "",
+ reportId: "",
+ jxbz:"",
+ };
+ },
+ created() {
+ //鎶ヨ〃妯℃澘缂栧彿
+ this.viewNum = this.$route.query.viewNum;
+ //浣撴鍙�
+ this.tjNumber = this.$route.query.tjNumber;
+ this.jxbz = this.$route.query.jxbz;
+ view().then((res) => {this.src =res +"/" +this.viewNum +"?tjNumber=" +this.tjNumber +"&jxbz="+this.jxbz +"&token=Bearer " +getToken();});
+ },
+ methods: {
+ handleRefresh() {
+ document.getElementById("reportView").src =
+ document.getElementById("reportView").src;
+ },
+ },
+ mounted: function () {
+ setTimeout(() => {
+ this.loading = false;
+ }, 230);
+ const that = this;
+ window.onresize = function temp() {
+ that.height = document.documentElement.clientHeight - 94.5 + "px;";
+ };
+ },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/jmreport/jmreport/view.vue b/src/views/jmreport/jmreport/view.vue
index c35781f..b73959b 100644
--- a/src/views/jmreport/jmreport/view.vue
+++ b/src/views/jmreport/jmreport/view.vue
@@ -1,55 +1,64 @@
<template>
- <div v-loading="loading" :style="'height:'+ height" class="app-container">
- <!-- <el-row style="margin-bottom: 10px;">
+ <div v-loading="loading" :style="'height:' + height" class="app-container">
+ <!-- <el-row style="margin-bottom: 10px;">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-refresh-right" size="mini" @click="handleRefresh">鍒锋柊</el-button>
</el-col>
</el-row> -->
-
- <iframe :src="src" id="reportView" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
-
- </div>
- </template>
+
+ <iframe
+ :src="src"
+ id="reportView"
+ frameborder="no"
+ style="width: 100%; height: 100%"
+ scrolling="auto"
+ />
+ </div>
+</template>
<script>
- import {
- getToken
- } from '@/utils/auth'
- import {
- view
- } from '@/api/jmreport/jimu'
- export default {
- name: "Ureport",
- data() {
- return {
- src: "",
- height: document.documentElement.clientHeight - 94.5 + "px;",
- loading: true,
- viewNum: "",
- reportId: "",
- };
- },
- created() {
- //鎶ヨ〃妯℃澘缂栧彿
- this.viewNum = this.$route.query.viewNum
- //浣撴鍙�
- this.tjNumber = this.$route.query.tjNumber
- view().then(res => {
- this.src = res + "/"+this.viewNum+"?tjNumber=" + this.tjNumber + "&token=Bearer " + getToken();
- })
- },
- methods: {
- handleRefresh() {
- document.getElementById("reportView").src = document.getElementById("reportView").src;
- },
- },
- mounted: function() {
- setTimeout(() => {
- this.loading = false;
- }, 230);
- const that = this;
- window.onresize = function temp() {
- that.height = document.documentElement.clientHeight - 94.5 + "px;";
- };
- }
+import { getToken } from "@/utils/auth";
+import { view } from "@/api/jmreport/jimu";
+export default {
+ name: "Ureport",
+ data() {
+ return {
+ src: "",
+ height: document.documentElement.clientHeight - 94.5 + "px;",
+ loading: true,
+ viewNum: "",
+ reportId: "",
};
- </script>
\ No newline at end of file
+ },
+ created() {
+ //鎶ヨ〃妯℃澘缂栧彿
+ this.viewNum = this.$route.query.viewNum;
+ //浣撴鍙�
+ this.tjNumber = this.$route.query.tjNumber;
+ view().then((res) => {
+ this.src =
+ res +
+ "/" +
+ this.viewNum +
+ "?tjNumber=" +
+ this.tjNumber +
+ "&token=Bearer " +
+ getToken();
+ });
+ },
+ methods: {
+ handleRefresh() {
+ document.getElementById("reportView").src =
+ document.getElementById("reportView").src;
+ },
+ },
+ mounted: function () {
+ setTimeout(() => {
+ this.loading = false;
+ }, 230);
+ const that = this;
+ window.onresize = function temp() {
+ that.height = document.documentElement.clientHeight - 94.5 + "px;";
+ };
+ },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/reservation/resercopy/index.vue b/src/views/reservation/resercopy/index.vue
index b82e029..3e19c79 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="鏈夋晥澶╂暟"
/>澶�(鍙嚜瀹氫箟)
@@ -475,7 +475,7 @@
objs: {
drugManufacturerId: "",
reservationTime: "",
- yxts:"30",
+ yxts: "30",
},
DataList: [],
tjOrderList: [], //鍗曚釜椤圭洰闆嗗悎
@@ -876,6 +876,12 @@
},
// 鏂囦欢涓婁紶鎴愬姛澶勭悊
handleFileSuccess(response, file, fileList) {
+ console.log(response,666666);
+ if (response.code == 500) {
+ console.log(22222222222);
+ // Message.warning(response.msg);
+ this.$modal.msgError(response.msg);
+ }
this.ListObj = response.data;
this.userList = response.data.list;
this.userList.forEach((item) => {
@@ -889,6 +895,8 @@
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
this.leftList = response.msg;
+ console.log(response.code);
+
if (this.leftList == "鎿嶄綔澶辫触") {
this.isdisabled = true;
this.$alert(
@@ -977,8 +985,8 @@
reservations: this.userList,
reservationTime: this.objs.reservationTime,
dwDeptId: this.data.dwDeptId,
- yxts:this.objs.yxts,
- dwId: this.data.dwId,
+ yxts: this.objs.yxts,
+ dwId: this.data.dwId,
};
newConfirm(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
--
Gitblit v1.8.0