Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-11 a80a022b6f385cd4793f9143a9a1abe091ae84ad

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/DeductionItemList.vue

@@ -17,10 +17,10 @@
            :sm="24"
          >
            <a-form-item label="编号">
              <a-input
              <j-input
                placeholder="请输入编号"
                v-model="queryParam.num"
              ></a-input>
              ></j-input>
            </a-form-item>
          </a-col>
          <a-col
@@ -30,10 +30,10 @@
            :sm="24"
          >
            <a-form-item label="内容">
              <a-input
              <j-input
                placeholder="请输入内容"
                v-model="queryParam.content"
              ></a-input>
              ></j-input>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">

 src/views/eam/DocumentTypeList.vue

@@ -75,24 +75,24 @@
        type="primary"
        icon="plus"
      >新增</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('文档类型')"
      >导出</a-button>
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel"
      >
        <a-button
          type="primary"
          icon="import"
        >导入</a-button>
      </a-upload>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('文档类型')"-->
<!--      >导出</a-button>-->
<!--      <a-upload-->
<!--        name="file"-->
<!--        :showUploadList="false"-->
<!--        :multiple="false"-->
<!--        :headers="tokenHeader"-->
<!--        :action="importExcelUrl"-->
<!--        @change="handleImportExcel"-->
<!--      >-->
<!--        <a-button-->
<!--          type="primary"-->
<!--          icon="import"-->
<!--        >导入</a-button>-->
<!--      </a-upload>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item

 src/views/eam/MaintenanceSpecialtyList.vue

@@ -66,24 +66,24 @@
        icon="plus"
        :loading="confirmLoading"
      >新增</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('mom_eam_maintenance_specialty')"
      >导出</a-button>
      <a-upload
        name="file"
        :showUploadList="false"
        :multiple="false"
        :headers="tokenHeader"
        :action="importExcelUrl"
        @change="handleImportExcel"
      >
        <a-button
          type="primary"
          icon="import"
        >导入</a-button>
      </a-upload>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('mom_eam_maintenance_specialty')"-->
<!--      >导出</a-button>-->
<!--      <a-upload-->
<!--        name="file"-->
<!--        :showUploadList="false"-->
<!--        :multiple="false"-->
<!--        :headers="tokenHeader"-->
<!--        :action="importExcelUrl"-->
<!--        @change="handleImportExcel"-->
<!--      >-->
<!--        <a-button-->
<!--          type="primary"-->
<!--          icon="import"-->
<!--        >导入</a-button>-->
<!--      </a-upload>-->
      <!-- 高级查询区域 -->
      <!-- <j-super-query
        :fieldList="superFieldList"

 src/views/eam/OperationCertificateApplyList.vue

@@ -95,11 +95,11 @@
        type="primary"
        icon="plus"
      >申请</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('操作证申请表')"
      >导出</a-button>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('操作证申请表')"-->
<!--      >导出</a-button>-->
      <!-- <a-upload
        name="file"
        :showUploadList="false"

 src/views/eam/OperationCertificateList.vue

@@ -17,10 +17,10 @@
            :sm='24'
          >
            <a-form-item label='操作证编号'>
              <a-input
              <j-input
                placeholder='请输入操作证编号'
                v-model='queryParam.num'
              ></a-input>
              ></j-input>
            </a-form-item>
          </a-col>
          <a-col
@@ -108,11 +108,11 @@
        type='primary'
        icon='plus'
      >变更操作证</a-button>
      <a-button
        type='primary'
        icon='download'
        @click="handleExportXls('操作证书管理')"
      >导出</a-button>
<!--      <a-button-->
<!--        type='primary'-->
<!--        icon='download'-->
<!--        @click="handleExportXls('操作证书管理')"-->
<!--      >导出</a-button>-->
      <!-- <a-upload
        name='file'
        :showUploadList='false'

 src/views/eam/PrecisionParametersTemplateList.vue

@@ -6,8 +6,8 @@
        <a-row :gutter="24">

          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="精度参数模版编码">
              <j-input placeholder="请输入精度参数模版编码" v-model="queryParam.num"></j-input>
            <a-form-item label="统一编码">
              <j-input placeholder="请输入统一编码" v-model="queryParam.num"></j-input>
            </a-form-item>
          </a-col>
          <template>

 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/RiskPreventionList.vue

@@ -31,9 +31,9 @@
              :md='8'
              :sm='24'
            >
              <a-form-item label='危险源'>
              <a-form-item label='危险源名称'>
                <j-input
                  placeholder='请输入危险源'
                  placeholder='请输入危险源名称'
                  v-model='queryParam.name'
                ></j-input>
              </a-form-item>
@@ -78,24 +78,24 @@
        type='primary'
        icon='plus'
      >新增</a-button>
      <a-button
        type='primary'
        icon='download'
        @click="handleExportXls('危险防控')"
      >导出</a-button>
      <a-upload
        name='file'
        :showUploadList='false'
        :multiple='false'
        :headers='tokenHeader'
        :action='importExcelUrl'
        @change='handleImportExcel'
      >
        <a-button
          type='primary'
          icon='import'
        >导入</a-button>
      </a-upload>
<!--      <a-button-->
<!--        type='primary'-->
<!--        icon='download'-->
<!--        @click="handleExportXls('危险防控')"-->
<!--      >导出</a-button>-->
<!--      <a-upload-->
<!--        name='file'-->
<!--        :showUploadList='false'-->
<!--        :multiple='false'-->
<!--        :headers='tokenHeader'-->
<!--        :action='importExcelUrl'-->
<!--        @change='handleImportExcel'-->
<!--      >-->
<!--        <a-button-->
<!--          type='primary'-->
<!--          icon='import'-->
<!--        >导入</a-button>-->
<!--      </a-upload>-->

      <a-dropdown v-if='selectedRowKeys.length > 0'>
        <a-menu slot='overlay'>

 src/views/eam/UploadList.vue

@@ -332,7 +332,7 @@
        deleteBatch: '/sys/upload/deleteBatch',
        urlDownload: '/sys/common/static',
        download: '/sys/upload/downloadFile',
        // download: '/sys/upload/downloadFileByType', 
        // download: '/sys/upload/downloadFileByType',
        realityUrl: 'sys/upload/realityUrl',
      },
      path: '',

 src/views/eam/modules/dailyMaintenanceOrder/ActualHourUserSelect.vue

@@ -17,7 +17,7 @@
            @keyup.enter.native="searchQuery"
          >
            <a-row :gutter="24">
              <a-col
              <!-- <a-col
                :md="6"
                :sm="8"
              >
@@ -27,7 +27,7 @@
                    v-model="queryParam.num"
                  ></a-input>
                </a-form-item>
              </a-col>
              </a-col> -->
              <a-col
                :md="6"
                :sm="8"
@@ -155,11 +155,11 @@
            return parseInt(index) + 1
          }
        },
        {
          title: '班组编码',
          align: 'center',
          dataIndex: 'teamName',
        },
        // {
        //   title: '班组编码',
        //   align: 'center',
        //   dataIndex: 'teamName',
        // },
        {
          title: '人员编号',
          align: 'center',

 src/views/eam/modules/equipmentCalibrationOrder/EquipmentList.vue

@@ -21,9 +21,9 @@
                :md="6"
                :sm="8"
              >
                <a-form-item label="设备编号">
                <a-form-item label="统一编码">
                  <a-input
                    placeholder="请输入标准编号检索"
                    placeholder="请输入统一编码检索"
                    v-model="queryParam.num"
                  ></a-input>
                </a-form-item>

 src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue

@@ -63,12 +63,12 @@
        type="primary"
        icon="plus"
      >新增</a-button> -->
      <a-button
        v-has="'equipmentCategory:import&outport'"
        type="primary"
        icon="download"
        @click="handleExportXls('设备分类报表')"
      >导出</a-button>
<!--      <a-button-->
<!--        v-has="'equipmentCategory:import&outport'"-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('设备分类报表')"-->
<!--      >导出</a-button>-->
      <a-dropdown
        v-if="selectedRowKeys.length > 0"
        v-has="'equipmentCategory:add&Edit&delete'"
@@ -247,7 +247,7 @@
                return record.parentName+text;
              }
            },
  

          {
            title: '上级设备分类名称',
            align: "center",

 src/views/eam/modules/equipmentSeal/EquipmentSelectModal.vue

@@ -32,10 +32,10 @@
              :md="8"
              :sm="6"
            >
              <a-form-item label="统一编码">
              <a-form-item label="设备名称">
                <a-input
                  placeholder="请输入统一编码"
                  v-model="queryParam.num"
                  placeholder="请输入设备名称"
                  v-model="queryParam.name"
                />
              </a-form-item>
            </a-col>

 src/views/eam/modules/faultCause/FaultCause2List.vue

@@ -63,11 +63,11 @@
        type="primary"
        icon="plus"
      >新增</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('原因')"
      >导出</a-button>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('原因')"-->
<!--      >导出</a-button>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作

 src/views/eam/modules/faultType/FaultType2List.vue

@@ -22,9 +22,9 @@
            :md='8'
            :sm='8'
          >
            <a-form-item label='故障类型编号'>
            <a-form-item label='故障类型编码'>
              <a-input
                placeholder='请输入故障类型编号查询'
                placeholder='请输入故障类型编码查询'
                v-model='queryParam.num'
              ></a-input>
            </a-form-item>
@@ -66,12 +66,12 @@
        icon='plus'
      >新增
      </a-button>
      <a-button
        type='primary'
        icon='download'
        @click="handleExportXls('类型')"
      >导出
      </a-button>
<!--      <a-button-->
<!--        type='primary'-->
<!--        icon='download'-->
<!--        @click="handleExportXls('类型')"-->
<!--      >导出-->
<!--      </a-button>-->
      <a-dropdown v-if='selectedRowKeys.length > 0'>
        <a-button style='margin-left: 8px'>
          批量操作

 src/views/eam/modules/precisionParameter/PrecisionParametersRight.vue

@@ -56,11 +56,11 @@
        icon="plus"
        :hidden="disabled"
      >新增</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('原因')"
      >导出</a-button>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('原因')"-->
<!--      >导出</a-button>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作

 src/views/eam/modules/precisionParametersTemplate/JSelectPrecisionParametersModal.vue

@@ -22,7 +22,7 @@
              :sm="6"
            >
              <a-form-item label="检验项目名称">
                <a-input
                <j-input
                  placeholder="请输入检验项目名称"
                  v-model="queryParam.name"
                />

 src/views/eam/modules/processParameters/ProcessParametersRight.vue

@@ -56,11 +56,11 @@
        icon="plus"
        :hidden="disabled"
      >新增</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('原因')"
      >导出</a-button>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('原因')"-->
<!--      >导出</a-button>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作

 src/views/eam/modules/processParametersTemplate/JSelectProcessParametersModal.vue

@@ -22,7 +22,7 @@
              :sm="6"
            >
              <a-form-item label="工艺参数代码">
                <a-input
                <j-input
                  placeholder="请输入工艺参数代码"
                  v-model="queryParam.num"
                />
@@ -33,7 +33,7 @@
              :sm="6"
            >
              <a-form-item label="工艺参数名称">
                <a-input
                <j-input
                  placeholder="请输入工艺参数名称"
                  v-model="queryParam.name"
                />

 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">
          批量操作

 src/views/eam/modules/transferMethod/TransferMethodRight.vue

@@ -56,11 +56,11 @@
        icon="plus"
        :hidden="disabled"
      >新增</a-button>
      <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('增减方式')"
      >导出</a-button>
<!--      <a-button-->
<!--        type="primary"-->
<!--        icon="download"-->
<!--        @click="handleExportXls('增减方式')"-->
<!--      >导出</a-button>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-button style="margin-left: 8px">
          批量操作