Merge branch 'test' into ChronicMag_zxc

src/components/icss/AddMedicinePrompt.vue

@@ -111,7 +111,7 @@
               return {
                         title:it.title,
                         position:this.mapStringToNum(it.position),
-                        content:it.content.replace('{imageUrlPrefix}',config.imgHost),
+                        content:it.content.replace(/{imageUrlPrefix}/g,config.imgHost),
                         isReason:it.isReason,
                         text:it.text,
                         disabled:true};
@@ -217,7 +217,7 @@
           return Object.assign({},it,{
                                         position:typeof it.position=='string'?it.position:it.position.join(","),
                                         conceptId:this.form.conceptId,
-                                        content:it.content.replace(config.imgHost,'{imageUrlPrefix}')});
+                                        content:it.content.replace(new RegExp(config.imgHost,'g'),'{imageUrlPrefix}')});
         });
         this.showSaveDialog(param,'是否保存该静态知识？');
       },

src/components/icss/MedicineInfoPg.vue

@@ -2,18 +2,18 @@
     <el-form :rules="rules" :model="data" ref="form" class="sub-form">
         <!--<el-input v-model="form.orderNo" :value="index" type="hidden"></el-input>-->
         <el-form-item label="显示位置：" prop="position" label-width="160px">
-            <el-checkbox-group v-model="data.position" :disabled="data.disabled">
+            <el-checkbox-group v-model="data.position">
                 <el-checkbox v-for="it in positions" :key="it.key" :label="it.key">{{it.name}}</el-checkbox>
             </el-checkbox-group>
         </el-form-item>
         <el-form-item label="是否属于诊断依据：" prop="isReason" label-width="160px">
-            <el-select v-model="data.isReason" placeholder="请选择" :disabled="data.disabled">
+            <el-select v-model="data.isReason" placeholder="请选择">
                 <el-option label="否" :value="0"></el-option>
                 <el-option label="是" :value="1"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item label="标题名称：" prop="title" label-width="160px">
-            <el-input v-model="data.title" :disabled="data.disabled"></el-input>
+            <el-input v-model="data.title"></el-input>
         </el-form-item>
         <el-form-item label="内容" prop="content" label-width="160px">
             <quillEditor v-model="data.content"
@@ -53,6 +53,14 @@
             ImageExtend: {
               loading: true,
               name: 'upfile',
+              size:1,
+              sizeError: () => {
+                this.$message({
+                  showClose: true,
+                  message: '请上传 1M 以内的图片！',
+                  type: 'warning'
+                })
+              },
               action: config.urls.promptServer,
               response: (res) => {
                 return config.imgHost+res.url;