护理相关提交

src/api/config.js

@@ -90,6 +90,7 @@ export default {
     'saveOrUpdateRecord': '/tran/nurseConfig/saveOrUpdateRecord',   //护理列表添加
     'deleteNurseRecord': '/tran/nurseConfig/deleteRecord',   //护理-删除映射关系
     'exportNurseRecord': '/tran/nurseConfig/exportExcel',   //护理-数据导出
+    'importNurseRecord': '/tran/nurseConfig/importExcel',   //检验-数据导入
     'exportNurseModule': '/tran/nurseConfig/exportExcelModule',   //护理-数据导入模板导出
 
 

src/api/icss.js

@@ -139,32 +139,32 @@ export default {
   },
 
 
-    getScalePage(param) {
-        //量表列表-列表
-        return axios.post(urls.getScalePageCDSS, param);
-    },
-    scaleIsExistRecord(param) {
-        return axios.post(urls.scaleIsExistRecordCDSS, param);
-    },
-    saveOrUpdateScaleRecord(param) {
-        return axios.post(urls.saveOrUpdateScaleRecordCDSS, param);
-    },
-    deleteScaleRecord(param) {
-        return axios.post(urls.deleteScaleRecordCDSS, param);
-    },
-    exportScaleRecord(param) {
-        return axios.post(urls.exportScaleRecordCDSS, param, {
-            responseType: 'blob',
-        });
-    },
-    importScaleRecord(param) {
-        return axios.post(urls.importScaleRecordCDSS, param);
-    },
-    exportScaleModule(param) {
-        return axios.post(urls.exportScaleModuleCDSS, param, {
-            responseType: 'blob',
-        });
-    },
+  getScalePage(param) {
+    //量表列表-列表
+    return axios.post(urls.getScalePageCDSS, param);
+  },
+  scaleIsExistRecord(param) {
+    return axios.post(urls.scaleIsExistRecordCDSS, param);
+  },
+  saveOrUpdateScaleRecord(param) {
+    return axios.post(urls.saveOrUpdateScaleRecordCDSS, param);
+  },
+  deleteScaleRecord(param) {
+    return axios.post(urls.deleteScaleRecordCDSS, param);
+  },
+  exportScaleRecord(param) {
+    return axios.post(urls.exportScaleRecordCDSS, param, {
+      responseType: 'blob',
+    });
+  },
+  importScaleRecord(param) {
+    return axios.post(urls.importScaleRecordCDSS, param);
+  },
+  exportScaleModule(param) {
+    return axios.post(urls.exportScaleModuleCDSS, param, {
+      responseType: 'blob',
+    });
+  },
 
   getOperationPage(param) {
     //手术/操作列表-列表
@@ -286,12 +286,21 @@ export default {
   },
   exportNurseRecord(param) {
     //护理-数据导出
-    return axios.post(urls.exportNurseRecord, param);
+    return axios.post(urls.exportNurseRecord, param, {
+      responseType: 'blob',
+    });
+  },
+  importNurseRecord(param) {
+    //护理-数据导入
+    return axios.post(urls.importNurseRecord, param);
   },
   exportNurseModule(param) {
     //护理-数据导入模板导出
-    return axios.post(urls.exportNurseModule, param);
+    return axios.post(urls.exportNurseModule, param, {
+      responseType: 'blob',
+    });
   },
+  
 
   getHospitalInfo(param) {
     return axios.post(urls.getHospitalInfo, param);

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 500000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-//axios.defaults.baseURL = 'http://192.168.2.241:6060';
+axios.defaults.baseURL = 'http://192.168.2.236:6060';
 // axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.113:6060';
 

src/components/icss/AddMedicinePrompt.vue

@@ -179,7 +179,7 @@ export default {
       showConfirm: true,
       isSuccessUpload: 0, //是否上传成功  0: 不在上传  1: 上传过程中  2: 上传成功
       isShowTip: false,
-      showType: -1, // 1 诊断  2  药品   3检验套餐 4检验细项  5检查  6检查子 7手术和操作 8量表
+      showType: -1, // 1 诊断  2  药品   3检验套餐 4检验细项  5检查  6检查子 7手术和操作 8量表 9护理
       editCount: -1, // 页面会否被编辑 >0被编辑   =0 未编辑
       startCount: -1,
       isSaveSuccess: false // 是否保存成功
@@ -206,6 +206,7 @@ export default {
   },
   created: function() {
     const { isEdit, data, isCopy } = this.$route.params;   
+    console.log(data)
     if (isEdit || isCopy) {
       this.showType = data.type; // 编辑页确认显示类型
       this.isEdit = isEdit;

src/components/icss/MedicineInfoPg.vue

@@ -162,7 +162,8 @@ export default {
           this.filterHiddenPosition();
       },200)
   },
-  mounted() {},
+  mounted() {
+  },
   methods: {
     reOrder(i) {
       this.$emit('reOrder', i, this.index);
@@ -174,6 +175,7 @@ export default {
       this.$emit('del', this.index);
     },
       filterHiddenPosition(){
+        
           const pos = this.data.position;
           const pArr = this.positions.map((it)=>{return it.key});
           const pStr = pArr.join(",");
@@ -186,7 +188,7 @@ export default {
     renderPositions() {
       //显示位置枚举列表
       const pos = localStorage.getItem('knowledgeEnumsData');
-      // console.log('this.showType,', this.showType);
+      console.log('this.showType,', this.showType);
       let positions = config.contentTypes;
       if (this.showType == 1) {
         // 诊断
@@ -201,7 +203,7 @@ export default {
         this.positions = positions.filter(item => {
           return item.key <= 2;
         });
-      } else if (this.showType == 2 || this.showType == 7|| this.showType == 8) {
+      } else if (this.showType == 2 || this.showType == 7|| this.showType == 8|| this.showType == 9) {
         // 药品/手术
         this.positions = positions.filter(item => item.key === 1);
       } else {

src/components/icss/nursing/Addnursing.vue

@@ -4,7 +4,7 @@
       :title="isEdit ? '护理关联维护--修改关联' : '护理关联维护--添加关联'"
       class="topBack"
       :param="$route.params"
-      linkTo="DeptManage"
+      linkTo="Nursing"
     ></crumbs>
     <el-form
       :model="form"
@@ -55,9 +55,9 @@
                   <el-option
                     v-for="(item,idx) in uniqueNameList"
                     :key="idx"
-                    :label="item"
-                    :value="item"
-                    :title="item"
+                    :label="item.name"
+                    :value="item.name"
+                    :title="item.name"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -124,7 +124,7 @@ export default {
       this.searchInfo = query;
       this.showDrop = true;
       let params = {
-        type: 7, //科室
+        type: 11, //科室
         inputStr: query,
         sex: 3,
         age: 0
@@ -132,7 +132,7 @@ export default {
       api.retrievalSearch(params).then(res => {
         this.showDrop = false;
         if (res.data.code === '0') {
-          this.uniqueNameList = res.data.data.deptNames;
+          this.uniqueNameList = res.data.data.nursenames;
         }
       });
     },

src/components/icss/nursing/nursing.vue

@@ -88,7 +88,6 @@ export default {
     };
   },
   created() {
-    console.log(localStorage.getItem('token'))
     const param = this.$route.params;
     if(param.currentPage){
       this.inCurrentPage = param.currentPage
@@ -333,7 +332,7 @@ export default {
         }
       };
       this.uploadInfo = '导入中...';
-      api.importDeptRecord(formData, header).then(res => {
+      api.importNurseRecord(formData, header).then(res => {
         // console.log('导入文件结果', '===================', res);
         if (res.data.code === '00000001') {
           this.$confirm(`数据存在异常，导入失败，请修改后再试`, '提示', {