zhangherong
2025-05-15 6ecce65da54f4dbc1e13a3c8f94deff2e51e97c0
art: 设备管理-设备处置 报废 基础代码修改
已重命名2个文件
62 ■■■■■ 文件已修改
src/views/eam/dispose/EamEquipmentScrapList.vue 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/dispose/modules/EamEquipmentScrapModal.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/eam/dispose/EamEquipmentScrapList.vue
ÎļþÃû´Ó src/views/eam/dispose/EamEquipmentDisposeList.vue ÐÞ¸Ä
@@ -24,7 +24,7 @@
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="转让/报废">
              <a-input placeholder="请输入转让/报废" v-model="queryParam.disposeType"></a-input>
              <a-input placeholder="请输入转让/报废" v-model="queryParam.scrapType"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -51,7 +51,7 @@
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" 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" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
@@ -104,24 +104,24 @@
    <!-- table区域-end -->
    <!-- è¡¨å•区域 -->
    <eamEquipmentDispose-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentDispose-modal>
    <eamEquipmentScrap-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentScrap-modal>
  </a-card>
</template>
<script>
  import '@/assets/less/TableExpand.less'
  import EamEquipmentDisposeModal from './modules/EamEquipmentDisposeModal'
  import EamEquipmentScrapModal from './modules/EamEquipmentScrapModal'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  export default {
    name: "EamEquipmentDisposeList",
    name: "EamEquipmentScrapList",
    mixins:[JeecgListMixin],
    components: {
      EamEquipmentDisposeModal
      EamEquipmentScrapModal
    },
    data () {
      return {
        description: '设备处置(转让报废)管理页面',
        description: '设备报废(转让)管理页面',
        // è¡¨å¤´
        columns: [
          {
@@ -152,7 +152,7 @@
           {
            title: '转让/报废',
            align:"center",
            dataIndex: 'disposeType'
            dataIndex: 'scrapType'
           },
           {
            title: '申请人',
@@ -162,22 +162,27 @@
           {
            title: '处置时间',
            align:"center",
            dataIndex: 'disposeTime'
            dataIndex: 'scrapTime'
           },
           {
            title: '处置理由',
            align:"center",
            dataIndex: 'disposeReason'
            dataIndex: 'scrapReason'
           },
           {
            title: '处置金额',
            align:"center",
            dataIndex: 'disposeAmount'
            dataIndex: 'scrapAmount'
           },
           {
            title: '审核人',
            align:"center",
            dataIndex: 'approvalUser'
           },
           {
            title: '审核意见',
            align:"center",
            dataIndex: 'approvalComment'
           },
           {
            title: '审核时间',
@@ -197,11 +202,11 @@
          }
        ],
        url: {
          list: "/eam/eamEquipmentDispose/list",
          delete: "/eam/eamEquipmentDispose/delete",
          deleteBatch: "/eam/eamEquipmentDispose/deleteBatch",
          exportXlsUrl: "eam/eamEquipmentDispose/exportXls",
          importExcelUrl: "eam/eamEquipmentDispose/importExcel",
          list: "/eam/eamEquipmentScrap/list",
          delete: "/eam/eamEquipmentScrap/delete",
          deleteBatch: "/eam/eamEquipmentScrap/deleteBatch",
          exportXlsUrl: "eam/eamEquipmentScrap/exportXls",
          importExcelUrl: "eam/eamEquipmentScrap/importExcel",
       },
    }
  },
src/views/eam/dispose/modules/EamEquipmentScrapModal.vue
ÎļþÃû´Ó src/views/eam/dispose/modules/EamEquipmentDisposeModal.vue ÐÞ¸Ä
@@ -21,23 +21,26 @@
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设备ID">
          <a-input placeholder="请输入设备ID" v-model="model.equipmentId" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeType" label="转让/报废">
          <a-input placeholder="请输入转让/报废" v-model="model.disposeType" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapType" label="转让/报废">
          <a-input placeholder="请输入转让/报废" v-model="model.scrapType" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser" label="申请人">
          <a-input placeholder="请输入申请人" v-model="model.reportUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeTime" label="处置时间">
          <a-input placeholder="请输入处置时间" v-model="model.disposeTime" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapTime" label="处置时间">
          <a-input placeholder="请输入处置时间" v-model="model.scrapTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeReason" label="处置理由">
          <a-input placeholder="请输入处置理由" v-model="model.disposeReason" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapReason" label="处置理由">
          <a-input placeholder="请输入处置理由" v-model="model.scrapReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="disposeAmount" label="处置金额">
          <a-input placeholder="请输入处置金额" v-model="model.disposeAmount" />
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scrapAmount" label="处置金额">
          <a-input placeholder="请输入处置金额" v-model="model.scrapAmount" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="审核人">
          <a-input placeholder="请输入审核人" v-model="model.approvalUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="审核意见">
          <a-input placeholder="请输入审核意见" v-model="model.approvalComment" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="审核时间">
          <a-input placeholder="请输入审核时间" v-model="model.approvalTime" />
@@ -56,7 +59,7 @@
  import moment from "moment"
  export default {
    name: "EamEquipmentDisposeModal",
    name: "EamEquipmentScrapModal",
    data () {
      return {
        title:"操作",
@@ -75,8 +78,8 @@
        validatorRules:{
        },
        url: {
          add: "/eam/eamEquipmentDispose/add",
          edit: "/eam/eamEquipmentDispose/edit",
          add: "/eam/eamEquipmentScrap/add",
          edit: "/eam/eamEquipmentScrap/edit",
        },
      }
    },