Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 af5d0dc7c9c6a6d2bac1580e176bc1af5141b393

Merge remote-tracking branch 'origin/master'

 src/views/eam/DailyMaintenanceOrderList.vue

@@ -61,7 +61,7 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-item label="移交单状态">
              <j-dict-select-tag
                dictCode="two_maintenance_devolution_status"
@@ -69,7 +69,7 @@
                v-model="queryParam.confirmStatus"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="7">
            <a-form-item label="完工时间">
              <a-range-picker

 src/views/eam/EquipmentMaintenancePlanList.vue

@@ -499,11 +499,33 @@
        this.queryParam.endTime = ''
      } else {
        //后端报这个错rejected value ["2024-03-14T06:26:38.692Z"]
        this.queryParam.beginTime = this.ranges[0].format('YYYY-MM-DD')
        this.queryParam.endTime = this.ranges[1].format('YYYY-MM-DD')
        // var beginTime = this.formattedTime(this.ranges[0])
        // this.queryParam.beginTime = this.ranges[0].format('YYYY-MM-DD')
        // this.queryParam.endTime = this.ranges[1].format('YYYY-MM-DD')
        this.queryParam.beginTime = this.formattedTime(this.ranges[0])
        this.queryParam.endTime = this.formattedTime(this.ranges[1])
      }
    },

    formattedTime(originalTime) {

      // 创建 Date 对象
      const date = new Date(originalTime)

      // 检查 Date 对象是否有效
      if (isNaN(date.getTime())) return '无效时间'

      // 获取年、月、日、时、分
      const year = date.getFullYear()
      const month = String(date.getMonth() + 1).padStart(2, '0')
      const day = String(date.getDate()).padStart(2, '0')
      const hours = String(date.getHours()).padStart(2, '0')
      const minutes = String(date.getMinutes()).padStart(2, '0')
      const seconds = String(date.getSeconds()).padStart(2, '0')
      // 拼接成指定格式
      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
    },

  }
}
</script>

 src/views/eam/MaintenanceTypeList.vue

@@ -67,7 +67,7 @@
        type="primary"
        icon="plus"
      >新增</a-button>
      <a-button
      <!-- <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('mom_eam_maintenance_type')"
@@ -84,7 +84,7 @@
          type="primary"
          icon="import"
        >导入</a-button>
      </a-upload>
      </a-upload> -->
      <!-- 高级查询区域 -->
      <!-- <j-super-query
        :fieldList="superFieldList"

 src/views/eam/SelfMaintenanceAndInspectionList.vue

@@ -33,8 +33,11 @@
    <a-spin :spinning="loading">
      <table id="dataTable" v-if="dataSource.list1&&dataSource.list1.length>0">
        <thead>
        <tr style="height: 48px">
          <th colspan="42">生产设备自主维护点检表</th>
        <tr style="height: 48px;position: relative">
          <th colspan="42">
            生产设备自主维护点检表
            <span style="position: absolute;right: 22.5%">{{dataSource.regulations}}</span>
          </th>
        </tr>

        <tr style="height: 48px">
@@ -119,11 +122,10 @@
        <tr>
          <td colspan="11">周保养检查人确认（维修人员签字）</td>
          <td v-for="childItem in 4" colspan="6">
            {{dataSource.list5&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem).repairConfirmPerson:''}}

            {{dataSource.list6&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===childItem).repairConfirmPerson:''}}
          </td>
          <td colspan="7">
            {{dataSource.list5&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5).repairConfirmPerson:''}}
            {{dataSource.list6&&dataSource.list6[0]&&dataSource.list6[0].dataList&&dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5)?dataSource.list6[0].dataList.find(item=>item.weekOfMonth===5).repairConfirmPerson:''}}
          </td>
        </tr>


 src/views/eam/modules/dailyInspectionStandard/JSelectDailylnspectionStandardModal.vue

@@ -164,6 +164,7 @@
        type: 'checkbox',
        onChange: (selectedRowKeys, selectedRows) => {
          this.selectedRowKeys = selectedRowKeys
          this.onSelectChange(selectedRows)
        },
        onSelect: (record, selected, selectedRows) => {
          if (selected) {
@@ -259,14 +260,18 @@
      this.loadData()
    },
    handleSubmit() {
      this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.searchReset(0)
      this.close()
    },
    onSelectionChange(selectedRowKeys, selectedRows) {
      this.selectedRowKeys = selectedRowKeys;
      this.selectedRows = selectedRows;
    onSelectChange(selectionRows) {
      this.selectionRows = selectionRows
    },
    // onSelectionChange(selectedRowKeys, selectedRows) {
    //   this.selectedRowKeys = selectedRowKeys;
    //   this.selectedRows = selectedRows;
    // },

    searchQuery() {
      this.loadData(1)

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

@@ -266,7 +266,8 @@
      this.loadData()
    },
    handleSubmit() {
      this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      this.$bus.$emit('selectionRows', this.selectionRows)
      // this.searchReset(0)
      this.close()
    },

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

@@ -266,7 +266,8 @@
      this.loadData()
    },
    handleSubmit() {
      this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      // this.$bus.$emit('selectionRows', this.selectionRowsNotClear)
      this.$bus.$emit('selectionRows', this.selectionRows)
      // this.searchReset(0)
      this.close()
    },

 src/views/eam/modules/maintenancePlan/StandardSelect.vue

@@ -361,8 +361,29 @@

    },
    changeDate(date, dateString) {
      this.queryParam.startTime = dateString[0].format('YYYY-MM-DD HH:mm:ss');
      this.queryParam.endTime = dateString[1].format('YYYY-MM-DD HH:mm:ss');
      // this.queryParam.startTime = dateString[0].format('YYYY-MM-DD HH:mm:ss');
      // this.queryParam.endTime = dateString[1].format('YYYY-MM-DD HH:mm:ss');
      this.queryParam.startTime = this.formattedTime(dateString[0]);
      this.queryParam.endTime = this.formattedTime(dateString[1]);
      debugger
    },
    formattedTime(originalTime) {

      // 创建 Date 对象
      const date = new Date(originalTime)

      // 检查 Date 对象是否有效
      if (isNaN(date.getTime())) return '无效时间'

      // 获取年、月、日、时、分
      const year = date.getFullYear()
      const month = String(date.getMonth() + 1).padStart(2, '0')
      const day = String(date.getDate()).padStart(2, '0')
      const hours = String(date.getHours()).padStart(2, '0')
      const minutes = String(date.getMinutes()).padStart(2, '0')
      const seconds = String(date.getSeconds()).padStart(2, '0')
      // 拼接成指定格式
      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
    },
    onSelectChange(selectionRows) {
      this.selectionRows = selectionRows;

 src/views/eam/modules/maintenanceProject/MaintenanceProjectRight.vue

@@ -10,7 +10,7 @@
        @keyup.enter.native="searchQuery"
      >
        <a-row :gutter="24">
          <a-col
          <!-- <a-col
            :md="8"
            :sm="8"
          >
@@ -20,7 +20,7 @@
                v-model="queryParam.num"
              ></j-input>
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col
            :md="8"
            :sm="8"
@@ -56,11 +56,11 @@
        icon="plus"
      >新增</a-button>
      <!-- :hidden="disabled" -->
      <a-button
      <!-- <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('原因')"
      >导出</a-button>
      >导出</a-button> -->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作