Merge remote-tracking branch 'origin/master'

cuilei

2025-06-05 373e07b3ab5bebaa08c7a48ce76cedeab37f1972

Merge remote-tracking branch 'origin/master'

 src/views/eam/spare/EamSparePartReceiveList.vue

@@ -15,24 +15,11 @@
            :md="8"
            :sm="24"
          >
            <a-form-item label="删除标记">
              <a-input
                placeholder="请输入删除标记"
                v-model="queryParam.delFlag"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col
            :xl="6"
            :lg="7"
            :md="8"
            :sm="24"
          >
            <a-form-item label="领用单编码">
              <a-input
                placeholder="请输入领用单编码"
                v-model="queryParam.receiveCode"
              ></a-input>
              />
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
@@ -55,24 +42,19 @@
              :md="8"
              :sm="24"
            >
              <a-form-item label="领用事由">
                <a-input
                  placeholder="请输入领用事由"
                  v-model="queryParam.receiveReason"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
              <a-form-item label="领用状态">
                <a-input
                <!-- <a-input
                  placeholder="请输入领用状态"
                  v-model="queryParam.receiveStatus"
                ></a-input>
                ></a-input> -->
                <j-dict-select-tag
                  allow-clear
                  :disabled="false"
                  placeholder="请选择领用状态"
                  :triggerChange="true"
                  dictCode="receive_status"
                  v-model="queryParam.receiveStatus"
                />
              </a-form-item>
            </a-col>
          </template>
@@ -118,7 +100,7 @@
        type="primary"
        icon="plus"
      >新增</a-button>
      <a-button
      <!-- <a-button
        type="primary"
        icon="download"
        @click="handleExportXls('备品备件领用单')"
@@ -135,7 +117,7 @@
          type="primary"
          icon="import"
        >导入</a-button>
      </a-upload>
      </a-upload> -->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item
@@ -172,16 +154,46 @@
        class="j-table-force-nowrap"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        @change="handleTableChange"
        :customRow='clickThenSelect'
      >

        <span
          slot="action"
          slot-scope="text, record"
        >
          <a @click="handleEdit(record)">编辑</a>
          <a
            v-show="record.receiveStatus === '1'"
            @click="handleEdit(record)"
          >编辑</a>

          <a-divider type="vertical" />
          <a-dropdown>
          <a-popconfirm
            title="确定删除吗?"
            @confirm="() => handleDelete(record.id)"
          >
            <a v-show="record.receiveStatus === '1'">删除</a>
          </a-popconfirm>
          <a-divider type="vertical" />
          <a
            v-show="record.receiveStatus === '1'"
            @click="handleSubmit(record)"
          >提交</a>
          <a-divider type="vertical" />
          <a
            v-show="record.receiveStatus === '2'"
            @click="handleConfirm(record)"
          >确认</a>
          <a-divider type="vertical" />
          <a
            v-show="record.receiveStatus === '3' && record.giveBackFlag === 'yes'"
            @click="handleReturn(record)"
          >归还</a>
          <a-divider type="vertical" />
          <a
            v-show="record.receiveStatus === '4' && record.giveBackFlag === 'yes'"
            @click="handleReturnConfirm(record)"
          >归还确认</a>
          <!-- <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
@@ -193,10 +205,23 @@
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
          </a-dropdown> -->
        </span>

      </a-table>
      <a-tabs defaultActiveKey="1">
        <a-tab-pane
          tab='备件领用明细'
          key="1"
        >
          <div
            class="table-operator"
            style="margin:-16px"
          >
            <eamSparePartReceive-Detail-list :sparePartReceiveId='sparePartReceiveId' />
          </div>
        </a-tab-pane>
      </a-tabs>
    </div>
    <!-- table区域-end -->

@@ -211,17 +236,22 @@
<script>
import '@assets/less/TableExpand.less'
import EamSparePartReceiveModal from './modules/EamSparePartReceive/EamSparePartReceiveModal.vue'
import EamSparePartReceiveDetailList from './modules/EamSparePartReceive/EamSparePartReceiveDetailList.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { deleteAction, getAction, postAction } from '@api/manage'

export default {
  name: "EamSparePartReceiveList",
  mixins: [JeecgListMixin],
  components: {
    EamSparePartReceiveModal
    EamSparePartReceiveModal,
    EamSparePartReceiveDetailList
  },
  data() {
    return {
      description: '备品备件领用单管理页面',
      sparePartReceiveId: "-1",
      dataSource: [],
      // è¡¨å¤´
      columns: [
        {
@@ -233,11 +263,6 @@
          customRender: function (t, r, index) {
            return parseInt(index) + 1;
          }
        },
        {
          title: '删除标记',
          align: "center",
          dataIndex: 'delFlag'
        },
        {
          title: '领用单编码',
@@ -257,12 +282,12 @@
        {
          title: '领用状态',
          align: "center",
          dataIndex: 'receiveStatus'
          dataIndex: 'receiveStatus_dictText'
        },
        {
          title: '是否需要归还;是：存在归还动作，否：直接完成',
          title: '是否需要归还',
          align: "center",
          dataIndex: 'giveBackFlag'
          dataIndex: 'giveBackFlag_dictText'
        },
        {
          title: '审核人',
@@ -292,6 +317,10 @@
        deleteBatch: "/eam/eamSparePartReceive/deleteBatch",
        exportXlsUrl: "eam/eamSparePartReceive/exportXls",
        importExcelUrl: "eam/eamSparePartReceive/importExcel",
        submit: "eam/eamSparePartReceive/submit",
        confirm: "eam/eamSparePartReceive/confirm",
        return: "eam/eamSparePartReceive/return",
        returnConfirm: "eam/eamSparePartReceive/returnConfirm",
      },
    }
  },
@@ -302,6 +331,145 @@
  },
  methods: {

    searchReset() {
      this.queryParam = {}
      this.onClearSelected()
      this.loadData(1);
    },
    searchQuery() {
      this.onClearSelected()
      this.loadData(1);
    },

    clickThenSelect(record) {
      return {
        on: {
          click: () => {
            this.onSelectChange(record.id.split(','), [record])
          }
        }
      }
    },
    onClearSelected() {
      this.selectedRowKeys = []
      this.selectionRows = []
      this.sparePartReceiveId = '-1'
    },
    onSelectChange(selectedRowKeys, selectionRows) {
      if (selectedRowKeys.length == 1) {
        this.sparePartReceiveId = selectionRows[0]['id']
      } else {
        this.sparePartReceiveId = '-1'
      }
      this.selectedRowKeys = selectedRowKeys
      this.selectionRows = selectionRows
    },

    handleSubmit(record) {
      if (!this.url.submit) {
        this.$message.error('请设置url.submit属性!')
        return
      }
      var that = this
      this.$confirm({
        title: '确认提交',
        content: '确定提交吗?',
        onOk: function () {
          that.loading = true;
          postAction(that.url.submit, record).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.loadData()
            } else {
              that.$message.warning(res.message)
            }
            that.loading = false
          }).finally(() => {
            that.loading = false;
          });
        }
      })
    },

    handleConfirm(record) {
      if (!this.url.confirm) {
        this.$message.error('请设置url.confirm属性!')
        return
      }
      var that = this
      this.$confirm({
        title: '确认领取',
        content: '确定领取备件吗?',
        onOk: function () {
          that.loading = true;
          postAction(that.url.confirm, record).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.loadData()
            } else {
              that.$message.warning(res.message)
            }
            that.loading = false
          }).finally(() => {
            that.loading = false;
          });
        }
      })
    },

    handleReturn(record) {
      if (!this.url.return) {
        this.$message.error('请设置url.return属性!')
        return
      }
      var that = this
      this.$confirm({
        title: '备件归还',
        content: '确定归还备件吗?',
        onOk: function () {
          that.loading = true;
          postAction(that.url.return, record).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.loadData()
            } else {
              that.$message.warning(res.message)
            }
            that.loading = false
          }).finally(() => {
            that.loading = false;
          });
        }
      })
    },


    handleReturnConfirm(record) {
      if (!this.url.returnConfirm) {
        this.$message.error('请设置url.returnConfirm属性!')
        return
      }
      var that = this
      this.$confirm({
        title: '备件归还确认',
        content: '确定备件归还吗?',
        onOk: function () {
          that.loading = true;
          postAction(that.url.returnConfirm, record).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.loadData()
            } else {
              that.$message.warning(res.message)
            }
            that.loading = false
          }).finally(() => {
            that.loading = false;
          });
        }
      })
    },

  }
}
</script>

 src/views/eam/spare/modules/EamSparePartReceive/EamSparePartReceiveDetailList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,185 @@
<template>
  <a-card
    :bordered="false"
    :class="'cust-erp-sub-tab'"
  >
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form
        layout="inline"
        @keyup.enter.native="searchQuery"
      >
        <a-row :gutter="24">
        </a-row>
      </a-form>
    </div>
    <div>
      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :scroll="{x:true}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        @change="handleTableChange"
      >

      </a-table>
    </div>

  </a-card>
</template>

<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@/api/manage'
import Tooltip from 'ant-design-vue/es/tooltip'
import { ACCESS_TOKEN } from '@/store/mutation-types'
import Vue from 'vue'
import { getFileAccessHttpUrl } from '@/api/manage';

export default {
  name: "EamSparePartInventoryList",
  mixins: [JeecgListMixin],
  components: {
    Tooltip,
  },
  props: {
    sparePartReceiveId: {
      type: String,
      default: '-1',
      required: false
    }
  },
  watch: {
    sparePartReceiveId: {
      immediate: true,
      handler(val) {
        if (!this.sparePartReceiveId) {
          this.clearList()
        } else {
          this.queryParam['sparePartReceiveId'] = val;
          this.loadData(1);
        }
      }
    }
  },
  data() {
    return {
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: "center",
          customRender: function (t, r, index) {
            return parseInt(index) + 1;
          }
        },
        {
          title: '备件编码',
          align: "center",
          dataIndex: 'partCode'
        },
        {
          title: '备件名称',
          align: "center",
          dataIndex: 'partName'
        },
        {
          title: '备件型号',
          align: "center",
          dataIndex: 'partModel'
        },
        {
          title: '备件规格',
          align: "center",
          dataIndex: 'partSpecification'
        },

        {
          title: '领用/归还数量',
          align: "center",
          dataIndex: 'receiveNum'
        },
        // {
        //   title: '操作',
        //   dataIndex: 'action',
        //   align: "center",
        //   scopedSlots: { customRender: 'action' },
        // }
      ],
      url: {
        list: "/eam/eamSparePartReceiveDetail/list",
        delete: "/eam/eamSparePartInventory/delete",
        deleteBatch: "/eam/eamSparePartInventory/deleteBatch",
        exportXlsUrl: "eam/eamSparePartInventory/exportXls",
        importExcelUrl: "eam/eamSparePartInventory/importExcel",
      },
      /* åˆ†é¡µå‚æ•° */
      ipagination: {
        current: 1,
        pageSize: 20,
        pageSizeOptions: ['5', '10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + '-' + range[1] + ' å…±' + total + '条'
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
    }
  },
  created() {
  },
  computed: {
  },
  methods: {
    clearList() {
      this.dataSource = []
      this.selectedRowKeys = []
      this.ipagination.current = 1
    },
    loadData(arg) {
      if (!this.url.list) {
        this.$message.error("请设置url.list属性!")
        return
      }
      //加载数据 è‹¥ä¼ å…¥å‚æ•°1则加载第一页的内容
      if (arg === 1) {
        this.ipagination.current = 1;
      }
      var params = this.getQueryParams();//查询条件
      this.loading = true;
      // this.originTargetKeys = [];
      getAction(this.url.list, params).then((res) => {
        if (res.success) {
          // for (let i = 0; i < res.result.records.length; i++) {
          //   let r = res.result.records[i].upload;
          //   r.src = this.getSrc(res.result.records[i].upload);
          // }
          this.dataSource = res.result.records || res.result;
          if (res.result.total) {
            this.ipagination.total = res.result.total;
          } else {
            this.ipagination.total = 0;
          }
          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
        } else {
          this.$message.warning(res.message)
        }
      }).finally(() => {
        this.loading = false
      })
    },
  }
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/eam/spare/modules/EamSparePartReceive/EamSparePartReceiveModal.vue

@@ -1,135 +1,305 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :width="1000"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    centered
    :mask-closable="false"
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    cancelText="关闭"
  >

    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
    <a-spin :spinning="spinning">
      <a-form-model
        ref="form"
        :model="model"
        :rules="validatorRules"
      >
        <!-- :labelCol="labelCol"
        :wrapperCol="wrapperCol" -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-model-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="receiveCode"
              label="请购单编码"
            >
              <a-input
                placeholder="请购单编码自动生成"
                v-model="model.receiveCode"
                :disabled="true"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="giveBackFlag"
              label="是否需要归还"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="false"
                placeholder="请选择是否需要归还"
                :triggerChange="true"
                dictCode="give_back_flag"
                v-model="model.giveBackFlag"
              />
            </a-form-model-item>
          </a-col>

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="删除标记">
          <a-input-number v-model="model.delFlag"/>
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiveCode" label="领用单编码">
          <a-input placeholder="请输入领用单编码" v-model="model.receiveCode" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiveUser" label="领用人">
          <a-input placeholder="请输入领用人" v-model="model.receiveUser" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiveReason" label="领用事由">
          <a-input placeholder="请输入领用事由" v-model="model.receiveReason" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="receiveStatus" label="领用状态">
          <a-input placeholder="请输入领用状态" v-model="model.receiveStatus" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="giveBackFlag" label="是否需要归还;是：存在归还动作，否：直接完成">
          <a-input placeholder="请输入是否需要归还;是：存在归还动作，否：直接完成" v-model="model.giveBackFlag" />
        </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="approvalTime" label="审核时间">
          <a-input placeholder="请输入审核时间" v-model="model.approvalTime" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="备注">
          <a-input placeholder="请输入备注" v-model="model.remark" />
        </a-form-model-item>

        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item
              :labelCol="{xs: { span: 24 }, sm: { span: 3 }}"
              :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}"
              prop="receiveReason"
              label="领用事由"
            >
              <a-textarea
                placeholder="请输入领用事由"
                v-model="model.receiveReason"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-model-item
              :labelCol="{xs: { span: 24 }, sm: { span: 3 }}"
              :wrapperCol="{xs: { span: 24 },sm: { span: 21 }}"
              prop="remark"
              label="备注"
            >
              <a-textarea
                placeholder="请输入备注"
                v-model="model.remark"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <j-vxe-table
            ref="editableDetailTable"
            :rowNumber="true"
            :rowSelection="true"
            :bordered="true"
            :alwaysEdit="true"
            :toolbar="true"
            keep-source
            :height="300"
            :loading="detail.loading"
            :dataSource="detail.dataSource"
            :columns="detail.columns"
            style="margin-top: 8px;"
          />
        </a-row>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
  import { httpAction } from '@api/manage'
  import moment from "moment"
import { getAction, httpAction } from '@/api/manage'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import { JVXETypes } from '@/components/jeecg/JVxeTable'

  export default {
    name: "EamSparePartReceiveModal",
    data () {
      return {
        title:"操作",
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
export default {
  name: 'EamSparePartReceiveModal',
  mixins: [JVxeTableModelMixin],
  components: {},
  data() {
    return {
      title: '操作',
      visible: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      confirmLoading: false,
      spinning: false,
      disabled: false,
      validatorRules: {
        giveBackFlag: [
          { required: true, message: '请选择归还条件！' }
        ]
      },
      url: {
        add: '/eam/eamSparePartReceive/add',
        edit: '/eam/eamSparePartReceive/edit',
        // add: "/eam/eamSparePartRequisition/add",
        // edit: "/eam/eamSparePartRequisition/edit",
        getDetails: "/eam/eamSparePartRequisitionDetail/list",
        generateRequisitionCode: "sys/sysBusinessCodeRule/generateBusinessCodeSeq"
      },
      detail: {
        loading: false,
        dataSource: [],
        columns: [
          {
            title: '备件',
            key: 'partId',
            type: JVXETypes.select,
            width: '30%',
            align: 'center',
            dictCode: 'eam_spare_parts,part_name,id, del_flag!=\'1\'',
            validateRules: [
              { required: true, message: '备件不能为空！' },
            ],
          },
          {
            title: '领用数量',
            key: 'receiveNum',
            type: JVXETypes.inputNumber,
            width: '30%',
            align: 'center',
            validateRules: [
              { required: true, message: '数量不能为空！' },
            ]
          },

        confirmLoading: false,
        validatorRules:{
        },
        url: {
          add: "/eam/eamSparePartReceive/add",
          edit: "/eam/eamSparePartReceive/edit",
        },
        ]
      }
    }
  },
  created() {
  },
  methods: {
    add() {

      const that = this
      this.visible = true;
      let params = {
        businessCode: "SparePartReceive"
      }
      getAction(that.url.generateRequisitionCode, params).then((res) => {
        if (res.success) {
          this.model = {
            receiveCode: res.result
          }
        } else {
          that.$message.warning(res.message);
        }
      })
      //初始化默认值
      that.edit(this.model);
    },
    edit(record) {
      this.model = Object.assign({}, record);
      this.detail.dataSource = record.sparePartReceiveDetails
      this.visible = true;
    },

    async handleOk() {
      const that = this
      let errMap = await that.$refs.editableDetailTable.validateTable()
      if (errMap) {
        this.$message.warning('数据校验失败！')
        return
      }
      let tableData = that.$refs.editableDetailTable.getTableData()
      if (tableData.length == 0) {
        this.$message.warning('请选择备件领用信息！')
        return
      }

      for (var i = 0; i < tableData.length; i++) {
        let count = 0;
        tableData.forEach(row => {
          if (row.partId === tableData[i].partId) {
            count++;
          }
        });
        // å¦‚果重复次数大于1，说明有重复
        if (count > 1) {
          this.$message.warning('选择的备件不能重复！')
          return
        }
      }


      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          let tableData = that.$refs.editableDetailTable.getTableData()
          let removeData = that.$refs.editableDetailTable.getDeleteData()
          that.model.sparePartReceiveDetails = [...tableData]
          that.model.removeDetailList = [...removeData]

          that.confirmLoading = that.spinning = true
          let httpurl = ''
          let method = ''
          if (!this.model.id) {
            httpurl += this.url.add
            method = 'post'
          } else {
            httpurl += this.url.edit
            method = 'put'
          }
          httpAction(httpurl, this.model, method).then((res) => {

            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
              that.close()
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = that.spinning = false
          })
        } else {
          return false
        }
      })
    },



    handleCancel() {
      this.close()
    },

    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
    },
    checkUniqueName(rule, value, callback) {

      // if (!value) {
      //   return callback(); // ç©ºå€¼ç”±required规则校验
      // }

      // èŽ·å–当前表格数据
      let tableData = this.$refs.editableDetailTable.getTableData()
      // è®¡ç®—重复次数（不包括当前行）
      let count = 0;
      tableData.forEach(row => {
        if (row.partId === rule.cellValue) {
          count++;
        }
      });
      // å¦‚果重复次数大于1，说明有重复
      if (count > 1) {
        this.$message.warning('选择的备件不能重复！')
        return
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;
        // è§¦å‘表单验证
         this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false;
          }
        })
      },
      handleCancel () {
        this.close()
      },


    }
  }
}
</script>

<style lang="less" scoped>

</style>

 src/views/eam/spare/modules/EamSparePartRequisition/EamSparePartRequisitionModal.vue

@@ -183,6 +183,26 @@
        this.$message.warning('数据校验失败！')
        return
      }

      let tableData = that.$refs.editableDetailTable.getTableData()
      if (tableData.length == 0) {
        this.$message.warning('请选择备件信息！')
        return
      }

      for (var i = 0; i < tableData.length; i++) {
        let count = 0;
        tableData.forEach(row => {
          if (row.partId === tableData[i].partId) {
            count++;
          }
        });
        // å¦‚果重复次数大于1，说明有重复
        if (count > 1) {
          this.$message.warning('选择的备件不能重复！')
          return
        }
      }
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {

 src/views/eam/spare/modules/EamSpareParts/EamSparePartIntoModal.vue

@@ -178,6 +178,26 @@
        this.$message.warning('数据校验失败！')
        return
      }

      let tableData = that.$refs.editableDetailTable.getTableData()
      if (tableData.length == 0) {
        this.$message.warning('请选择备件入库明细！')
        return
      }

      for (var i = 0; i < tableData.length; i++) {
        let count = 0;
        tableData.forEach(row => {
          if (row.sparePartId === tableData[i].sparePartId) {
            count++;
          }
        });
        // å¦‚果重复次数大于1，说明有重复
        if (count > 1) {
          this.$message.warning('选择的备件不能重复！')
          return
        }
      }
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {