冲突解决

src/components/knowledgeExtra/AddDevKnow.vue

@@ -2,110 +2,11 @@
   <el-scrollbar style="height: 100%" ref="elscrollbar" id="message-container">
     <div class="NoiseTemplateWrapper TemplateWrapper knowledgeWrapper">
       <crumbs
-<<<<<<< HEAD
-        :title="'医学术语静态知识维护-'+title"
-=======
         :title="'医学术语静态知识维护-' + title"
->>>>>>> parent of e19d1f7 (no message)
         class="topBack"
         :param="$route.params"
         linkTo="StaticInfo"
       ></crumbs>
-<<<<<<< HEAD
-      <div class="info-container">
-        <el-form :rules="rules" :model="form" label-width="160px" ref="groups">
-          <el-form-item v-if="!isEdit" label="选择标准术语：" prop="selectedTerm">
-            <el-select
-              v-model="form.selectedTerm"
-              filterable
-              remote
-              clearable
-              :loading="showDrop"
-              loading-text="加载中..."
-              @change="changeWord"
-              @visible-change="handleVisible"
-              value-key="id"
-              @clear="handleClear"
-              ref="termName"
-              placeholder="搜索"
-              :remote-method="searchTerms"
-            >
-              <el-option
-                v-for="(term,idx) in terms"
-                :key="idx"
-                :label="term.name+(term.typeName?'('+term.typeName+')':'')"
-                :value="term"
-                :title="term.name+(term.typeName?'('+term.typeName+')':'')"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="已选择标准术语：" label-width="160px">{{form.selectedTermName}}</el-form-item>
-          <el-form-item
-            v-if="form.selectedTerm&&(form.typeId==1||form.typeId==3||form.typeId==4||form.typeId==5||form.typeId==6)"
-            :label="titleChange"
-            prop="titleChange"
-            label-width="160px"
-          >
-            <el-input v-model="form.titleChange"></el-input>
-          </el-form-item>
-          <p class="line"></p>
-          <DevInfo
-            v-for="(f,i) in form.prags"
-            v-if="!upload"
-            :key="(i+1)*10000 + showType"
-            :data="f"
-            :index="i"
-            :total="form.prags.length"
-            :isEdit="isEdit"
-            :isCopy="isCopy"
-            ref="subForm"
-            @add="addParagraph(i)"
-            @del="delParagraph"
-            @reOrder="reOrder"
-            :showType="showType"
-          ></DevInfo>
-          <el-form-item v-if="upload" label="标题名称搜索：" prop="fileTitle" label-width="160px">
-            <el-input v-model="form.fileTitle"></el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="upload"
-            label="上传文件："
-            ref="upload"
-            prop="fileList"
-            label-width="160px"
-          >
-            <el-upload
-              @mouseenter.native="handleMouseenter"
-              @mouseleave.native="handleMouseleave"
-              class="upload-demo"
-              :action="config.urls.promptServer"
-              name="upfile"
-              :multiple="false"
-              :limit="1"
-              :on-preview="handlePreview"
-              :on-remove="handleRemove"
-              :before-upload="handleBeforeUpLoad"
-              :before-remove="beforeRemove"
-              :on-change="handleChange"
-              :on-success="handleSuccess"
-              :show-file-list="showFileList"
-              :file-list="form.fileList"
-            >
-              <el-button size="small" type="primary" v-if="showUpLoad">点击上传</el-button>
-              <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
-            </el-upload>
-            <span class="tipInfo" v-show="isShowTip">{{form.fileList[0]&&form.fileList[0].name}}</span>
-            <!-- <el-button size="small" type="primary" >点击上传</el-button> -->
-          </el-form-item>
-          <el-form-item label-width="160px">
-            <div class="uploadInfo" v-if="isSuccessUpload===1">文件上传中，请稍等...</div>
-          </el-form-item>
-        </el-form>
-        <div class="btn">
-          <el-button type="primary" :disabled="saveDisable" @click="submitForm">确 定</el-button>
-        </div>
-      </div>
-=======
 
       <div class="info-container">
         <el-form :rules="rules1" :model="form" label-width="160px" ref="groups1" size="mini">
@@ -298,7 +199,6 @@
       <div class="btn">
         <el-button type="primary" :disabled="saveDisable" @click="submitForm">确 定</el-button>
       </div>
->>>>>>> parent of e19d1f7 (no message)
     </div>
   </el-scrollbar>
 </template>
@@ -310,20 +210,11 @@ import api from '@api/knowledgeTree.js';
 import DevInfo from './DevInfo';
 import config from '@api/config';
 import $ from 'jquery';
-<<<<<<< HEAD
-=======
 import AddAssess from './AddAssess';
->>>>>>> parent of e19d1f7 (no message)
 
 export default {
   name: 'AddDevKnow',
   components: {
-<<<<<<< HEAD
-    DevInfo
-  },
-  data() {
-    return {
-=======
     DevInfo,
     AddAssess
   },
@@ -335,7 +226,6 @@ export default {
       AssesComSHow: false,
       toAssesTermId: null,
       scaleData: null,
->>>>>>> parent of e19d1f7 (no message)
       isFixedTop: true,
       isEdit: false,
       isCopy: false,
@@ -367,19 +257,12 @@ export default {
         fileTitle: '',
         titleChange: ''
       },
-<<<<<<< HEAD
-      rules: {
-        selectedTerm: [
-          { required: true, message: '请选择标准术语', trigger: 'change' }
-        ],
-=======
       rules1: {
         selectedTerm: [
           { required: true, message: '请选择标准术语', trigger: 'change' }
         ]
       },
       rules: {
->>>>>>> parent of e19d1f7 (no message)
         fileTitle: [
           { required: true, message: '请输入标题名称', trigger: 'change' },
           {
@@ -424,12 +307,8 @@ export default {
       showType: -1, // 1 诊断  2  药品   3检验套餐 4检验细项  5检查 6检查子   7手术和操作 8量表
       editCount: -1, // 页面会否被编辑 >0被编辑   =0 未编辑
       startCount: -1,
-<<<<<<< HEAD
-      isSaveSuccess: false // 是否保存成功
-=======
       isSaveSuccess: false, // 是否保存成功
       tabActive: 'one'
->>>>>>> parent of e19d1f7 (no message)
     };
   },
   watch: {
@@ -453,32 +332,17 @@ export default {
   created: function() {
     const { isEdit, data, isCopy } = this.$route.params;
     if (isEdit || isCopy) {
-<<<<<<< HEAD
-=======
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       });
->>>>>>> parent of e19d1f7 (no message)
       this.showType = data.type; // 编辑页确认显示类型
       this.isEdit = isEdit;
       this.isCopy = isCopy;
       this.title = isEdit ? '修改' : isCopy ? '复制' : '添加';
       (isEdit || isCopy) && this.changeWord(data);
-<<<<<<< HEAD
-      if (isCopy) {
-        const _this = this;
-        setTimeout(() => {
-          _this.handleClear();
-        }, 300);
-      }
-      api.getBaseRecordById({ id: data.id })
-        .then(res => {
-          if (res.data.code == '0') {
-            const data = res.data.data;
-=======
 
       api
         .getBaseRecordById({ id: data.id })
@@ -495,7 +359,6 @@ export default {
                 this.AssesTabSHow = false;
               }
             }
->>>>>>> parent of e19d1f7 (no message)
             if (this.form.typeId === 82 || this.form.typeId === 83) {
               // console.log('data',data)
               this.form.fileList =
@@ -522,27 +385,6 @@ export default {
                 data.name + (data.typeName ? '(' + data.typeName + ')' : '');
               this.form.selectedTerm =
                 data.name + (data.typeName ? '(' + data.typeName + ')' : '');
-<<<<<<< HEAD
-              this.form.prags =
-                data &&
-                data.details.map(it => {
-                  return {
-                    title: it.title,
-                    position: this.mapStringToNum(it.contentType),
-                    content: it.content.replace(
-                      /{imageUrlPrefix}/g,
-                      config.imgHost
-                    ),
-                    // isReason:it.isReason,
-                    text: it.text,
-                    disabled: true
-                  };
-                });
-            }
-          }
-        })
-        .catch(error => {
-=======
               if (isCopy) {
                 this.handleClear();
               }
@@ -574,7 +416,6 @@ export default {
         })
         .catch(error => {
           loading.close();
->>>>>>> parent of e19d1f7 (no message)
           if (error.code === '900010001') {
             return false;
           }
@@ -631,8 +472,6 @@ export default {
     }
   },
   methods: {
-<<<<<<< HEAD
-=======
     scrollTo(dom) {
       var div = this.$refs['elscrollbar'].$refs['wrap'];
       if (dom >= 0) {
@@ -698,15 +537,10 @@ export default {
         }, 200);
       }
     },
->>>>>>> parent of e19d1f7 (no message)
     handleClear() {
       this.form.selectedTermName = '';
       this.form.selectedTerm = '';
       this.form.titleChange = '';
-<<<<<<< HEAD
-      // console.log('处理清空的操作');
-=======
->>>>>>> parent of e19d1f7 (no message)
     },
 
     handleMouseenter() {
@@ -718,9 +552,6 @@ export default {
       this.isShowTip = false;
     },
     changeWord(newVal) {
-<<<<<<< HEAD
-      // console.log(newVal, '选中');
-=======
       if (newVal.typeName == '量表') {
         this.AssesComSHow = true;
       } else {
@@ -729,17 +560,12 @@ export default {
         this.tabActive = 'one';
       }
       this.toAssesTermId = newVal.id;
->>>>>>> parent of e19d1f7 (no message)
       this.showType = newVal.type || -1;
       const name = newVal.name;
       const typeName = newVal.typeName;
       const type = newVal.type;
-<<<<<<< HEAD
-      this.form.selectedTermName = name + (typeName ? '(' + typeName + ')' : '');
-=======
       this.form.selectedTermName =
         name + (typeName ? '(' + typeName + ')' : '');
->>>>>>> parent of e19d1f7 (no message)
       // this.form.selectedTerm = name + (typeName ? '(' + typeName + ')' : '');
       this.form.name = name;
       this.form.fileList = [];
@@ -825,16 +651,6 @@ export default {
       }
       //搜索术语列表
       this.showDrop = true;
-<<<<<<< HEAD
-      api.staticKnowledgeBaseInfo({ inputStr: query.trim(), types: [0] }).then(res => {
-        this.showDrop = false;
-        if (res.data.code === '0') {
-          this.terms = res.data.data;
-        } else {
-          this.warning('数据获取失败');
-        }
-      });
-=======
       api
         .staticKnowledgeBaseInfo({ inputStr: query.trim(), types: [0] })
         .then(res => {
@@ -845,17 +661,12 @@ export default {
             this.warning('数据获取失败');
           }
         });
->>>>>>> parent of e19d1f7 (no message)
     },
     mapStringToNum(str) {
       return str.split(',').map(it => {
         return +it;
       });
     },
-<<<<<<< HEAD
-=======
-
->>>>>>> parent of e19d1f7 (no message)
     // 额外的表单检验
     formVal() {
       let positiontemp = this.form.prags.map(item => {
@@ -864,19 +675,11 @@ export default {
       let positionArr = positiontemp.reduce(function(a, b) {
         return a.concat(b);
       }); // 所有被选中的值集合
-<<<<<<< HEAD
-      console.log(positionArr, 'positionArr');
-      console.log(this.showType, '当前页的显示类型');
-      let isVisFlag = positionArr.some(item => item === 2);
-      let isDiagFlag = positionArr.some(item => item === 3);
-      console.log(isVisFlag, 'isVisFlag是否显示');
-=======
       // console.log(positionArr, "positionArr");
       // console.log(this.showType, "当前页的显示类型");
       let isVisFlag = positionArr.some(item => item === 2);
       let isDiagFlag = positionArr.some(item => item === 3);
       // console.log(isVisFlag, "isVisFlag是否显示");
->>>>>>> parent of e19d1f7 (no message)
       if (
         (this.showType == 3 ||
           this.showType == 4 ||
@@ -884,27 +687,16 @@ export default {
           this.showType == 6) &&
         isVisFlag
       ) {
-<<<<<<< HEAD
-        console.log('进入校验');
-        //若医学术语为检验/检查，且内容类型选择了注意事项，此时“注意事项标题”是必填项
-        this.$refs.groups.clearValidate();
-=======
         // console.log("进入校验");
         //若医学术语为检验/检查，且内容类型选择了注意事项，此时“注意事项标题”是必填项
         this.$refs.groups && this.$refs.groups.clearValidate();
->>>>>>> parent of e19d1f7 (no message)
         this.rules.titleChange.push({
           required: true,
           message: '请输入注意事项标题',
           trigger: 'change'
         });
-<<<<<<< HEAD
-        this.$refs.groups.validateField('titleChange');
-        this.$refs.groups.validateField('selectedTerm');
-=======
         this.$refs.groups && this.$refs.groups.validateField('titleChange');
         this.$refs.groups && this.$refs.groups.validateField('selectedTerm');
->>>>>>> parent of e19d1f7 (no message)
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
 
         if (this.form.titleChange.trim() !== '') {
@@ -920,23 +712,14 @@ export default {
         // return;
       } else if (isDiagFlag && this.showType == 1) {
         // 若医学术语为诊断，且内容类型选择了临床路径，此时“临床路径标题”是必填项
-<<<<<<< HEAD
-        this.$refs.groups.clearValidate();
-=======
         this.$refs.groups && this.$refs.groups.clearValidate();
->>>>>>> parent of e19d1f7 (no message)
         this.rules.titleChange.push({
           required: true,
           message: '请输入临床路径标题',
           trigger: 'change'
         });
-<<<<<<< HEAD
-        this.$refs.groups.validateField('titleChange');
-        this.$refs.groups.validateField('selectedTerm');
-=======
         this.$refs.groups && this.$refs.groups.validateField('titleChange');
         this.$refs.groups && this.$refs.groups.validateField('selectedTerm');
->>>>>>> parent of e19d1f7 (no message)
         this.rules.titleChange = this.rules.titleChange.slice(0, 1);
 
         if (this.form.titleChange.trim() !== '') {
@@ -951,61 +734,6 @@ export default {
         }
       }
     },
-<<<<<<< HEAD
-
-    submitForm() {
-      if (this.isSuccessUpload === 1) {
-        this.warning('文件上传中，请稍等');
-        return;
-      }
-      let flagVal = this.formVal(); // 额外的表单校验
-      if (flagVal === false) return;
-      //验证外层表单
-      let goOn = true,
-        it = null;
-      let outIsVia = true; // 外层验证是否通过
-      this.$refs.groups.validate(valid => {
-        if (!valid) {
-          goOn = false;
-          outIsVia = false;
-          return false;
-        }
-      });
-      //验证段落表单
-      let viewHeight = 0; // 定位到表单校验的高度
-      let viewHeightArr = []; // 表单校验出错高度的所有数组
-      if (this.form.typeId !== 82 && this.form.typeId !== 83) {
-        for (let i = 0; i < this.$refs.subForm.length; i++) {
-          it = this.$refs.subForm[i];
-          viewHeight += it.$el.offsetHeight;
-          it.$refs.form.validate(valid => {
-            if (!valid) {
-              goOn = false;
-              viewHeightArr.push(viewHeight);
-            }
-          });
-        }
-      }
-      // console.log(viewHeightArr,'viewHeightArr');
-      if (!goOn) {
-        var div = this.$refs['elscrollbar'].$refs['wrap'];
-        if (outIsVia) {
-          // 外层校验通过,跳转至下层校验具体位置
-          this.$nextTick(() => {
-            div.scrollTop = +viewHeightArr[0] - 150;
-          });
-        } else {
-          // 外层校验没通过,页面滚动到顶部
-          this.$nextTick(() => {
-            div.scrollTop = 0;
-          });
-        }
-        return;
-      }
-      //通过必填验证，提交保存
-      const item = this.form.prags;
-      let param = [];
-=======
     async submitForm() {
       let all = [];
       let goOn = true,
@@ -1171,7 +899,6 @@ export default {
       let param = [];
       // const item = this.form.prags;
 
->>>>>>> parent of e19d1f7 (no message)
       if (this.form.typeId === 82 || this.form.typeId === 83) {
         if (this.form.fileList.length === 0) {
           this.warning('文件未上传，不存储数据');
@@ -1190,11 +917,8 @@ export default {
           )
         );
       } else {
-<<<<<<< HEAD
-=======
         // if (this.staticTabShow) {
         // }
->>>>>>> parent of e19d1f7 (no message)
         let data = this.form.prags,
           tempArr = [],
           paramsAll = {},
@@ -1217,13 +941,6 @@ export default {
             ? this.form.titleChange
             : '';
         paramsAll.type = this.form.typeId;
-<<<<<<< HEAD
-        paramsAll.details = tempArr;
-        param = paramsAll;
-      }
-      // this.showSaveDialog(param,'是否'+(this.isEdit?'修改':'保存')+'该静态知识？');
-
-=======
         if (this.staticTabShow) {
           paramsAll.details = tempArr;
         } else {
@@ -1256,7 +973,6 @@ export default {
       console.log('param-------');
       console.dir(param);
       // return;
->>>>>>> parent of e19d1f7 (no message)
       if (!this.isEdit) {
         // 新增页面
         this.saveDisable = true;
@@ -1278,13 +994,9 @@ export default {
     //保存编辑 接口
     sendSaveOrEdit(param) {
       this.isCopy && (param.id = undefined);
-<<<<<<< HEAD
-      api.saveBaseOrUpdateRecord(param)
-=======
       param.source = 1; //0:医院端  1：云平台
       api
         .saveBaseOrUpdateRecord(param)
->>>>>>> parent of e19d1f7 (no message)
         .then(res => {
           if (res.data.code === '0') {
             this.isSuccessUpload = 0; // 修改文件上传状态为0
@@ -1330,12 +1042,8 @@ export default {
       this.$message({
         showClose: true,
         message: msg,
-<<<<<<< HEAD
-        type: type || 'warning'
-=======
         type: type || 'warning',
         duration:1000
->>>>>>> parent of e19d1f7 (no message)
       });
     },
     handleChange(file, fileList) {
@@ -1413,16 +1121,10 @@ export default {
   top: 0;
 }
 .info-container {
-<<<<<<< HEAD
-  background: #fff;
-  padding: 20px;
-  margin: 70px 20px -20px 20px;
-=======
   // background: #fff;
   // padding: 20px 0;
   margin: 60px 20px -20px 20px;
   min-width: 960px;
->>>>>>> parent of e19d1f7 (no message)
   .el-input__inner {
     width: 200px;
   }
@@ -1432,29 +1134,17 @@ export default {
   .add-prg .el-form-item {
     margin-bottom: 20px;
   }
-<<<<<<< HEAD
-  .el-form-item {
-    margin-bottom: 8px !important;
-  }
-=======
   // .el-form-item {
   //   margin-bottom: 8px !important;
   // }
->>>>>>> parent of e19d1f7 (no message)
 }
 // .cancel span {
 //   color: #22ccc8;
 // }
 .line {
-<<<<<<< HEAD
-  border-top: 1px #dcdfe6 solid;
-  margin-bottom: 25px;
-  margin-top: 25px;
-=======
   // border-top: 1px #dcdfe6 solid;
   background: #dcdfe6;
   height: 12px;
->>>>>>> parent of e19d1f7 (no message)
 }
 .NoiseTemplateWrapper .info-container .el-input__inner {
   width: 250px;
@@ -1517,13 +1207,9 @@ export default {
 }
 .btn {
   text-align: right;
-<<<<<<< HEAD
-  padding-right: 20px;
-=======
   margin: 10px 20px;
   padding: 30px;
   background: #fff;
->>>>>>> parent of e19d1f7 (no message)
 }
 .el-message-box {
   /deep/ .el-icon-warning {
@@ -1550,8 +1236,6 @@ export default {
     }
   }
 }
-<<<<<<< HEAD
-=======
 /deep/ .el-tabs__header {
   padding: 0 10px !important;
 }
@@ -1603,6 +1287,5 @@ export default {
 /deep/ .el-form-item.is-success .el-textarea__inner {
   border-color: #c9c9c9 !important;
 }
->>>>>>> parent of e19d1f7 (no message)
 </style>