hdy
2024-03-23 21508c20a9b80b959d935bdf4ed55002fcff8d16
设备计划修改
已删除9个文件
已修改2个文件
1823 ■■■■■ 文件已修改
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/controller/EmInspectionPlanInfoController.java 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/domain/EmInspectionPlanInfo.java 417 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/resources/mapper/em/inspectionPlanInfo/EmInspectionPlanInfoMapper.xml 194 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionPlan/index.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionPlanInfo/index.vue 519 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionPlanInfo/machinery.vue 159 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionPlanInfo/subject.vue 152 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/controller/EmInspectionPlanInfoController.java
ÎļþÒÑɾ³ý
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/domain/EmInspectionPlanInfo.java
ÎļþÒÑɾ³ý
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/mapper/EmInspectionPlanInfoMapper.java
ÎļþÒÑɾ³ý
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/IEmInspectionPlanInfoService.java
ÎļþÒÑɾ³ý
jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanInfo/service/impl/EmInspectionPlanInfoServiceImpl.java
ÎļþÒÑɾ³ý
jcdm-main/src/main/resources/mapper/em/inspectionPlanInfo/EmInspectionPlanInfoMapper.xml
ÎļþÒÑɾ³ý
jcdm-ui/src/views/main/em/inspectionPlan/index.vue
@@ -214,10 +214,10 @@
      </el-form>
      <el-tabs type="border-card" >
        <el-tab-pane label="设备清单" >
          <Checkmachinery ref="machinerylist"  @inSelected="onMachineryAdd"></Checkmachinery>
          <Checkmachinery ref="machinerylist"  :id="form.id" :planCode="form.planCode" @inSelected="onMachineryAdd" ></Checkmachinery>
        </el-tab-pane>
        <el-tab-pane label="点检项目">
          <Checksubject ref="subjectlist"      @subSelected="subMachineryAdd"></Checksubject>
          <Checksubject ref="subjectlist"    :id="form.id"  @subSelected="subMachineryAdd"></Checksubject>
            </el-tab-pane>
          </el-tabs>
      <el-divider></el-divider>
@@ -238,6 +238,7 @@
  name: "InspectionPlan",
  dicts: ['plan_status','plan_type','dimension'],
  components:{Checkmachinery,Checksubject},
  data() {
    return {
      // é®ç½©å±‚
@@ -246,6 +247,7 @@
      optType: null,
      // é€‰ä¸­æ•°ç»„
      ids: [],
      planCodes: [],
      // éžå•ä¸ªç¦ç”¨
      single: true,
      // éžå¤šä¸ªç¦ç”¨
@@ -345,7 +347,16 @@
    this.getList();
  },
  methods: {
    /** æŸ¥è¯¢ç‚¹æ£€ä¿å…»è®¡åˆ’列表 */
    clearCheckmachineryList(){
      this.$refs.machinerylist.clearCheckmachineryList()
    },
    clearSubjectList() {
      this.subjectList = [];
    },
    clearMachineryList(){
      this.machineryList =[];
    },
      /** æŸ¥è¯¢ç‚¹æ£€ä¿å…»è®¡åˆ’列表 */
    getList() {
      this.loading = true;
      listInspectionPlan(this.queryParams).then(response => {
@@ -358,6 +369,7 @@
    cancel() {
      this.open = false;
      this.reset();
      this.clearCheckmachineryList()
    },
    // è¡¨å•é‡ç½®
    reset() {
@@ -406,18 +418,22 @@
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.planCode =selection.map(item => item.planCode)
      this.single = selection.length!==1
      this.multiple = !selection.length
      console.log(this.planCode)
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
      this.reset();
      this.open = true;
      this.titleName = "添加点检保养计划";
      console.log(this.machineryList)
    },
    /** ä¿®æ”¹æŒ‰é’®æ“ä½œ */
    handleUpdate(row) {
@@ -464,7 +480,9 @@
          }
        }
      });
      this.clearSubjectList();
      this.clearMachineryList();
      this.clearCheckmachineryList()
    },
    /** åˆ é™¤æŒ‰é’®æ“ä½œ */
    handleDelete(row) {
jcdm-ui/src/views/main/em/inspectionPlan/machinery.vue
@@ -47,10 +47,10 @@
export default {
  name: "Checkmachinery",
  components:{MachinerySelect},
  props:{
    planId: null,
    optType: null
  },
  props:{ id: null,
          optType: null,
          planCode: null,
        },
  data() {
    return {
      // é®ç½©å±‚
@@ -91,7 +91,9 @@
    this.getList();
  },
  methods: {
    clearCheckmachineryList() {
      this.checkmachineryList = [];
    },
    deleteSelectedColumns(row) {
      const index = this.checkmachineryList.findIndex(item => item.id === row.id);
      if (index !== -1) {
@@ -108,29 +110,17 @@
  /** æŸ¥è¯¢ç‚¹æ£€è®¾å¤‡åˆ—表 */
    getList() {
      this.loading = true;
      this.checkmachineryList =this.machineryList;
      listInspectionPlanArchives(this.queryParams).then(response => {
        // this.checkmachineryList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    /** æ–°å¢žæŒ‰é’®æ“ä½œ */
    handleAdd() {
    handleAdd(){
      this.$refs.machinerySelect.showFlag = true;
    },
      //设备资源选择回调
    // onMachineryAdd(rows){
    //   if(rows !=null && rows.length >0){
    //      rows.forEach(row => {
    //         row.planId = this.planId;
    //        addInspectionPlanArchives(row).then(response =>{
    //           this.getList();
    //         });
    //      });
    //   }
    // },
    onMachineryAdd(selectedRows){
      if(selectedRows !=null && selectedRows.length >0){
        this.checkmachineryList = selectedRows
jcdm-ui/src/views/main/em/inspectionPlanInfo/index.vue
ÎļþÒÑɾ³ý
jcdm-ui/src/views/main/em/inspectionPlanInfo/machinery.vue
ÎļþÒÑɾ³ý
jcdm-ui/src/views/main/em/inspectionPlanInfo/subject.vue
ÎļþÒÑɾ³ý