Merge remote-tracking branch 'origin/master'

Houjie

2025-06-10 3d9988d5f19da5e86c1678bf812ac9f7bcfcdfd4

Merge remote-tracking branch 'origin/master'

 src/views/eam/DailyMaintenanceOrderList.vue

@@ -565,6 +565,10 @@
        this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true
        this.$refs.DailyMaintenanceOrderExeDrawer.revocationDistable = true
        this.$refs.DailyMaintenanceOrderExeDrawer.SWbuttonDistable = true
      } else if (record.status === '8') {
        this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true
        this.$refs.DailyMaintenanceOrderExeDrawer.revocationDistable = true
        this.$refs.DailyMaintenanceOrderExeDrawer.SWbuttonDistable = true
      }
    },


 src/views/eam/RepairOrderList.vue

@@ -122,11 +122,12 @@
            <a-form-item label="工区">
              <j-dict-select-tag
                allow-clear
                placeholder="请选择资工区"
                placeholder="请选择工区"
                :triggerChange="true"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                dictCode="mom_base_area,name,id,del_flag!='1' and type='2'"
                v-model="queryParam.factoryModelId"
              />
              <!-- dictCode="mom_base_area,name,id,del_flag!='1'" -->
            </a-form-item>
          </a-col>
          <a-col
@@ -261,18 +262,18 @@
        @click="searchReset"
        icon="reload"
      >重置</a-button>
      <a-button
      <!-- <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('维修履历')"
      >导出</a-button>
      <a-button
      >导出</a-button> -->
      <!-- <a-button
        hidden
        type="primary"
        icon="plus"
        @click="handleDispatch()"
        :disabled="selectionRows.length==0"
      >派工</a-button>
      >派工</a-button> -->
      <a-button
        type="primary"
        icon="plus"

 src/views/eam/modules/repairStandard/RepairStandardRight.vue

@@ -54,13 +54,13 @@
        @click="handleAdd"
        type="primary"
        icon="plus"
        :hidden="disabled"
      >新增</a-button>
      <a-button
      <!-- :hidden="disabled" -->
      <!-- <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">
          批量操作