Merge remote-tracking branch 'origin/dev5.3.3' into test

src/components/icss/AddMedicinePrompt.vue

@@ -145,9 +145,9 @@
             return ;
           }
           temp = Object.assign(this.form.prags[i-1]);
-          temp.orderNo = temp.orderNo+1;
+          //temp.orderNo = temp.orderNo+1;
           it = Object.assign(this.form.prags[i]);
-          it.orderNo = it.orderNo-1;
+          //it.orderNo = it.orderNo-1;
           this.form.prags.splice(i-1,2,it,temp);
         }else{
           if(i===this.form.prags.length-1){
@@ -155,9 +155,9 @@
             return ;
           }
           temp = Object.assign(this.form.prags[i+1]);
-          temp.orderNo = temp.orderNo-1;
+          //temp.orderNo = temp.orderNo-1;
           it = Object.assign(this.form.prags[i]);
-          it.orderNo = it.orderNo+1;
+          //it.orderNo = it.orderNo+1;
           this.form.prags.splice(i,2,temp,it);
         }
       },
@@ -166,7 +166,6 @@
           title:'',
           content:'',
           isReason:0,
-          orderNo:i+1,
           position:[],
           text:''});
         //添加段落光标自动落到新增的段落中
@@ -236,10 +235,11 @@
         }
         //通过必填验证，提交保存
         const item=this.form.prags;
-        const param =item.map((it)=>{
+        const param =item.map((it,i)=>{
           return Object.assign({},it,{
                                         position:typeof it.position=='string'?it.position:it.position.join(","),
                                         conceptId:this.form.conceptId,
+                                        orderNo:i,
                                         content:it.content.replace(new RegExp(config.imgHost,'g'),'{imageUrlPrefix}')});
         });
         this.showSaveDialog(param,'是否保存该静态知识？');