v6

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.236:6060';
+axios.defaults.baseURL = 'http://192.168.2.241:6060';
 // axios.defaults.baseURL = 'http://192.168.2.241';
 // axios.defaults.baseURL = 'http://192.168.3.113:6060';
 

src/components/icss/dept/DeptManage.vue

@@ -23,12 +23,7 @@
         <el-table-column :resizable="false" type="index" :index="indexMethod" label="编号" width="60"></el-table-column>
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <el-table-column :resizable="false" prop="hisName" label="医院科室名称" show-overflow-tooltip></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="uniqueCode"
-          label="对应项编码"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="标准科室名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
@@ -65,7 +60,7 @@ import config from '@api/config.js';
 import utils from '@api/utils.js';
 
 export default {
-  name: 'DeptManage', 
+  name: 'DeptManage',
   data: function() {
     return {
       list: [],
@@ -213,8 +208,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -311,6 +308,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box {
+  /deep/.cancelBtn {
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/disease/ChemicalAndCommonMapping.vue

@@ -214,8 +214,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -312,6 +314,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box{
+  /deep/.cancelBtn{
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/drug/DrugManage.vue

@@ -24,12 +24,7 @@
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <!-- <el-table-column :resizable="false" prop="mealName" label="化验大项" show-overflow-tooltip></el-table-column> -->
         <el-table-column :resizable="false" prop="hisName" label="医院药品名称" show-overflow-tooltip></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="uniqueCode"
-          label="对应项编码"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="标准药品名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
@@ -214,8 +209,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -312,6 +309,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box{
+  /deep/.cancelBtn{
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/fusion/Fusion.vue

@@ -24,12 +24,7 @@
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <!-- <el-table-column :resizable="false" prop="mealName" label="化验大项" show-overflow-tooltip></el-table-column> -->
         <el-table-column :resizable="false" prop="hisName" label="医院用血类型" show-overflow-tooltip></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="uniqueCode"
-          label="对应项编码"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="标准用血术语" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
@@ -214,8 +209,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -312,6 +309,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box {
+  /deep/.cancelBtn {
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/lis/Lis.vue

@@ -149,7 +149,7 @@ export default {
         hisName: this.filter.hisName.trim(),
         uniqueName: this.filter.uniqueName.trim(),
         uniqueCode: '',
-        hisDetailName: this.filter.hisDetailName.trim(),
+        hisDetailName: this.filter.hisDetailName.trim()
       };
       return param;
     },
@@ -215,8 +215,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -313,6 +315,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box{
+  /deep/.cancelBtn{
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/operation/Operation.vue

@@ -24,13 +24,13 @@
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <!-- <el-table-column :resizable="false" prop="mealName" label="化验大项" show-overflow-tooltip></el-table-column> -->
         <el-table-column :resizable="false" prop="hisName" label="医院手术/操作名称" show-overflow-tooltip></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column>
         <el-table-column
           :resizable="false"
-          prop="uniqueCode"
-          label="对应项编码"
+          prop="uniqueName"
+          label="标准手术/操作名称"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column :resizable="false" prop="uniqueName" label="标准手术/操作名称" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
             <el-button @click="modifyRelation(scope.row)" type="text" size="small">修改</el-button>
@@ -214,8 +214,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -312,6 +314,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box {
+  /deep/.cancelBtn {
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/pacs/Pacs.vue

@@ -24,12 +24,7 @@
         <el-table-column :resizable="false" prop="gmtModified" label="操作时间" width="180"></el-table-column>
         <!-- <el-table-column :resizable="false" prop="mealName" label="化验大项" show-overflow-tooltip></el-table-column> -->
         <el-table-column :resizable="false" prop="hisName" label="医院检查项目" show-overflow-tooltip></el-table-column>
-        <el-table-column
-          :resizable="false"
-          prop="uniqueCode"
-          label="对应项编码"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column :resizable="false" prop="uniqueCode" label="对应项编码" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="uniqueName" label="标准检查项目" show-overflow-tooltip></el-table-column>
         <el-table-column :resizable="false" prop="operate" label="操作">
           <template slot-scope="scope">
@@ -214,8 +209,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -312,6 +309,12 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.el-message-box{
+  /deep/.cancelBtn{
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;

src/components/icss/plan/AddPlan.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="AddPlanWrapper clearfix" @click="close">
-    <crumbs  :title="isEdit ? '电子病历方案配置-修改方案' : '电子病历方案配置-添加方案'" class="topBack" :param="$route.params" linkTo="Plan"></crumbs>
+    <crumbs
+      :title="isEdit ? '电子病历方案配置-修改方案' : '电子病历方案配置-添加方案'"
+      class="topBack"
+      :param="$route.params"
+      linkTo="Plan"
+    ></crumbs>
     <div class="AddPlanBox">
       <el-row :gutter="20">
         <el-col :span="16">
@@ -151,9 +156,7 @@ export default {
   },
   watch: {
     planDefaultList: {
-      handler(newName, oldName) {
-        // console.log('obj.a changed');
-      },
+      handler(newName, oldName) {},
       immediate: true
     }
   },
@@ -280,16 +283,52 @@ export default {
     },
 
     // 编辑页面 根据id获取方案配置
-    _getPlanInfoIds(params) {
-      api.getPlanInfoIds(params).then(res => {
-        if (res.data.code === '0') {
-          this.planDefaultList = res.data.data[0].sysSetInfo[0].planDetails;
-          this.form.planName = res.data.data[0].planName;
-          this.form.planCode = res.data.data[0].planCode;
-          this.switchSubStatus = res.data.data[0].sysSetInfo[0].status;
-          this.switchMedStatus = res.data.data[0].sysSetInfo[1].status;
+    async _getPlanInfoIds(params) {
+      // 先获取默认的所有方案
+      let tempArr = [];
+      let newPlan = [];
+      let res = await api.getDefaultPlans();
+      if (res.data.code === '0') {
+        tempArr =
+          res.data.data &&
+          res.data.data.planDetailDefault.length !== 0 &&
+          res.data.data.planDetailDefault[0].planDetails;
+      }
+      let res1 = await api.getPlanInfoIds(params);
+      if (res1.data.code === '0') {
+        // this.planDefaultList = res.data.data[0].sysSetInfo[0].planDetails;
+        newPlan = res1.data.data[0].sysSetInfo[0].planDetails;
+        this.form.planName = res1.data.data[0].planName;
+        this.form.planCode = res1.data.data[0].planCode;
+        this.switchSubStatus = res1.data.data[0].sysSetInfo[0].status;
+        this.switchMedStatus = res1.data.data[0].sysSetInfo[1].status;
+        this.planDefaultList = res1.data.data[0].sysSetInfo[0].planDetails;
+      }
+
+      // api.getPlanInfoIds(params).then(res => {
+      //   if (res.data.code === '0') {
+      //     // this.planDefaultList = res.data.data[0].sysSetInfo[0].planDetails;
+      //     newPlan = res.data.data[0].sysSetInfo[0].planDetails;
+      //     this.form.planName = res.data.data[0].planName;
+      //     this.form.planCode = res.data.data[0].planCode;
+      //     this.switchSubStatus = res.data.data[0].sysSetInfo[0].status;
+      //     this.switchMedStatus = res.data.data[0].sysSetInfo[1].status;
+      //   }
+      // });
+      // console.log(newPlan, '获取的方案配置');
+      // console.log(tempArr, '===========');
+      let tempArr2 = tempArr.map( item=>{
+        return {...item, status: 0, isNO: true}
+      })
+      // let tempArr2 = [...tempArr]
+      for (var i = 0; i < newPlan.length; i++) {
+        for (var j = 0; j < tempArr2.length; j++) {
+          if (tempArr2[j].code === newPlan[i].code) {
+            tempArr2.splice(j, 1,newPlan[i]);
+          }
         }
-      });
+      }
+      // console.log(tempArr2);
     },
 
     // format处理细项数据

src/components/icss/plan/Plan.vue

@@ -25,6 +25,7 @@
               type="text"
               size="small"
               v-if="scope.row.planStatus === 1"
+              class="disable"
             >修改</el-button>
             <el-button plain type="text" size="small" v-else disabled>修改</el-button>
             <span style="margin:0 3px;">|</span>
@@ -90,7 +91,7 @@ export default {
     setTimeout(function() {
       that.getDataList();
     });
-    this._getHospital();
+    // this._getHospital();
   },
   watch: {
     filter: {
@@ -119,8 +120,8 @@ export default {
     },
 
     // 获取列表数据
-    getDataList(isTurnPage) {
-      const params = this.getFilterItems(isTurnPage);
+     async getDataList(isTurnPage) {
+      let params = await this.getFilterItems(isTurnPage)
       this.searched = true;
       const loading = this.$loading({
         lock: true,
@@ -142,16 +143,20 @@ export default {
     },
 
     // 处理列表请求数据参数
-    getFilterItems(isTurnPage) {
+    async getFilterItems(isTurnPage) {
       //翻页时筛选条件没点确定则清空
       if (isTurnPage && !this.searched) {
         this.clearFilter();
       }
+      let res = await api.getHospitalInfo()
+      if (res.data.code === '0') {
+        this.hospitalId = res.data.data.id;
+      }
       const param = {
         current: this.inCurrentPage || this.currentPage,
         size: this.pageSize,
-        planName: this.filter.planName.trim()
-        // planCode: ''
+        planName: this.filter.planName.trim(),
+        hospitalId: res.data.data.id
       };
       return param;
     },
@@ -216,8 +221,10 @@ export default {
       });
     },
     showConfirmDialog(msg, resolve) {
-      this.$alert(msg, '提示', {
+      this.$confirm(msg, '提示', {
         confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        cancelButtonClass: 'cancelBtn',
         type: 'warning'
       })
         .then(() => {
@@ -332,6 +339,15 @@ export default {
 .pagination {
   min-width: 1010px;
 }
+.disable{
+  border-color: transparent
+}
+.el-message-box {
+  /deep/.cancelBtn {
+    background-color: #d7d7d7;
+    border-color: transparent;
+  }
+}
 .exportBox {
   /deep/ .el-message-box__btns {
     margin-top: 20px;