处理冲突

src/components/icss/AddVersion.vue

@@ -4,7 +4,20 @@
     <div class="contents">
       <div class="content">
         <!-- <el-form ref="form" :label-position="labelPosition" label-width="95px" class="add-admin-form" :model="form" :rules="rules"> -->
-        <el-form ref="form" :label-position="labelPosition" label-width="95px" class="add-version-form" :model="form" :rules="rules">
+        <el-form ref="form" :label-position="labelPosition" label-width="108px" class="add-version-form" :model="form" :rules="rules">
+          <el-form-item label="版本号归属：" prop="productType">
+            <el-select v-model="form.productType" 
+                      placeholder="请选择" 
+                      size="small"
+                      :disabled="id && !copy?true:false">
+              <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="name" class="version-num">
               <el-input v-model="form.name" placeholder="请输入版本号" maxlength="21"></el-input>
           </el-form-item>
@@ -71,14 +84,16 @@
         form:{
           name:'',
           refreshTime:'',
-          remark:''
+          remark:'',
+          productType:null
         },
         id:null,
         rules:{
           name:[{ required: true, validator: titleVaild, trigger: [ 'change'] },
                 { required: true, message: '请输入版本号',trigger: ['blur', 'change'] }],
           remark:{ required: false, validator: remarkVaild, trigger: [ 'change'] },
-          refreshTime:{ required: true, message: '请选择时间', trigger: ['blur', 'change'] }
+          refreshTime:{ required: true, message: '请选择时间', trigger: ['blur', 'change'] },
+          productType:{ required: true, message: '请选择版本号归属', trigger: ['blur', 'change'] },
         },
         pickerOptions1:{
           disabledDate(time) {
@@ -86,7 +101,8 @@
           },
         },
         copy:null,
-        saveDisable: false  //保存按钮禁止点击
+        saveDisable: false,  //保存按钮禁止点击
+        typeList:[]
       }
     },
     created(){
@@ -97,10 +113,13 @@
         this.form.name = info.name;
         this.form.refreshTime = info.refreshTime;
         this.form.remark = info.remark;
+        this.form.productType = info.productType && !this.copy?info.productType:null;
         this.title = this.copy?"版本信息维护-复制版本信息":"版本信息维护-修改版本信息";
         // this.getList();
         this.list = info.detail;
       }
+      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
+      this.typeList = typeList.productTypeEnum;
     },
     methods:{
       /*getList(){
@@ -173,7 +192,8 @@
                     message:"添加成功",
                     type:'success'
                   })
-                  this.$router.push({path: 'LT-YXSJWH-BBXXWH'});
+                  // this.$router.push({path: 'LT-GBBXXWH-BBXXWH'});
+                  this.$router.push({name: 'VersionInfo'});
                 }else{
                   this.$message({
                     message:res.data.msg,

src/components/icss/ConceptRelation.vue

@@ -192,7 +192,9 @@ export default {
             const param = {
                 current: this.currentPage,
                 size: this.pageSize,
-                name:this.filter.conceptName
+                name:this.filter.conceptName,
+                relationId:17,
+                relationModelTypeCode:this.filter.type
             };
             return param;
         },

src/components/icss/VersionDesc.vue

@@ -221,7 +221,7 @@
                 description: this.form.description,
                 title: this.form.title,
               }
-              if(!this.isCopy){
+              if(!this.isCopy && this.versionId){
                 const params = {
                   versionDetail: [
                     item

src/components/icss/VersionInfo.vue

@@ -2,16 +2,26 @@
     <div>
         <crumbs title="版本信息维护">
             <el-form :inline="true" class="demo-form-inline">
-                <el-form-item label="查询版本号：">
-                    <el-input size="mini" v-model="filter.name" placeholder="输入版本号"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button size="mini" @click="filterDatas">确认</el-button>
-                    <!-- <router-link to="/admin/LT-YXSJWH-TJBBXX" style="margin:0 10px">
-                        <el-button size="mini" type="warning">添加版本信息</el-button>
-                    </router-link> -->
-                    <el-button size="mini" type="warning" style="margin:0 10px" @click="addVersion">添加版本信息</el-button>
-                </el-form-item>
+              <el-form-item label="版本号归属：">
+                <el-select v-model="filter.type" placeholder="请选择" size="mini" clearable>
+                  <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="查询版本号：">
+                  <el-input size="mini" v-model="filter.name" placeholder="输入版本号"></el-input>
+              </el-form-item>
+              <el-form-item>
+                  <el-button size="mini" @click="filterDatas">确认</el-button>
+                  <!-- <router-link to="/admin/LT-YXSJWH-TJBBXX" style="margin:0 10px">
+                      <el-button size="mini" type="warning">添加版本信息</el-button>
+                  </router-link> -->
+                  <el-button size="mini" type="warning" style="margin:0 10px" @click="addVersion">添加版本信息</el-button>
+              </el-form-item>
             </el-form>
         </crumbs>
         <div class="contents">
@@ -38,6 +48,12 @@
                         prop="refreshTime"
                         label="版本时间">
                 </el-table-column>
+                <el-table-column
+                        label="版本号归属">
+                    <template slot-scope="scope">
+                      <span>{{getProdType(scope.row)}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                         prop="modifierid"
                         label="操作人">
@@ -84,14 +100,18 @@
         total: 0,
         searched: false,
         filter: {
-          name: ''
+          name: '',
+          type:null
         },
         canModiId:null, //标识列表中的第一个可修改和复制项，区分分页和搜索
-        flag:true
+        flag:true,
+        typeList:[]
       }
     },
     created() {
       this.getDataList();
+      let typeList = JSON.parse(localStorage.getItem("knowledgeEnumsData"));
+      this.typeList = typeList.productTypeEnum;
     },
     watch: {
       'filter': {
@@ -108,6 +128,16 @@
       })
     },
     methods: {
+      getProdType(item){
+        let name = "";
+        let type = item.productType;
+        for(let i in this.typeList){
+          if(this.typeList[i].key == type){
+            name = this.typeList[i].name;
+          }
+        }
+        return name;
+      },
       addVersion(){
         // 添加版本信息
         const pam = this.searched ? {
@@ -160,11 +190,13 @@
         //翻页时筛选条件没点确定则清空
         if(isTurnPage&&!this.searched){
           this.filter.name='';
+          this.filter.type = null;
         };
         const param = {
           name: this.filter.name,
           current: this.currentPage,
-          size: this.pageSize
+          size: this.pageSize,
+          productType:this.filter.type?this.filter.type:0
         };
         return param;
       },