字段映射添加修改接口对接

src/components/qualityControl/BaseFieldList.vue

@@ -3,12 +3,12 @@
         <crumbs title="字段映射维护">
             <el-form :inline="true" class="demo-form-inline">
                 <el-form-item label="所属医院：">
-                    <el-select size="mini" v-model="filter.hisType" placeholder="所属医院" clearable>
+                    <el-select size="mini" v-model="filter.hospitalId" placeholder="所属医院" clearable>
                         <el-option v-for="item in hisTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="所属模块：">
-                    <el-select size="mini" v-model="filter.moduleType" placeholder="所属模块" clearable>
+                    <el-select size="mini" v-model="filter.modeId" placeholder="所属模块" clearable>
                         <el-option v-for="item in fieldTypes" :label="item.name" :value="item.val" :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
@@ -37,10 +37,12 @@
                         prop="gmtModified"
                         label="所属医院"
                         width="150"
+                        :formatter="hisFormatter"
                         :show-overflow-tooltip="true">
                 </el-table-column>
                 <el-table-column
                         prop="name"
+                        :formatter="moduleFormatter"
                         label="所属模块">
                 </el-table-column>
                 <el-table-column
@@ -113,8 +115,8 @@
         fieldTypes:[],
         hisTypes:[],
         filter: {
-          hisType:'',
-          moduleType:'',
+          hospitalId:'',
+          modeId:'',
           tagName: ''
         }
       }
@@ -124,6 +126,14 @@
       this.getDataList();
     },
     methods: {
+      moduleFormatter(item){
+        const field = this.fieldTypes.filter((it)=>it.val==item.modeId);
+        return field[0]?field[0].name:'';
+      },
+      hisFormatter(item){
+        const field = this.hisTypes.filter((it)=>it.val==item.hospitalId);
+        return field[0]?field[0].name:'';
+      },
       getAllTypes(){
         if(localStorage.getItem("qcModuleTypes")){
           this.hisTypes = JSON.parse(localStorage.getItem("qcHospitalTypes"));

src/components/qualityControl/FieldMatch.vue

@@ -4,29 +4,27 @@
         <div class="contents">
             <div class="content">
             <el-form ref="form" :label-position="labelPosition" label-width="118px" :model="form" :rules="rules">
-                <el-form-item label="所属医院：" prop="hisName">
-                    <el-select v-model="form.hisName"
+                <el-form-item label="所属医院：" prop="hospitalId">
+                    <el-select v-model="form.hospitalId"
                                placeholder="请选择"
-                               size="small"
-                               :disabled="id && !copy?true:false">
+                               size="small">
                         <el-option
                                 v-for="item in hisTypes"
                                 :key="item.val"
                                 :label="item.name"
-                                :value="item.val">
+                                :value="Number(item.val)">
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="所属模块：" prop="moduleName">
-                    <el-select v-model="form.moduleName"
+                <el-form-item label="所属模块：" prop="modeId">
+                    <el-select v-model="form.modeId"
                                placeholder="请选择"
-                               size="small"
-                               :disabled="id && !copy?true:false">
+                               size="small">
                         <el-option
                                 v-for="item in fieldTypes"
                                 :key="item.val"
                                 :label="item.name"
-                                :value="item.val">
+                                :value="Number(item.val)">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -37,14 +35,13 @@
                     <el-input type="text" placeholder="请输入显示名称" v-model="form.name"></el-input>
                 </el-form-item>
                 <el-form-item label="取值字段：" prop="value">
-                    <el-input type="text" placeholder="请输入取值字段" v-model="form.value"></el-input>
+                    <el-input type="text" placeholder="请输入取值字段" v-model="form.val"></el-input>
                 </el-form-item>
                 <el-form-item label="关联缺陷条目：" prop="flawId">
                     <el-select filterable
                                v-model="form.flawId"
                                placeholder="请选择"
-                               size="small"
-                               :disabled="id && !copy?true:false">
+                               size="small">
                         <el-option
                                 v-for="item in flawList"
                                 :key="item.val"
@@ -54,9 +51,10 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item>
-                    <el-checkbox v-model="form.breakLine">换行</el-checkbox>
-                    <el-checkbox v-model="form.bold">内容加粗</el-checkbox>
-                    <el-checkbox v-model="form.intent">缩进</el-checkbox>
+                    <el-checkbox v-model="form.addLine" :true-label="Number(1)" :false-label="Number(0)">换行</el-checkbox>
+                    <el-checkbox v-model="form.position" :true-label="Number(1)" :false-label="Number(0)">靠右显示</el-checkbox>
+                    <el-checkbox v-model="form.bold" :true-label="Number(1)" :false-label="Number(0)">内容加粗</el-checkbox>
+                    <el-checkbox v-model="form.retract" :true-label="Number(1)" :false-label="Number(0)">缩进</el-checkbox>
                 </el-form-item>
                 <el-button class="disclButn" size="small" type="primary" :disabled = 'saveDisable' @click="comfirn('form')">确定</el-button>
             </el-form>
@@ -76,15 +74,21 @@
         isFirst:true,
         title:'字段映射维护-添加映射字段',
         form:{
-          moduleName:"",
-          hisName:"",
+          tagType:1,        //固定
+          modeId:"",
+          hospitalId:"",
           name:'',
-          remark:'',
+          val:'',
+          tagName:'',
+          addLine:0,
+          bold:0,
+          position:0,
+          retract:0
         },
         id:null,
         rules:{
-          hisName:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
-          moduleName:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
+          hospitalId:{ required: true, message: '请选择所属医院', trigger: ['blur', 'change']},
+          modeId:{ required: true, message: '请选择所属模块', trigger: ['blur', 'change']},
           tagName:{ required: true, message: '请输入备注', trigger: ['blur', 'change']},
           /*name:[{ required: true, message: '请输入显示名称',trigger: ['blur', 'change'] }],*/
         },
@@ -132,10 +136,10 @@
         }*/
         this.$refs[form].validate((valid) => {
           if (valid) {
-            if(this.id && !this.copy){//修改
-              const param = Object.assign({},this.form,{id:this.id})
-              this.saveDisable = true  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
-              api.updateFieldMatch(param).then((res)=>{
+            if(this.id){//修改
+              const param = Object.assign({},this.form,{id:this.id});
+              this.saveDisable = true;  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
+              api.addFieldMatch(param).then((res)=>{
                 if(res.data.code==0){
                   this.$message({
                     message:"修改成功",
@@ -143,7 +147,7 @@
                   });
                   //返回带搜索条件的首页
                   this.$router.push({
-                    name: 'VersionInfo',
+                    name: 'BaseField',
                     params: Object.assign({}, this.$route.params, {currentPage: 1})
                   });
                 }else{
@@ -157,12 +161,12 @@
             }else{//添加
               const params = Object.assign({},this.form);
               this.saveDisable = true;  //提交保存按钮不可点击，返回结果时才可点击，防止频繁发送请求
-              api.addFieldMatch(params).then((res)=>{
+              api.addFieldMatch({questionWrapper:params}).then((res)=>{
                 if(res.data.code==0){
                   this.$message({
                     message:"添加成功",
                     type:'success'
-                  })
+                  });
                   this.$router.push({name: 'BaseField'});
                 }else{
                   this.$message({