浏览代码

dev5.3.4内容撤回

zhouna 5 年之前
父节点
当前提交
9b5cf8b0e7

+ 0 - 1
src/api/utils.js

@@ -377,7 +377,6 @@ export default {
       specFlag:'specFlag',
       required: 'required',
       explains:'explains',
-      flag:'flag'
     };
     isDpt?maps.controlType = 'region2':maps.tagType = 'region2';
     let obj = {};

+ 6 - 1
src/components/preTreat/AddSimpleQuestion.vue

@@ -67,6 +67,12 @@
       changeVal(val) {   //子组件数据改变传递到父组件
         this.dataPub = val;
       },
+      changeSex() {       //性别改变,清空填写单明细
+        this.changeType();
+      },
+      changeType() {      //填写单类型改变,标签明细左侧更新,右侧清空
+        this.options = [];
+      },
       pushValues(its){
         this.options = its;
       },
@@ -134,7 +140,6 @@
             "itemType" :this.dataPub.region12,           //是否为主要内容
             "url":this.dataPub.region13,                  //上传图片
             "specFlag": this.dataPub.specFlag,            //是否拼接到主诉
-            "flag": this.dataPub.flag,            //是否拼接到主诉
             "required": this.dataPub.required,             //必填
             "questionDetails": this.options,                //明细项
             //"questionMappings": [],      //映射关系,

+ 16 - 16
src/components/preTreat/PubIndeptQa.vue

@@ -35,7 +35,7 @@
                 <el-select
                         v-model="form.region2"
                         placeholder="请选择类型"
-                        :disabled="(!!editData.id&&editData.controlType!='1'&&editData.controlType!='2')  || !form.region1"
+                        :disabled="!!editData.id  || !form.region1"
                         @change="readyChangeSelect(2)"
                 >
                     <el-option
@@ -100,13 +100,19 @@
                         @change="sendData"
                 ></el-input>
             </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 =='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
                     v-if="qaType==2"
                     label="填写单患者界面展示通俗内容:"
@@ -292,7 +298,6 @@
           region13:'',          //上传图片
           specFlag:'0',         //拼接到主诉
           required: '0',        //必填
-          flag:'',          //控件类型:时间类型1、诱因类型2、伴随类型3
         },
         //isNeedSearch: false, //是否需要查询(系统名称)
         imgList:[],
@@ -607,13 +612,8 @@
     .upload-hide .el-upload--picture{
         display: none;
     }
-    .PubTagGroupWrapper .groups .flag-box {
-     .el-form-item__content{
-         width:100%;
-     }
-        label:not(:first-child){
-            margin-left: 20px;
-        }
+    .flagBox {
+        margin-left: 20px;
     }
 </style>
 

+ 4 - 35
src/components/preTreat/PubSelect.vue

@@ -38,12 +38,8 @@
                     <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 sigle-row" v-if="type==3">
+            <div class="main-area" v-if="type==3">
                 <el-col v-for="(it,i) in rows" :key="i">
                     <div class="inps">
                         <el-input v-model="rows[i].name"
@@ -56,10 +52,6 @@
                     <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>
@@ -68,11 +60,6 @@
     @import "../../less/common.less";
     .main-area{
         position: relative;
-        .bottomPartMid{
-            position: absolute;
-            top:29px;
-            right: 0px;
-        }
     }
     .main-area .static-tip{
         border:1px solid #dcdfe6;
@@ -122,15 +109,7 @@
     .main-area{
         width: 80%;
         min-width: 400px;
-        margin:20px 150px 20px 20px;
-        &.sigle-row{
-             width: 60%;
-             margin:20px 150px 20px 30%;
-             .bottomPartMid{
-                 top: 0;
-                 right: 40%;
-             }
-         }
+        margin:20px 150px;
     .inps{
         display: inline-block;
         width: calc(100% - 60px);
@@ -208,9 +187,9 @@
       focusOn(newVal){
         this.checkedExc = this.rows[newVal].exclusion===1;
       },
-      /*type() {
+      type() {
         this.initData();
-      },*/
+      },
       sexType() {
         this.initData();
       },
@@ -232,16 +211,6 @@
         }
         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);

+ 2 - 2
src/components/preTreat/QuestionTagGroup.vue

@@ -27,7 +27,7 @@
             >
                 <p class="ellipsis" >
                     <span class="tagName">{{item.tagName}}</span>
-                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
+                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}})</span>
                 </p>
             </li>
         </ul>
@@ -48,7 +48,7 @@
             >
                 <p class="ellipsis" :title="'[ '+item.tagName+' ]('+sex[item.sexType]+(item.required?'、必':'')+(item.specFlag?'、跟主':'')+')'">
                     <span class="tagName">{{item.tagName}}</span>
-                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}}{{item.flag==1?'、时间':''}}{{item.flag==2?'、诱因':''}}{{item.flag==3?'、伴随':''}})</span>
+                    <span>({{sex[item.sexType]}}{{item.required?'、必':''}}{{item.specFlag?'、跟主':''}})</span>
                 </p>
                 <el-tag class="exclu" v-if="item.exclusionType==1" type="info" size="mini">互斥项</el-tag>
             </li>