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

src/api/config.js

@@ -1,6 +1,6 @@
 export default {
   host:'http://192.168.2.241:5050',
-  imgHost:'http://192.168.2.241:82',      //富文本编辑器图片回传地址
+  imgHost:'http://192.168.2.121:82',      //富文本编辑器图片回传地址
   urls: {
     /* 登录注册相关接口 */
     'getImgVerification': '/api/user/userver/getImgVerification',

src/components/diagBase/AddDiagBase.vue

@@ -130,7 +130,7 @@
                                 :class="{borderRed:item.verifyFormula,inpDisabled:!item.type}"
                                 :title="item.formula" 
                                 v-model.trim="item.formula" 
-                                @input="handleInp(index,$event,'FormulaNumber',item.type)"  
+                                @input="handleInp(index,$event,'FormulaNumber',item.type)"
                                 @focus="clickItem(index,'FormulaNumber')">
                             </el-input>
                         </el-tooltip> 
@@ -147,9 +147,6 @@
             </table>
              <div class="btn clearfix">
                      <div class="btnBox">
-                        <!-- <el-button size="mini" @click="uploadClick">导入</el-button>
-                        <input type="file" name="uploadfile " id="upFile" @change="uploadFile($event)" accept=".csv, application/vnd.ms-excel, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                          -->
                          <el-button
                                 type="primary"
                                 :disabled = "isReady"
@@ -323,94 +320,6 @@
                 this.disFormulaList.splice(index, 1)
             }
         },
-        //导入
-        // uploadClick() {
-        //     let inp = document.getElementById("upFile");
-        //     inp.click();
-        // },
-        // uploadFile(e){
-        //     let fileInfo = e.target.files[0];
-        //     e.preventDefault();
-        //     let formData = new FormData();
-        //     formData.append('uploadfile', fileInfo);
-        //     const header = {
-        //         headers:{
-        //         'Content-Type': 'multipart/form-data'
-        //         }
-        //     }
-        //     api.importDiagnosticBasis(formData,header).then((res)=>{
-        //         console.log('ress', res)
-        //         if(res.data.code==0){
-        //             const data = res.data.data
-        //             this.warning('上传成功','success')
-        //             let feature = data.feature
-        //             let equation = data.equation
-        //             const featureList = []
-        //             const formulaList = []
-
-        //             if(feature&&feature.length > 0) {
-        //                for(let i = 1; i <feature.length; i++) {
-        //                    const item = {}
-        //                    item.type = '';
-        //                    for (let j = 0; j < this.featureTypeList.length; j++) {
-        //                        if(feature[i].type.indexOf(this.featureTypeList[j].name) > -1) {
-        //                            item.type = this.featureTypeList[j].key
-        //                            break;
-        //                        }
-        //                    }
-                           
-        //                    item.code = feature[i].code
-        //                    item.standard = feature[i].standard
-        //                    item.relation = feature[i].associated
-        //                    if(item.type === 4) {
-        //                        item.result = ''
-        //                    } else {
-        //                         item.result = feature[i].result
-        //                    }
-        //                    featureList.push(item)
-        //                }
-        //             }
-        //             if(equation&&equation.length > 0) {
-        //                for(let i = 1; i <equation.length; i++) {
-        //                    const item = {}
-        //                    item.type = '';
-        //                    for (let j = 0; j < this.formulaTypeList.length; j++) {
-        //                        if(equation[i].type.indexOf(this.formulaTypeList[j].name) > -1) {
-        //                            item.type = this.formulaTypeList[j].key
-        //                            break;
-        //                        }
-        //                    }
-        //                    item.formula = equation[i].associated
-                           
-        //                    formulaList.push(item)
-        //                }
-        //             }
-        //             this.disFeatureList = featureList
-        //             this.disFormulaList = formulaList
-        //             console.log(' this.disFormulaListResult',  this.disFormulaListResult)
-        //         }else{
-        //         /*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 }`
-        //             });*/
-        //             }
-        //         });
-        //         }
-        //     })
-            
-        //     //解决上传相同文件不触发change
-        //     let inp = document.getElementById("upFile");
-        //     inp.value = "";   
-        // },
         updateNeo() {
             this.submitForm('updateNeo').then(() => {
                 if(this.hasQuestion == 0) {
@@ -522,22 +431,6 @@
                     errStrList.push(errStr)
                 }
                
-                //导入后判断
-                // let regexPause = new RegExp(`、`)      //判断标准词是否有顿号
-                //  if(disFeatureList[i].standard &&regexPause.test(disFeatureList[i].standard)) {
-                //     disFeatureList[i].verifyStandard ='数据异常'
-                //     const errStr = "疾病特征第" + (i+ 1) +"行标准词数据异常"
-                //     errStrList.push(errStr)
-                // }
-
-                // if(disFeatureList[i].type == '3'&&regexPause.test(disFeatureList[i].relation)) {
-                //     disFeatureList[i].verifyRelation ='数据异常'
-                //     const errStr = "疾病特征第" + (i+ 1) +"行化验关联词数据异常"
-                //     errStrList.push(errStr)
-                // }
-                //导入后判断
-
-
                 if(disFeatureList[i].type == '3' && !disFeatureList[i].result ) { //化验项下面诊断公式如果有用到，判断是否填写结果项
                     const regex2 = new RegExp(`(?<=\\D|\\s?)${disFeatureList[i].code}(?=\\D|\\s?)`)
                     //  const regex2 = new RegExp(`、\\s*、{1,}`) 
@@ -575,7 +468,6 @@
                 }
                 
                 
-                
             }
             this.disFeatureList = JSON.parse(JSON.stringify(disFeatureList))
             let formulaListErrNum = 0
@@ -591,28 +483,6 @@
                         errStrList.push(errStr)
                         formulaListErrNum++;
                    }
-                    
-                    //导入后判断
-                    // if(disFormulaList[i].type == 91) { //确诊中有没有包含其他不可输入内容
-                    //     let regexDisFormula = /[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u5341\u62df\u8bca0-9\/\.+\(\)\（\）]/g
-                    //     if(regexDisFormula.test(disFormulaList[i].formula)) {
-                    //          disFormulaList[i].verifyFormula = "公式格式错误"
-                    //          const errStr = "诊断公式第" + (i+ 1) +"行公式格式错误,"
-                    //         errStrList.push(errStr)
-                    //         formulaListErrNum++;
-                    //     }
-                    // } else {   //其他诊断中有没有包含其他不可输入内容
-                    // //计算公式只能输入以下内容： 任、一、二、三、四、五、六、七、八、九、十、0-9、/、.、(、)、（、）
-                    //     let regexDisFormula = /[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u53410-9\/\.+\(\)\（\）]/g
-                    //     if(regexDisFormula.test(disFormulaList[i].formula)) {
-                    //          disFormulaList[i].verifyFormula = "公式格式错误"
-                    //          const errStr = "诊断公式第" + (i+ 1) +"行公式格式错误。"
-                    //         errStrList.push(errStr)
-                    //         formulaListErrNum++;
-                    //     }
-                    // }
-                    //导入后判断
-
                    if(disFormulaList[i].type == 91 && disFormulaList[i].formula.indexOf("拟诊") > -1) { //确诊项如果有拟诊这两个字，判断公式列表中有没有拟诊这项
                        const noError = disFormulaList.filter(item => item.type == 92).length > 0
                        if(!noError) {
@@ -620,7 +490,7 @@
                             const errStr = "诊断公式第" + (i+ 1) +"行公式格式错误"
                             errStrList.push(errStr)
                             formulaListErrNum++;
-                       } 
+                       }
                    }
 
             }
@@ -725,7 +595,7 @@
                 //计算公式确诊只能输入以下内容： 任、一、二、三、四、五、六、七、八、九、十、拟、诊、0-9、/、.、(、)、（、）
                 if(itemType == 91) {
                     this.$nextTick(() => {
-                       
+
                         this.disFormulaList[index].formula =  value.replace(/[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u5341\u62df\u8bca0-9\/\.+\(\)\（\）]/g,'').replace(/[\（]/g, '(').replace(/[\）]/g, ')').replace(/' '/g, '')
                     })
                 } else {    //计算公式其他只能输入以下内容： 任、一、二、三、四、五、六、七、八、九、十、0-9、/、.、(、)、（、）

src/components/icss/AddMedicinePrompt.vue

@@ -169,6 +169,11 @@
           orderNo:i+1,
           position:[],
           text:''});
+        //添加段落光标自动落到新增的段落中
+        setTimeout(()=>{
+          //console.log(this.$refs.subForm[i+1].$el.getElementsByClassName("el-input__inner")[0]);
+          this.$refs.subForm[i+1].$el.getElementsByClassName("el-input__inner")[0].focus()
+        })
         /*this.form.prags.push({
           title:'',
           content:'',

src/components/icss/MedicalMultRelation.vue

@@ -52,7 +52,7 @@
                 <el-table-column
                         label="操作" width="160">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" :disabled="scope.row.isDeleted != 'N'" @click="toEditProduct(scope.row)">修改</el-button>
+                        <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>
                         <!-- <span style="margin:0 3px;">|</span>
                         <el-button type="text" size="small" :class="scope.row.isDeleted == 'N'?'delete':'review'" @click="showDelDialog(scope.row)">{{scope.row.isDeleted == 'N'?'删除':'恢复'}}</el-button> -->
                     </template>

src/components/icss/MedicineInfoPg.vue

@@ -1,11 +1,6 @@
 <template>
     <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">
-                <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="请选择">
                 <el-option label="否" :value="0"></el-option>
@@ -15,6 +10,11 @@
         <el-form-item label="标题名称：" prop="title" label-width="160px">
             <el-input v-model="data.title"></el-input>
         </el-form-item>
+        <el-form-item label="显示位置：" prop="position" label-width="160px">
+            <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="content" label-width="160px">
             <quillEditor v-model="data.content"
                          :options="editorOption"
@@ -22,8 +22,8 @@
                          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>
+            <a v-if="index!==0" :class="index===total-1?'order-spc':'order-up'" @click="reOrder(1)">上升</a>
+            <a v-if="index!==total-1" :class="index===0?'order-spc':'order-down'" @click="reOrder(0)">下降</a>
         </div>
         <el-form-item label-width="130px">
             <el-button @click="addEmit">添加段落</el-button>
@@ -169,7 +169,7 @@
     }
     .order-btn{
         position:absolute;
-        top:40px;
+        top:-22px;
         right:50px;
         a{
             display: block;
@@ -181,8 +181,8 @@
             cursor: pointer;
             font-size: 12px;
         }
-        .order-up{
-
+        .order-spc{
+            margin-top: 28px;
         }
     }
     /**富文本编辑器样式修改***/