From c1857baa3a4fbce727da5de733fe30d38477978f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 25 四月 2024 15:05:09 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/index.vue | 2
src/views/repositoryai/templateku/configurat/index.vue | 4 +-
src/store/getters.js | 4 +-
src/views/repositoryai/intention/index.vue | 19 ++++++++-
src/views/patient/propaganda/particty.vue | 38 +++++++++++++------
src/components/SFtable/index.vue | 4 +-
6 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue
index 4bf2088..66089f3 100644
--- a/src/components/SFtable/index.vue
+++ b/src/components/SFtable/index.vue
@@ -34,7 +34,7 @@
:formatter="formatData"
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鏄惁鍙敤"
align="center"
key="isavailable"
@@ -44,7 +44,7 @@
<template slot-scope="scope">
<dict-tag :options="qyoptions" :value="scope.row.usestate" />
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
v-if="center"
label="鎿嶄綔"
diff --git a/src/store/getters.js b/src/store/getters.js
index 926ae9a..7fc54d3 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -204,7 +204,7 @@
// 鏄惁蹇呭～
required: (state) => [
{
- value: "0",
+ value: "1",
label: "蹇呭～",
raw: {
cssClass: "",
@@ -212,7 +212,7 @@
},
},
{
- value: "1",
+ value: "2",
label: "闈炲繀濉�",
raw: {
cssClass: "",
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index 3ba5975..86d879e 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -589,7 +589,7 @@
handleUpdate(row) {
this.$router.push({
path: "/followvisit/record/detailpage/",
- query: { id: "1" },
+ query: { id: "1", type: row.hosptype},
});
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index c44777c..42620a3 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -376,11 +376,11 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
size="mini"
@click="variableEdit(scope.$index, scope.row)"
>缂栬緫</el-button
- >
+ > -->
<el-button
size="mini"
type="danger"
@@ -526,10 +526,12 @@
</el-row>
<!-- 閫変腑鎮ｈ�呭垪琛� -->
<SFtable
+ @details="detailhz"
@handleUpdate="handleUpdate"
@handleSelectionChange="handleSelectionChange"
:currentList="form.patTaskRelevances"
:tableLabel="tableLabelhz"
+ :serialnumber="false"
:controlxz="false"
:typeinfo="2"
/>
@@ -632,7 +634,7 @@
:currentList="patientuserList"
:tableLabel="tableLabelhz"
:serialnumber="false"
- :controlsc="false"
+ :center="false"
:typeinfo="3"
/>
</el-row>
@@ -687,7 +689,7 @@
radio: 1,
checkboxlist: [],
tableLabel: [],
-
+
// 鎮ｈ�呰〃鍗�
tableLabelhz: [
{ label: "搴忓彿", width: "", prop: "patid" },
@@ -776,6 +778,7 @@
userList: [], //妯＄増鍒楄〃
patientuserList: [], //閫夋嫨鎮ｈ�呭垪琛�
sonuserList: [], //閫変腑鎮ｈ�呭垪琛�
+ delvariableList: [], //鍒犻櫎鍙橀噺涓存椂瀛樺偍
variableList: [
{
name: "濮撳悕",
@@ -849,8 +852,8 @@
this.id = this.$route.query.id;
this.form.hospType = this.$route.query.type;
this.listDept();
- this.Getdetails();
this.Acquisitiontype();
+ this.Getdetails();
},
methods: {
@@ -953,7 +956,6 @@
);
console.log(filteredArray, "瀛樺墠鍙橀噺");
this.form.textParam = this.convertFormat2ToFormat1(filteredArray);
-
if (this.form.id) {
this.form.isoperation = 2;
} else {
@@ -1050,6 +1052,8 @@
this.multiple = !selection.length;
console.log(this.ids);
},
+ // 鍒犻櫎閫変腑鎮ｈ��
+ detailhz(row, info) {},
getList() {},
handleQuery() {
this.handleAddpatient();
@@ -1075,11 +1079,19 @@
Getdetails() {
if (this.id) {
getTaskInfo({ taskid: this.id }).then((res) => {
- const filteredArray = "";
+ let filteredArray = "";
if (res.code == 200) {
this.form = res.data;
this.checkList = this.form.serviceform.split(",");
+ this.daytime = this.form.sendlimitabegin.split(",");
+ if (this.form.sendlimitaend)
+ this.time1 = this.form.sendlimitaend.split(",");
+ if (this.form.sendlimitnbegin)
+ this.time2 = this.form.sendlimitaend.split(",");
+ if (this.form.sendlimitnend)
+ this.time3 = this.form.sendlimitaend.split(",");
filteredArray = this.convertFormat1ToFormat2(this.form.textParam);
+ console.log(filteredArray, "filteredArray");
this.variableList = this.transitionList.concat(filteredArray);
} else {
this.$modal.msgError(res.code);
@@ -1105,10 +1117,13 @@
},
// 鍙橀噺---------------
- variableEdit(index, row) {
- console.log(index, row);
- },
+ // variableEdit(index, row) {
+ // console.log(index, row);
+ // },
variableDelete(index, row) {
+ this.variableList.splice(index, 1);
+ row.isoperation = 3;
+ this.delvariableList.push(row);
console.log(index, row);
},
// 鏃堕棿----------
@@ -1170,8 +1185,7 @@
}
this.form.sendTimeslot = combinedData;
// 灞曠ず鏁版嵁涓存椂瀛樺偍鏃ユ湡銆佹棭銆佷腑銆佹櫄
- console.log(11);
- console.log(this.time2, "this.time2");
+
this.form.sendlimitabegin = this.daytime.join(",");
if (this.time1) this.form.sendlimitaend = this.time1.join(",");
if (this.time2) this.form.sendlimitnbegin = this.time2.join(",");
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index fa40443..0b3eb02 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -706,7 +706,9 @@
}, //绫诲埆琛ㄥ崟
// 琛ㄦ牸鏁版嵁
targetList: null,
- testuserList: [],
+ testuserList: [
+
+ ],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -1156,9 +1158,22 @@
console.log(row);
this.title = "鎸囨爣璇︽儏";
this.indexform = row;
+ if(!row.targetoptionList[0]){
+ row.targetoptionList=[{
+ targettype: "1",
+ targetvalue: "",
+ targetregex: "",
+ targetregex2: "",
+ isoperation: 1,
+ dynamiccruxs: [],
+ nodynamiccruxs: [],
+ dynamiccruxsJson: "",
+ nodynamiccruxsJson: "",
+ },]
+ }
this.dynamicTags = row.baseTagList.map(this.processElement);
this.testuserList = row.targetoptionList;
- this.testvalue='';
+ this.testvalue = "";
this.indexopen = true;
this.measurement = false;
},
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index c88b36e..4fe67d7 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -463,8 +463,8 @@
<el-col :span="12"
><el-form-item label="鏄惁蹇呭～">
<el-select
- v-model="topicobj.ismandatory"
- placeholder="璇烽�夋嫨"
+ v-model="topicobj.isMust"
+ placeholder="榛樿蹇呭～"
>
<el-option
v-for="item in required"
--
Gitblit v1.9.3