人工审核

src/views/manage/Auditing/index.vue

@@ -263,9 +263,9 @@ export default {
             portaitCheckRemark: value,
             portaitCheckStatus: 'DISAGREE',
             signPatientRecordId: this.$route.query.signRecordId,
-            labelFieldContentList: [],
+            labelFieldAndPartitionDictList: [],
           }
-          obj.labelFieldContentList = this.portraitlistdata
+          obj.labelFieldAndPartitionDictList = this.portraitlistdata
           updatePortaitCheckStatus(obj).then(res => {
             this.$notify({
               type: 'success',
@@ -317,9 +317,9 @@ export default {
             portaitCheckRemark: value,
             portaitCheckStatus: 'AGREE',
             signPatientRecordId: this.$route.query.signRecordId,
-            labelFieldContentList: [],
+            labelFieldAndPartitionDictList: [],
           }
-          obj.labelFieldContentList = this.portraitlistdata
+          obj.labelFieldAndPartitionDictList = this.portraitlistdata
           console.log(obj, 'tijiao')
           // return
           updatePortaitCheckStatus(obj).then(res => {

src/views/manage/Portraitedit/index.vue

@@ -32,19 +32,24 @@
                 taskid == ulitem.taskPartitionDictId ? 'allactive' : 'all'
               "
             >
-              {{ulitem.taskTypeName}}<span class="spanitme" v-if="ulitem.taskTypeName">|</span>{{ ulitem.taskPartitionDictName }}
+              {{ ulitem.taskTypeName
+              }}<span class="spanitme" v-if="ulitem.taskTypeName">|</span
+              >{{ ulitem.taskPartitionDictName }}
             </div>
-            <!-- <span class="count">{{ ulitem.countNum }}</span> -->
           </div>
         </div>
       </div>
       <div class="texts">
         <div class="topform">
-          <div v-if="getParamslistData">
+          <div style="margin-bottom: 20px">
+            <div v-for="(aitem, aindex) in getParamslistData" :key="aindex">
+              <el-card>
+                <!-- {{aitem}} -->
+                <div class="toptitle">{{ aitem.taskPartitionDictName }}</div>
                 <div
-              v-for="(item, index) in getParamslistData"
-              :key="index"
                   style="display: flex"
+                  v-for="(bitem, bindex) in aitem.portraitSnVOList"
+                  :key="bindex"
                 >
                   <el-card class="box-card">
                     <el-form
@@ -55,44 +60,30 @@
                       label-width="100px"
                       :rules="rules"
                     >
-                  <!-- {{item}} -->
                       <el-form-item
-                    v-for="(ite, ind) in item"
+                        v-for="(cItem, cIndex) in bitem.groupingValues"
-                    :label="ite.fieldName"
+                        :key="cIndex"
-                    :key="ind"
+                        :label="cItem.fieldName"
                       >
-                    <el-input
+                        <el-input v-model="cItem.fieldValue"></el-input>
-                      class="textarea"
-                      v-model="ite.fieldValue"
-                    ></el-input>
                       </el-form-item>
                     </el-form>
                   </el-card>
                   <div class="icon">
                     <i
                       class="el-icon-delete"
-                  @click="delitem(index)"
+                      @click="delitem(aindex, bindex)"
-                  v-if="index != 0"
+                      v-if="bindex != 0"
                     ></i>
                     <i
-                  v-if="index == 0"
+                      v-if="bindex == 0"
                       class="el-icon-circle-plus-outline"
-                  @click="additem(index)"
+                      @click="additem(aindex, bindex)"
                     ></i>
-                <!-- <el-button
-                  v-if="
-                    taskPartitionCode == 'MEDICATION_GUIDE' ||
-                    taskPartitionCode == 'SPORT_GUIDE' ||
-                    taskPartitionCode == 'DIET_GUIDE' ||
-                    taskPartitionCode == 'NURSING_GUIDE'
-                  "
-                  round
-                  style="margin-left: 10px"
-                  @click="knowledge(index, item)"
-                  >知识库获取</el-button
-                > -->
                   </div>
                 </div>
+              </el-card>
+            </div>
           </div>
         </div>
       </div>
@@ -145,20 +136,7 @@ export default {
     console.log(this.$route.query, 'this.$route.query')
     this.qurelist.patientId = this.$route.query.patientId
     this.getAllNodeBy()
-    // console.log(this.DepartmentoList)
-    // var querytParams={
-    //   taskPartitionDictId: this.DepartmentoList[0].taskPartitionDictId,
-    //     patientId: this.$route.query.patientId,
 
-    // }
-    // groupingValue(querytParams).then(res => {
-    //     console.log(res, 'res')
-
-    //     this.moban = JSON.parse(JSON.stringify(res))
-    //     this.getParamslistData = res
-    //     // console.log(this.getParamslistData, '009090')
-
-    //   })
   },
   beforeDestroy() { },
   watch: {
@@ -195,7 +173,6 @@ export default {
       }
     },
     bottomclickevent(ulitem) {
-      console.log(ulitem, '9999')
       this.taskid = ulitem.taskPartitionDictId
       // this.querytParams.signPatientManageRouteNodeId = ulitem.taskPartitionDictId
       this.querytParams.taskPartitionDictId = ulitem.taskPartitionDictId
@@ -215,14 +192,15 @@ export default {
 
     //保存
     TemporaryStorage() {
+      // console.log(this.getParamslistData,'this.getParamslistData')
       var emptyItems = []
 
       var form = {
-        groupingValues:[]
+        labelFieldAndPartitionDictList: []
       }
-      form.groupingValues=this.getParamslistData
+      form.labelFieldAndPartitionDictList = this.getParamslistData
       // emptyItems = form.groupingValues.flat().filter(f => f.fieldValue == "" || !f.fieldValue)
-      // console.log(form, 'this.form')
+      console.log(this.form, 'this.form')
       // console.log(emptyItems, 'emptyItems')
       // return
 
@@ -256,24 +234,19 @@ export default {
       })
       // }
     },
-
+    additem(aindex, bindex) {
-    additem(index) {
+      // console.log(this.form.list,'this.form.list')
-      this.moban[0].forEach(e => {
+      const newVal = JSON.parse(JSON.stringify(this.moban[aindex].portraitSnVOList[0]))
+      newVal.groupingValues.forEach(e => {
         e.fieldValue = ""
-
         e.portraitSn = ''
-        // e.id = ""
+
-      })
+      });
-      const newVal = JSON.parse(JSON.stringify(this.moban[0]))
+
-      // const newVal = JSON.parse(JSON.stringify(this.getParamslistData[0]))
+      this.getParamslistData[aindex].portraitSnVOList.push(newVal)
-      // newVal.forEach(i => {
-      //   // i.sn = this.getParamslistData.length +1
-      //   i.sn = this.getParamslistData[this.getParamslistData.length - 1][0].sn + 1
-      // })
-      this.getParamslistData.push(newVal)
     },
-    delitem(index, item) {
+    delitem(aindex, bindex) {
-      this.getParamslistData.splice(index, 1)
+      this.getParamslistData[aindex].portraitSnVOList.splice(bindex, 1)
     },
   }
 };
@@ -302,19 +275,25 @@ export default {
 .dialog-footer {
   padding: 2px 44px 0;
   text-align: right;
+  position: relative;
+  bottom: 66px;
 }
 .texts {
   // overflow-y: scroll;
   overflow-x: hidden;
   width: 72%;
-  height: calc(100vh - 30px);
+  height: calc(100vh - 200px);
   background-color: #fff;
   .topform {
     width: 100%;
     position: relative;
     height: calc(100% - 177px);
-    overflow-y: auto;
+    // overflow-y: auto;
     padding: 15px 70px 30px 15px;
+    .toptitle {
+      font-weight: 600;
+      font-size: 18px;
+    }
     .box-card {
       // width:calc(100% - 149px);
       width: 85%;
@@ -355,7 +334,7 @@ export default {
 .list {
   margin: 20px auto;
   width: 100%;
-  height: calc(100% - 80px);
+  height: calc(100% - 11px);
   background-color: #f2f4f5;
   display: flex;
   padding-top: 15px;
@@ -367,6 +346,7 @@ export default {
     width: 25%;
     background-color: #fff;
     padding: 17px 20px;
+    height: calc(100% - 56px);
     // height: 680px;
     // height: calc(100vh - 294px);
     overflow-y: scroll;
@@ -386,8 +366,7 @@ export default {
         border-bottom: 1px solid #dcdfe6;
         .spanitme {
           padding: 10px;
-          color: #A8A8A8;
+          color: #a8a8a8;
-
         }
 
         .count {

src/views/manage/components/portrait.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="topform">
-    <div v-if="form.getParamslistData">
+    <div v-if="getParamslistData">
-      <div v-for="(aitem, aindex) in form.getParamslistData"  :key="aindex">
+      <div v-for="(aitem, aindex) in getParamslistData"  :key="aindex">
           <el-card>
-        
             <div class="toptitle">{{ aitem.taskPartitionDictName }}</div>
             <div
               style="display: flex"
@@ -24,11 +23,12 @@
                     :key="cIndex"
                     :label="cItem.fieldName"
                   >
-                    <el-input v-model="cItem.fieldValue"></el-input>
+                  <el-input class="textarea" v-model="cItem.fieldValue" v-if="!portaitCheckStatus"></el-input>
+              <el-input class="textarea" v-model="cItem.fieldValue" disabled  v-else></el-input>
                   </el-form-item>
                 </el-form>
               </el-card>
-              <div class="icon">
+              <div class="icon" v-if="!portaitCheckStatus">
                 <i
                   class="el-icon-delete"
                   @click="delitem(aindex,bindex)"
@@ -89,10 +89,8 @@
 </template>
 
 <script>
+import { groupingValue } from '@/api/manage/Portraitedit'
 
-import {
-  getPortaitByPatient
-} from '@/api/manage/Auditing.js'
 export default {
   props:['patientId','portaitCheckStatus'],//接收psMsg值
 
@@ -110,13 +108,9 @@ export default {
           { required: true, message: '请选择节点审核状态', trigger: 'change' }
         ],
       },
-      form: {
+      form: {},
       getParamslistData: [],
 
-      },
-      // form:{},
-      // getParamslistData: [],
-
     }
   },
   watch: {
@@ -145,35 +139,29 @@ export default {
   methods: {
     // 右侧列表
     getParams() {
-      // getPortaitByPatient
+      groupingValue(this.querytParams).then(res => {
-      getPortaitByPatient(this.querytParams).then(res => {
         console.log(res, 'res')
-        this.moban = JSON.parse(JSON.stringify(res.data))
+        this.moban = JSON.parse(JSON.stringify(res))
-        this.getParamslistData = res.data
+        this.getParamslistData = res
-        // console.log(this.getParamslistData, '009090')
+        console.log(this.getParamslistData, '009090')
 
       })
     },
     // 添加
-    additem(index) {
+    additem(aindex, bindex) {
-      this.moban[0].forEach(e => {
+      // console.log(this.form.list,'this.form.list')
+      const newVal = JSON.parse(JSON.stringify(this.moban[aindex].portraitSnVOList[0]))
+      newVal.groupingValues.forEach(e => {
         e.fieldValue = ""
         e.portraitSn = ''
-        // e.id = ""
+
-      })
+      });
-      const newVal = JSON.parse(JSON.stringify(this.moban[0]))
+
-      // const newVal = JSON.parse(JSON.stringify(this.getParamslistData[0]))
+      this.getParamslistData[aindex].portraitSnVOList.push(newVal)
-      // newVal.forEach(i => {
-      //   // i.sn = this.getParamslistData.length +1
-      //   i.sn = this.getParamslistData[this.getParamslistData.length - 1][0].sn + 1
-      // })
-      this.getParamslistData.push(newVal)
     },
     // 删除
-    delitem(index, item) {
+    delitem(aindex, bindex) {
-      // this.form.items.splice(index, 1)
+      this.getParamslistData[aindex].portraitSnVOList.splice(bindex, 1)
-      this.getParamslistData.splice(index, 1)
-
     },
 
   },
@@ -184,6 +172,9 @@ export default {
 ::v-deep .el-input.is-disabled .el-input__inner{
   background: #fff;
 }
+::v-deep .el-card {
+    margin-bottom: 20px !important;
+  }
 .topform {
   width: 100%;
   position: relative;