Merge remote-tracking branch 'origin/dev5.3.4' into testedMerge

# Conflicts:
#	src/components/preTreat/PubIndeptQa.vue
#	src/components/preTreat/PubSelect.vue
#	src/components/preTreat/QuestionTagGroup.vue

src/components/icss/AddMedicinePrompt.vue

@@ -257,6 +257,7 @@
             }
             this.saveDisable = false
           }).catch((err) => {
+            this.saveDisable = false
             this.warning(err);
           })
         });

src/components/preTreat/PubIndeptQa.vue

@@ -35,7 +35,7 @@
                 <el-select
                         v-model="form.region2"
                         placeholder="请选择类型"
-                        :disabled="!!editData.id  || !form.region1"
+                        :disabled="(!!editData.id&&editData.controlType!='1'&&editData.controlType!='2')  || !form.region1"
                         @change="readyChangeSelect(2)"
                 >
                     <el-option
@@ -94,25 +94,19 @@
                     prop="region4"
             >
                 <el-input
-                        :disabled="!form.region1"
+                        :disabled="!form.region1||(qaType==2&&form.region1==1)"
                         v-model="form.region4"
                         :placeholder="qaType==2?'请输入填写单医生界面展示标准内容':'请输入填写单界面描述名称'"
                         @change="sendData"
                 ></el-input>
             </el-form-item>
-            <el-form-item  v-if="qaType =='1'&& form.region1 == '1' && form.region2 != '4'">
-            <span
-                    v-if="qaType =='1' && form.region1 == '1'  && form.region2 != '4'"
-            >
-                   <el-checkbox v-model="form.required"  label="必填" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
-                </span>
-                <span
-                        class = "flagBox"
-                        v-if="qaType =='1' &&form.region1=='1'&&form.region2=='9'"
-                >
-                   <el-checkbox v-model="form.specFlag" label="拼接到主诉" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
-                </span>
-            </el-form-item>
+          <el-form-item class="flag-box"  v-if="qaType =='1'&& form.region1 == '1' && form.region2 != '4'">
+              <el-checkbox v-model="form.required"  label="必填" true-label="1" false-label="0"  @change="sendData"></el-checkbox>
+              <!--<el-checkbox v-if="form.region2=='9'" v-model="form.specFlag" label="拼接到主诉" true-label="1" false-label="0"  @change="sendData"></el-checkbox>-->
+              <el-checkbox v-if="form.region2=='1'||form.region2=='9'" :disabled="form.flag==='2'" v-model="form.flag" label="时间类型" true-label="1" false-label=""  @change="sendData"></el-checkbox>
+              <el-checkbox v-if="form.region2=='1'||form.region2=='2'" :disabled="form.flag==='1'" v-model="form.flag" label="诱因类型" true-label="2" false-label=""  @change="sendData"></el-checkbox>
+              <el-checkbox v-if="form.region2=='8'" v-model="form.flag" label="伴随类型" true-label="3" false-label=""  @change="sendData"></el-checkbox>
+          </el-form-item>
             <el-form-item
                     v-if="qaType==2"
                     label="填写单患者界面展示通俗内容："
@@ -298,6 +292,7 @@
           region13:'',          //上传图片
           specFlag:'0',         //拼接到主诉
           required: '0',        //必填
+          flag:'',          //控件类型：时间类型1、诱因类型2、伴随类型3
         },
         //isNeedSearch: false, //是否需要查询（系统名称）
         imgList:[],
@@ -467,6 +462,7 @@
           this.labelTypes = this.labelTypesList.filter(item => maps[this.form.region1].includes(item.val));
         }
         //if(type === 2||type === 3) {
+        this.form.flag = '';
           this.sendData();
         //}
       },
@@ -506,6 +502,9 @@
       },
       pushSystemName(val) {
         this.form.region3 = val;
+        if(this.qaType==2&&this.form.region1==1){
+          this.form.region4 = val;
+        }
         this.systemNameShow = false;
         this.sendData();
       },
@@ -612,8 +611,13 @@
     .upload-hide .el-upload--picture{
         display: none;
     }
-    .flagBox {
-        margin-left: 20px;
+    .PubTagGroupWrapper .groups .flag-box {
+     .el-form-item__content{
+         width:100%;
+     }
+        label:not(:first-child){
+            margin-left: 20px;
+        }
     }
 </style>
 

src/components/preTreat/PubSelect.vue

@@ -38,8 +38,12 @@
                     <el-tag v-if="it.exclusion" type="info" size="mini">互斥项</el-tag>
                 </el-col>
                 <el-button @click="addRow">+</el-button>
+                <div class="bottomPartMid bottomPartMidss">
+                    <p><span class="el-icon-arrow-up" @click="orderUpDown(-1)"></span></p>
+                    <p><span class="el-icon-arrow-down" @click="orderUpDown(1)"></span></p>
+                </div>
             </div>
-            <div class="main-area" v-if="type==3">
+            <div class="main-area sigle-row" v-if="type==3">
                 <el-col v-for="(it,i) in rows" :key="i">
                     <div class="inps">
                         <el-input v-model="rows[i].name"
@@ -52,6 +56,10 @@
                     <el-tag v-if="it.exclusion" type="info" size="mini">互斥项</el-tag>
                 </el-col>
                 <el-button @click="addRow" class="little">+</el-button>
+                <div class="bottomPartMid bottomPartMidss">
+                    <p><span class="el-icon-arrow-up" @click="orderUpDown(-1)"></span></p>
+                    <p><span class="el-icon-arrow-down" @click="orderUpDown(1)"></span></p>
+                </div>
             </div>
         </el-form>
     </div>
@@ -60,6 +68,11 @@
     @import "../../less/common.less";
     .main-area{
         position: relative;
+        .bottomPartMid{
+            position: absolute;
+            top:29px;
+            right: 0px;
+        }
     }
     .main-area .static-tip{
         border:1px solid #dcdfe6;
@@ -109,7 +122,15 @@
     .main-area{
         width: 80%;
         min-width: 400px;
-        margin:20px 150px;
+        margin:20px 150px 20px 140px;
+        &.sigle-row{
+             width: 60%;
+             margin:20px 150px 20px 30%;
+             .bottomPartMid{
+                 top: 0;
+                 right: 40%;
+             }
+         }
     .inps{
         display: inline-block;
         width: calc(100% - 60px);
@@ -187,9 +208,9 @@
       focusOn(newVal){
         this.checkedExc = this.rows[newVal].exclusion===1;
       },
-      type() {
+      /*type() {
         this.initData();
-      },
+      },*/
       sexType() {
         this.initData();
       },
@@ -211,6 +232,16 @@
         }
         this.disableBtn = false;
       },
+      orderUpDown(i){
+        const item = this.rows[this.focusOn];       //要调整位置的行
+        const inx = this.focusOn;
+        if(inx===-1||(inx===0&&i===-1)||(inx===this.rows.length-1&&i===1)){
+          return ;
+        }
+        this.focusOn = inx+i;
+        this.rows.splice(inx,1);
+        this.rows.splice(inx+i,0,item);
+      },
       handlePlaceholder(type){          //占位符类型，type=0文本输入框，type=1数字输入框
         const i = this.focusOn;
         clearTimeout(this.msgTimer);

src/components/preTreat/QuestionTagGroup.vue

@@ -21,13 +21,13 @@
             <li v-for="(item, index) in leftTagsList"
                 class = "tagItem"
                 :key='item.id'
-                :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+(item.specFlag?'、跟主':'')+')'"
+                :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+')'"
                 :style="getStyle(item)?styles:null"
                 @click='selectLeftTag(item, index, $event)'
             >
                 <p class="ellipsis" >
                     <span class="tagName">{{item.tagName}}</span>
-                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}})</span>
+                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
                 </p>
             </li>
         </ul>
@@ -46,9 +46,9 @@
                 :style="getStyle2(item)?styles:null"
                 @click='selectRightTag(item)'
             >
-                <p class="ellipsis" :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+(item.specFlag?'、跟主':'')+')'">
+                <p class="ellipsis" :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+')'">
                     <span class="tagName">{{item.tagName}}</span>
-                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}})</span>
+                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
                 </p>
                 <el-tag class="exclu" v-if="item.exclusionType==1" type="info" size="mini">互斥项</el-tag>
             </li>