修改

jinlin

2023-12-19 67c04bf46afc584884b73a57d3d23012126c5afc

修改

 modules/mainPart/src/main/java/com/zt/life/modules/baselineRelease/service/BaselineReleaseService.java

@@ -70,7 +70,7 @@
        if (list.size() > 0) {
            workflowService.getRunFlow(list, "jxfb");
        }
        return baseDao.getList(queryFilter.getQueryParams());
        return list;
    }

    /**

 modules/mainPart/src/main/resources/mapper/baselineRelease/BaselineReleaseDao.xml

@@ -4,8 +4,9 @@
<mapper namespace="com.zt.life.modules.baselineRelease.dao.BaselineReleaseDao">

    <select id="getList" resultType="com.zt.life.modules.baselineRelease.model.BaselineRelease">
        select a.*
        select a.*,p.software_name,p.software_identity
        from baseline_release a
        INNER JOIN  project p ON p.id = a.project_id
        <where>
            a.is_delete = 0
            <if test="whereSql!=null">

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml

@@ -54,9 +54,10 @@
        from config_item_warehouse_detail a
        WHERE a.is_delete = 0
        and a.project_id = ${projectId}
        and a.select_id is NULL
        <if test="ids!=null and ids!=''">
            AND id not in (${ids})
            and a.id NOT IN (select select_id from config_item_warehouse_detail where select_id is not null)
        </if>
        and a.id NOT IN (select select_id from config_item_warehouse_detail where select_id is not null)
    </select>
</mapper>

 web/src/views/modules/baselineRelease/BaselineRelease-AddOrUpdate.vue

@@ -159,12 +159,12 @@
  export default {
    data() {
      return {
        ids:'',
        dataForm: {
          id: '',
          pageCode: '',
          projectId:'',
          stepMarker: '',
          configChangeList:[],
          pageName: {
            demand: '需求基线', product:'产品基线'
          },
@@ -184,7 +184,7 @@
            softwareIdentity: '',
            softwareName: ''
          },
          remarkList: []
          configItemList: []
        }
      }
    },
@@ -221,8 +221,8 @@
      },
      handleCommand() {
        this.$nextTick(()=>{
          console.log(this.dataForm.projectId,'this.dataForm.projectId')
          this.ids = this.dataForm.configChangeList.map(item=>item.selectId).join(',')
          this.ids = this.dataForm.remarkList.map(item=>item.selectId).join(',')
          console.log(this.ids,'handleCommand ids')
          this.$refs.configItemList.$refs.dialog.init(this.dataForm.projectId,this.ids)
        })
      },
@@ -242,11 +242,11 @@
        console.log(this.dataForm, 'this.dataForm this.dataForm')
      },
      getChangeItemList(data){
        console.log(data.configChangeList,'getChangeItemList(data)')
        if(data.configChangeList){
          this.dataForm.configChangeList=this.dataForm.configChangeList.concat(data.configChangeList)
        console.log(data.remarkList,'getChangeItemList(data)')
        if(data.remarkList){
          this.dataForm.remarkList=this.dataForm.remarkList.concat(data.remarkList)
        }
        console.log(this.dataForm.configChangeList,ids,'this.dataForm.configChangeList')
        console.log(this.dataForm.remarkList,'this.dataForm.configChangeList')
      },
      async print() {
        var params = qs.stringify({

 web/src/views/modules/baselineRelease/BaselineRelease.vue

@@ -21,6 +21,7 @@
        <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
          <el-table-column type="selection" width="40"/>
            <el-table-column prop="code" label="基线发布编号"/>
            <el-table-column prop="softwareIdentity" label="项目名称"/>
                <zt-table-column-dict prop="baselineType" label="基线类型" dict="baseline_type"/>
                <el-table-column prop="baselineName" label="基线名称"/>
                <el-table-column prop="baselineVersion" label="基线版本"/>
@@ -69,7 +70,7 @@
    methods: {
      add() {
        console.log(this.pageCode, 'this.pageCode')
        this.$refs.projectSelect.$refs.dialog.init("test_check_order", {pageCode: this.pageCode})
        this.$refs.projectSelect.$refs.dialog.init("baseline_release", {pageCode: this.pageCode})
      },
      openAddWin(projectRow) {
        console.log(projectRow, 'openAddWin(projectRow) projectRow')

 web/src/views/modules/configItemChange/configItemList.vue

@@ -48,6 +48,7 @@
        ids:null,
        projectId:'',
        configChangeList:[],
        remarkList:[]
      }
    }
  },
@@ -68,6 +69,7 @@
    },
    changeRow(selection){
      this.dataForm.configChangeList = selection
      this.dataForm.remarkList = selection
      console.log(this.dataForm.configChangeList,'this.dataForm.checkList 选中的列表数据')
    },
    async formSubmit(){