Merge branch 'recordItem' into recordInp

src/api/config.js

@@ -296,7 +296,7 @@ export default {
       'delRecordItem':'/api/mrman/qcCasesEntry/deleteQcCasesEntry', //删除病例条目
       'getRecordItemDetail':'/api/mrman/qcCasesEntry/getUpdateInfo', //获取病例详情
       'getInputcasesDetial':'/api/mrman/qcInputcases/getInputcasesDetial', //获取标注病例详情
-
+      'gethospitalModuleList': '/api/mrman/qcMode/getModes', //获取医院数据模块
   },
 	menuIconList: { //菜单对应图标
 		'YH-KZT': 'el-icon-menu',

src/api/records.js

@@ -55,6 +55,9 @@ export default {
     return axios.post(urls.getRecordItemDetail,param);
   },
   getInputcasesDetial:(param) =>{ //获取标注病例详情
-    return axios.post(urls.getInputcasesDetial,param);
+    
+  },
+  gethospitalModuleList: (param) =>{ //获取医院数据模块
+    return axios.post(urls.gethospitalModuleList,param);
   }
 }

src/components/recordInput/AddRecordItem.vue

@@ -23,8 +23,21 @@
                     <el-form-item label="条目编码：" prop="brbarh">
                          <el-input v-model="form.itemCode" placeholder="请输入条目编码"></el-input>
                     </el-form-item>
-                    <el-form-item label="层级定义：" prop="remark">
+                    <!-- <el-form-item label="层级定义：" prop="remark">
                          <el-input v-model="form.levelNo" placeholder="请输入层级定义"></el-input>
+                    </el-form-item> -->
+                    <el-form-item label="医院数据模块：" prop="remark">
+                        <el-select v-model="form.hospitalModuleId"
+                                   placeholder="请选择模块"
+                                   @change="changeModule"
+                                   >
+                            <el-option
+                                    v-for="item in hospitalModuleList"
+                                    :key="item.id"
+                                    :label="item.name"
+                                    :value="item.id">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item label="备注：" prop="remark">
                          <el-input v-model="form.remark" placeholder="请输入备注"></el-input>
@@ -105,6 +118,7 @@
         modifier:'',
         hospitalList:[],
         caseLIst:[],
+        hospitalModuleList:[], //医院数据模块列表
         title:'病例条目-新增',
         form:{
           itemName:'',
@@ -112,7 +126,8 @@
           itemCode:'',
           remark:'',
           levelNo:'',
-          precond:''
+          precond:'',
+          hospitalModuleId:''
         },
         tableData:[],
         selectHospital:[],
@@ -134,12 +149,14 @@
         this.form.itemCode = data.code
         this.form.casesId = data.casesId
         this.form.remark = data.remark
-        this.form.levelNo = data.levelNo
+        // this.form.levelNo = data.levelNo
+          this.form.hospitalModuleId = data.modeId
         this.form.precond = data.precond
         this.selectHospital = data.getUpdateInfoDetialDTOS || []
       }
        this.getRecordInpModule()
       this.getRecordHopitalList()
+      this.gethospitalModuleList()
     },
     methods:{
       handleSelectionChange(val) {
@@ -202,7 +219,20 @@
           }
         })
       },
-      
+      gethospitalModuleList(){
+        return api.gethospitalModuleList({}).then((res)=>{
+          const result = res.data;
+          if(result.code==0){
+            this.hospitalModuleList = result.data
+          }else{
+            this.$message({
+              message:result.msg,
+              type:'warning',
+              showClose: true
+            });
+          }
+        })
+      },
       getRecordInpModule(){
         return api.getRecordCases({}).then((res)=>{
           const result = res.data;
@@ -224,7 +254,7 @@
         });
       },
       comfirn(form){
-          const {itemName,casesId,itemCode,remark,levelNo,precond} = this.form
+          const {itemName,casesId,itemCode,remark,levelNo,precond,hospitalModuleId} = this.form
           if(!itemName){
             this.$message({
               message:"请输入条目名称",
@@ -244,6 +274,22 @@
           let  casesEntryHospitals = []
           for(let i = 0; i < this.multipleSelection.length; i++){
             const item = this.multipleSelection[i]
+            if(item.value ===''){
+              this.$message({
+                message:"请填写所选医院扣分项",
+                type:'warning',
+                showClose: true
+              })
+              return
+            }
+            if(item.tipMsg ===''){
+              this.$message({
+                message:"请填写所选医院提示语",
+                type:'warning',
+                showClose: true
+              })
+              return
+            }
             casesEntryHospitals.push({
               creator: '0',
               score: item.value,
@@ -257,7 +303,7 @@
            let params = {
             id:this.id,
             name:itemName,
-            levelNo: levelNo,
+            modeId: hospitalModuleId,
             remark: remark,
             code: itemCode,
             precond:precond,

src/components/recordInput/ManageItemBatch.vue

@@ -81,6 +81,11 @@
                                       prop="name"
                                       width="240">
                                     </el-table-column>
+                                    <el-table-column
+                                      label="医院数据模块"
+                                      prop="modeName"
+                                      width="120">
+                                    </el-table-column>
                                     <el-table-column
                                       prop=""
                                       label="扣分值"
@@ -200,7 +205,6 @@
         this.checkAllMap[remark] = val;
       },
       getIsUsed(row){
-        console.log('row', row)
         // if(this.multipleSelection.findIndex(it => it.hospitalId ==row.hospitalId) > -1){
         //   return false
         // } else{
@@ -281,6 +285,7 @@
                 recordItem.score = checkedItem.score
                 recordItem.msg = checkedItem.msg
                 recordItem.isUsed = checkedItem.isUsed
+                recordItem.modeName = checkedItem.modeName
                 this.checkAllMap[caseItem.remark].push(recordItem)
               }
             }
@@ -426,11 +431,14 @@
 <style lang="less">
     @import "../../less/admin.less";
     .ManageItemBatchWrapper{
+      .container{
+        min-width: 1050px;
+      }
       .content{
         background: #fff;
         padding: 20px 20px 50px;
         color: #545455;
-        min-width: 980px;
+        min-width: 1040pxpx;
         position: relative;
         .short-inp{
             width: 200px;

src/components/recordInput/RecordItemList.vue

@@ -20,9 +20,9 @@
                     </el-option>
                   </el-select>
                </el-form-item>
-               <el-form-item label="层级定义：">
+               <!-- <el-form-item label="层级定义：">
                    <el-input size="mini" v-model.trim="filter.level" placeholder="层级定义" clearable></el-input>
-               </el-form-item>
+               </el-form-item> -->
                <el-form-item label="条目编码：">
                    <el-input size="mini" v-model.trim="filter.itemCode" placeholder="条目编码" clearable></el-input>
                </el-form-item>
@@ -70,8 +70,8 @@
                 </el-table-column>
                 <el-table-column
                         :resizable = "false"
-                        prop="levelNo"
-                        label="层级定义"
+                        prop="modeName"
+                        label="医院数据模块"
                         width="">
                   
                 </el-table-column>

vue.config.js

@@ -1,10 +1,10 @@
 const path = require('path');
 // const proxy_path = 'http://192.168.2.236:80';
 // const proxy_path = 'http://192.168.2.241:88';
-const proxy_path = 'http://192.168.2.236:88';
+// const proxy_path = 'http://192.168.2.236:88';
 // const proxy_path = 'http://192.168.3.101:5050';
 // const proxy_path = 'http://192.168.3.117:5050';//周铁刚
-// const proxy_path = 'http://192.168.3.115:5050';
+const proxy_path = 'http://192.168.3.113:5050'; //王峰
 
 module.exports = {
     lintOnSave: false,