Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/deviceRepair/DeviceRepairListModel.vue

@@ -66,7 +66,7 @@
      <div>
        <a-table ref="table" size="middle" bordered rowKey="id" :scroll="{  y: 400 }" :columns="columns"
                 :dataSource="dataSource" :pagination="ipagination" :loading="loading"
                 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                 :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,getCheckboxProps:getCheckboxProps,selections: true,}"
                 @change="handleTableChange">
        </a-table>
      </div>
@@ -110,6 +110,9 @@
      status: {
        type: Number,
        default: 1
      },
      selectedEquipmentIds:{
        type:String
      }
    },
    data() {
@@ -199,6 +202,9 @@
        this.selectionRows = selectionRows
        // this.SelectedList =[...this.SelectedList,...selectionRows];
        // console.log(this.SelectedList);
        console.log('selectedRowKeys',selectedRowKeys)
        console.log('selectionRows',selectionRows)

      },
      handleTableChange(pagination, filters, sorter) {
        // this.onClearSelected()
@@ -305,8 +311,6 @@
          }
        })
      },


      initGroupOptions() {
        getAction(this.url.loadProductionOptions).then(res => {
          if (res.success) {
@@ -319,6 +323,27 @@
            });
          }
        })
      },
      /**
       * 每次加载列表时判断已选中设备编号数组是否包含表格数据中的设备编号，如果包含则选中
       * @param record
       * @returns {{props: {defaultChecked: boolean}}}
       */
      getCheckboxProps(record){
        if(this.selectedEquipmentIds){
          let selectedEquipmentIdsArr=this.selectedEquipmentIds.split(',')
          return {
            props:{
              defaultChecked: selectedEquipmentIdsArr.includes(record.equipmentId)
            }
          }
        }else{
          return {
            props:{
              defaultChecked:false
            }
          }
        }
      }
    },
  }