Merge branch 'test'

src/components/recordInput/AddRecordItem.vue

@@ -74,10 +74,35 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否控费：" prop="ruleType">
+                        <el-select v-model="form.costControl"
+                                   placeholder="请选择是否控费："
+                        >
+                            <el-option
+                                    v-for="item in costControlList"
+                                    :key="item.val"
+                                    :label="item.name"
+                                    :value="Number(item.val)">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                     <!-- <el-form-item label="备注：" prop="remark">
                          <el-input v-model="form.remark" maxlength="200" placeholder="请输入备注"></el-input>
                     </el-form-item> -->
-                    <el-form-item label="备注：" prop="remark">
+                  
+                    <el-form-item label="质控形式：" prop="ruleType">
+                        <el-select v-model="form.qcType"
+                                   placeholder="请选择质控形式：："
+                        >
+                            <el-option
+                                    v-for="item in qcTypeList"
+                                    :key="item.val"
+                                    :label="item.name"
+                                    :value="Number(item.val)">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                      <el-form-item label="备注：" prop="remark">
                          <el-input v-model="form.remark" maxlength="500" type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="请输入备注"></el-input>
                     </el-form-item>
                      <el-form-item label="前置条件：" prop="remark" class="procent">
@@ -168,6 +193,8 @@
         ruleTypeList:[],
         devTypeList:[],
         accuracyTypeList:[],
+        costControlList:[],
+        qcTypeList:[],
         caseLIst:[],
         hospitalModuleList:[], //医院数据模块列表
         title:'质控条目-新增',
@@ -181,7 +208,9 @@
           remark:'',
           levelNo:'',
           precond:'',
-          hospitalModuleId:''
+          hospitalModuleId:'',
+          costControl:2,
+          qcType:1
         },
         tableData:[],
         selectHospital:[],
@@ -199,14 +228,10 @@
       }
     },
     created(){
-      let {isEdit, data,ruleTypeList,devTypeList,accuracyTypeList} = this.$route.params;
+       this.getRuleTypeModule();
+      let {isEdit, data} = this.$route.params;
       const userLoginDTO = JSON.parse(localStorage.getItem('userLoginDTO'))
       this.modifier = userLoginDTO && userLoginDTO.linkman
-      this.ruleTypeList=ruleTypeList;
-      this.devTypeList=devTypeList;
-      this.accuracyTypeList=accuracyTypeList;
-      this.devTypeList.shift();
-      this.accuracyTypeList.shift();
       if(isEdit){
         this.title = '质控条目-修改'
         this.isEdit = isEdit
@@ -219,7 +244,9 @@
         this.form.casesId = data.casesId
         this.form.remark = data.remark
         // this.form.levelNo = data.levelNo
-          this.form.hospitalModuleId = data.modeId
+        this.form.hospitalModuleId = data.modeId
+        this.form.costControl = data.drgs
+        this.form.qcType = data.type
         this.form.precond = data.precond
         this.selectHospital = data.getUpdateInfoDetialDTOS || []
       }
@@ -321,6 +348,24 @@
           }
         })
       },
+      getRuleTypeModule(){
+        return api.getRuleTypes({}).then((res)=>{
+          const result = res.data;
+          if(result.code==0){
+            this.ruleTypeList = result.data["14"];
+            this.devTypeList = res.data.data&&res.data.data["15"]
+            this.accuracyTypeList = res.data.data&&res.data.data["16"]
+            this.costControlList = res.data.data&&res.data.data["17"] 
+            this.qcTypeList = res.data.data&&res.data.data["18"]
+          }else{
+            this.$message({
+              message:result.msg,
+              type:'warning',
+              showClose: true
+            });
+          }
+        })
+      },
       cancel(){
         this.$router.push({
           name: 'RecordItemList',
@@ -332,7 +377,7 @@
             return
           }
           this.canSave = false
-          const {itemName,casesId,itemCode,remark,levelNo,precond,hospitalModuleId,ruleType,devType,accuracyType} = this.form
+          const {itemName,casesId,itemCode,remark,levelNo,precond,hospitalModuleId,ruleType,devType,accuracyType,costControl,qcType} = this.form
           if(!itemName){
             this.$message({
               message:"请输入条目名称",
@@ -407,7 +452,9 @@
             casesName:  this.caseLIst.find(item => item.id === casesId).name,
             modifier:this.modifier,
             creator: '0',
-            casesEntryHospitals:casesEntryHospitals
+            casesEntryHospitals:casesEntryHospitals,
+            drgs:costControl,
+            type:qcType
           }
            api.addRecordItem(params).then((res)=>{
               this.canSave = true

src/components/recordInput/RecordItemList.vue

@@ -74,6 +74,38 @@
                
             </el-form>
             <el-form :inline="true" class="demo-form-inline demo-form-inline-second">
+               <el-form-item label="是否控费：">
+                    <!-- <el-input size="mini" v-model.trim="filter.module" placeholder="所属模块" clearable></el-input> -->
+                    <el-select v-model="filter.costControl"
+                               clearable
+                               filterable
+                               placeholder="请选择是否控费"
+                               size="mini"
+                               class="long-item">
+                        <el-option
+                                v-for="item in costControlList"
+                                :key="item.val"
+                                :label="item.name"
+                                :value="item.val">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                 <el-form-item label="质控形式：">
+                    <!-- <el-input size="mini" v-model.trim="filter.module" placeholder="所属模块" clearable></el-input> -->
+                    <el-select v-model="filter.qcType"
+                               clearable
+                               filterable
+                               placeholder="请选择准确率"
+                               size="mini"
+                               class="long-item">
+                        <el-option
+                                v-for="item in qcTypeList"
+                                :key="item.val"
+                                :label="item.name"
+                                :value="item.val">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
               <el-form-item :inline="true"  label="条目编码：">
                    <el-input size="mini" v-model.trim="filter.itemCode" placeholder="条目编码" clearable></el-input>
                </el-form-item>
@@ -146,6 +178,20 @@
                         label="医院数据模块"
                         width="">
                   
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="drgs"
+                        label="是否控费"
+                        :formatter="dragsFormatter"
+                >
+                </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="type"
+                        label="质控形式"
+                        :formatter="qcTypeFormatter"
+                >
                 </el-table-column>
                  <el-table-column
                         :resizable = "false"
@@ -189,6 +235,8 @@
         ruleTypeList:[],
         devTypeList:[],
         accuracyTypeList:[],
+        costControlList:[],
+        qcTypeList:[],
         filter:{
           itemName:'',
           ruleType:'',
@@ -196,7 +244,9 @@
           level:'',
           itemCode:'',
           devType:'',
-          accuracyType:''
+          accuracyType:'',
+          costControl:'',
+          qcType:''
         },
         currentPage: 1,
         pageSize: config.pageSize,
@@ -242,6 +292,14 @@
         const li = this.accuracyTypeList.filter((it)=>it.val===""+cellValue);
         return li[0]?li[0].name:"";
       },
+      dragsFormatter(row, column, cellValue){
+        const li = this.costControlList.filter((it)=>it.val===""+cellValue);
+        return li[0]?li[0].name:"";
+      },
+      qcTypeFormatter(row, column, cellValue){
+        const li = this.qcTypeList.filter((it)=>it.val===""+cellValue);
+        return li[0]?li[0].name:"";
+      },
      handleSizeChange(val){
         this.pageSize = val;
         this.currentPage = utils.getCurrentPage(this.currentPage, this.total, this.pageSize);
@@ -253,13 +311,7 @@
       AddRecordItem(){
          const pam = this.searched?{currentPage:this.currentPage,
           pageSize:this.pageSize,
-          ruleTypeList:this.ruleTypeList,
-          devTypeList:this.devTypeList,
-          accuracyTypeList:this.accuracyTypeList,
           filter:this.filter}:{currentPage:this.currentPage,
-           ruleTypeList:this.ruleTypeList,
-            devTypeList:this.devTypeList,
-          accuracyTypeList:this.accuracyTypeList,
           pageSize:this.pageSize};
         this.$router.push({
           name:'AddRecordItem',
@@ -297,8 +349,12 @@
             this.ruleTypeList = result.data[14];
             this.devTypeList = res.data.data&&res.data.data["15"]
             this.accuracyTypeList = res.data.data&&res.data.data["16"]
+            this.costControlList = res.data.data&&res.data.data["17"] 
+            this.qcTypeList = res.data.data&&res.data.data["18"]
             this.devTypeList.unshift({name:"全部", val:""})
             this.accuracyTypeList.unshift({name:"全部", val:""})
+            this.qcTypeList.unshift({name:"全部", val:""})
+            this.costControlList.unshift({name:"全部", val:""})
           }else{
             this.$message({
               message:result.msg,
@@ -347,15 +403,9 @@
           const pam = this.searched ? {
             currentPage: this.currentPage,
             pageSize:this.pageSize,
-            ruleTypeList:this.ruleTypeList,
-            devTypeList:this.devTypeList,
-            accuracyTypeList:this.accuracyTypeList,
             filter: this.filter,
           } : {
             currentPage: this.currentPage,
-            ruleTypeList:this.ruleTypeList,
-            devTypeList:this.devTypeList,
-            accuracyTypeList:this.accuracyTypeList,
             pageSize:this.pageSize};
           this.$router.push({
             name:'AddRecordItem',
@@ -383,6 +433,8 @@
           current: this.inCurrentPage||this.currentPage,
           size: this.pageSize,
           devType:this.filter.devType,
+          drgs:this.filter.costControl,
+          type:this.filter.qcType,
           accuracyType:this.filter.accuracyType,
        
         };