From a65e5b04d64edb3318d0dfdc46bc5c83e133eaa6 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期五, 13 十二月 2024 19:06:10 +0800
Subject: [PATCH] 重置修改
---
src/views/hosp/order/index.vue | 289 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 222 insertions(+), 67 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 5ea424e..d30c48c 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -13,7 +13,7 @@
ref="inputName"
v-model="queryParams.name"
placeholder="璇疯緭鍏ュ鍚�"
- style="width: 120px"
+ style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -23,7 +23,7 @@
ref="inputName"
v-model="queryParams.tjNum"
placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- style="width: 170px"
+ style="width: 200px"
clearable
@keyup.enter.native="handleQuery"
@blur="hb"
@@ -34,10 +34,35 @@
ref="inputName"
v-model="queryParams.xmmc"
placeholder="璇疯緭鍏ヤ綋妫�椤圭洰"
- style="width: 120px"
+ style="width: 300px"
clearable
@keyup.enter.native="handleQuery"
/>
+ </el-form-item>
+ <el-form-item
+ label="鍗曚綅鍚嶇О"
+ prop="tjCompName"
+ style="margin-left: 20px"
+ >
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.tjCompName"
+ value-key="drugManufacturerId"
+ style="width: 300px"
+ remote
+ filterable
+ placeholder="璇烽�夋嫨鍗曚綅鍚嶇О"
+ clearable
+ @change="searchSelect"
+
+ >
+ <el-option
+ v-for="dict in CompanyList"
+ :key="dict.drugManufacturerId"
+ :label="dict.cnName"
+ :value="dict"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
<el-date-picker
@@ -246,8 +271,12 @@
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
- <span v-if="scope.row.tjType == '2'">涓汉</span>
- <span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
+ <dict-tag
+ :options="dict.type.dict_team"
+ :value="scope.row.tjType"
+ />
+ <!-- <span v-if="scope.row.tjType == '2'">涓汉</span>
+ <span v-if="scope.row.tjType == '1'">鍥㈤槦</span> -->
</template>
</el-table-column>
<el-table-column
@@ -264,6 +293,18 @@
:show-overflow-tooltip="true"
width="160px"
/>
+ <el-table-column
+ label="鍗曚綅鍚嶇О"
+ align="center"
+ prop="dictCompName"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鐘舵��"
+ align="center"
+ prop="tjtype"
+ :show-overflow-tooltip="true"
+ />
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
<el-table-column
label="鎵�閫夊椁�"
@@ -272,6 +313,18 @@
:formatter="driver"
:show-overflow-tooltip="true"
/>
+ <el-table-column
+ label="瀵艰瘖鎵撳嵃娆℃暟"
+ align="center"
+ prop="dycs"
+ width="110px"
+ :formatter="driver"
+ :show-overflow-tooltip="true"
+ >
+ <template slot-scope="scope">
+ {{ scope.row.dycs === null ? 0 : scope.row.dycs }}
+ </template>
+ </el-table-column>
<el-table-column
label="鐧昏鏃堕棿"
align="center"
@@ -313,19 +366,14 @@
</el-table-column>
<!-- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" /> -->
<!-- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" /> -->
- <el-table-column
+ <!-- <el-table-column
label="鍗曚綅宸ュ彿"
align="center"
prop="firmWorkId"
width="100px"
:show-overflow-tooltip="true"
- />
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="dictCompName"
- :show-overflow-tooltip="true"
- />
+ /> -->
+
<!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> -->
<!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> -->
@@ -706,10 +754,14 @@
<template>
<el-form :model="form">
<el-form-item label="浣撴绫诲瀷" prop="tjType">
- <el-radio-group v-model="form.tjType">
+ <div class="type">
+ {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }}
+ </div>
+
+ <!-- <el-radio-group v-model="form.tjType">
<el-radio :label="1">鍥㈤槦</el-radio>
<el-radio :label="2">涓汉</el-radio>
- </el-radio-group>
+ </el-radio-group> -->
</el-form-item>
</el-form>
</template>
@@ -744,6 +796,7 @@
style="width: 120px"
v-model="payType"
placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ @change="onPayTypeChange"
>
<el-option
v-for="dict in dict.type.dict_pay_type"
@@ -856,9 +909,9 @@
</el-tab-pane>
<el-tab-pane label="鍗曢」" name="third">
<div class="tab8">
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="22">
- <!-- <div
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="22">
+ <!-- <div
style="
text-align: center;
margin-bottom: 10px;
@@ -867,29 +920,29 @@
>
椤圭洰鍒楄〃
</div> -->
- <el-input
- placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
- v-model="filterText"
- >
- </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-input
+ placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�"
+ v-model="filterText"
>
- </el-tree>
- </div>
- </el-col>
- <!-- <el-col :span="11">
+ </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>
+ </div>
+ </el-col>
+ <!-- <el-col :span="11">
<div
style="
text-align: center;
@@ -917,7 +970,7 @@
</div>
</div>
</el-col> -->
- <!-- <el-col :span="11">
+ <!-- <el-col :span="11">
<div class="grid-content bg-purple">
<div
style="
@@ -965,7 +1018,7 @@
</template>
</el-table-column>
</el-table> -->
- <!-- <el-collapse v-model="activeName" accordion v-if="list1">
+ <!-- <el-collapse v-model="activeName" accordion v-if="list1">
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
<el-table
@@ -987,16 +1040,16 @@
</el-collapse-item>
</div>
</el-collapse> -->
- <!-- </div>
+ <!-- </div>
</el-col> -->
- </el-row>
+ </el-row>
</div>
</el-tab-pane>
</el-tabs>
</div>
<div class="grid-content bg-purple">
- <div style="text-align: center; margin-bottom: 10px;margin-top:9px">
+ <div style="text-align: center; margin-bottom: 10px; margin-top: 9px">
宸查�夐」鐩垪琛�
</div>
<el-table
@@ -1036,16 +1089,19 @@
</div>
<div class="heji">
- <template>
- <el-form :model="form" :inline="true">
+ <div class="o">
+ <el-form
+ :model="form"
+ :inline="true"
+ style="display: flex; align-items: center"
+ >
<el-form-item label="浣撴绫诲瀷" prop="tjType">
- <el-radio-group v-model="form.tjType">
- <el-radio :label="1">鍥㈤槦</el-radio>
- <el-radio :label="2">涓汉</el-radio>
- </el-radio-group>
+ <div class="type">
+ {{ { 1: "鍥㈤槦", 2: "涓汉", 3: "鍥綋绁�" }[form.tjType] }}
+ </div>
</el-form-item>
</el-form>
- </template>
+ </div>
<div class="outsides">
<el-form :inline="true" class="outside2" label-width="80px">
@@ -1077,6 +1133,7 @@
style="width: 120px"
v-model="payType"
placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ @change="onPayTypeChange"
>
<el-option
v-for="dict in dict.type.dict_pay_type"
@@ -1413,6 +1470,7 @@
import moment from "moment";
import { getZhList, getlistByZhId } from "@/api/system/package";
import { getwater } from "@/api/hosp/customer";
+import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
import {
projectGetList,
@@ -1420,12 +1478,18 @@
getProParentIdDxList,
getProSonDxList,
} from "@/api/system/tijian";
+import {
+ SubmitCompany,
+ getCompany,
+ queryCompany,
+ addbatch,
+} from "@/api/team/tuanti";
import { createLogger } from "vuex";
export default {
components: {
ViewPdf,
},
- dicts: ["dict_pay_type"],
+ dicts: ["dict_pay_type", "dict_team"],
name: "Order",
data() {
return {
@@ -1436,6 +1500,7 @@
DataLists: [],
infoList: [],
bldhs: [],
+ CompanyList: [],
filterage: "",
activeName1: "second",
filterText: "",
@@ -1493,6 +1558,7 @@
TotalPrice7: 0,
numberList: [],
dialogVisible: false,
+ CheckBox: {},
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -1529,6 +1595,8 @@
bgbeginTime: null,
bgendTime: null,
xmmc: null,
+ tjCompName:'',
+ dw:null
},
startTime: "",
startTime1: "",
@@ -1571,6 +1639,7 @@
},
};
},
+
watch: {
filterText(val) {
this.$refs.tree.filter(val);
@@ -1590,6 +1659,33 @@
});
},
methods: {
+ // 鎼滅储
+ getRemoteData(query) {
+ if (query) {
+ let compName = query;
+ queryCompany(compName).then((response) => {
+ this.CompanyList = response.data;
+ this.CompanyList.forEach((item) => {
+ this.queryParams = item;
+ });
+ });
+ }
+ },
+ // 閫夋鏁版嵁
+ searchSelect(val) {
+ this.CheckBox = val;
+ console.log(this.CheckBox,9999);
+
+ },
+ onPayTypeChange() {
+ if (this.payType === "6" && this.form.tjType !== 3) {
+ this.cannotSelectPayType = true;
+ this.$message.warning("璇ヤ粯娆剧被鍨嬪湪姝や綋妫�绫诲瀷涓嬩笉鍏佽閫夋嫨锛�");
+ this.payType = this.dict.type.dict_pay_type[0]?.value || null;
+ } else {
+ this.cannotSelectPayType = false;
+ }
+ },
getdate() {
getNewDateList().then((res) => {
if (res.data) {
@@ -1649,6 +1745,8 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
+ this.queryParams.compId = this.CheckBox.drugManufacturerId;
+ this.queryParams.dw = this.CheckBox.cnName;
if (this.startTime) {
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
@@ -1678,6 +1776,13 @@
this.total = response.data.total;
this.loading = false;
});
+ // 鑾峰彇鍗曚綅淇℃伅闆嗗悎
+ getCompany(this.queryParams).then((response) => {
+ this.CompanyList = response.data;
+ console.log( this.CompanyList,555);
+
+ this.loading = false;
+ });
},
driver(row) {
return row.pacName == null ? "鏅�氫綋妫�" : row.pacName;
@@ -1696,9 +1801,13 @@
});
},
/** 鐐瑰嚮鏄剧ず瀵兼鍗曟姤琛�*/ //lige 寮�濮�
- handleReport1(row) {
+ /* handleReport1(row) {
const tjNumber = this.tjnumbers;
const viewNum = "792931586196398080";
+ getInfo().then(((res)=>{
+ console.log(res,123);
+
+ }))
const params = { viewNum, tjNumber };
hasReport(tjNumber).then((res) => {
if (res == 1) {
@@ -1707,6 +1816,31 @@
this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
}
});
+ }, */
+ handleReport1(row) {
+ const tjNumber = this.tjnumbers;
+ const viewNum = "792931586196398080";
+ // 鍏堣皟鐢� getInfo 鑾峰彇 userId
+ getInfo()
+ .then((res) => {
+ console.log(res, 1111);
+
+ const dqdlr = res.user.userId; // 鑾峰彇 userId
+ console.log("User ID:", dqdlr);
+ const params = { viewNum, tjNumber, dqdlr }; // 灏� userId 鍔犲叆 params
+
+ // 鍐嶈皟鐢� hasReport 妫�鏌ユ姤鍛婄姸鎬�
+ hasReport(tjNumber).then((reportRes) => {
+ if (reportRes === 1) {
+ this.$tab.openPage("瀵艰瘖鍗�", "/report/breDailyReport", params);
+ } else {
+ this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
+ }
+ });
+ })
+ .catch(() => {
+ this.$message.error("鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛�");
+ });
},
handleRevoke() {
@@ -1717,7 +1851,7 @@
})
.then(() => {
revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
- this.$modal.msgSuccess(res.msg);
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛");
this.getList();
});
})
@@ -1811,6 +1945,7 @@
djendTime: null,
bgbeginTime: null,
bgendTime: null,
+ dw: null
};
this.resetForm("form");
},
@@ -1892,6 +2027,7 @@
this.cusSex = item.tjCustomerSex;
this.form.tjType = parseInt(item.tjType);
});
+
this.ids = selection.map((item) => item.orderId);
// this.tjNumbers = selection.map((item) => item.tjNumber);
this.single = selection.length !== 1;
@@ -2015,16 +2151,30 @@
const tjNumber = this.tjnumbers;
const viewNum = "983185234038140928";
const jxbz = this.bldhid;
- const params = { viewNum, tjNumber, jxbz };
- console.log(params);
- hasReport(tjNumber).then((res) => {
+ // const params = { viewNum, tjNumber, jxbz };
+ // console.log(params);
+ getInfo().then((res) => {
+ console.log(res, 1111);
+ const dqdlr = res.user.userId; // 鑾峰彇 userId
+ const params = { viewNum, tjNumber, jxbz, dqdlr };
+
+ hasReport(tjNumber).then((res) => {
+ if (res == 1) {
+ this.$tab.openPage("瀵艰瘖鍗�", "/report/budabreDailyReport", params);
+ this.budadaozhen = false;
+ } else {
+ this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
+ }
+ });
+ });
+ /* hasReport(tjNumber).then((res) => {
if (res == 1) {
this.$tab.openPage("瀵艰瘖鍗�", "/report/budabreDailyReport", params);
this.budadaozhen = false;
} else {
this.$message.error("璇ョ敤鎴锋殏鏃犻」鐩紒");
}
- });
+ }); */
},
handleClick(tab, event) {
@@ -2103,6 +2253,7 @@
// 琛ュ綍椤圭洰
handleProject(row) {
+ this.payType = "0";
this.loading = true;
this.DataList = [];
this.DataList3 = [];
@@ -2172,6 +2323,7 @@
},
// 琛ュ綍椤圭洰
handleProject1() {
+ this.payType = "0";
this.loading = true;
this.DataList = [];
this.DataList3 = [];
@@ -2318,9 +2470,9 @@
}
});
this.TotalPrice1 = 0;
- this.DataList3.forEach(item=>{
+ this.DataList3.forEach((item) => {
this.TotalPrice1 += item.proPrice;
- })
+ });
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -2422,9 +2574,9 @@
getaddtTransition(data).then((response) => {
if (response.code === 200) {
this.DataList = [];
- this.DataList3 = [];
- this.DataLists = [];
- this.TotalPrice1 = 0;
+ this.DataList3 = [];
+ this.DataLists = [];
+ this.TotalPrice1 = 0;
let tjType = this.form.tjType;
let copeWith = this.TotalPrice1;
let paidIn = copeWith * (this.discount / 10);
@@ -2610,7 +2762,9 @@
// .el-dialog__body {
// padding: 20px;
// }
-
+.o {
+ margin-top: 8px;
+}
.outside {
width: 500px;
display: flex;
@@ -2620,6 +2774,7 @@
width: 500px;
display: flex;
// margin-top: 12px;
+ // margin-right: 40%;
}
.tab3 {
@@ -2646,13 +2801,13 @@
margin-top: 10px;
}
.box {
-
display: flex;
justify-content: space-between;
}
-.box1{
+.box1 {
width: 50%;
display: flex;
flex-direction: column;
}
+
</style>
--
Gitblit v1.8.0