Merge remote-tracking branch 'origin/dev' into dev

src/api/manage/Auditing.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+// 查询管理任务路径及节点
+export function getRouteNodeList(query) {
+    return request({
+        url: '/manage/signnode/getRouteNodeList',
+        method: 'get',
+        params: query
+    })
+}
+

src/views/manage/Auditing/index.vue

@@ -1,25 +1,124 @@
 <template>
-    <div class="card">
+    <div style="background-color:#F1F3F5">
-        <div class="cardleft">
+        <div slot="footer" style="float: right;padding:10px 10px 0 0;height:35px">
-            <img class="headsculpture" src="../../../assets/manage/touxiang.png" alt="">
+            <el-button size="mini" @click="cancel">取 消</el-button>
-            <!-- <img class="headsculpture" src="../../../assets/manage/nvtouxiang.png" alt=""> -->
+            <el-button size="mini" type="primary">审核通过</el-button>
         </div>
-        <div class="cardright">
+        <div class="card">
+            <div class="cardleft">
+                <div class="title">
+                    <img class="headsculpture" src="../../../assets/manage/touxiang.png" alt="">
+                    <!-- <img class="headsculpture" src="../../../assets/manage/nvtouxiang.png" alt=""> -->
+                    <div class="name">
+                        胡登
+                    </div>
+                    <div class="genderandage">
+                        <span>男</span>
+                        |
+                        <span>24岁</span>
+                    </div>
+                    <div class="source">
+                        <div class="situation item">
+                            {{ list.visitMethod == 'OUTPATIENT_SERVICE' ? '门诊' : '' }}
+                            {{ list.visitMethod == 'BE_IN_HOSPITAL' ? '住院' : '' }}
+                        </div>
+                        <div class="item" style="color:#00E06E;border-color:#00E06E">
+                            <img src="../../../assets/manage/gzh.png" alt="">
+                            <div>
+                                公众号
+                            </div>
+                        </div>
+                        <div class="item" style="color:#339DE5;border-color:#339DE5">
+                            <img src="../../../assets/manage/xcx.png" alt="">
+                            <div>
+                                小程序
+                            </div>
+                        </div>
+                        <div class="item" style="color:#F4881F;border-color:#F4881F">
+                            <img src="../../../assets/manage/gld.png" alt="">
+                            <div>
+                                管理端
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="texts">
+                    <div class="text">
+                        医院: 济南医院
+                    </div>
+                    <div class="text">
+                        科室: 肠胃科
+                    </div>
+                    <div class="text" v-if="list.visitMethod == 'BE_IN_HOSPITAL'">
+                        入院时间: {{ list.admissionTime }}
+                    </div>
+                    <div class="text" v-if="list.visitMethod == 'BE_IN_HOSPITAL'">
+                        出院时间: {{ list.dischargeTime }}
+                    </div>
+                    <div class="text" v-if="list.visitMethod == 'OUTPATIENT_SERVICE'">
+                        就诊时间: {{ list.dischargeTime }}
+                    </div>
+                </div>
+                <el-descriptions title="诊断信息">
+                    <el-descriptions-item label="主要诊断">kooriookami</el-descriptions-item>
+                </el-descriptions>
+                <el-descriptions title="手术信息">
+                    <el-descriptions-item label="手术名称">kooriookami</el-descriptions-item>
+                </el-descriptions>
+                <el-collapse v-model="activeNames">
+                    <el-collapse-item title="入院记录" name="1">
+                        <div>与现实生活一致：与现实生活的流程、逻辑保持一致，遵循用户习惯的语言和概念；</div>
+                        <div>在界面中一致：所有的元素和结构需保持一致，比如：设计样式、图标和文本、元素的位置等。</div>
+                    </el-collapse-item>
+                    <el-collapse-item title="手术记录" name="2">
+                        <div>用户决策：根据场景可给予用户操作建议或安全提示，但不能代替用户进行决策；</div>
+                        <div>结果可控：用户可以自由的进行操作，包括撤销、回退和终止当前操作等。</div>
+                    </el-collapse-item>
+                    <el-collapse-item title="出院记录" name="3">
+                        <div>简化流程：设计简洁直观的操作流程；</div>
+                        <div>清晰明确：语言表达清晰且表意明确，让用户快速理解进而作出决策；</div>
+                        <div>帮助用户识别：界面简单直白，让用户快速识别而非回忆，减少用户记忆负担。</div>
+                    </el-collapse-item>
+                </el-collapse>
+            </div>
+            <div class="cardright">
 
+            </div>
         </div>
     </div>
 </template>
 
 <script>
+import {
+    getRouteNodeList
+} from '@/api/manage/Auditing.js'
 export default {
     name: "Auditing",
     data() {
         return {
+            activeNames: ['1', '2', '3'],
+            list: {
+                visitMethod: "BE_IN_HOSPITAL",
+            },
+            nodelist: [],
         };
     },
     created() {
+        this.info();
     },
     methods: {
+        info() {
+            getRouteNodeList({ patientId: this.$route.query.patientId, taskCreateType: 'MANUAL_CREATE' }).then(res => {
+                this.nodelist = res.data
+            })
+        },
+        cancel() {
+            this.$store.dispatch('tagsView/delView', this.$route).then(({ visitedViews }) => {
+                this.$router.push({
+                    path: "/task/manualReview",
+                });
+            })
+        },
     }
 };
 </script>
@@ -29,8 +128,7 @@ export default {
     display: flex;
     justify-content: space-evenly;
     padding: 20px 0;
-    height: calc(100vh - 84px);
+    height: calc(100vh - 119px);
-    background-color: #F1F3F5;
 
     .cardleft {
         width: 35%;
@@ -38,10 +136,73 @@ export default {
         overflow: scroll;
         padding: 20px;
 
-        .headsculpture {
+        ::v-deep .el-collapse-item__header {
-            width: 50px;
+            font-size: 16px;
-            height: 50px;
+            font-weight: bold;
         }
+
+        .texts {
+            margin: 16px 0 20px;
+            flex-wrap: wrap;
+            width: 100%;
+            display: flex;
+            font-size: 14px;
+
+            .text {
+                margin-bottom: 10px;
+                width: 50%;
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                -o-text-overflow: ellipsis;
+            }
+        }
+
+        .title {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            .source {
+                display: flex;
+
+                .situation {
+                    background-color: #F1FAF7;
+                    padding: 3px 6px;
+                    color: #83CAC0 !important;
+                    border: 1px solid #83CAC0 !important;
+                }
+
+                .item {
+                    font-size: 14px;
+                    margin-left: 5px;
+                    border: 1px solid #fff;
+                    padding: 3px 6px;
+                    border-radius: 5px;
+                    justify-content: center;
+                    display: flex;
+                    align-items: center;
+
+                    img {
+                        margin-right: 2px;
+                        width: 16px;
+                        height: 16px;
+                    }
+                }
+            }
+
+            .name {}
+
+            .genderandage {}
+
+            .time {}
+
+            .headsculpture {
+                width: 35px;
+                height: 35px;
+            }
+        }
+
     }
 
     .cardright {
@@ -50,4 +211,4 @@ export default {
         width: 62%;
     }
 }
-</style>
+</style>

src/views/manage/manualReview/index.vue

@@ -210,22 +210,12 @@ export default {
         },
         /** 审核操作 */
         handleAuthRole(row) {
-            // this.$router.push({
+            this.$router.push({
-            //     path: "/patient/patientdetails",
+                path: "/task/Auditing",
-            //     query: {
+                query: {
-            //         patientId: row.id,
+                    patientId: row.patientId,
-            //         cardNo: row.cardNo,
+                },
-            //         patientName: row.patientName,
+            });
-            //         patientPhone: row.patientPhone,
-            //         sex: row.sex,
-            //         birthDate: row.birthDate,
-            //         familyMemberPhone: row.familyMemberPhone,
-            //         address: row.address,
-            //         patientSource: row.patientSource,
-            //         createTime: row.createTime,
-            //         age: row.birthDate ? getAge(row.birthDate) : ''
-            //     },
-            // });
         },
         /** 查询患者信息列表 */
         getList() {
@@ -358,4 +348,4 @@ export default {
         },
     }
 };
-</script>
+</script>

src/views/manage/patientInfo/index.vue

@@ -231,7 +231,6 @@ export default {
     },
     /** 详情操作 */
     handleAuthRole(row) {
-
       this.$router.push({
         path: "/patient/patientdetails",
         query: {

src/views/system/record/record.vue

@@ -380,6 +380,7 @@
                 <el-input
                   disabled
                   type="textarea"
+                  style="width: 500px;"
                   v-model="formlists.textRemindContent"
                   placeholder="请输入提醒内容"
                 />
@@ -483,9 +484,8 @@ export default {
             ) {
               e.checked = el.id;
             } else if (
-              (el.optionChooseSign == "0" &&
+              el.optionChooseSign == "0" &&
-                e.questionType == "MULTIPLE_CHOICE_QUESTIONS") ||
+              e.questionType == "MULTIPLE_CHOICE_QUESTIONS"
-              e.questionType == "COMBINATION_MULTIPLE_SUBJECT"
             ) {
               this.checkeddata.push(el.id);
             } else if (
@@ -493,6 +493,11 @@ export default {
               e.questionType == "SCORING_QUESTIONS"
             ) {
               e.checked = el.id;
+            } else if (
+              e.questionType == "COMBINATION_MULTIPLE_SUBJECT" &&
+              el.optionChooseSign == "0"
+            ) {
+              this.checkeddata.push(el.id);
             }
           });
         });
@@ -550,6 +555,11 @@ export default {
 };
 </script>
   <style lang="scss" scoped>
+  .tk {
+  ::v-deep .el-textarea__inner {
+    margin: 20px 0 10px 30px;
+  }
+}
 ::v-deep .el-radio {
   padding: 10px;
 }