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

src/api/manage/Portraitedit.js

@@ -16,11 +16,11 @@ export function getAllNodeByPatient(query) {
         params: query
     })
 }
-// 根据节点id提取参数列表
+// 根据节点id提取参数右侧列表
 
-export function getParams(query) {
+export function groupingValue(query) {
     return request({
-        url: '/system/specialDiseaseNode/getParams',
+        url: '/manage/labelfieldcontent/groupingValue',
         method: 'get',
         params: query
     })
@@ -33,4 +33,4 @@ export function inserList(data) {
         data: data
     })
 }
-// 
+//

src/views/manage/Portraitedit/index.vue

@@ -4,14 +4,14 @@
       <div class="timelist">
         <div class="left" ref="box">
           <div class="name">画像分组</div>
-          <div>
+          <!-- <div>
             <el-input
               v-model="name"
               placeholder="请输入画像分组"
               clearable
               @keyup.enter.native="handleQuery"
             />
-          </div>
+          </div> -->
           <!-- <div class="listitem">
             <div
               :class="itemname == null ? 'allactive' : 'all'"
@@ -27,7 +27,7 @@
             :key="index"
             @click="bottomclickevent(ulitem)"
           >
-            <div :class="taskid == ulitem.taskPartitionDictId? 'allactive' : 'all'">
+            <div :class="taskid == ulitem.taskPartitionDictId ? 'allactive' : 'all'">
               {{ ulitem.taskPartitionDictName }}
             </div>
             <!-- <span class="count">{{ ulitem.countNum }}</span> -->
@@ -112,14 +112,15 @@
                   label-width="100px"
                   :rules="rules"
                 >
+                <!-- {{item}} -->
                   <el-form-item
-                    :label="ite.paramName"
                     v-for="(ite, ind) in item"
+                    :label="ite.fieldName"
                     :key="ind"
                   >
                     <el-input
                       class="textarea"
-                      v-model="ite.paramValue"
+                      v-model="ite.fieldValue"
                     ></el-input>
                   </el-form-item>
                 </el-form>
@@ -158,19 +159,20 @@
     </div>
   </div>
 </template>
-  
+
   <script>
-import { getAllNodeByPatient, getParams, inserList,groupingContent } from '@/api/manage/Portraitedit'
+import { getAllNodeByPatient, groupingValue, inserList, groupingContent } from '@/api/manage/Portraitedit'
 export default {
-  name: "Portraitedit",
+  name: "Portraitedit1",
   data() {
     return {
-      name:null,
+      name: null,
       taskid: 0,
-      count:'',
+      count: '',
       DepartmentoList: [],
-            // 左侧传值
-            querydepartmen: {
+      // 左侧传值
+      querydepartmen: {
+        // patientId: this.$route.query.patientId,
         taskPartitionDictName: "",
       },
       itemid: null,
@@ -184,7 +186,8 @@ export default {
         patientId: '',
       },
       querytParams: {
-        id: '',
+        taskPartitionDictId: '',
+        // signPatientManageRouteNodeId: '',
         patientId: this.$route.query.patientId,
       },
       rules: {
@@ -208,7 +211,7 @@ export default {
     };
   },
   created() {
-    this.Departmentlist()
+    // this.Departmentlist()
     console.log(this.$route.query, 'this.$route.query')
     this.qurelist.patientId = this.$route.query.patientId
     this.getAllNodeBy()
@@ -226,13 +229,13 @@ export default {
   methods: {
 
     // 左侧列表
-    Departmentlist() {
-      this.loading = true;
-      groupingContent(this.querydepartmen).then(response => {
-        this.DepartmentoList = response.data;
-        this.loading = false;
-      });
-    },
+    // Departmentlist() {
+    //   this.loading = true;
+    //   groupingContent(this.querydepartmen).then(response => {
+    //     this.DepartmentoList = response.data;
+    //     this.loading = false;
+    //   });
+    // },
     // 左侧
     getAllNodeBy() {
       const loading = this.$loading({
@@ -243,13 +246,15 @@ export default {
       });
       this.getAllNodeByPatientlist = []
       if (this.$route.query) {
-        this.qurelist.patientId=15
-        getAllNodeByPatient(this.qurelist).then(res => {
-          // this.getAllNodeByPatientlist = res.data
+        groupingContent(this.querydepartmen).then(response => {
+        this.DepartmentoList = response.data;
           loading.close();
-          this.getAllNodeByPatientlist = this.handleData(res.data, 'routeNodeDay', 'routeNodeName')
-          // console.log(this.getAllNodeByPatientlist, 'this.getAllNodeByPatientlist')
-        })
+
+        this.loading = false;
+      }).catch(() => {
+        loading.close();
+        });
+
       } else {
         loading.close();
         this.getAllNodeByPatientlist.push({
@@ -304,22 +309,28 @@ export default {
       });
       return newList;
     },
-    getParams() {
-        this.querytParams={
-            id: 730,
-        patientId: this.$route.query.patientId,
 
-        }
-      getParams(this.querytParams).then(res => {
-        res.data.forEach(e => {
-          e.forEach(el => {
-            el.patientId = this.$route.query.patientId
-            el.patientName = this.$route.query.patientName
-            el.sn = Number(el.sn)
-          })
-        })
-        this.moban = JSON.parse(JSON.stringify(res.data))
-        this.getParamslistData = res.data
+    bottomclickevent(ulitem) {
+      console.log(ulitem, '9999')
+      this.taskid = ulitem.taskPartitionDictId
+      // this.querytParams.signPatientManageRouteNodeId = ulitem.taskPartitionDictId
+      this.querytParams.taskPartitionDictId = ulitem.taskPartitionDictId
+      this.loading = true;
+      this.getParams()
+    },
+    // 右侧列表
+    getParams() {
+      groupingValue(this.querytParams).then(res => {
+        console.log(res, 'res')
+        // res.data.forEach(e => {
+        //   e.forEach(el => {
+        //     el.patientId = this.$route.query.patientId
+        //     el.patientName = this.$route.query.patientName
+        //     el.sn = Number(el.sn)
+        //   })
+        // })
+        this.moban = JSON.parse(JSON.stringify(res))
+        this.getParamslistData = res
         console.log(this.getParamslistData, '009090')
 
       })
@@ -328,22 +339,23 @@ export default {
     //保存
     TemporaryStorage() {
       var emptyItems = []
-      emptyItems = this.getParamslistData.flat().filter(f => f.paramValue == "")
-      this.getParamslistData.forEach(e => {
-        e.forEach(el => {
-          el.routeId = this.itemdata.routeId
-          el.routeName = this.itemdata.routeName
-          el.routeNodeId = this.querytParams.id
-          el.routeNodeName = this.itemdata.routeNodeName
-          el.taskPartitionCode = this.itemdata.taskPartitionCode
-          el.taskPartitionDictId = this.itemdata.taskPartitionDictId
-          el.taskPartitionDictName = this.itemdata.taskPartitionDictName
-          el.taskTypeCode = this.itemdata.taskTypeCode
-          el.taskTypeId = this.itemdata.taskTypeId
-          el.taskTypeName = this.itemdata.taskTypeName
-        })
-      })
-      // return
+      emptyItems = this.getParamslistData.flat().filter(f => f.fieldValue == "")
+      console.log(this.getParamslistData,'this.getParamslistData')
+      // this.getParamslistData.forEach(e => {
+      //   e.forEach(el => {
+      //     el.routeId = this.itemdata.routeId
+      //     el.routeName = this.itemdata.routeName
+      //     el.routeNodeId = this.querytParams.id
+      //     el.routeNodeName = this.itemdata.routeNodeName
+      //     el.taskPartitionCode = this.itemdata.taskPartitionCode
+      //     el.taskPartitionDictId = this.itemdata.taskPartitionDictId
+      //     el.taskPartitionDictName = this.itemdata.taskPartitionDictName
+      //     el.taskTypeCode = this.itemdata.taskTypeCode
+      //     el.taskTypeId = this.itemdata.taskTypeId
+      //     el.taskTypeName = this.itemdata.taskTypeName
+      //   })
+      // })
+      return
       if (emptyItems && emptyItems.length > 0) {
         this.$modal.msgError("请填写完整,再进行提交");
       } else {
@@ -372,23 +384,20 @@ export default {
         })
       }
     },
-    bottomclickevent(ulitem) {
-        console.log(ulitem, '9999')
-        this.taskid = ulitem.taskPartitionDictId
-        this.loading = true;
-        // this.getList()
-    },
+
     additem(index) {
       this.moban[0].forEach(e => {
-        e.paramValue = ""
-        e.id = ""
+        e.fieldValue = ""
+
+        e.portraitSn=''
+        // e.id = ""
       })
       const newVal = JSON.parse(JSON.stringify(this.moban[0]))
       // const newVal = JSON.parse(JSON.stringify(this.getParamslistData[0]))
-      newVal.forEach(i => {
-        // i.sn = this.getParamslistData.length +1
-        i.sn = this.getParamslistData[this.getParamslistData.length - 1][0].sn + 1
-      })
+      // 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) {
@@ -585,4 +594,3 @@ export default {
   transform: translateY(-2%);
 }
 </style>
-  

src/views/manage/labelfieldinfo/index.vue

@@ -439,7 +439,7 @@
             <el-button
               type="primary"
               style="width: 15px; height: 15px"
-              v-if="taskPartitionDictId == scope.row.taskTypeId"
+              v-if="taskPartitionDictId == scope.row.id"
               circle
               @click="nurseclickzx(scope.row)"
             ></el-button>
@@ -694,11 +694,11 @@ export default {
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictName =
           row.taskPartitionName;
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskPartitionDictId =
-          row.taskTypeId;
+          row.id;
       } else if (this.titleup == '修改标签字段信息') {
         this.form.taskPartitionDictName =row.taskPartitionName;
         this.form.taskPartitionDictId =
-          row.taskTypeId;
+          row.id;
 
       }
 

src/views/manage/patientInfo/index.vue

@@ -272,7 +272,7 @@ export default {
       this.$router.push({
         path: "/patient/Portraitedit",
         query: {
-          patientId: row.patientId,
+          patientId: row.id,
           cardNo: row.cardNo,
           patientName: row.patientName,
           patientPhone: row.patientPhone,