新增MDC设备实施台账页面新增导入,按照车间、工段筛选,调整表格标题展示
已添加1个文件
已修改2个文件
38 ■■■■ 文件已修改
public/static/MDC设备实施台账.xls 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/MdcEquipmentImplementLedger.vue 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/modules/MdcEquipmentImplementLedger/MdcImplementLedgersModal.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
public/static/MDC设备实施台账.xls
Binary files differ
src/views/system/MdcEquipmentImplementLedger.vue
@@ -5,12 +5,22 @@
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <a-row :gutter="24">
            <a-col :md="5" :sm="5">
            <a-col :md="4" :sm="4">
              <a-form-item label="杞﹂棿">
                <a-input v-model="queryParam.productionName" allowClear></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="4" :sm="4">
              <a-form-item label="宸ユ">
                <a-input v-model="queryParam.sectionName" allowClear></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="4" :sm="4">
              <a-form-item label="璁惧缂栧彿">
                <a-input v-model="queryParam.equipmentId" allowClear></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="5" :sm="5">
            <a-col :md="4" :sm="4">
              <a-form-item label="璁惧鍚嶇О">
                <a-input v-model="queryParam.equipmentName" allowClear></a-input>
              </a-form-item>
@@ -28,6 +38,12 @@
      <!-- 鎿嶄綔鎸夐挳鍖哄煙路 -->
      <div class="table-operator" style="border-top: 5px">
        <a-button @click="handleAdd" type="primary" icon="plus">娣诲姞鍙拌处</a-button>
        <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
                  :action="url.importExcelUrl"
                  @change="handleImportExcel">
          <a-button type="primary" icon="import">瀵煎叆</a-button>
        </a-upload>
        <!--<a-button type="primary" icon="download" @click="handleExportXls('MDC璁惧瀹炴柦鍙拌处')">瀵煎嚭</a-button>-->
        <a-dropdown v-if="selectedRowKeys.length > 0">
          <a-menu slot="overlay" @click="handleMenuClick">
            <a-menu-item key="1">
@@ -145,14 +161,14 @@
      scopedSlots: { customRender: 'isMdcInstall' }
    },
    {
      title: 'MDC纭欢瀹夎',
      title: 'MDC纭欢瀹夎鎯呭喌',
      dataIndex: 'isMdcHardwareInstall',
      key: 'isMdcHardwareInstall',
      align: 'center',
      width: 150,
      scopedSlots: { customRender: 'isMdcHardwareInstall' }
    },
    { title: '瀹夎鏃堕棿', dataIndex: 'mdcInstallTime', key: 'mdcInstallTime', align: 'center', width: 150 },
    { title: 'MDC瀹夎鏃堕棿', dataIndex: 'mdcInstallTime', key: 'mdcInstallTime', align: 'center', width: 150 },
    {
      title: 'DNC瀹夎鎯呭喌',
      dataIndex: 'isDncInstall',
@@ -162,14 +178,14 @@
      scopedSlots: { customRender: 'isDncInstall' }
    },
    {
      title: 'DNC纭欢瀹夎',
      title: 'DNC纭欢瀹夎鎯呭喌',
      dataIndex: 'isDncHardwareInstall',
      key: 'isDncHardwareInstall',
      align: 'center',
      width: 150,
      scopedSlots: { customRender: 'isDncHardwareInstall' }
    },
    { title: '瀹夎鏃堕棿', dataIndex: 'dncInstallTime', key: 'dncInstallTime', align: 'center', width: 150 },
    { title: 'DNC瀹夎鏃堕棿', dataIndex: 'dncInstallTime', key: 'dncInstallTime', align: 'center', width: 150 },
    {
      title: '鎿嶄綔',
      dataIndex: 'action',
@@ -257,7 +273,9 @@
        dataList: [],
        url: {
          mdcImplementLedgersList: '/mdc/mdcImplementLedgers/list',
          mdcImplementLedgersSubList: '/mdc/mdcImplementLedgersSub/list'
          mdcImplementLedgersSubList: '/mdc/mdcImplementLedgersSub/list',
          exportXlsUrl: '/mdc/mdcImplementLedgers/exportXls',
          importExcelUrl: '/mdc/mdcImplementLedgers/importExcel'
        },
        columns,
        innerColumns,
src/views/system/modules/MdcEquipmentImplementLedger/MdcImplementLedgersModal.vue
@@ -100,7 +100,8 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="MDC纭欢瀹夎" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-form-model-item label="MDC纭欢瀹夎鎯呭喌" :labelCol="{xs: { span: 24 },sm: { span: 10 }}"
                               :wrapperCol="{xs: { span: 24 },sm: { span: 14 }}">
              <j-switch :disabled="disableSubmit" v-model="model.isMdcHardwareInstall"></j-switch>
            </a-form-model-item>
          </a-col>
@@ -122,7 +123,8 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="DNC纭欢瀹夎" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <a-form-model-item label="DNC纭欢瀹夎鎯呭喌" :labelCol="{xs: { span: 24 },sm: { span: 10 }}"
                               :wrapperCol="{xs: { span: 24 },sm: { span: 14 }}">
              <j-switch :disabled="disableSubmit" v-model="model.isDncHardwareInstall"></j-switch>
            </a-form-model-item>
          </a-col>