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

src/components/icss/AddIndeptLabel.vue

@@ -174,12 +174,17 @@
           })
         });*/
         const h = this.$createElement;
+        const {isEdit} = this.$route.params;
+      const addMsg = h('div',{style:'padding-bottom:10px'},[
+            h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签？')
+          ])
+      const modMsg = h('div',{style:'padding-bottom:10px'},[
+            h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签？'),
+            h('span',{style:'color:red;font-size:12px'},'若标签系统名称已经改变，请去别名维护中修改相关信息'),
+          ])
         this.$msgbox({
           title:'提示',
-          message:h('div',{style:'padding-bottom:10px'},[
-              h('p',{style:'font-size:15px;margin-bottom:10px'},'是否保存该标签？'),
-              h('span',{style:'color:red;font-size:12px'},'标签系统名称已经改变，请去别名维护中修改相关信息'),
-            ]),
+          message:isEdit?modMsg:addMsg,
           showCancelButton: true,
           distinguishCancelAndClose:true,
           confirmButtonText: '确认并前往别名维护',

src/components/icss/AddPromptInfo.vue

@@ -15,7 +15,6 @@
                 <InfoParagraph v-for="(f,i) in form.prags"
                                :data="f"
                                :index="i"
-                               :len="len"
                                :isEdit = "isEdit"
                                @add="addParagraph"
                                @del="delParagraph" ref="subForm"></InfoParagraph>
@@ -66,7 +65,6 @@
       return {
         isEdit:false,
         tagPool:[],                 //标签池数据
-        len:0,
         Adscriptions:[],            //归属列表
         editData:{
           id:'',
@@ -112,7 +110,7 @@
           if(res.data.code === '0') {
             this.form = this.parseData(res.data.data);
             this.editData = Object.assign({},this.form);
-            this.len=res.data.data.details&&res.data.data.details.length;
+            //this.len=res.data.data.details&&res.data.data.details.length;
           }else{
             this.warning("数据获取失败");
           }
@@ -129,7 +127,7 @@
       parseData(info){
         let detail = [];
         info.details.forEach((it)=>{
-          detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position)}));
+          detail.push(Object.assign({},it,{position:this.mapStringToNum(it.position),disabled:true}));
         });
         return {
           id:info.id,

src/components/icss/InfoParagraph.vue

@@ -3,13 +3,13 @@
             <p class="line"></p>
             <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
             <el-form-item label="是否属于诊断依据：" prop="isReason">
-                <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&index<len">
+                <el-select v-model="data.isReason" placeholder="请选择" :disabled="isEdit&&data.disabled">
                     <el-option label="否" :value="0"></el-option>
                     <el-option label="是" :value="1"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item label="显示位置：" prop="position" label-width="130px">
-                <el-checkbox-group v-model="data.position" :disabled="isEdit&&index<len">
+                <el-checkbox-group v-model="data.position" :disabled="isEdit&&data.disabled">
                     <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
                 </el-checkbox-group>
             </el-form-item>
@@ -35,7 +35,7 @@
   import {container, ImageExtend, QuillWatch} from 'quill-image-extend-module';
   Quill.register('modules/ImageExtend', ImageExtend);
   export default{
-    props:['data','index','isEdit','len'],
+    props:['data','index','isEdit'],
     name:'InfoParagraph',
     components:{
       quillEditor