Merge remote-tracking branch 'origin/testedMerge'

src/components/qualityControl/AddCombineFeild.vue

@@ -141,6 +141,7 @@
         }
         this.form = Object.assign({},data);
         if(isCopy){
+          this.title='组合字段维护-复制组合字段';
           this.isCopy = isCopy
           this.form.tagName = ""
           this.form.id=""

src/components/qualityControl/AddQcType.vue

@@ -7,7 +7,7 @@
                     <el-form-item label="所属医院：" prop="hospitalId">
                         <el-select v-model="form.hospitalId"
                                    placeholder="请选择"
-                                   :disabled="!!this.form.id"
+                                   :disabled="!!this.form.id||copy"
                                    @change="changeHospital"
                                    size="small">
                             <el-option
@@ -76,7 +76,15 @@
         rules:{
           hospitalId:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
           //qcItem:{ required: true, message: '请选择质控条目', trigger: ['blur', 'change']},
-          name:{ required: true, message: '请输入质控类型', trigger: ['blur', 'change']},
+          name:[{ required: true, message: '请输入质控类型', trigger: ['blur', 'change']},{
+            validator:(rule, value, callback)=>{
+              if(!value.trim()){
+                callback(new Error('请输入质控类型'));
+              }else{
+                callback();
+              }
+            }, trigger: 'blur'
+          }],
         },
         copy:null,
         saveDisable: false,  //保存按钮禁止点击
@@ -99,7 +107,7 @@
         };
         //this.getQcTypeItem({hospitalId:info.hospitalId});
       }else{
-        let hospitalId = localStorage.getItem("qcSelectHospital");
+        let hospitalId = localStorage.getItem("qcSelectHospital")||this.hisTypes[0].val;
         this.form.hospitalId = +hospitalId;
         this.getQcTypeItem({hospitalId:hospitalId});
       }
@@ -114,7 +122,7 @@
                 list.push({caseEntryId:t.id});
               }
             })
-          }console.log(list)
+          }
           this.form.qcTypeCasesEntryVOList=list;
         },
         deep:true
@@ -162,6 +170,7 @@
           if (valid) {
             if(this.form.id){//修改
               const param = Object.assign({},this.form);
+              param.name=param.name.trim();
               this.saveDisable = true;  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
               api.addQcType(param).then((res)=>{
                 if(res.data.code==0){
@@ -184,6 +193,7 @@
               })
             }else{//添加
               const params = Object.assign({},this.form);
+              params.name=params.name.trim();
               this.saveDisable = true;  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
               api.addQcType(params).then((res)=>{
                 if(res.data.code==0){

src/components/qualityControl/BaseFieldList.vue

@@ -25,12 +25,12 @@
             <el-table :data="list"
                       border
                       style="width: 100%">
-                <!--<el-table-column
+                <el-table-column
                         type="index"
                         :index="indexMethod"
                         label="编号"
                         width="60">
-                </el-table-column>-->
+                </el-table-column>
                 <el-table-column
                         prop="gmtModified"
                         label="所属医院"
@@ -227,7 +227,8 @@
       getFilterItems() {
         const param = Object.assign({
           current: this.currentPage,
-          size: this.pageSize
+          size: this.pageSize,
+          tagTypeList:[1]
         },this.filter);
         return param;
       },

src/components/qualityControl/CombineFeildList.vue

@@ -208,7 +208,8 @@
       getFilterItems() {
         const param =  Object.assign({
           current: this.currentPage,
-          size: this.pageSize
+          size: this.pageSize,
+          tagTypeList:[4]
         },this.filter);
         return param;
       },

src/components/qualityControl/FieldMatch.vue

@@ -191,7 +191,7 @@
             const data = res.data.data;
             this.flawList = []
             this.flawList = data.records;
-            let info = this.$route.params.info;
+            /*let info = this.$route.params.info;
             if(info){
               const infoCopy =  Object.assign({},this.form);
 
@@ -205,7 +205,7 @@
               }
               this.flawList.unshift(obj)
             }
-            }
+            }*/
           }else{
             this.warning("获取缺陷条目失败");
           }

src/components/qualityControl/QCTypeMang.vue

@@ -42,7 +42,7 @@
                         label="质控类型">
                 </el-table-column>
                 <el-table-column
-                        label="操作" width="100">
+                        label="操作" width="150">
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditField(scope.row, 'modify')">修改</el-button>
                         <span style="margin:0 3px;">|</span>
@@ -211,7 +211,7 @@
         }).catch(() => {});
       },
       showDelDialog(id){
-        this.showConfirmDialog('是否删除该字段映射？',()=>{
+        this.showConfirmDialog('是否删除该质控类型？',()=>{
           api.delQcType({ids:[id]}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');

src/components/qualityControl/QualityControlTemp.vue

@@ -27,6 +27,12 @@
                     :data="list"
                     border
                     style="width: 100%">
+                <el-table-column
+                    type="index"
+                    :index="indexMethod"
+                    label="编号"
+                    width="60">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         label="模板Id"