Browse Source

Merge branch 'test' of http://192.168.2.236:10080/zhouna/platformFront into test

liucf 6 years ago
parent
commit
63a9304d18

+ 39 - 17
src/components/icss/AddCommonSymptom.vue

@@ -6,16 +6,26 @@
             @click="back"
         ></i> 常见症状维护系统--{{titleText}}</div>
         <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
+            <!-- 一期 -->
+            <el-form-item label="选择科室" prop="department">
+                <el-select :disabled="isEdit || isDetail" v-model="form.department" placeholder="请添加科室" @change="changeDept" class="selectDepart">
+                    <el-option v-for="item in departList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
              <el-form-item label="选择类型" prop="type">
                 <el-select :disabled="isEdit || isDetail" v-model="form.type" placeholder="请选择类型"  @change="changeType" class="selectDepart">
-                    <el-option v-for="item in typeList" :key="item.key" :label="item.name" :value="item.key"></el-option>
+                    <!-- 一期 -->
+                    <el-option v-for="item in typeList" :key="item.type" :label="item.typeName" :value="item.type"></el-option>
+                    <!-- 二期 -->
+                    <!-- <el-option v-for="item in typeList" :key="item.key" :label="item.name" :value="item.key"></el-option> -->
                 </el-select>
             </el-form-item>
-            <el-form-item label="选择科室" prop="department">
+            <!-- 二期 -->
+            <!-- <el-form-item label="选择科室" prop="department">
                 <el-select :disabled="isEdit || isDetail || !form.type" v-model="form.department" placeholder="请添加科室" @change="changeDept" class="selectDepart">
                     <el-option v-for="item in departList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
-            </el-form-item>
+            </el-form-item> -->
         </el-form>
         <div class="symptomList">
             <div class="bottomPartLeft fl" v-if="!isDetail">
@@ -132,6 +142,7 @@
             
         } else {
             this.getDepartmentList()
+            //二期
             // this.getIcssEnumsData()
         }
     },
@@ -148,18 +159,22 @@
         back(){
             this.$router.go(-1);
         },
-        getIcssEnumsData()  {
-            api.getIcssEnumsData().then((res) => {
-                if(res.data.code === '0') {
-                   this.typeList = res.data.data.questionUsualTypeEnum
-                }
-            })
-        },
+        // 二期
+        // getIcssEnumsData()  {
+        //     api.getIcssEnumsData().then((res) => {
+        //         if(res.data.code === '0') {
+        //            this.typeList = res.data.data.questionUsualTypeEnum
+        //         }
+        //     })
+        // },
         getDepartmentList() {
-            const param = {
-                "type": this.form.type
-            }
-            api.getDepartmentList(param).then((res)=>{
+            // 二期
+            // const param = {
+            //     "type": this.form.type
+            // }
+            // api.getDepartmentList(param).then((res)=>{
+            // 一期
+            api.getDepartmentList({}).then((res)=>{
                if(res.data.code === '0') {
                    this.departList = res.data.data
                 }
@@ -184,12 +199,19 @@
             })
         },
         changeDept() {
+            //一期
+            this.form.type = ''
+            this.typeList = this.departList.filter(item => this.form.department == item.id)[0].typeDTOList
+            //二期
+            // this.getSymptomList()
             this.clearData()
-            this.getSymptomList()
         },
         changeType() {
-            this.form.department = ''
-            this.getDepartmentList()
+            // 一期
+            this.getSymptomList()
+            // 二期
+            // this.form.department = ''
+            // this.getDepartmentList()
             this.clearData()
         },
         clearData() {

+ 227 - 0
src/components/icss/ChemicalAndCommonMapping.vue

@@ -0,0 +1,227 @@
+<template>
+    <div>
+        <crumbs title="标签组维护" style="min-width: 980px">
+            <el-form :inline="true" class="demo-form-inline">
+                <el-form-item label="化验大项:">
+                    <el-input size="mini" v-model="filter.mealName" placeholder="化验大项" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="化验小项:">
+                    <el-input size="mini" v-model="filter.itemName" placeholder="化验小项" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="化验公表项:">
+                    <el-input size="mini" v-model="filter.uniqueName" placeholder="化验公表项" clearable></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button size="mini" @click="filterDatas">确认</el-button>
+                    <el-button size="mini" type="warning" @click="addRelation">添加关联</el-button>
+                </el-form-item>
+            </el-form>
+        </crumbs>
+        <div class="contents">
+            <el-table
+                :data="list"
+                border
+                style="width: 100%">
+                <el-table-column
+                    :resizable = "false"
+                    type="index"
+                    :index = 'indexMethod'
+                    label="编号"
+                    width="60">
+                </el-table-column>
+                <el-table-column
+                    :resizable = "false"
+                    prop="gmtOperate"
+                    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="itemName"
+                    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="modifier"
+                    label="操作人">
+                </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>
+                        <el-button @click="showDelDialog(scope.row.id)" class="delete" type="text" size="small">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        <div class="pagination">
+            <el-pagination v-if="total>pageSize"
+                       :current-page.sync="currentPage"
+                       @current-change="currentChange"
+                       background
+                       :page-size="pageSize"
+                       layout="total,prev, pager, next, jumper"
+                       :total="total">
+            </el-pagination>
+        </div>
+        
+        </div>
+       <!--  <div class="pagination">
+           <el-pagination v-if="total>pageSize"
+                      :current-page.sync="currentPage"
+                      @current-change="currentChange"
+                      background
+                      :page-size="pageSize"
+                      layout="total,prev, pager, next, jumper"
+                      :total="total">
+           </el-pagination>
+       </div> -->
+        
+    </div>
+</template>
+
+<script>
+import api from '@api/icss.js';
+
+export default {
+    name: 'ChemicalAndCommonMapping',   //化验大小项和公表维护
+    data: function() {
+        return {
+            list: [],
+            filter: {
+                mealName:'',
+                itemName:'',
+                uniqueName:''
+            },
+            currentPage: 1,
+            pageSize: 10,
+            total: 0,
+        }
+    },
+    created() {
+        this.getDataList()
+        
+    },
+    methods: {
+        getDataList() {
+            const param = this.getFilterItems();
+            api.getLisMappingPage(param).then((res) => {
+                if(res.data.code == '0') {
+                    this.list = res.data.data.records
+                }
+                this.total = res.data.data.total;
+            })
+        },
+        filterDatas() {
+            this.currentPage = 1;
+            this.getDataList();
+        },
+        addRelation() {
+            this.$router.push({path:'LT-YXSJWH-TJBQZ'})
+        },
+        modifyRelation(row) {
+            console.log(row,'row')
+            const param = {
+                mealName:row.mealName,
+                itemName:row.itemName,
+                uniqueName:row.uniqueName
+            }
+            api.modifyLisMapping(param).then((res)=>{
+                const {code,data,msg} = res.data;
+                if(code=='0'){
+                    const item = Object.assign({},row,data);
+                    // console.log('item', item)
+                    this.$router.push({name:'AddChemicalAndCommonMapping',params:{isEdit:true,data:item}});
+                }else{
+                    this.$message({
+                    message: msg,
+                    type: 'warning'
+                    });
+                }
+            });
+        },
+        currentChange(next) {
+            this.currentPage = next;
+            this.getDataList();
+            // if (this.cacheData[next]) {       //如果已请求过该页数据,则使用缓存不重复请求
+            //     this.list = this.cacheData[next];
+            // } else {
+            //     this.getDataList();
+            // }
+        },
+        getFilterItems() {
+            const param = {
+                current: this.currentPage,
+                size: this.pageSize,
+                mealName:this.filter.mealName,
+                itemName:this.filter.itemName,
+                uniqueName:this.filter.uniqueName
+            };
+            return param;
+        },
+        indexMethod(index) {
+            return ((this.currentPage - 1) * this.pageSize) + index + 1;
+        },
+        getTagType(val) {
+            return val
+        },
+        warning(msg,type){
+          this.$message({
+            showClose: true,
+            message:msg,
+            type:type||'warning'
+          })
+        },
+        showConfirmDialog(msg,resolve){
+          this.$alert(msg, '提示', {
+            confirmButtonText: '确定',
+            type: 'warning'
+          }).then(() => {
+            resolve();
+          }).catch(() => {});
+        },
+        showDelDialog(id){
+          this.showConfirmDialog('是否删除该关联?',()=>{
+            api.delLisMappingById({id:id}).then((res)=>{
+              if(res.data.code=='0'){
+                this.getDataList();
+                this.warning(res.data.msg || '操作成功','success');
+              }else{
+                this.warning(res.data.msg);
+              }
+            }).catch((error)=>{
+              this.warning(error);
+            })
+          });
+        }
+    }
+}
+</script>
+
+
+<style lang="less">
+    @import "../../less/admin.less";
+    .delete{
+       color: red;
+    }
+    .delete:hover {
+        color: red;
+    } 
+    .pagination {
+        min-width: 1010px;
+    }
+</style>

+ 1 - 1
src/components/icss/CommonSymptom.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <crumbs title="icss科室维护系统">
+        <crumbs title="icss科室症状维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="科室名称:">
                     <el-input size="mini" v-model="filter.proName" placeholder="科室名称"></el-input>

+ 3 - 0
src/routes.js

@@ -63,6 +63,8 @@ import MedicalRelation from '@components/icss/MedicalRelation.vue'//医学术语
 import AddMedicalRelation from '@components/icss/AddMedicalRelation.vue'//医学术语维护-关系维护-添加
 import MedicalInfo from '@components/icss/MedicalInfo.vue'//医学术语维护-信息维护(属性维护)
 import AddMedicalInfo from '@components/icss/AddMedicalInfo.vue'//医学术语维护-信息维护(属性维护)-添加
+import ChemicalAndCommonMapping from '@components/icss/ChemicalAndCommonMapping.vue'; //化验大小项与公表维护
+
 import MedicalType from '@components/icss/MedicalType.vue'//医学术语维护-类型维护
 export default [
   {
@@ -193,6 +195,7 @@ export default [
       {path:'LT-YXSYKWH-TJYXSYGX',component:AddMedicalRelation,name:'AddMedicalRelation'},     //医学术语--关系维护-添加
       {path:'LT-YXSYKWH-SYYXSXWH',component:MedicalInfo,name:'MedicalInfo'},  //医学术语维护-信息维护(属性维护)
       {path:'LT-YXSYKWH-TJYXSYXX',component:AddMedicalInfo,name:'AddMedicalInfo'},  //医学术语维护-信息维护(属性维护) -- 添加
+      {path:'LT-YXSJWH-HYDXXYGBXDY',component:ChemicalAndCommonMapping,name:'ChemicalAndCommonMapping'},  //化验大小项与公表维护
       {path:'LT-YXSYKWH-YXSYLXWH',component:MedicalType,name:'MedicalType'},     //医学术语--类型维护
     ]
   }