From e17811c1d7b1e6318af32a366d23bd586750b6d2 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期三, 27 十一月 2024 11:32:48 +0800 Subject: [PATCH] 2024 11 27 --- src/views/hosp/order/index.vue | 90 ++++++++++++++++++++++++++++++-------------- 1 files changed, 61 insertions(+), 29 deletions(-) diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index 3a7b1ce..7168850 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -277,6 +277,18 @@ :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" prop="createTime" @@ -710,10 +722,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 +764,7 @@ style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷" + @change="onPayTypeChange" > <el-option v-for="dict in dict.type.dict_pay_type" @@ -1040,16 +1057,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 +1101,7 @@ style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷" + @change="onPayTypeChange" > <el-option v-for="dict in dict.type.dict_pay_type" @@ -1576,6 +1597,7 @@ }, }; }, + watch: { filterText(val) { this.$refs.tree.filter(val); @@ -1595,6 +1617,15 @@ }); }, methods: { + 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) { @@ -1926,6 +1957,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; @@ -2051,25 +2083,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 +2183,7 @@ // 琛ュ綍椤圭洰 handleProject(row) { + this.payType = "0"; this.loading = true; this.DataList = []; this.DataList3 = []; @@ -2225,6 +2253,7 @@ }, // 琛ュ綍椤圭洰 handleProject1() { + this.payType = "0"; this.loading = true; this.DataList = []; this.DataList3 = []; @@ -2663,7 +2692,9 @@ // .el-dialog__body { // padding: 20px; // } - +.o { + margin-top: 8px; +} .outside { width: 500px; display: flex; @@ -2673,6 +2704,7 @@ width: 500px; display: flex; // margin-top: 12px; + // margin-right: 40%; } .tab3 { -- Gitblit v1.8.0