常见科室症状

src/api/config.js

@@ -109,8 +109,9 @@ export default {
     'commonSymptomList': 'api/icssman/questionUsual/getDeptInfos', //常见症状维护-常见症状列表
     'getDepartmentList':'api/icssman/questionUsual/getDeptName', //常见症状维护-科室列表
     'getSymptomList':'api/icssman/questionUsual/getQuestionInfo', //常见科室症状维护--获取症状列表
-    'addCommonSymptom': 'api/icssman/questionUsual/addQuestionUsual',  //常见科室症状维护--添加修改科室症状
-    'delCommonSymptom': 'api/icssman/questionUsual/deleteQuestionUsual',  //常见科室症状维护--添加修改科室症状
+    'addCommonSymptom': 'api/icssman/questionUsual/addQuestionUsual',  //常见科室症状维护--添加科室症状
+    'getCommonSymptomById': 'api/icssman/questionUsual/getQuestionUsualByDept', //常见科室症状维护--修改、详情
+    'delCommonSymptom': 'api/icssman/questionUsual/deleteQuestionUsual',  //常见科室症状维护--删除科室症状
     'discInformation': 'api/icssman/disclaimerInformation/getDisclaimerInformations', //免责声明
     'addDiscInformation': 'api/icssman/disclaimerInformation/addDisclaimerInformations', //免责声明-新增
     'modifDiscInformation': 'api/icssman/disclaimerInformation/updateDisclaimerInformations', //免责声明-修改

src/components/icss/AddCommonSymptom.vue

@@ -7,13 +7,13 @@
         ></i> 常见症状维护系统--添加科室常见症状</div>
         <el-form :model="form" ref="ruleForm" :rules="rules" class="addDepartForm">
             <el-form-item label="选择科室" prop="department">
-                <el-select v-model="form.department" placeholder="请添加科室" class="selectDepart">
+                <el-select 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 v-model="form.type" placeholder="请选择类型" class="selectDepart">
-                    <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                <el-select v-model="form.type" placeholder="请选择类型"  @change="changeType" class="selectDepart">
+                    <el-option v-for="item in typeList" :key="item.type" :label="item.typeName" :value="item.type"></el-option>
                 </el-select>
             </el-form-item>
         </el-form>
@@ -106,8 +106,13 @@
         }
     },
     created(){
-        this.getDepartmentList()
-        this.getSymptomList()
+        const { isEdit, isDetail, data } = this.$route.params;
+        if(isEdit || isDetail) {
+            this.isEdit = isEdit
+            
+        } else {
+            this.getDepartmentList()
+        }
     },
     watch: {
         searchVal(newVal, preVal) {
@@ -126,7 +131,6 @@
             api.getDepartmentList().then((res)=>{
                if(res.data.code === '0') {
                    this.departList = res.data.data
-                   
                 }
             })
         },
@@ -138,7 +142,8 @@
             const param = {
                 "deptId": this.form.department,
                 "tagName": this.searchVal,
-                "noIds": noIds
+                "noIds": noIds,
+                "type": this.form.type
             }
             api.getSymptomList(param).then((res)=>{
                if(res.data.code === '0') {
@@ -146,6 +151,22 @@
                 }
             })
         },
+        changeDept() {
+            console.log('asdasfdgag',this.departList)
+            this.form.type = ''
+            this.typeList = this.departList.filter(item => this.form.department == item.id)[0].typeDTOList
+            this.clearData()
+        },
+        changeType() {
+            this.clearData()
+            this.getSymptomList()
+        },
+        clearData() {
+            this.leftTagsList = [];
+            this.rightTagsList = [];
+            this.selectLeftTagsList = [];
+            this.selectRightTagIndex = -1;
+        },
         selectLeftTag(tag, index, e) {
             const hasTag = this.isHasTag(tag, this.selectLeftTagsList)
             if (hasTag) {

src/components/icss/AddPhysicalExamTemp.vue

@@ -1,6 +1,6 @@
 <!-- 添加常见科室症状  -->
 <template>
-    <div class="addCommonSymptomWrapper">
+    <div class="AddPhysicalExamTempWrapper">
         <div class="groupTitle"><i
             class="el-icon-back"
             @click="back"
@@ -48,9 +48,12 @@
                 <p><span class="el-icon-arrow-left" @click="toLeftList"></span></p>
             </div>
             <div class="bottomPartRight fl">
-                <p class="symptomPoolTitle">查体模板：</p>
+                <p class="symptomPoolTitle">查体模板： 
+                    <span class="el-icon-arrow-right arrowIcon" @click="toDown"></span>
+                    <span class="el-icon-arrow-left arrowIcon" @click="toUp"></span> 
+                </p>
                 <ul class="tagList operationPool">
-                        <li class = "tagItem"
+                        <li class = "tagItem fl"
                             v-for="(item,index) in rightTagsList" 
                             :key='item.id'
                             :style="index === selectRightTagIndex?styles:null"
@@ -61,10 +64,7 @@
                     </ul>
 
             </div>
-            <div class="bottomPartMid fl" v-if="!isDetail">
-                <p><span class="el-icon-arrow-up" @click="toUp"></span></p>
-                <p><span class="el-icon-arrow-down" @click="toDown"></span></p>
-            </div>
+           
             
         </div>
         <div class="btn">
@@ -80,7 +80,7 @@
 <script>
   import api from '@api/icss.js';
   export default {
-    name: 'AddCommonSymptom',
+    name: 'AddPhysicalExamTempWrapper',
     data() {
         return{
             rules: {
@@ -103,13 +103,14 @@
         }
     },
     created(){
-        console.log('param', this.$route.params)
         const { isEdit, isDetail, data } = this.$route.params;
         if(isEdit || isDetail) {
+            const { id, name } = data
             this.isEdit = isEdit
             this.isDetail = isDetail
             this.rightTagsList = data.vitals
-            this.form.department = data.id
+            this.departList.push({ id, name, val:id })
+            this.form.department = id
             
         }
         this.getDepartmentList()
@@ -287,7 +288,7 @@
 
 <style lang="less">
     @import '../../less/common.less';
-    .addCommonSymptomWrapper {
+    .AddPhysicalExamTempWrapper {
         .groupTitle {
             background-color: #fff;
             height: 40px;
@@ -360,8 +361,21 @@
             }
             }
         }
+        .arrowIcon {
+             cursor: pointer;
+            display: inline-block;
+            width: 40px;
+            height: 30px;
+            line-height: 30px;
+            border: 1px solid @icssBorder;
+            font-size: 18px;
+            text-align: center;
+            margin-right: 15px;
+            .fr
+
+        }
         .bottomPartRight {
-            width: 32%;
+            width: 52%;
         }
         .operationPool {
             position: relative;

src/components/icss/CommonSymptom.vue

@@ -30,6 +30,11 @@
                         label="操作时间"
                         :show-overflow-tooltip="true">
                 </el-table-column>
+                <el-table-column
+                        :resizable = "false"
+                        prop="typeName"
+                        label="类型">
+                </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         prop="name"
@@ -48,14 +53,14 @@
                     <template slot-scope="scope">
                         <el-button type="text" size="small" @click="toEditProduct(scope.row)">修改</el-button>
                         <span style="margin:0 3px;">|</span>
-                        <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row.id)">删除</el-button>
+                        <el-button type="text" size="small" class="delete" @click="showDelDialog(scope.row)">删除</el-button>
                     </template>
                 </el-table-column>
                 <el-table-column
                         :resizable = "false"
                         label="详情">
                     <template slot-scope="scope">
-                        <el-button type="text" size="small" @click="getDetailList(scope.row.id)">详情</el-button>
+                        <el-button type="text" size="small" @click="getDetailList(scope.row)">详情</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -97,10 +102,23 @@
     },
     methods: {
       toEditProduct(row){
-        this.$router.push({
-          name:'AddCommonSymptom',
-          params: {info:row}
-        })
+        const param = {
+            "deptId": row.id,
+            "type": row.type
+        }
+        api.getCommonSymptomById(param).then((res)=>{
+            const {code,data,msg} = res.data;
+            if(code=='0'){
+                const item = Object.assign({},row,data);
+                this.$router.push({name:'AddCommonSymptom',params:{isEdit:true,data:item}});
+            }else{
+                this.$message({
+                message: msg,
+                type: 'warning'
+                });
+            }
+        });
+
       },
       filterDatas(){
         this.currentPage = 1;
@@ -122,24 +140,23 @@
           console.log(error);
         });
       },
-      getDetailList(id) {
-        const param = {'id': id,};
-        this.$router.push({name:'AddCommonSymptom', params:{id: id}})
-        /*api.getDeptInfoDetials(param).then((res) => {
-          if (res.data.code == '0') {
-            this.$router.push({name:'DeptInfoDetail', params:{id: id}})
-            // console.log("详情接口调用成功");
-          } else {
-            this.$message({
-              showClose: true,
-              message:res.data.msg,
-              type:'warning'
-            });
-            this.getDataList()  //刷新列表
-          }
-        }).catch((error) => {
-          console.log(error);
-        });*/
+      getDetailList(row) {
+        const param = {
+            "deptId": row.id,
+            "type": row.type
+        }
+        api.getCommonSymptomById(param).then((res)=>{
+            const {code,data,msg} = res.data;
+            if(code=='0'){
+                const item = Object.assign({},row,data);
+                this.$router.push({name:'AddCommonSymptom',params:{isEdit:true,data:item}});
+            }else{
+                this.$message({
+                message: msg,
+                type: 'warning'
+                });
+            }
+        });
       },
       getFilterItems() {
         const param = {
@@ -175,9 +192,13 @@
           resolve();
         }).catch(() => {});
       },
-      showDelDialog(id){
+      showDelDialog(row){
         this.showConfirmDialog('是否删除该科室症状？',()=>{
-          api.delCommonSymptom({'deptId':id}).then((res)=>{
+          const param = {
+            "deptId": row.id,
+            "type": row.type
+          }
+          api.delCommonSymptom(param).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();

src/components/icss/PubIndeptTag.vue

@@ -44,6 +44,30 @@
                             :key="item.id"
                     ></el-option>
                 </el-select>
+            </el-form-item>
+             <el-form-item
+                    label="性别："
+                    prop="region7"
+            >
+                <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span>
+                <el-select
+                        v-model="form.region7"
+                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
+                        @change="(e)=>readyChangeSelect(e,3)"
+                >
+                    <el-option
+                            label="通用"
+                            value="3"
+                    ></el-option>
+                    <el-option
+                            label="男"
+                            value="1"
+                    ></el-option>
+                    <el-option
+                            label="女"
+                            value="2"
+                    ></el-option>
+                </el-select>
             </el-form-item>
             <el-form-item
                     label="标签系统名称："
@@ -73,7 +97,7 @@
                     label="标签前后缀："
                     class="fix-inp"
                     prop="region12"
-                    v-if="form.region2==6"
+                    v-if="form.region2==6 || form.region2==7"
             >
                 <el-col :span="10">
                 <el-input v-model="form.prefix"
@@ -123,30 +147,7 @@
                     ></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item
-                    label="性别："
-                    prop="region7"
-            >
-                <span class="changeTips">改变性别后，标签明细将会恢复到默认状态</span>
-                <el-select
-                        v-model="form.region7"
-                        :disabled="!!editData.id || !form.region1 || form.region2 == '99'"
-                        @change="(e)=>readyChangeSelect(e,3)"
-                >
-                    <el-option
-                            label="通用"
-                            value="3"
-                    ></el-option>
-                    <el-option
-                            label="男"
-                            value="1"
-                    ></el-option>
-                    <el-option
-                            label="女"
-                            value="2"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
+           
             <el-form-item
                     label="年龄："
                     prop="region8"