Merge branch 'dev' of http://192.168.2.236:10080/zhouna/platformFront into dev

src/components/icss/AddIndeptLabel.vue

@@ -173,7 +173,7 @@
             "labelSuffix":this.dataPub.suffix,                                 //后缀
             "minValue": this.dataPub.minNormalVal,        //化验最小正常值
             "maxValue": this.dataPub.maxNormalVal,         //化验最大正常值
-            "specFlag": this.dataPub.specFlag,  //标记状态（0：没有标记，1：主诉高亮，2：诱因记录）
+            "specFlag": this.dataPub.specFlag,  //标记状态（0：没有标记，1：主诉高亮，2：诱因记录, 4:生命体征）
             "questionDetails": this.options,
             "questionMappings": [],      //映射关系,
             "formulaCode": isEdit?data.formulaCode : ''

src/components/icss/MedicinePrompt.vue

@@ -161,9 +161,13 @@
         })
       },
       toCopyProduct(row){
+        const pam = this.searched ? {
+          currentPage: this.currentPage,
+          filter: this.filter
+        } : {currentPage: this.currentPage};
         this.$router.push({
           name:'AddMedicinePrompt',
-          params: {data:row,isCopy:true}
+          params: Object.assign(pam, {data:row,isCopy:true})
         })
       },
       filterDatas(){

src/components/icss/NoiseTemplate.vue

@@ -235,6 +235,7 @@ export default {
           "joint": this.dataPub.region5,               //标签间的连接符
           // "subType": this.dataPub.region6,   	         //0:可以，1：不可以(当项目检索)
           "sexType": this.dataPub.region7,             //1:男，2：女，3：通用
+          "specFlag": this.dataPub.specFlag,           //生命体征
           "ageBegin": this.dataPub.region8,       		 //最小年龄
           "ageEnd": this.dataPub.region9,              //最大年龄
           "textGenerate": this.form.currentOrder,      //成文顺序 默认0

src/components/icss/PubIndeptTag.vue

@@ -304,6 +304,12 @@
               ></el-input>
             </el-form-item>
           </div>
+           <el-form-item v-if="form.region1 == 4">
+            <span>
+                <el-checkbox v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
+            </span>
+                
+          </el-form-item>
           
         </el-form>
     </div>

src/components/icss/PubTagGroup.vue

@@ -258,6 +258,11 @@
           ></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item v-if="form.region1 == 4">
+          <span>
+              <el-checkbox v-model="form.specFlag"  label="是否为生命体征" true-label="4" false-label="0"  @change="sendData"></el-checkbox>
+          </span>
+      </el-form-item>
     </el-form>
   </div>
 </template>
@@ -317,6 +322,7 @@ export default {
         tagPool: [],          //标签池数据
         order: [],            //排序方式
         tipLis: [],           //提示列表
+        specFlag: '0'       //生命体征
       },
       labelTypesMaps: {       //// 归属和填写单类型限制
         '1': ['2', '3', '4'],  //推送类型暂时不用

src/components/preTreat/CombinQuestion.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="组合填写单维护">
+        <crumbs title="组合填写单维护" class="simpleQ-crumb">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="归属：">
                     <el-select size="mini" v-model="filter.tagAdscription"  placeholder="归属" clearable>
@@ -24,7 +24,7 @@
                 </el-form-item>
             </el-form>
         </crumbs>
-        <div class="contents">
+        <div class="contents simpleQ-contents">
             <el-table
                     :data="list"
                     border