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

src/api/index.js

@@ -3,7 +3,7 @@ import config from './config.js';
 
 axios.default.timeout = 5000;
 axios.defaults.headers.post['Content-Type'] = "application/json;charset=utf-8";
-axios.defaults.baseURL = 'http://192.168.2.236:88';
+axios.defaults.baseURL = 'http://192.168.2.236';
 
 const urls = config.urls;
 export default {

src/api/qualityControl.js

@@ -3,14 +3,14 @@ import config from '@api/config.js';
 
 const urls = config.urls;
 export default {
-  getFieldList(){
-    return axios.post(urls.getFieldList);
+  getFieldList(param){
+    return axios.post(urls.getFieldList,param);
   },
-  addFieldMatch(){
-    return axios.post(urls.addFieldMatch);
+  addFieldMatch(param){
+    return axios.post(urls.addFieldMatch,param);
   },
-  delFieldMatch(){
-    return axios.post(urls.delFieldMatch);
+  delFieldMatch(param){
+    return axios.post(urls.delFieldMatch,param);
   },
   getQcTypes(){
     return axios.post(urls.getQcTypes);

src/components/qualityControl/AddCombineFeild.vue

@@ -10,10 +10,10 @@
                                    size="small"
                                    :disabled="id && !copy?true:false">
                             <el-option
-                                    v-for="item in typeList"
-                                    :key="item.key"
+                                    v-for="item in hisTypes"
+                                    :key="item.val"
                                     :label="item.name"
-                                    :value="item.key">
+                                    :value="item.val">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -23,15 +23,15 @@
                                    size="small"
                                    :disabled="id && !copy?true:false">
                             <el-option
-                                    v-for="item in typeList"
-                                    :key="item.key"
+                                    v-for="item in fieldTypes"
+                                    :key="item.val"
                                     :label="item.name"
-                                    :value="item.key">
+                                    :value="item.val">
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="系统名称：" prop="tagName">
-                        <el-input type="text" placeholder="请输入显示名称" v-model="form.tagName"></el-input>
+                    <el-form-item label="备注：" prop="tagName">
+                        <el-input type="text" placeholder="请输入备注" v-model="form.tagName"></el-input>
                     </el-form-item>
                     <el-form-item label="显示名称：" prop="name">
                         <el-input type="text" placeholder="请输入显示名称" v-model="form.name"></el-input>
@@ -71,30 +71,52 @@
         isFirst:true,
         title:'组合字段维护-添加组合字段',
         form:{
+          moduleName:"",
+          hisName:"",
           name:'',
-          refreshTime:'',
           remark:'',
-          productType:null
         },
         id:null,
         rules:{
           hisName:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
           moduleName:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
-          tagName:{ required: true, message: '请输入系统名称', trigger: ['blur', 'change']},
+          tagName:{ required: true, message: '请输入备注', trigger: ['blur', 'change']},
           /*name:[{ required: true, message: '请输入显示名称',trigger: ['blur', 'change'] }],*/
         },
         copy:null,
         saveDisable: false,  //保存按钮禁止点击
-        typeList:[]
+        flawList:[],
+        fieldTypes:[],
+        hisTypes:[]
       }
     },
     created(){
+      this.getAllTypes();
       let info = this.$route.params.info;
-      this.form = Object.assign({},info);
-      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
-      this.typeList = typeList.productTypeEnum;
+      if(info){
+        this.title='组合字段维护-修改组合字段';
+        this.form = Object.assign({},info);
+      }
     },
     methods:{
+      getAllTypes(){
+        if(localStorage.getItem("qcModuleTypes")){
+          this.hisTypes = JSON.parse(localStorage.getItem("qcHospitalTypes"));
+          this.fieldTypes = JSON.parse(localStorage.getItem("qcModuleTypes"));console.log()
+          return ;
+        }
+        //获取枚举信息
+        api.getQcTypes().then((res)=>{
+          if(res.data.code==="0"){
+            const data = res.data.data;
+            localStorage.setItem("qcFieldTypes",JSON.stringify(data[11]));
+            localStorage.setItem("qcModuleTypes",JSON.stringify(data[12]));
+            localStorage.setItem("qcHospitalTypes",JSON.stringify(data[13]));
+          }else{
+            this.warning("获取枚举信息失败");
+          }
+        });
+      },
       comfirn(form){
         /*if(!this.form.name.trim() || !this.form.refreshTime.trim()){
           this.$message({

src/components/qualityControl/BaseFieldList.vue

@@ -12,13 +12,13 @@
                         <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="系统名称：">
-                    <el-input size="mini" v-model="filter.proName" placeholder="系统名称"></el-input>
+                <el-form-item label="备注：">
+                    <el-input size="mini" v-model="filter.tagName" placeholder="备注"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
                     <router-link to="/admin/LT-ZKYMSJWH-TJZDYSWH" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加映射</el-button>
+                        <el-button size="mini" type="warning">添加字段映射</el-button>
                     </router-link>
                 </el-form-item>
             </el-form>
@@ -43,24 +43,24 @@
                         prop="name"
                         label="所属模块">
                 </el-table-column>
-                <el-table-column
-                        prop="userName"
-                        label="系统名称">
-                </el-table-column>
                 <el-table-column
                         prop="name"
                         label="显示名称">
                 </el-table-column>
                 <el-table-column
-                        prop="name"
+                        prop="val"
                         label="取值字段">
                 </el-table-column>
                 <el-table-column
+                        prop="tagName"
+                        label="备注">
+                </el-table-column>
+                <!--<el-table-column
                         prop="name"
                         width="200"
                         label="关联缺陷条目">
                 </el-table-column>
-                <!--<el-table-column
+                <el-table-column
                         prop="name"
                         width="60"
                         label="换行">
@@ -106,6 +106,7 @@
       return {
         list: [],
         cacheData: {},
+        tagType:[1],
         currentPage: 1,
         pageSize: 10,
         total: 0,
@@ -114,7 +115,7 @@
         filter: {
           hisType:'',
           moduleType:'',
-          proName: ''
+          tagName: ''
         }
       }
     },
@@ -153,7 +154,7 @@
       },
       getDataList() {
         const param = this.getFilterItems();
-        api.getDeptInfo(param).then((res) => {
+        api.getFieldList(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;
@@ -165,11 +166,11 @@
         });
       },
       getFilterItems() {
-        const param = {
-          name: this.filter.proName,
+        const param = Object.assign({
+          tagTypeList:this.tagType,
           current: this.currentPage,
           size: this.pageSize
-        };
+        },this.filter);
         return param;
       },
       indexMethod(index) {
@@ -200,7 +201,7 @@
       },
       showDelDialog(id){
         this.showConfirmDialog('是否删除该字段映射？',()=>{
-          api.delFieldMatch({id}).then((res)=>{
+          api.delFieldMatch({ids:id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();

src/components/qualityControl/CombineFeildList.vue

@@ -4,16 +4,16 @@
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="所属医院：">
                     <el-select size="mini" v-model="filter.hisType" placeholder="所属医院" clearable>
-                        <el-option v-for="item in hisTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
+                        <el-option v-for="item in hisTypes" :label="item.name" :value="item.val" :key="item.val"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="所属模块：">
                     <el-select size="mini" v-model="filter.moduleType" placeholder="所属模块" clearable>
-                        <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
+                        <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.val"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="系统名称：">
-                    <el-input size="mini" v-model="filter.proName" placeholder="系统名称"></el-input>
+                <el-form-item label="备注：">
+                    <el-input size="mini" v-model="filter.tagName" placeholder="备注"></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button size="mini" @click="filterDatas">确认</el-button>
@@ -34,26 +34,26 @@
                         width="60">
                 </el-table-column>-->
                 <el-table-column
-                        prop="gmtModified"
+                        prop="hisName"
                         label="所属医院"
                         width="150"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
-                        prop="name"
+                        prop="moduleName"
                         label="所属模块">
                 </el-table-column>
-                <el-table-column
-                        prop="userName"
-                        label="系统名称">
-                </el-table-column>
                 <el-table-column
                         prop="name"
                         label="显示名称">
                 </el-table-column>
-                <el-table-column
+                <!--<el-table-column
                         prop="name"
                         label="包含字段">
+                </el-table-column>-->
+                <el-table-column
+                        prop="tagName"
+                        label="备注">
                 </el-table-column>
                 <el-table-column
                         label="操作" width="100">
@@ -86,6 +86,7 @@
       return {
         list: [],
         cacheData: {},
+        tagType:[4],
         currentPage: 1,
         pageSize: 10,
         total: 0,
@@ -94,7 +95,7 @@
         filter: {
           hisType:'',
           moduleType:'',
-          proName: ''
+          tagName: ''
         }
       }
     },
@@ -133,7 +134,7 @@
       },
       getDataList() {
         const param = this.getFilterItems();
-        api.getDeptInfo(param).then((res) => {
+        api.getFieldList(param).then((res) => {
           if (res.data.code == '0') {
             const data = res.data.data;
             this.list = data.records;
@@ -145,11 +146,11 @@
         });
       },
       getFilterItems() {
-        const param = {
-          name: this.filter.proName,
+        const param =  Object.assign({
+          tagTypeList:this.tagType,
           current: this.currentPage,
           size: this.pageSize
-        };
+        },this.filter);
         return param;
       },
       indexMethod(index) {
@@ -180,7 +181,7 @@
       },
       showDelDialog(id){
         this.showConfirmDialog('是否删除该组合字段？',()=>{
-          api.delFieldMatch({id}).then((res)=>{
+          api.delFieldMatch({ids:id}).then((res)=>{
             if(res.data.code=='0'){
               this.warning(res.data.msg||'操作成功','success');
               this.getDataList();

src/components/qualityControl/FieldMatch.vue

@@ -10,10 +10,10 @@
                                size="small"
                                :disabled="id && !copy?true:false">
                         <el-option
-                                v-for="item in typeList"
-                                :key="item.key"
+                                v-for="item in hisTypes"
+                                :key="item.val"
                                 :label="item.name"
-                                :value="item.key">
+                                :value="item.val">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -23,15 +23,15 @@
                                size="small"
                                :disabled="id && !copy?true:false">
                         <el-option
-                                v-for="item in typeList"
-                                :key="item.key"
+                                v-for="item in fieldTypes"
+                                :key="item.val"
                                 :label="item.name"
-                                :value="item.key">
+                                :value="item.val">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="系统名称：" prop="tagName">
-                    <el-input type="text" placeholder="请输入系统名称" v-model="form.tagName"></el-input>
+                <el-form-item label="备注：" prop="tagName">
+                    <el-input type="text" placeholder="请输入备注" v-model="form.tagName"></el-input>
                 </el-form-item>
                 <el-form-item label="显示名称：" prop="name">
                     <el-input type="text" placeholder="请输入显示名称" v-model="form.name"></el-input>
@@ -47,9 +47,9 @@
                                :disabled="id && !copy?true:false">
                         <el-option
                                 v-for="item in flawList"
-                                :key="item.key"
+                                :key="item.val"
                                 :label="item.name"
-                                :value="item.key">
+                                :value="item.val">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -76,30 +76,52 @@
         isFirst:true,
         title:'字段映射维护-添加映射字段',
         form:{
+          moduleName:"",
+          hisName:"",
           name:'',
-          refreshTime:'',
           remark:'',
-          productType:null
         },
         id:null,
         rules:{
           hisName:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
           moduleName:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
-          tagName:{ required: true, message: '请输入系统名称', trigger: ['blur', 'change']},
+          tagName:{ required: true, message: '请输入备注', trigger: ['blur', 'change']},
           /*name:[{ required: true, message: '请输入显示名称',trigger: ['blur', 'change'] }],*/
         },
         copy:null,
         saveDisable: false,  //保存按钮禁止点击
-        typeList:[]
+        flawList:[],
+        hisTypes:[],
+        fieldTypes:[],
       }
     },
     created(){
+      this.getAllTypes();
       let info = this.$route.params.info;
-      this.form = Object.assign({},info);
-      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
-      this.typeList = typeList.productTypeEnum;
+      if(info){
+        this.title='字段映射维护-修改映射字段';
+        this.form = Object.assign({},info);
+      }
     },
     methods:{
+      getAllTypes(){
+        if(localStorage.getItem("qcModuleTypes")){
+          this.hisTypes = JSON.parse(localStorage.getItem("qcHospitalTypes"));
+          this.fieldTypes = JSON.parse(localStorage.getItem("qcModuleTypes"));
+          return ;
+        }
+        //获取枚举信息
+        api.getQcTypes().then((res)=>{
+          if(res.data.code==="0"){
+            const data = res.data.data;
+            localStorage.setItem("qcFieldTypes",JSON.stringify(data[11]));
+            localStorage.setItem("qcModuleTypes",JSON.stringify(data[12]));
+            localStorage.setItem("qcHospitalTypes",JSON.stringify(data[13]));
+          }else{
+            this.warning("获取枚举信息失败");
+          }
+        });
+      },
       comfirn(form){
         /*if(!this.form.name.trim() || !this.form.refreshTime.trim()){
           this.$message({