Merge remote-tracking branch 'origin/AIControlV1.3.1' into test

# Conflicts:
#	src/api/index.js

src/components/qualityControl/AutoTestList.vue

@@ -82,7 +82,7 @@
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -92,6 +92,16 @@
                     <el-input v-model.tirm="taskName" placeholder="请输入任务名称" autocomplete="off"></el-input>
                 </el-form-item>
             </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="addTask" :disabled="addBtnDisable">确 定</el-button>
+            </div>
+        </el-dialog>
+        <el-dialog title="提示" :visible.sync="dialogTippop" class="tip-dialog">
+            <div class="dialog-body">
+                <p>经程序自动化测试，下列病历存在问题，请及时处理~</p>
+                <br/>
+                <div class="warn-tip" v-html="tips"></div>
+            </div>
             <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="addTask">确 定</el-button>
             </div>
@@ -102,6 +112,7 @@
 <script>
   import api from '@api/qualityControl.js';
   import { Loading } from 'element-ui';
+  import config from '@api/config.js';
 
   export default {
     name: 'AutoTestList',
@@ -118,6 +129,10 @@
         hisTypes:[],
         taskName:"",
         dialogTaskName:false,
+        dialogTippop:false,
+        addBtnDisable:false,
+        pageLayout:config.pageLayout,
+        tips:'',
         filter: {
           hospitalId:'',
           entryName:'',
@@ -178,7 +193,17 @@
           if(res.data.code==="0"){
             //this.loading=false;
             loadingInstance.close();
-            this.warning('操作成功','success');
+            const {messages}=res.data.data;
+            let str='';
+            if(messages.length>0){
+              for(let i=0;i<messages.length;i++){
+                str+=`<p>`+messages[i]+`</p>`;
+              }
+              this.tips = str;
+              this.dialogTippop=true;
+            }else{
+              this.warning(res.data.msg||'操作成功','success');
+            }
             this.getDataList();
           }else{
             this.warning(res.data.msg||"自动化测试失败");
@@ -193,7 +218,9 @@
           this.warning("请输入任务名称");
           return;
         }
+        this.addBtnDisable=true;
         api.addTask({missionName:this.taskName}).then((res)=>{
+          this.addBtnDisable=false;
           if(res.data.code==="0"){
             this.dialogTaskName = false;
             this.toTaskList();

src/components/qualityControl/AutoTestTask.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="转化为任务">
+        <crumbs title="任务列表">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="任务名称：">
                     <el-input size="mini" v-model="filter.missionName" placeholder="任务名称"></el-input>
@@ -38,7 +38,7 @@
                            @current-change="currentChange"
                            background
                            :page-size="pageSize"
-                           layout="total,prev, pager, next, jumper"
+                           :layout="pageLayout"
                            :total="total">
             </el-pagination>
         </div>
@@ -47,6 +47,7 @@
 
 <script>
   import api from '@api/qualityControl.js';
+  import config from '@api/config.js';
 
   export default {
     name: 'AutoTestTask',
@@ -59,6 +60,7 @@
         total: 0,
         fieldTypes:[],
         searched:false,
+        pageLayout:config.pageLayout,
         hisTypes:[],
         filter: {
           missionName: ''

src/components/qualityControl/StandardRecord.vue

@@ -284,6 +284,11 @@
           this.clearFilter();
         };
         const {hospitalId,behospitalCode, deptId, name,date1,date2} = this.filter;
+        let beCode=behospitalCode;
+        var patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/g;
+        beCode=behospitalCode.replace(patrn,function(x){
+          return "\\"+x;
+        });
         const {tranformDate} = utils;
         const param = {
           current: this.inCurrentPage||this.currentPage,
@@ -291,7 +296,7 @@
           hospitalId,
           deptId,
           name,
-          behospitalCode,
+          behospitalCode:beCode,
           leaveHosDateEnd:tranformDate(date2,' 23:59:59'),
           leaveHosDateStart: tranformDate(date1," 00:00:00")
         };
@@ -354,10 +359,10 @@
   @import "../../less/admin.less";
   .standardRecordWrapper{
     .el-date-editor.el-input{
-      width: 115px;
+      width: 130px;
       input{
         padding: 0 5px;
-        width: 115px;
+        width: 130px;
         height: 25px;
       }
     }
@@ -390,4 +395,7 @@
   .standardRecordWrapper .el-form-item{
       margin-bottom: 0;
   }
+  .standardRecordWrapper .el-input__suffix{
+      right: 22px;
+  }
 </style>

src/components/qualityControl/TaskDetail.vue

@@ -45,13 +45,13 @@
                 <el-table-column
                         prop="gmtModified"
                         label="所属医院"
-                        width="120"
+                        width="110"
                         :formatter="hisFormatter"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
                         prop="casesName"
-                        width="120"
+                        width="110"
                         label="所属模块">
                 </el-table-column>
                 <el-table-column
@@ -75,13 +75,13 @@
                 </el-table-column>
                 <el-table-column
                         prop="status"
-                        width="100"
+                        width="80"
                         :formatter="statusFormatter"
                         label="状态">
                 </el-table-column>
                 <el-table-column
                         prop="remark"
-                        width="200"
+                        width="60"
                         label="备注">
                 </el-table-column>
                 <el-table-column