Sfoglia il codice sorgente

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

zhouna 6 anni fa
parent
commit
ba05acc035

+ 0 - 1
src/components/icss/AddVersion.vue

@@ -13,7 +13,6 @@
               v-model="form.refreshTime"
               type="date"
               placeholder="选择日期"
-              :picker-options="pickerOptions1"
               value-format="yyyy-MM-dd"
               :clearable='false'>
             </el-date-picker>

+ 11 - 1
src/components/icss/MedicalName.vue

@@ -256,10 +256,20 @@
             });
             this.getDataList();
           }else{
-            this.$message({
+            /*this.$message({
               dangerouslyUseHTMLString: true,
               message:res.data.msg,
               type:'warning'
+            });*/
+            this.$alert(res.data.msg,'错误信息',{
+              dangerouslyUseHTMLString: true,
+              confirmButtonText: '确定',
+              callback: action => {
+                /*this.$message({
+                  type: 'info',
+                  message: `action: ${ action }`
+                });*/
+              }
             });
           }
         })

+ 12 - 1
src/components/icss/MedicalRelation.vue

@@ -284,10 +284,21 @@
             });
             this.getDataList()
           }else{
-            this.$message({
+            /*this.$message({
               dangerouslyUseHTMLString: true,
               message:res.data.msg,
               type:'warning'
+            });*/
+            // 7-22 改成确定按钮
+            this.$alert(res.data.msg,'错误信息',{
+              dangerouslyUseHTMLString: true,
+              confirmButtonText: '确定',
+              callback: action => {
+                /*this.$message({
+                  type: 'info',
+                  message: `action: ${ action }`
+                });*/
+              }
             });
           }
         })

+ 5 - 5
src/components/preTreat/AddSimpleQuestion.vue

@@ -84,9 +84,9 @@
         let options2 = [];
         const opts = this.options;
         let pureName='',pureDesc = '';
-        for (let i = 0; i < this.options.length; i++) {
-          pureName=this.options[i].name.replace(/(\$\{number_\S*?\})|(\$\{input_\S*?\})/g,'');
-          pureDesc = this.options[i].description.replace(/(\$\{number_\S*?\})|(\$\{input_\S*?\})/g,'');
+        for (let i = 0; i < opts.length; i++) {
+          pureName=opts[i].name.replace(/(\$\{number_\S*?\})|(\$\{input_\S*?\})/g,'');
+          pureDesc = opts[i].description.replace(/(\$\{number_\S*?\})|(\$\{input_\S*?\})/g,'');
           if(pureName.length>30){
             this.warning('医生界面展示内容不能超过30个字');
             return ;
@@ -96,9 +96,9 @@
             return ;
           }
 
-          if(this.options[i].name.trim() != '') {
+          if(opts[i].name.trim() != '') {
               options2.push(this.options[i]);
-          }else if(this.options[i].description.trim() != ''){           //患者填了,医生没填,提示医生必填
+          }else if(opts[i].description.trim() != ''){           //患者填了,医生没填,提示医生必填
             isNull = true;
           }
         }

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

@@ -166,7 +166,7 @@
                           prop="region13">
                 <el-upload
                         :class="form.region13?'upload-hide':''"
-                        :limit="2"
+                        :limit="1"
                         :action="uploadUrl"
                         list-type="picture"
                         :file-list="imgList"

+ 2 - 3
src/components/preTreat/PubSelect.vue

@@ -157,9 +157,8 @@
         const arr = options.filter((it)=>{
           return it.name;
         });
-        this.rows = arr;
-        const items = utils.simpleOptionData(this.rows);
-        this.$emit('pushValues',items);
+        this.rows = arr.length==0?utils.getInitRow(initRow,4):arr;
+        this.$emit('pushValues',arr);
       }else{
         this.initData();
       }

+ 5 - 0
src/less/admin.less

@@ -177,4 +177,9 @@
 .el-button--primary .is-disabled[type=button]:hover {
   background: @adminBase;
   color: #fff
+}
+
+.el-message-box .el-message-box__content{
+  max-height: 100px;
+  overflow-y: auto;
 }