From e370a1ff62ce99b31ca2da42675eb350196169b5 Mon Sep 17 00:00:00 2001
From: Liuyujia <18050528999@163.com>
Date: Mon, 13 Feb 2023 17:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=A2=9E=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/note.js                         |  55 ++-----
 src/styles/vab.scss                     |   2 +-
 src/views/followupentry/followaudit.vue | 202 ++++++++++++++----------
 3 files changed, 138 insertions(+), 121 deletions(-)

diff --git a/src/api/note.js b/src/api/note.js
index 95e8e01..8a68b7b 100644
--- a/src/api/note.js
+++ b/src/api/note.js
@@ -12,51 +12,28 @@ export function getSysCheckNote(params = {}) {
     params,
   });
 }
-//随访调查 列表
-export function getFollowSurvey(params = {}) {
-  return request({
-    url: "/disease-data/follow/survey",
-    method: "get",
-    params,
-  });
-}
-///////////////审核质控/////////////////////
-//随访已审核列表
-export function getFollowCheck(params = {}) {
+
+//新增意见标签
+export function postSysCheckNote(data = {}) {
   return request({
-    url: "/disease-data/dataCheck/follow/check",
-    method: "get",
-    params,
+    url: "/disease-data/sysCheckNote",
+    method: "post",
+    data
   });
 }
-//随访待审核列表
-export function getFollowUncheck(params = {}) {
+
+//修改意见标签
+export function putSysCheckNote(data = {}) {
   return request({
-    url: "/disease-data/dataCheck/follow/unCheck",
-    method: "get",
-    params,
+    url: "/disease-data/sysCheckNote",
+    method: "put",
+    data
   });
 }
-//随访病例待审核(详情数据)
-export function getFollowUnCheckDetail(id) {
+//删除意见标签
+export function delSysCheckNote(id) {
   return request({
-    url: `/disease-data/dataCheck/follow/unCheck/detail/${id}`,
-    method: "get",
+    url: `/disease-data/sysCheckNote/${id}`,
+    method: "delete",
   });
-}
-//随访病例审核
-export function putFollowCheck(data = {}) {
-  return request({
-    url: "/disease-data/dataCheck/follow/check",
-    method: "put",
-    data,
-  })
-}
-//修改随访审核意见
-export function putFollowCheckAdvice(data = {}) {
-  return request({
-    url: "/disease-data/dataCheck/follow/check/advice",
-    method: "put",
-    data,
-  })
 }
\ No newline at end of file
diff --git a/src/styles/vab.scss b/src/styles/vab.scss
index 6449d60..7bcb759 100644
--- a/src/styles/vab.scss
+++ b/src/styles/vab.scss
@@ -272,7 +272,7 @@ html {
         border-top: 1px solid $base-border-color;
 
         .el-form {
-          padding-right: 30px;
+          // padding-right: 30px;
         }
       }
 
diff --git a/src/views/followupentry/followaudit.vue b/src/views/followupentry/followaudit.vue
index d7bd3f4..aac73e3 100644
--- a/src/views/followupentry/followaudit.vue
+++ b/src/views/followupentry/followaudit.vue
@@ -11,10 +11,7 @@
       </div>
     </div>
     <div class="table-content p-24">
-      <follow-review
-        :formDataList="formEdit"
-        :tabActive="tabActive"
-      ></follow-review>
+      <follow-review :formDataList="formEdit" :tabActive="tabActive"></follow-review>
     </div>
     <div class="choose-handle p-24">
       <span v-if="!editStatus">请选择审核结果:</span>
@@ -26,8 +23,7 @@
           class="p-btn"
           size="medium"
           @click="showDialog(item.value, index)"
-          >{{ item.text }}</el-button
-        >
+        >{{ item.text }}</el-button>
         <span v-if="editStatus" class="op">驳回修改建议:胃镜图片不合规</span>
       </div>
     </div>
@@ -38,27 +34,21 @@
         <div class="content">
           <div class="showTips">
             该病例已经审核【驳回修改】，需要改为{{
-              btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
+            btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : ""
             }}吗
           </div>
         </div>
         <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onCancel"
-            >否</el-button
-          >
-          <el-button type="primary" :loading="loading" @click="editSubmit"
-            >是</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="onCancel">否</el-button>
+          <el-button type="primary" :loading="loading" @click="editSubmit">是</el-button>
         </div>
       </template>
     </public-dialog>
     <public-dialog ref="publicDialog" @onSubmit="onSubmit" @onCancel="onCancel">
       <!-- 审核结果回显 -->
       <template v-if="!confirmStatus" slot="content">
-        <div class="title">
-          {{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }}
-        </div>
-        <div class="content">
+        <div class="title">{{ btnGroup[curBtn - 1] ? btnGroup[curBtn - 1].text : "" }}</div>
+        <div class="content" ref="publicContent">
           <div v-if="curBtn != 1" class="noPass">
             <el-form
               ref="form"
@@ -68,10 +58,7 @@
               label-width="100px"
               class="demo-ruleForm"
             >
-              <el-form-item
-                :label="curBtn == 2 ? '不合格原因' : '驳回修改建议'"
-                prop="reason"
-              >
+              <el-form-item :label="curBtn == 2 ? '不合格原因' : '驳回修改建议'" prop="reason">
                 <el-input
                   v-model="form.reason"
                   type="textarea"
@@ -82,7 +69,7 @@
               </el-form-item>
             </el-form>
             <!-- 标签 -->
-            <div class="tag-form">
+            <div class="tag-form" v-loading="tagLoading">
               <el-tag
                 :key="index"
                 v-for="(item, index) in tagList"
@@ -90,16 +77,14 @@
                 :class="item.isSelect ? '' : 'unselect-tag'"
                 @click="seleckTag(item, index)"
               >
-                <span>{{ item.text }}</span>
+                <span>{{ item.note }}</span>
               </el-tag>
               <p class="handle-row" @click="handleEdit">编辑标签</p>
             </div>
           </div>
         </div>
         <div class="btn">
-          <el-button type="primary" :loading="loading" @click="onSubmit"
-            >确 定</el-button
-          >
+          <el-button type="primary" :loading="loading" @click="onSubmit">确 定</el-button>
         </div>
       </template>
       <!-- 提交后结果 -->
@@ -109,58 +94,73 @@
           <div v-if="curBtn == 1" class="pass">该病例审核合格成功！</div>
           <div v-if="curBtn != 1" class="noPass">
             <!-- 不合格和驳回 -->
-            <div class="label">
-              {{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}
-            </div>
+            <div class="label">{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}</div>
             <div class="reason">{{ form.reason }}</div>
           </div>
         </div>
-        <div v-if="curBtn != 1" class="showTips">
-          该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！
-        </div>
+        <div v-if="curBtn != 1" class="showTips">该病例审核{{ curBtn == 2 ? "不合格原因" : "驳回修改建议" }}提交成功！</div>
         <div class="btn">
-          <el-button
-            type="primary"
-            @click="nextExample"
-            :loading="auditLoading"
-          >
-            <span v-if="tabActive < this.formEdit.length - 1"
-              >确认并进入下一列审核</span
-            >
+          <el-button type="primary" @click="nextExample" :loading="auditLoading">
+            <span v-if="tabActive < this.formEdit.length - 1">确认并进入下一列审核</span>
             <span v-else>确 定</span>
           </el-button>
         </div>
       </template>
     </public-dialog>
     <!-- 标签操作 -->
-    <public-dialog
-      ref="noteDialog"
-      @onSubmit="onSubmit"
-      @onCancel="onCancel"
-      class="note-dialog"
-    >
+    <public-dialog ref="noteDialog" @onSubmit="onSubmit" @onCancel="onCancel" class="note-dialog">
       <template v-if="!confirmStatus" slot="content">
         <div class="title">编辑标签</div>
-        <div class="content">
+        <div class="content" v-if="tagList.length>0" :style="{'min-height':minHeight}">
           <el-row :key="index" v-for="(item, index) in tagList" class="mb-16">
-            <el-col span="18">
+            <el-col :span="18">
               <el-input
                 size="medium"
-                v-model="item.text"
+                v-model="item.note"
                 class="tag-input"
                 :class="item.isSelect ? '' : 'unselect-tag'"
+                placeholder="请输入标签"
                 @click="seleckTag(item, index)"
-              >
-              </el-input>
+                @blur="handleTag(item)"
+              ></el-input>
+            </el-col>
+            <el-col :span="3">
+              <span class="handle-text" style="color: #E02020;" @click="delTag(index)">删除</span>
+            </el-col>
+            <el-col :span="2">
+              <span
+                class="handle-text"
+                style="color: #4E68FF;"
+                v-if="index == tagList.length - 1"
+                @click="addTag"
+              >添加</span>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="content" :style="{'min-height':minHeight}" v-else>
+          <el-row class="mb-16">
+            <el-col :span="18">
+              <el-input
+                size="medium"
+                v-model="newNote"
+                class="tag-input"
+                placeholder="请输入标签"
+                @blur="handleTag({note:newNote})"
+              ></el-input>
             </el-col>
-            <el-col span="3">
-              <span class="handle-text" style="color: #E02020;">删除</span>
+            <el-col :span="3">
+              <span class="handle-text" style="color: #E02020;" @click="delTag(index)">删除</span>
             </el-col>
-            <el-col span="2">
-              <span  class="handle-text" style="color: #4E68FF;" v-if="index == tagList.length - 1">添加</span>
+            <el-col :span="2">
+              <span class="handle-text" style="color: #4E68FF;" @click="addTag">添加</span>
             </el-col>
           </el-row>
         </div>
+        <div class="btn">
+          <el-button type="primary" :loading="auditLoading" @click="noteSave">
+            <span>保 存</span>
+          </el-button>
+        </div>
       </template>
     </public-dialog>
   </div>
@@ -169,7 +169,7 @@
 import publicDialog from "./components/publicDialog.vue"
 import followReview from "./components/followReview.vue"
 import { getFollowUnCheckDetail, putFollowCheck } from "@/api/followup"
-import { getSysCheckNote } from "@/api/note"
+import { getSysCheckNote,postSysCheckNote,putSysCheckNote,delSysCheckNote } from "@/api/note"
 export default {
   components: { publicDialog, followReview },
   data() {
@@ -191,16 +191,18 @@ export default {
           reportTime: "",
           riskRank: "",
           formId: "1598197066503389185",
+          is_accept: "0",
         },
         {
           name: "djksh",
           contact_phone: "12345678",
-          is_accept: "0",
+          is_accept: "1",
           gas_exam: "15",
           G_17: "6",
         },
       ], //填报数据
       auditLoading: false,
+      tagLoading:false,
       form: {
         reason: "",
       }, //审核表单
@@ -226,26 +228,35 @@ export default {
       curComponent: "followReview",
       confirmStatus: false,
       tagList: [
-        {
-          text: "不合格原因",
-          isSelect: false,
-        },
-        {
-          text: "不合格原因不合格原因",
-        },
-        {
-          text: "不合格原因",
-        },
-        {
-          text: "不合格原因",
-        },
-        {
-          text: "不合格原因",
-        },
+        // {
+        //   note: "不合格原因",
+        //   isSelect: false,
+        // },
+        // {
+        //   note: "不合格原因不合格原因",
+        // },
+        // {
+        //   note: "不合格原因",
+        // },
+        // {
+        //   note: "不合格原因",
+        // },
+        // {
+        //   note: "不合格原因",
+        // },
       ],
+      newNote:'',
+      minHeight:'170px'
+    }
+  },
+  watch: {
+    tagList(){
+      this.$nextTick(() => {
+        this.minHeight = this.$refs.publicContent.offsetHeight + "px"
+      })
+      console.log('高度',this.$refs.publicContent.offsetHeight)
     }
   },
-  watch: {},
   created() {
     this.getDetail()
   },
@@ -307,7 +318,8 @@ export default {
         this.form = {}
       }
       this.$refs.editDialog.dialogVisible = false
-      this.$refs.publicDialog.dialogVisible = false
+      // this.$refs.publicDialog.dialogVisible = false
+      this.$refs.noteDialog.dialogVisible = false
       if (this.$refs.form) {
         this.$refs.form.clearValidate()
       }
@@ -356,21 +368,46 @@ export default {
       // }
       this.auditLoading = false
     },
-    // 审核标签
+    // 获取审核标签
     async getSysCheckNote() {
-      this.loading = true
+      this.tagLoading = true
       let res = await getSysCheckNote()
       if (res.code == 1) {
-        // this.formEdit=res.data //调试注释
+        this.tagList=res.data
       }
-      this.loading = false
+      this.tagLoading = false
     },
     //选择标签
     seleckTag(item, index) {
       this.tagList[index]["isSelect"] = true
-      this.form.reason = this.form.reason + item.text
+      this.form.reason = this.form.reason + item.note
       this.$forceUpdate()
     },
+    //标签添加
+    addTag(){
+      this.tagList.push(
+        {
+          note:''
+        },
+      )
+      this.$forceUpdate();
+    },
+    //标签对话框操作
+    noteSave(){
+      this.$refs.noteDialog.dialogVisible = false
+      this.getSysCheckNote()
+    },
+    //添加、编辑标签
+    async handleTag(item){
+      if(!item.note) return
+      else{
+        let params = {
+          note:item.note
+        }
+        item.id ? params['id']=item.id : ''
+        let res = item.id ? await putSysCheckNote(params) : await postSysCheckNote(params)
+      }
+    }
   },
 }
 </script>
@@ -476,6 +513,9 @@ export default {
       margin: 0px 12px 12px 0px;
       cursor: pointer;
       border-color: #4e68ff;
+      span {
+        display: inline-block;
+      }
     }
     .unselect-tag {
       color: #353a45;
@@ -497,7 +537,7 @@ export default {
         border-radius: 2px;
       }
     }
-    .handle-text{
+    .handle-text {
       line-height: 36px;
       cursor: pointer;
     }
-- 
2.22.0