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

src/components/icss/AddMedicinePrompt.vue

@@ -29,10 +29,12 @@
                 <InfoParagraph v-for="(f,i) in form.prags"
                                :data="f"
                                :index="i"
+                               :total="form.prags.length"
                                :isEdit = "isEdit"
                                ref="subForm"
                                @add="addParagraph(i)"
-                               @del="delParagraph"></InfoParagraph>
+                               @del="delParagraph"
+                               @reOrder="reOrder"></InfoParagraph>
             </el-form>
             <div class="btn">
                 <el-button
@@ -122,14 +124,45 @@
       }
     },
     methods: {
+      reOrder(isUp,i){
+        let temp = {},it={};
+        if(isUp===1){
+          if(i===0){
+            this.warning('已经是第一个，不能再升啦！');
+            return ;
+          }
+          temp = Object.assign(this.form.prags[i-1]);
+          temp.orderNo = temp.orderNo+1;
+          it = Object.assign(this.form.prags[i]);
+          it.orderNo = it.orderNo-1;
+          this.form.prags.splice(i-1,2,it,temp);
+        }else{
+          if(i===this.form.prags.length-1){
+            this.warning('已经是最后一个，不能再降啦！');
+            return ;
+          }
+          temp = Object.assign(this.form.prags[i+1]);
+          temp.orderNo = temp.orderNo-1;
+          it = Object.assign(this.form.prags[i]);
+          it.orderNo = it.orderNo+1;
+          this.form.prags.splice(i,2,temp,it);
+        }
+      },
       addParagraph(i){
-        this.form.prags.push({
+        this.form.prags.splice(i+1,0,{
           title:'',
           content:'',
           isReason:0,
-          orderNo:this.form.prags.length,
+          orderNo:i+1,
           position:[],
           text:''});
+        /*this.form.prags.push({
+          title:'',
+          content:'',
+          isReason:0,
+          orderNo:this.form.prags.length,
+          position:[],
+          text:''});*/
       },
       delParagraph(i){
         if(this.form.prags.length==1){

src/components/icss/MedicalName.vue

@@ -6,7 +6,7 @@
                     <el-input size="mini" v-model="filter.term" placeholder="输入术语"></el-input>
                 </el-form-item>
                 <el-form-item label="术语类型：">
-                  <el-select v-model="filter.type" 
+                  <el-select v-model="filter.type"
                   clearable 
                   filterable 
                   placeholder="请选择" 
@@ -19,7 +19,10 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-              <el-form-item label="状态：">
+                <el-form-item label="同义词：">
+                    <el-input size="mini" v-model="filter.libName" placeholder="输入同义词"></el-input>
+                </el-form-item>
+              <!--<el-form-item label="状态：">
                 <el-select v-model="isState" clearable placeholder="请选择" size="mini">
                   <el-option
                     v-for="item in stateSelect"
@@ -28,7 +31,7 @@
                     :value="item.id">
                   </el-option>
                 </el-select>
-              </el-form-item>
+              </el-form-item>-->
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <el-button size="mini" @click="uploadClick">导入</el-button>
@@ -121,7 +124,8 @@
         total: 0,
         filter: {
           term:'',
-          type:''
+          type:'',
+          libName:''
         },
         typeList:[]
       }
@@ -176,7 +180,7 @@
           current: this.currentPage,
           size: this.pageSize,
           type:this.filter.type,
-          isDeleted:this.isState
+          libName:this.filter.libName
         };
         return param;
       },

src/components/icss/MedicineInfoPg.vue

@@ -21,6 +21,10 @@
                          class="ql-editor"
                          ref="quillEditor"></quillEditor>
         </el-form-item>
+        <div class="order-btn">
+            <a v-if="index!==0" class="order-up" @click="reOrder(1)">上升</a>
+            <a v-if="index!==total-1" class="order-down" @click="reOrder(0)">下降</a>
+        </div>
         <el-form-item label-width="130px">
             <el-button @click="addEmit">添加段落</el-button>
             <el-button @click="delEmit" type="info">删除本段落</el-button>
@@ -37,7 +41,7 @@
   import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
   Quill.register('modules/ImageExtend', ImageExtend);
   export default{
-    props:['data','index','isEdit'],
+    props:['data','index','isEdit','total'],
     name:'MedicineInfoParagraph',
     components:{
       quillEditor
@@ -102,6 +106,9 @@
       this.positions = JSON.parse(pos)&&JSON.parse(pos).positionTypeEnum;
     },
     methods:{
+      reOrder(i){
+        this.$emit("reOrder",i,this.index);
+      },
       addEmit(){
         this.$emit("add");
       },
@@ -129,6 +136,27 @@
     .is-error .el-form-item__error{
         top:auto;
     }
+    .sub-form{
+        position: relative;
+    }
+    .order-btn{
+        position:absolute;
+        top:40px;
+        right:50px;
+        a{
+            display: block;
+            margin-bottom: 20px;
+            border: 1px solid #22ccc8;
+            color: #22ccc8;
+            padding: 5px 10px;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 12px;
+        }
+        .order-up{
+
+        }
+    }
     /**富文本编辑器样式修改***/
     .ql-snow .ql-picker.ql-size .ql-picker-label::before,
     .ql-snow .ql-picker.ql-size .ql-picker-item::before,

src/less/common.less

@@ -94,6 +94,9 @@
 } 
 
 /*element-ui 样式覆盖*/
+.demo-form-inline .el-input--mini .el-input__inner{
+  width: 100px;
+}
 .el-input--mini .el-input__inner {
   width: 120px;
   height: 24px;