From 628fd01beea81bac2f0299472d528860ae07cf3f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 02 六月 2024 10:52:30 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 35 ++++++++++++++++++++++++++++++++---
vue.config.js | 2 +-
src/views/patient/propaganda/particty.vue | 8 ++++++--
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 45a9c02..a04d02e 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -218,7 +218,7 @@
>
<template slot-scope="scope">
<el-button
- v-if="scope.row.status != 1"
+ v-if="scope.row.sendState == 1 || scope.row.sendState == 3"
size="medium"
type="text"
@click="sponsor(scope.row)"
@@ -226,12 +226,25 @@
><i class="el-icon-s-promotion"></i>浠诲姟鍙戣捣</span
></el-button
>
+ <el-button
+ v-if="scope.row.sendState == 1 || scope.row.sendState == 3"
+ size="medium"
+ type="text"
+ @click="immediateExecution(scope.row)"
+ ><span class="button-lj"
+ ><i class="el-icon-s-promotion"></i>绔嬪嵆鎵ц</span
+ ></el-button
+ >
<el-button size="medium" type="text" @click="newAdd(scope.row)"
><span class="button-xj"
><i class="el-icon-circle-plus-outline"></i>渚濈収鏂板</span
></el-button
>
- <el-button size="medium" type="text" @click="stop(scope.row)"
+ <el-button
+ v-if="scope.row.sendState == 2"
+ size="medium"
+ type="text"
+ @click="stop(scope.row)"
><span class="button-zt"
><i class="el-icon-circle-plus-outline"></i>鏆傚仠浠诲姟</span
></el-button
@@ -716,13 +729,23 @@
deletefn() {},
// 浠诲姟鍙戣捣
sponsor(row) {
- console.log(row,'浠诲姟淇℃伅');
+ console.log(row, "浠诲姟淇℃伅");
if (row.sendState != 2) {
this.TaskOperation.taskId = row.taskid;
this.TaskOperation.sendState = 2;
TaskTemplateSendExecution(this.TaskOperation).then((res) => {});
}
},
+ immediateExecution(row) {
+ console.log(row, "浠诲姟淇℃伅");
+ if (row.sendState != 2) {
+ this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.sendState = 2;
+ this.TaskOperation.sendType = 2;
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {});
+ }
+ },
+
// 渚濈収鏂板
newAdd(row) {
TaskTemplateSendExecution().then((res) => {});
@@ -891,6 +914,12 @@
border-radius: 1px;
color: #ffffff;
}
+.button-lj {
+ background: #e9614f;
+ padding: 5px;
+ border-radius: 1px;
+ color: #ffffff;
+}
.button-xj {
background: #815c94;
padding: 5px;
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index b94d4cf..8f06dbc 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -1078,8 +1078,12 @@
this.overallCase.forEach((item) => {
this.allpids.push(item.patid);
});
- this.patientqueryParams.pids = this.allpids;
- console.log(this.patientqueryParams.pids);
+ if (this.allpids[0]) {
+ this.patientqueryParams.pids = this.allpids;
+ console.log(this.patientqueryParams.pids);
+ } else {
+ this.patientqueryParams.pids = null;
+ }
getTaskpatient(this.patientqueryParams).then((response) => {
console.log(response);
diff --git a/vue.config.js b/vue.config.js
index 4e61a3f..610b425 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://192.168.1.10:8089`,
+ // target: `http://192.168.2.8:8089`,
target:`http://localhost:8089`,
// target: `http://www.hxsoft.com:8080`,
changeOrigin: true,
--
Gitblit v1.9.3