Houjie
2 天以前 4dfdc774c2e742764848177e44e75b7de518f285
设备台账导入
已修改4个文件
107 ■■■■ 文件已修改
src/views/eam/base/EamMaintenanceStandardList.vue 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/base/EamProcessParametersList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/equipment/EamEquipmentList.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/equipment/modules/EamEquipmentModal.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/base/EamMaintenanceStandardList.vue
@@ -123,11 +123,11 @@
            icon="import"
          >点检标准导入</a-button>
        </a-upload>
        <a-button
          type="primary"
          icon="download"
          @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)"
        >点检标准模板下载</a-button>
<!--        <a-button-->
<!--          type="primary"-->
<!--          icon="download"-->
<!--          @click="handleTemplateXlsDownload(url.inspectionXlsDownloadUrl)"-->
<!--        >点检标准模板下载</a-button>-->
        <a-upload
          name="file"
          :showUploadList="false"
@@ -141,11 +141,11 @@
            icon="import"
          >季保标准导入</a-button>
        </a-upload>
        <a-button
          type="primary"
          icon="download"
          @click="handleTemplateXlsDownload(url.secondMaintenanceXlsDownloadUrl)"
        >季保标准模板下载</a-button>
<!--        <a-button-->
<!--          type="primary"-->
<!--          icon="download"-->
<!--          @click="handleTemplateXlsDownload(url.secondMaintenanceXlsDownloadUrl)"-->
<!--        >季保标准模板下载</a-button>-->
        <a-upload
          name="file"
          :showUploadList="false"
@@ -159,11 +159,11 @@
            icon="import"
          >年保标准导入</a-button>
        </a-upload>
        <a-button
          type="primary"
          icon="download"
          @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)"
        >年保标准模板下载</a-button>
<!--        <a-button-->
<!--          type="primary"-->
<!--          icon="download"-->
<!--          @click="handleTemplateXlsDownload(url.thirdMaintenanceXlsDownloadUrl)"-->
<!--        >年保标准模板下载</a-button>-->
        <a-dropdown v-if="selectedRowKeys.length > 0">
          <a-menu slot="overlay">
            <a-menu-item
@@ -340,11 +340,11 @@
          align: 'center',
          dataIndex: 'fileCode'
        },
        {
          title: '保养周期(天)',
          align: 'center',
          dataIndex: 'maintenancePeriod'
        },
        // {
        //   title: '保养周期(天)',
        //   align: 'center',
        //   dataIndex: 'maintenancePeriod'
        // },
        {
          title: '初始日期',
          align: 'center',
@@ -383,9 +383,14 @@
        deleteBatch: '/eam/maintenanceStandard/deleteBatch',
        exportXlsUrl: 'eam/maintenanceStandard/exportXls',
        inspectionImportExcel: 'eam/maintenanceStandard/inspectionImportExcel',
        weekMaintenanceImportExcel: 'eam/maintenanceStandard/weekMaintenanceImportExcel',
        secondMaintenanceImportExcel: 'eam/maintenanceStandard/secondMaintenanceImportExcel',
        thirdMaintenanceImportExcel: 'eam/maintenanceStandard/thirdMaintenanceImportExcel',
        /**
         * 季保
         */
        secondMaintenanceImportExcel: 'eam/maintenanceStandard/maintenanceImportExcel',
        /**
         * 年保
         */
        thirdMaintenanceImportExcel: 'eam/maintenanceStandard/annualMaintenanceImportExcel',
        inspectionXlsDownloadUrl: '导入模板/点检标准导入模板_v1.0.xlsx',
        weekMaintenanceXlsDownloadUrl: '导入模板/周保标准导入模板_v1.0.xlsx',
        secondMaintenanceXlsDownloadUrl: '导入模板/二保标准导入模板_v1.0.xlsx',
@@ -400,9 +405,6 @@
  computed: {
    inspectionImportExcel: function () {
      return `${window._CONFIG['domianURL']}/${this.url.inspectionImportExcel}`
    },
    weekMaintenanceImportExcel: function () {
      return `${window._CONFIG['domianURL']}/${this.url.weekMaintenanceImportExcel}`
    },
    secondMaintenanceImportExcel: function () {
      return `${window._CONFIG['domianURL']}/${this.url.secondMaintenanceImportExcel}`
src/views/eam/base/EamProcessParametersList.vue
@@ -6,7 +6,7 @@
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="参数编码4444">
            <a-form-item label="参数编码">
              <j-input placeholder="请输入参数编码" v-model="queryParam.parameterCode"></j-input>
            </a-form-item>
          </a-col>
src/views/eam/equipment/EamEquipmentList.vue
@@ -289,7 +289,7 @@
        <eam-week-maintenance-order-list ref="tabPaneTableListRef3" :isDisplayOperation="false"/>
      </a-tab-pane>-->
      <a-tab-pane
        tab="二保工单"
        tab="季报工单"
        :key="3"
      >
        <eam-second-maintenance-order-list
@@ -298,7 +298,7 @@
        />
      </a-tab-pane>
      <a-tab-pane
        tab="三保工单"
        tab="年保工单"
        :key="4"
      >
        <eam-third-maintenance-order-list
@@ -344,15 +344,15 @@
          :isDisplayOperation="false"
        />
      </a-tab-pane>
      <a-tab-pane
        tab="设备油液"
        :key="9"
      >
        <eam-equipment-fluid-list
          ref="tabPaneTableListRef9"
          :isDisplayOperation="false"
        />
      </a-tab-pane>
<!--      <a-tab-pane-->
<!--        tab="设备油液"-->
<!--        :key="9"-->
<!--      >-->
<!--        <eam-equipment-fluid-list-->
<!--          ref="tabPaneTableListRef9"-->
<!--          :isDisplayOperation="false"-->
<!--        />-->
<!--      </a-tab-pane>-->
    </a-tabs>
    <!-- 表单区域 -->
@@ -377,25 +377,25 @@
import '@/assets/less/TableExpand.less'
import EamEquipmentModal from './modules/EamEquipmentModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction, templateXlsDownload } from '@api/manage'
import { getAction } from '@api/manage'
import NameplateModal from '@views/eam/equipment/modules/NameplateModal.vue'
import { getSystemConfigValue } from '@api/api'
import ResumeDrawer from '@views/eam/equipment/modules/ResumeDrawer.vue'
import EamMaintenanceStandardList from '@views/eam/base/EamMaintenanceStandardList.vue'
import EamRepairOrderList from '../repair/EamRepairOrderList'
// import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
import EamInspectionOrderList from '../maintenance/EamInspectionOrderList'
import EamEquipmentAttachmentList from '@views/eam/equipment/EamEquipmentAttachmentList.vue'
// import EamWeekMaintenanceOrderList from '@views/eam/maintenance/EamWeekMaintenanceOrderList.vue'
import EamEquipmentProcessList from '@views/eam/equipment/modules/EamEquipmentProcessList.vue'
import EamEquipmentPrecisionList from '@views/eam/equipment/modules/EamEquipmentPrecisionList.vue'
// import EamSecondMaintenanceOrderList from '@views/eam/maintenance/EamSecondMaintenanceOrderList.vue'
// import EamThirdMaintenanceOrderList from '@views/eam/maintenance/EamThirdMaintenanceOrderList.vue'
import EamEquipmentFluidList from '@views/eam/equipment/modules/EamEquipmentFluidList.vue'
import { hasPermission } from '@/utils/hasPermission' // 添加这一行
export default {
  name: 'EamEquipmentList',
  mixins: [JeecgListMixin],
  components: {
    EamInspectionOrderList,
    EamMaintenanceStandardList,
    ResumeDrawer,
    NameplateModal,
@@ -403,7 +403,7 @@
    EamEquipmentAttachmentList,
    EamEquipmentProcessList,
    EamEquipmentPrecisionList,
    EamEquipmentFluidList
  },
  data() {
    return {
src/views/eam/equipment/modules/EamEquipmentModal.vue
@@ -50,11 +50,16 @@
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="equipmentType"
                                   label="设备种类">
                  <j-tree-dict placeholder="请选择设备种类" v-model="model.equipmentType" parent-code="equipment_category" field="code" :async="true" :disabled="disableSubmit"></j-tree-dict>
                <a-form-model-item prop="overallDimensions" label="外形尺寸">
                  <a-input :placeholder="disableSubmit?'':'请输入外形尺寸'" v-model="model.overallDimensions" :disabled="disableSubmit"/>
                </a-form-model-item>
              </a-col>
<!--              <a-col :span="8">-->
<!--                <a-form-model-item prop="equipmentType"-->
<!--                                   label="设备种类">-->
<!--                  <j-tree-dict placeholder="请选择设备种类" v-model="model.equipmentType" parent-code="equipment_category" field="code" :async="true" :disabled="disableSubmit"></j-tree-dict>-->
<!--                </a-form-model-item>-->
<!--              </a-col>-->
            </a-row>
            <a-row>
              <a-col :span="8">
@@ -97,11 +102,7 @@
              <a-input :placeholder="disableSubmit?'':'请输入重量'" v-model="model.equipmentWeight" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="overallDimensions" label="外形尺寸">
              <a-input :placeholder="disableSubmit?'':'请输入外形尺寸'" v-model="model.overallDimensions" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
@@ -183,12 +184,12 @@
        <a-row :gutter="24">
          <a-col :span="6">
            <a-form-model-item prop="orgId" label="使用车间">
            <a-form-model-item prop="orgId" label="所属产线">
              <a-tree-select v-model="model.orgId"
                             style="width: 100%"
                             :tree-data="treeData"
                             :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                             placeholder="请选择使用车间"
                             placeholder="请选择所属产线"
                             allow-clear
                             tree-default-expand-all
                             :disabled="editable || disableSubmit"