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

src/views/manage/components/portrait.vue

@@ -1,7 +1,49 @@
 <template>
   <div class="topform">
-    <div v-if="getParamslistData">
-      <div
+    <div v-if="form.getParamslistData">
+      <div v-for="(aitem, aindex) in form.getParamslistData"  :key="aindex">
+          <el-card>
+        
+            <div class="toptitle">{{ aitem.taskPartitionDictName }}</div>
+            <div
+              style="display: flex"
+              v-for="(bitem, bindex) in aitem.portraitSnVOList"
+              :key="bindex"
+            >
+              <el-card class="box-card">
+                <el-form
+                  ref="form"
+                  :inline="true"
+                  :model="form"
+                  class="form"
+                  label-width="100px"
+                  :rules="rules"
+                >
+                  <el-form-item
+                    v-for="(cItem, cIndex) in bitem.groupingValues"
+                    :key="cIndex"
+                    :label="cItem.fieldName"
+                  >
+                    <el-input v-model="cItem.fieldValue"></el-input>
+                  </el-form-item>
+                </el-form>
+              </el-card>
+              <div class="icon">
+                <i
+                  class="el-icon-delete"
+                  @click="delitem(aindex,bindex)"
+                  v-if="bindex != 0"
+                ></i>
+                <i
+                  v-if="bindex == 0"
+                  class="el-icon-circle-plus-outline"
+                  @click="additem(aindex,bindex)"
+                ></i>
+              </div>
+            </div>
+          </el-card>
+        </div>
+      <!-- <div
         v-for="(item, index) in getParamslistData"
         :key="index"
         style="display: flex"
@@ -15,7 +57,6 @@
             label-width="100px"
             :rules="rules"
           >
-            <!-- {{item}} -->
             <el-form-item
               v-for="(ite, ind) in item"
               :label="ite.fieldName"
@@ -38,20 +79,8 @@
             class="el-icon-circle-plus-outline"
             @click="additem(index)"
           ></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>
+      </div> -->
     </div>
 
 
@@ -81,9 +110,13 @@ export default {
           { required: true, message: '请选择节点审核状态', trigger: 'change' }
         ],
       },
-      form:{},
+      form: {
       getParamslistData: [],
 
+      },
+      // form:{},
+      // getParamslistData: [],
+
     }
   },
   watch: {

src/views/manage/labelfieldinfo/index.vue

@@ -590,7 +590,7 @@
       :before-close="typeecancel"
     >
       <el-form
-        :model="queryParamstask"
+        :model="queryType"
         ref="queryForm"
         size="small"
         :inline="true"
@@ -599,7 +599,7 @@
       >
         <el-form-item label="任务类型名称" prop="taskTypeName">
           <el-input
-            v-model="queryParams.taskTypeName"
+            v-model="queryType.taskTypeName"
             placeholder="请输入任务类型名称"
             clearable
             @keyup.enter.native="handleQuery"
@@ -610,10 +610,10 @@
             type="primary"
             icon="el-icon-search"
             size="mini"
-            @click="handleQuerytask"
+            @click="handleQuerytype"
             >搜索</el-button
           >
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytask"
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuerytype"
             >重置</el-button
           >
         </el-form-item>
@@ -668,7 +668,7 @@
         :total="totaltype"
         :pageSize="queryType.pageSize"
         :indexFromWrap="queryType.pageNum"
-        @updateCPage="updateCPagetwo"
+        @updateCPage="updateCPagetype"
       ></myPagination>
     </el-dialog>
   </div>
@@ -853,6 +853,12 @@ export default {
       this.queryParamstask.pageSize = size
       this.getListpartit();
     },
+    updateCPagetype(index, size) {
+      this.queryType.pageNum = index
+      this.queryType.pageSize = size
+      this.getListType();
+    },
+
     infolistword() {
       var dictType = "field_type";
       getAgencytype(dictType).then((res) => {
@@ -949,6 +955,7 @@ export default {
     nurseclicktype(row) {
       console.log(row, 'row')
       this.queryParamstask.taskTypeId = row.id
+      this.taskTypeId=this.queryParamstask.taskTypeId
       this.getListpartit()
       if (this.title == '添加标签字段信息') {
         this.form.labelFieldInfoList[this.nnerVisibleindex].taskTypeName =
@@ -1041,6 +1048,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
+    // 细分
     handleQuerytask() {
       this.queryParamstask.pageNum = 1;
       this.getListpartit();
@@ -1050,6 +1058,16 @@ export default {
       this.resetForm("queryForm");
       this.handleQuerytask();
     },
+    // 类型
+    handleQuerytype(){
+      this.queryType.pageNum = 1;
+      this.getListType();
+
+    },
+    resetQuerytype() {
+      this.resetForm("queryForm");
+      this.handleQuerytype();
+    },
 
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1060,6 +1078,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.taskTypeId='',
+      this.taskPartitionDictId='',
       this.form = {
         labelFieldInfoList: [
           {
@@ -1081,7 +1101,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-
       this.reset();
       this.infolistword();
       const id = row.id || this.ids

src/views/system/ManageNodeInformation/index.vue

@@ -667,7 +667,7 @@ export default indexjs;
     padding: 0 20px 20px;
     height: calc(100vh - 347px);
 
-    overflow: scroll;
+    overflow: auto;
 
     .timetitle {
       height: 60px;
@@ -686,7 +686,7 @@ export default indexjs;
     width: 73%;
     height: calc(100vh - 347px);
 
-    overflow: scroll;
+    overflow: auto;
     background-color: #fff;
   }
 }
@@ -707,7 +707,7 @@ export default indexjs;
     padding: 0 20px 20px;
     height: calc(100vh - 273px);
 
-    overflow: scroll;
+    overflow: auto;
 
     .timetitle {
       height: 60px;
@@ -726,7 +726,7 @@ export default indexjs;
     width: 73%;
     height: calc(100vh - 273px);
 
-    overflow: scroll;
+    overflow: auto;
     background-color: #fff;
   }
 }

src/views/system/specialDiseaseNode/index.vue

@@ -1209,7 +1209,7 @@ export default {
     padding: 0 20px 20px;
     // height: 680px;
     height: calc(100vh - 294px);
-    overflow: scroll;
+    overflow: auto;
 
     .timetitle {
       height: 60px;
@@ -1228,7 +1228,7 @@ export default {
     width: 73%;
     // height: 680px;
     height: calc(100vh - 294px);
-    overflow: scroll;
+    overflow: auto;
     background-color: #fff;
   }
 }