From 17b59891ba3675d02812fc209838ece7275d41dd Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期一, 23 十二月 2024 17:41:48 +0800
Subject: [PATCH] 默认类型
---
src/views/hosp/order/index.vue | 314 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 268 insertions(+), 46 deletions(-)
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 3a7b1ce..a3a0b5a 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: 150px"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -23,7 +23,7 @@
ref="inputName"
v-model="queryParams.tjNum"
placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- style="width: 170px"
+ style="width: 150px"
clearable
@keyup.enter.native="handleQuery"
@blur="hb"
@@ -34,12 +34,59 @@
ref="inputName"
v-model="queryParams.xmmc"
placeholder="璇疯緭鍏ヤ綋妫�椤圭洰"
- style="width: 120px"
+ style="width: 150px"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
+ <el-form-item
+ label="鍗曚綅鍚嶇О"
+ prop="tjCompName"
+ style="margin-left: 20px; margin-right: 500px"
+ >
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.tjCompName"
+ value-key="drugManufacturerId"
+ style="width: 200px"
+ 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="zt">
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="queryParams.zt"
+ style="width: 150px"
+ remote
+ filterable
+ placeholder="璇烽�夋嫨鐘舵��"
+ clearable
+ @change="searchSelect"
+ >
+ <el-option
+ v-for="item in ztList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item
+ label="鐧昏鏃堕棿"
+ prop="createTimeList"
+ style="margin-right: 107px"
+ >
<el-date-picker
v-model="createTimeList"
type="datetimerange"
@@ -94,6 +141,24 @@
>
</el-form-item>
</el-form>
+
+ <div v-if="shijianlist.length > 0" style="margin-bottom: 20px">
+ {{ findNameByTjnum(shijianlist[shijianlist.length - 1].tjNUm) }}
+ <el-steps
+ :space="200"
+ :active="shijianlist[shijianlist.length - 1].sjz"
+ finish-status="success"
+ align-center
+ >
+ <el-step title="鏈"></el-step>
+ <el-step title="鍦ㄦ"></el-step>
+ <el-step title="宸插畬鎴�"></el-step>
+ <el-step title="宸插鏍�"></el-step>
+ <el-step title="鐢熸垚鎶ュ憡"></el-step>
+ <el-step title="鎶ュ憡鏍告敹"></el-step>
+ <el-step title="宸插嚭鎶ュ憡"></el-step>
+ </el-steps>
+ </div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -268,6 +333,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="zt"
+ :show-overflow-tooltip="true"
+ />
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
<el-table-column
label="鎵�閫夊椁�"
@@ -276,6 +353,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"
@@ -317,19 +406,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" /> -->
@@ -710,10 +794,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>
@@ -748,6 +836,7 @@
style="width: 120px"
v-model="payType"
placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ @change="onPayTypeChange"
>
<el-option
v-for="dict in dict.type.dict_pay_type"
@@ -1040,16 +1129,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">
@@ -1081,6 +1173,7 @@
style="width: 120px"
v-model="payType"
placeholder="璇烽�夋嫨浠樻绫诲瀷"
+ @change="onPayTypeChange"
>
<el-option
v-for="dict in dict.type.dict_pay_type"
@@ -1420,11 +1513,17 @@
import { getInfo } from "@/api/login";
import ViewPdf from "@/components/ViewPdf";
import {
- projectGetList,
+ shijianzhou,
getaddtTransition,
getProParentIdDxList,
getProSonDxList,
} from "@/api/system/tijian";
+import {
+ SubmitCompany,
+ getCompany,
+ queryCompany,
+ addbatch,
+} from "@/api/team/tuanti";
import { createLogger } from "vuex";
export default {
components: {
@@ -1434,6 +1533,15 @@
name: "Order",
data() {
return {
+ ztList: [
+ { name: "鏈", id: 0 },
+ { name: "鍦ㄦ", id: 1 },
+ { name: "宸插畬鎴�", id: 2 },
+ { name: "宸插鏍�", id: 3 },
+ { name: "鐢熸垚鎶ュ憡", id: 4 },
+ { name: "鎶ュ憡鏍告敹", id: 5 },
+ { name: "宸插嚭鎶ュ憡", id: 6 },
+ ],
DataList3: [],
bldhid: "",
budadaozhen: false,
@@ -1441,6 +1549,7 @@
DataLists: [],
infoList: [],
bldhs: [],
+ CompanyList: [],
filterage: "",
activeName1: "second",
filterText: "",
@@ -1488,6 +1597,7 @@
TreedataList: [],
discount: 10,
DataList: [],
+ shijianlist: [],
// 濂楅鎻愪氦鎸夐挳
confirm: false,
list1: true,
@@ -1498,6 +1608,7 @@
TotalPrice7: 0,
numberList: [],
dialogVisible: false,
+ CheckBox: {},
// 閬僵灞�
loading: true,
// 閫変腑鏁扮粍
@@ -1534,6 +1645,8 @@
bgbeginTime: null,
bgendTime: null,
xmmc: null,
+ tjCompName: "",
+ dw: null,
},
startTime: "",
startTime1: "",
@@ -1576,6 +1689,7 @@
},
};
},
+
watch: {
filterText(val) {
this.$refs.tree.filter(val);
@@ -1595,6 +1709,39 @@
});
},
methods: {
+ findNameByTjnum(tjnum) {
+ const order = this.orderList.find(
+ (orderItem) => orderItem.tjNumber === tjnum
+ );
+ return order ? order.tjCustomerName : "鏈壘鍒�"; // 濡傛灉鎵句笉鍒板搴旂殑椤癸紝杩斿洖涓�涓粯璁ゅ��
+ },
+ // 鎼滅储
+ 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;
+ this.queryParams.dw = this.CheckBox.cnName;
+ 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) {
@@ -1654,6 +1801,47 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
+ this.queryParams.compId = this.CheckBox.drugManufacturerId;
+ if (this.startTime) {
+ this.queryParams.djbeginTime = this.startTime[0];
+ this.queryParams.djendTime = this.startTime[1];
+ } else if (this.createTimeList) {
+ this.queryParams.djbeginTime = this.createTimeList[0];
+ this.queryParams.djendTime = this.createTimeList[1];
+ } else if (this.createTimeList == null) {
+ this.queryParams.djbeginTime = null;
+ this.queryParams.djendTime = null;
+ }
+ if (this.startTime1) {
+ this.queryParams.bgbeginTime = this.startTime1[0];
+ this.queryParams.bgendTime = this.startTime1[1];
+ }
+
+ this.loading = true;
+ getOrderList(this.queryParams).then((response) => {
+ this.orderList = response.data.list;
+ if (this.orderList) {
+ this.orderList.forEach((item, index) => {
+ item.newID =
+ (this.queryParams.pageNum - 1) * this.queryParams.pageSize +
+ index +
+ 1;
+ });
+ }
+ 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;
+ });
+ },
+
+ sub() {
+ this.queryParams.compId = this.CheckBox.drugManufacturerId;
if (this.startTime) {
this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
@@ -1751,7 +1939,7 @@
})
.then(() => {
revokeTjOrderByTjNum(this.tjnumbers).then((res) => {
- this.$modal.msgSuccess(res.msg);
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛");
this.getList();
});
})
@@ -1845,6 +2033,7 @@
djendTime: null,
bgbeginTime: null,
bgendTime: null,
+ dw: null,
};
this.resetForm("form");
},
@@ -1856,7 +2045,8 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
- this.getList();
+ // this.getList();
+ this.sub();
},
renderContents(h, { node, data, store }) {
return (
@@ -1911,10 +2101,23 @@
this.startTime1 = [];
this.createTimeList = [];
this.resetForm("queryForm");
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ djbeginTime: null,
+ djendTime: null,
+ tjNum: null,
+ bgbeginTime: null,
+ bgendTime: null,
+ xmmc: null,
+ tjCompName: "",
+ dw: null,
+ };
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ let tjNUms = selection.map((item) => item.tjNumber);
selection.forEach((item) => {
this.orderIds = item.orderId;
this.tjnumbers = item.tjNumber;
@@ -1926,10 +2129,17 @@
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;
this.multiple = !selection.length;
+ if (tjNUms.length > 0) {
+ shijianzhou(tjNUms).then((res) => {
+ this.shijianlist = res.data;
+ });
+ } else {
+ this.shijianlist = [];
+ }
},
/** 鏂板鎸夐挳鎿嶄綔 */
// handleAdd() {
@@ -2051,25 +2261,20 @@
const jxbz = this.bldhid;
// 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("璇ョ敤鎴锋殏鏃犻」鐩紒");
- }
- });
- })
+ 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);
@@ -2156,6 +2361,7 @@
// 琛ュ綍椤圭洰
handleProject(row) {
+ this.payType = "0";
this.loading = true;
this.DataList = [];
this.DataList3 = [];
@@ -2225,6 +2431,7 @@
},
// 琛ュ綍椤圭洰
handleProject1() {
+ this.payType = "0";
this.loading = true;
this.DataList = [];
this.DataList3 = [];
@@ -2558,6 +2765,7 @@
handleProjectssChange(selection) {
this.DataListss = [];
this.selection = [];
+
this.bldhs = selection.map((item) => item.bldh);
selection.forEach((item) => {
item.projectList.forEach((item1) => {
@@ -2612,7 +2820,7 @@
},
};
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.pag {
width: 100%;
display: flex;
@@ -2663,7 +2871,9 @@
// .el-dialog__body {
// padding: 20px;
// }
-
+.o {
+ margin-top: 8px;
+}
.outside {
width: 500px;
display: flex;
@@ -2673,6 +2883,7 @@
width: 500px;
display: flex;
// margin-top: 12px;
+ // margin-right: 40%;
}
.tab3 {
@@ -2707,4 +2918,15 @@
display: flex;
flex-direction: column;
}
+::v-deep .el-step__title.is-process {
+ color: rgb(24, 144, 255);
+}
+::v-deep .el-step__head.is-process {
+ color: rgb(24, 144, 255);
+ border-color: rgb(24, 144, 255);
+}
+.shijian {
+ display: flex;
+ align-items: flex-start;
+}
</style>
--
Gitblit v1.8.0