From a51f6cabf6919be2916cfc0b62c856c64b4f93c9 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 26 十二月 2024 08:56:28 +0800
Subject: [PATCH] order
---
src/views/hosp/order/index.vue | 58 +++++++++++
src/api/hosp/order.js | 157 ++++++++++++++++--------------
src/views/hosp/project/index.vue | 32 +++++-
3 files changed, 167 insertions(+), 80 deletions(-)
diff --git a/src/api/hosp/order.js b/src/api/hosp/order.js
index 560701f..1aaa744 100644
--- a/src/api/hosp/order.js
+++ b/src/api/hosp/order.js
@@ -82,7 +82,7 @@
// 鏌ヨ璇ヤ綋妫�鍙峰搴旂殑璁㈠崟娴佹按鍒楄〃
export function getNumber(tjNumber) {
return request({
- url: '/hosp/water/flowingWaterByTjNumber/'+ tjNumber,
+ url: '/hosp/water/flowingWaterByTjNumber/' + tjNumber,
method: 'get'
})
}
@@ -92,7 +92,7 @@
return request({
url: '/hosp/order/goOut',
method: 'get',
- params:data
+ params: data
})
}
@@ -101,30 +101,30 @@
return request({
url: '/hosp/order/abandon',
method: 'get',
- params:data
+ params: data
})
}
// 鐢熸垚pdf
-export function getPdf(tjNumber,flag) {
+export function getPdf(tjNumber, flag) {
return request({
- url: '/system/report/preview/'+ flag + '/'+ tjNumber,
+ url: '/system/report/preview/' + flag + '/' + tjNumber,
method: 'get',
responseType: 'blob',
- headers:{
+ headers: {
"type": 'application/pdf'
}
})
}
// 鐢熸垚pdf
-export function getPdfpre(tjNumber,flag,sfdy) {
+export function getPdfpre(tjNumber, flag, sfdy) {
return request({
- url: '/system/report/previewprint/'+ flag + '/'+ tjNumber + '/' + sfdy,
+ url: '/system/report/previewprint/' + flag + '/' + tjNumber + '/' + sfdy,
method: 'get',
responseType: 'blob',
- headers:{
+ headers: {
"type": 'application/pdf'
}
})
@@ -135,7 +135,7 @@
url: '/hosp/order/printGuidance/' + tjNumber,
method: 'get',
responseType: 'blob',
- headers:{
+ headers: {
"type": 'application/pdf'
}
})
@@ -160,7 +160,7 @@
// 鎾ら攢鐢熸垚浣撴鎶ュ憡
export function revoke(tjNumber) {
return request({
- url: '/system/report/revocationReport/'+ tjNumber,
+ url: '/system/report/revocationReport/' + tjNumber,
method: 'get'
})
}
@@ -278,72 +278,72 @@
})
}
- // 鍏紬鍙风鍚�
- export function getWxSignature(params) {
- return request({
- url: '/wx/jsapi/signature',
- method: 'get',
- params: params
- })
- }
+// 鍏紬鍙风鍚�
+export function getWxSignature(params) {
+ return request({
+ url: '/wx/jsapi/signature',
+ method: 'get',
+ params: params
+ })
+}
- export function createFormResultRequest(data) {
- return request({
- url: '/user/form/data/create',
- method: 'post',
- data: data
- })
- }
- export function publicCreateFormResultRequest(data) {
- return request({
- url: '/user/form/data/public/create',
- method: 'post',
- data: data
- })
- }
+export function createFormResultRequest(data) {
+ return request({
+ url: '/user/form/data/create',
+ method: 'post',
+ data: data
+ })
+}
+export function publicCreateFormResultRequest(data) {
+ return request({
+ url: '/user/form/data/public/create',
+ method: 'post',
+ data: data
+ })
+}
- export function checkWritePwdRequest(data) {
- return request({
- url: '/user/form/public/checkWritePwd',
- method: 'post',
- data: data
- })
- }
-
- export function getPublicSettingsRequest(key) {
- return request({
- url: '/user/form/public/settings/'+key,
- method: 'get',
- })
- }
+export function checkWritePwdRequest(data) {
+ return request({
+ url: '/user/form/public/checkWritePwd',
+ method: 'post',
+ data: data
+ })
+}
- export function getRecordByTjNumber(tjNumber) {
- return request({
- url: '/user/form/data/getRecordByTjNumber',
- method: 'get',
- params: {
- tjNumber
- }
- })
- }
+export function getPublicSettingsRequest(key) {
+ return request({
+ url: '/user/form/public/settings/' + key,
+ method: 'get',
+ })
+}
+
+export function getRecordByTjNumber(tjNumber) {
+ return request({
+ url: '/user/form/data/getRecordByTjNumber',
+ method: 'get',
+ params: {
+ tjNumber
+ }
+ })
+}
- export function listFormFieldsRequest(formKey) {
- return request({
- url: '/user/form/fields/'+formKey,
- method: 'get',
- })
- }
+export function listFormFieldsRequest(formKey) {
+ return request({
+ url: '/user/form/fields/' + formKey,
+ method: 'get',
+ })
+}
- export function listFormDataTableRequest(data) {
- return request({
- url: '/user/form/data/query',
- method: 'post',
- data: data
- })
- }
+export function listFormDataTableRequest(data) {
+ return request({
+ url: '/user/form/data/query',
+ method: 'post',
+ data: data
+ })
+}
- // 鎵归噺鍙戦�侀偖浠�
+// 鎵归噺鍙戦�侀偖浠�
export function addCustomerBlack(data) {
return request({
url: '/hosp/cusBlack/addCustomerBlack',
@@ -367,7 +367,7 @@
url: '/hosp/order/getBlproByTjh',
method: 'get',
params: {
- tjNum:tjNumber
+ tjNum: tjNumber
}
})
}
@@ -376,7 +376,7 @@
return request({
url: '/hosp/order/revokeBlProByBldhAndTjh',
method: 'post',
- data:data
+ data: data
})
}
@@ -385,6 +385,17 @@
return request({
url: '/hosp/order/heshouchexiao',
method: 'post',
- data:data
+ data: data
+ })
+}
+
+// 寮哄埗鎾ら攢
+export function getForceChexiao(tjNum) {
+ return request({
+ url: '/hosp/order/revokeTjOrderByTjh',
+ method: 'get',
+ params: {
+ tjNum
+ }
})
}
\ No newline at end of file
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index a3a0b5a..ccc77aa 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -232,6 +232,16 @@
>鎵撳嵃琛ュ綍鍗�</el-button
>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ size="mini"
+ @click="ForceChexiao"
+ :disabled="single"
+ v-hasPermi="['qzcx']"
+ >寮哄埗鎾ら攢</el-button
+ >
+ </el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
@@ -1506,6 +1516,7 @@
getTransitionInfo,
getBlproByTjh,
revokeBlProByBldhAndTjh,
+ getForceChexiao,
} from "@/api/hosp/order";
import moment from "moment";
import { getZhList, getlistByZhId } from "@/api/system/package";
@@ -1524,7 +1535,6 @@
queryCompany,
addbatch,
} from "@/api/team/tuanti";
-import { createLogger } from "vuex";
export default {
components: {
ViewPdf,
@@ -1929,6 +1939,45 @@
.catch(() => {
this.$message.error("鏃犳硶鑾峰彇鐢ㄦ埛淇℃伅锛�");
});
+ },
+
+ // 寮哄埗鎾ら攢鎸夐挳
+ ForceChexiao() {
+ const tjNum = this.tjnumbers;
+ this.$confirm(
+ "鎮ㄦ槸鍚﹂渶瑕佸己鍒舵挙閿�锛熸挙閿�鍚庤浜哄憳鏈浣撴璁板綍涓嶅彲鎭㈠锛�",
+ "纭淇℃伅",
+ {
+ distinguishCancelAndClose: true,
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ customClass: "custom-message-box",
+ }
+ )
+
+ .then(() => {
+ getForceChexiao(tjNum).then((res) => {
+ this.$modal.msgSuccess("鎾ら攢鎴愬姛");
+ this.getList();
+ });
+ })
+ .catch((action) => {
+ if (action === "cancel") {
+ this.$message({
+ type: "warning",
+ message: "宸插彇娑�",
+ });
+ }
+ });
+ this.$nextTick(() => {
+ // 纭繚寮规娓叉煋鍚庡簲鐢ㄦ牱寮�
+ const messageBox = document.querySelector(
+ ".custom-message-box .el-message-box__message"
+ );
+ if (messageBox) {
+ messageBox.style.color = "red"; // 閫氳繃 JS 寮哄埗璁剧疆棰滆壊
+ }
+ });
},
handleRevoke() {
@@ -2871,6 +2920,12 @@
// .el-dialog__body {
// padding: 20px;
// }
+::v-deep .el-message-box__message {
+ color: red !important; /* 寮哄埗璁剧疆棰滆壊涓虹孩鑹� */
+}
+// .custom-message-box .el-message-box__message {
+// color: red !important; /* 璁剧疆鏂囧瓧涓虹孩鑹� */
+// }
.o {
margin-top: 8px;
}
@@ -2918,6 +2973,7 @@
display: flex;
flex-direction: column;
}
+
::v-deep .el-step__title.is-process {
color: rgb(24, 144, 255);
}
diff --git a/src/views/hosp/project/index.vue b/src/views/hosp/project/index.vue
index bf03685..27ebed6 100644
--- a/src/views/hosp/project/index.vue
+++ b/src/views/hosp/project/index.vue
@@ -471,18 +471,32 @@
></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鍗曚綅" prop="proMetering">
+ <el-input
+ v-model="form.proMetering"
+ placeholder="璇疯緭鍏ュ崟浣�"
+ style="width: 260px"
+ />
+ </el-form-item>
+ <el-form-item label="鍙傝�冭寖鍥�" prop="proScope">
+ <el-input
+ v-model="form.proScope"
+ placeholder="璇疯緭鍏ュ弬鑰冭寖鍥�"
+ style="width: 200px"
+ />
+ </el-form-item>
<el-form-item label="鏁伴噺" prop="sl">
<el-input
v-model="form.sl"
placeholder="璇疯緭鍏ユ暟閲�"
- style="width: 260px"
+ style="width: 200px"
/>
</el-form-item>
<el-form-item label="缁勫悎鏍囧織" prop="sfzhfy">
<el-select
v-model="form.sfzhfy"
placeholder="璇烽�夋嫨鏄惁缁勫悎鏍囧織"
- style="width: 200px"
+ style="width: 260px"
>
<el-option
v-for="dict in dict.type.sys_yes_no"
@@ -519,7 +533,7 @@
</span>
- <el-input v-model="form.hisXmmc" placeholder="his椤圭洰鍚嶇О" style="width: 260px;">
+ <el-input v-model="form.hisXmmc" placeholder="his椤圭洰鍚嶇О" style="width: 200px;">
</el-input>
</el-form-item>
<el-form-item label="his椤圭洰鍚嶇О" prop="hisXmmc" v-if="key == 'N'">
@@ -530,7 +544,7 @@
<el-input
v-model="form.hisXmbm"
placeholder="璇疯緭鍏is缂栫爜"
- style="width: 200px"
+ style="width: 260px"
/>
</el-form-item>
<el-form-item label="his鍗曚环" prop="hisdj">
@@ -549,7 +563,7 @@
LIS椤圭洰
</span>
- <el-input v-model="form.lisXmmc" placeholder="璇疯緭鍏IS椤圭洰" style="width: 260px;">
+ <el-input v-model="form.lisXmmc" placeholder="璇疯緭鍏IS椤圭洰" style="width: 200px;">
</el-input>
</el-form-item>
@@ -557,7 +571,7 @@
<el-input
v-model="form.LISXmbm"
placeholder="璇疯緭鍏is缂栫爜"
- style="width: 200px"
+ style="width: 260px"
/>
</el-form-item>
<el-form-item label="澶囨敞" prop="proRemark">
@@ -1024,6 +1038,8 @@
sfxmId: "",
lisXmbm: "",
lisXmmc: "",
+ proMetering:'',
+ proScope:''
},
// 琛ㄥ崟鏍￠獙
rules: {
@@ -1123,6 +1139,8 @@
};
getAllChildListById(data).then((response) => {
// this.projectList = this.handleTree(response.data.list, "proId");
+ console.log(response,1122);
+
this.projectList = response.data.list;
this.loading = false;
});
@@ -1604,6 +1622,8 @@
const proId = row.proId || this.ids;
this.proParent = false;
getProject(proId).then((response) => {
+ console.log(response,999);
+
this.form = response.data;
if (this.form.proParentId === "0") {
this.showPrise = true;
--
Gitblit v1.8.0