Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-10 c46213fa824995bb2155c11ea332824d23232d9c

 src/views/eam/modules/dailyMaintenanceStandard/JSelectMaintenanceStandardModal.vue

@@ -22,7 +22,7 @@
              :sm='6'
            >
              <a-form-item label='保养项目名称'>
                <a-input
                <j-input
                  placeholder='请输入保养项目名称'
                  v-model='queryParam.name'
                />
@@ -102,37 +102,43 @@
          align: 'center',
          dataIndex: 'standard'
        },
        // {
        //   title: '方法',
        //   align: 'center',
        //   dataIndex: 'maintenanceMethod_dictText'
        // },
        // {
        //   title: '工具',
        //   align: 'center',
        //   dataIndex: 'maintenanceTool'
        // },
        // {
        //   title: '维保专业',
        //   align: 'center',
        //   dataIndex: 'maintenanceSpecialtyId_dictText'
        // },
        {
          title: '方法',
          title: '保养部位',
          align: 'center',
          dataIndex: 'maintenanceMethod_dictText'
          dataIndex: 'location'
        },
        {
          title: '工具',
          align: 'center',
          dataIndex: 'maintenanceTool'
        },
        {
          title: '维保专业',
          align: 'center',
          dataIndex: 'maintenanceSpecialtyId_dictText'
        },
        {
          title: '安全要求',
          align: 'center',
          dataIndex: 'maintenanceRequire'
        },
        {
          title: '工时定额',
          align: 'center',
          dataIndex: 'workingHourQuota'
        },
        // {
        //   title: '安全要求',
        //   align: 'center',
        //   dataIndex: 'maintenanceRequire'
        // },
        // {
        //   title: '工时定额',
        //   align: 'center',
        //   dataIndex: 'workingHourQuota'
        // },
      ],
      selectedRowKeys: [],
      oldSelectRows: [],
      scrollTrigger: {},
      dataSource: [],
      selectionRows: [],
      selectionRowsNotClear: [],
      title: '根据查询结果选择保养项目',
      ipagination: {
        current: 1,
@@ -162,7 +168,19 @@
        type: 'checkbox',
        onChange: (selectedRowKeys, selectedRows) => {
          this.selectedRowKeys = selectedRowKeys
          // this.selectionRowsNotClear.push(selectedRows)
          this.onSelectChange(selectedRows)
        },
        onSelect: (record, selected, selectedRows) => {
          if (selected) {
            this.selectionRowsNotClear.push(record);
          }
          if (!selected) {
            let delIndex = this.selectionRowsNotClear.findIndex(val => {
              return val.id === record.id
            })
            this.selectionRowsNotClear.splice(delIndex, 1);
          }
        },
        getCheckboxProps: record => ({
          props: {
@@ -204,6 +222,7 @@

    showModals(oldSelectRows) {
      this.selectionRows = []
      this.selectionRowsNotClear = []
      this.oldSelectRows = oldSelectRows
      this.visible = true
      this.loadData(1)
@@ -247,6 +266,7 @@
      this.loadData()
    },
    handleSubmit() {
      // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      this.$bus.$emit('selectionRows', this.selectionRows)
      // this.searchReset(0)
      this.close()