From d3f92860bb7bd72e52f6dc0e476d988188d00b48 Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期五, 27 十二月 2024 14:35:22 +0800
Subject: [PATCH] .
---
src/api/hosp/customer.js | 14 +++++-
/dev/null | 0
src/views/system/charge/index.vue | 17 +++++++-
src/views/hosp/project/index.vue | 38 +++++++++++--------
4 files changed, 47 insertions(+), 22 deletions(-)
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 0974762..0000000
--- a/dist.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/hosp/customer.js b/src/api/hosp/customer.js
index cfe2772..ade2dbd 100644
--- a/src/api/hosp/customer.js
+++ b/src/api/hosp/customer.js
@@ -40,7 +40,8 @@
// 浣撴(鏀惰垂)椤甸潰鏌ヨ鎺ュ彛
export function getfindTj(form) {
return request({
- url: '/hosp/water/findTjCollectFeesByNameAndTjNumAndPhone',
+ // url: '/hosp/water/findTjCollectFeesByNameAndTjNumAndPhone',
+ url: '/hosp/water/findTjCollectFeesByNameAndTjNumAndPhoneN',
method: 'get',
params: form
})
@@ -49,7 +50,8 @@
// 浣撴宸叉敹璐规湭鏀惰垂淇℃伅鏌ヨ鎺ュ彛
export function getByTjNum(data) {
return request({
- url: '/hosp/water/findTjChargedButNotChargedByTjNum',
+ // url: '/hosp/water/findTjChargedButNotChargedByTjNum',
+ url: '/hosp/water/findTjChargedButNotChargedByTjNumN',
method: 'get',
params: data
})
@@ -63,7 +65,13 @@
data: data
})
}
-
+export function getwaterSupper(data) {
+ return request({
+ url: '/hosp/water/supper',
+ method: 'put',
+ data: data
+ })
+}
// 鏌ヨ瀹㈡埛淇℃伅璇︾粏
export function getCustomer(cusId) {
return request({
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index aed11fc..c9078ee 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -181,12 +181,20 @@
:show-overflow-tooltip="true"
/>
<el-table-column
- label="涓村簥鎰忎箟"
+ label="缁撴灉绫诲瀷"
align="center"
- prop="proMeaning"
- width="350px"
+ prop="resultType"
+ width="110px"
:show-overflow-tooltip="true"
- />
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.tj_result_type"
+ :value="scope.row.resultType"
+ />
+ </template>
+ </el-table-column>
+
<!-- <el-table-column label="妫�鏌ユ柟寮�" align="center" prop="proCheckMethod" :show-overflow-tooltip="true"
width="110px" /> -->
<el-table-column
@@ -226,19 +234,12 @@
>
</el-table-column>
<el-table-column
- label="椤圭洰绫诲瀷"
+ label="涓村簥鎰忎箟"
align="center"
- prop="resultType"
- width="110px"
+ prop="proMeaning"
+ width="350px"
:show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.tj_result_type"
- :value="scope.row.resultType"
- />
- </template>
- </el-table-column>
+ />
<el-table-column
label="澶囨敞"
prop="remark"
@@ -1066,6 +1067,10 @@
lisXmmc: "",
proMetering: "",
proScope: "",
+
+ resultType: "", // 鍒濆鍊�
+
+
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -1191,6 +1196,7 @@
this.form.proPrice = 0.0;
this.form.proName = "";
this.form.proId = null;
+ this.form.resultType = "1";
// ProjectTree
getlist().then((response) => {
if (response.code == 200) {
@@ -1491,6 +1497,7 @@
consumablesList: [],
tjStandardList: [],
proStatus: "0",
+ resultType: "1",
};
this.resetForm("form");
},
@@ -1649,7 +1656,6 @@
this.proParent = false;
getProject(proId).then((response) => {
console.log(response, 999);
-
this.form = response.data;
if (this.form.proParentId === "0") {
this.showPrise = true;
diff --git a/src/views/system/charge/index.vue b/src/views/system/charge/index.vue
index 05fad38..a001ebc 100644
--- a/src/views/system/charge/index.vue
+++ b/src/views/system/charge/index.vue
@@ -37,7 +37,7 @@
:show-overflow-tooltip="true"></el-table-column>
<el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjComp"></el-table-column>
<el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px"></el-table-column>
- <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="180px" />
+ <el-table-column label="璁㈠崟娴佹按鍙�" align="center" prop="tjFlowingWater.waterId" width="230px" />
<el-table-column label="鏀惰垂鍛�" align="center" prop="tjFlowingWater.updateBy" width="100px" />
</el-table>
@@ -85,6 +85,10 @@
<el-button type="primary" size="mini" :disabled="disabled == 1 ? true : false"
@click="SubmitEvent">鏀惰垂</el-button>
</el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" :disabled="disabled == 0 ? true : false"
+ @click="tuifei">閫�璐�</el-button>
+ </el-form-item>
</el-col>
</el-row>
</el-form>
@@ -100,7 +104,7 @@
</template>
<script>
-import { getByTjNum, getfindTj, getwater, getpay } from "@/api/hosp/customer";
+import { getByTjNum, getfindTj, getwaterSupper, getpay } from "@/api/hosp/customer";
import { getInfo } from "@/api/login";
export default {
dicts: ["dict_pay_type"],
@@ -256,10 +260,12 @@
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.multipleTable.toggleRowSelection(del_row, false);
+
}
let data = {
type: this.tjStatus,
OrderId: this.OrderId,
+ tjSerialNumber: this.tjSerialNumber
};
getByTjNum(data).then((response) => {
if (response.data) {
@@ -326,6 +332,7 @@
let data = {
type: this.tjStatus,
OrderId: this.OrderId,
+ tjSerialNumber: this.tjSerialNumber
};
getByTjNum(data).then((response) => {
if (response.data) {
@@ -400,7 +407,7 @@
refundPros: this.refundPros,
orderId: this.OrderId,
};
- getwater(data).then((res) => {
+ getwaterSupper(data).then((res) => {
if (res.msg != "璇ヨ鍗曞凡浠樻 鏃犻』鍐嶄粯") {
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
this.disabled = 1
@@ -428,6 +435,10 @@
});
}
},
+ // 閫�璐�
+ tuifei() {
+
+ },
},
};
</script>
--
Gitblit v1.8.0