feat(cms): 重写了刀具报废新增逻辑， 从通过刀具信息选取刀具改为通过刀具库存里的数据获取刀具 修改库存id存入刀具id的错误

lixiangyu

2 天以前 a0c8a2eb778d529f77a347cba7382acde0916742

feat(cms):
重写了刀具报废新增逻辑，
从通过刀具信息选取刀具改为通过刀具库存里的数据获取刀具
修改库存id存入刀具id的错误

 src/views/cms/CuttingReceiveDetailList.vue

 src/views/cms/CuttingReceiveList.vue

ÎļþÒÑɾ³ý

 src/views/cms/CuttingScrapDetailList.vue

@@ -11,7 +11,7 @@

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<!--      <a-button @click="handleAdd" 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>
@@ -76,7 +76,6 @@
            </a-menu>
          </a-dropdown>
        </span>

      </a-table>
    </div>


 src/views/cms/CuttingScrapList.vue

@@ -60,7 +60,8 @@
    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a
        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

@@ -83,7 +84,8 @@
        </template>
        <template slot="imgSlot" slot-scope="text,record">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt=""
               style="max-width:80px;font-size: 12px;font-style: italic;" />
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
@@ -153,86 +155,86 @@
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
          align: 'center',
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            return parseInt(index) + 1
            }
          },
          {
            title:'申请人',
            align:"center",
          align: 'center',
            dataIndex: 'applicant_dictText'
          },
          {
            title:'申请时间',
            align:"center",
          align: 'center',
            dataIndex: 'applicationTime',
            customRender:function (text) {
              return !text?"":(text.length>10?text.substr(0,10):text)
            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
            }
          },
          {
            title:'申请说明',
            align:"center",
          align: 'center',
            dataIndex: 'applicationComment'
          },
          {
            title:'确认人',
            align:"center",
          align: 'center',
            dataIndex: 'confirmer_dictText'
          },
          {
            title:'确认时间',
            align:"center",
          align: 'center',
            dataIndex: 'confirmTime',
            customRender:function (text) {
              return !text?"":(text.length>10?text.substr(0,10):text)
            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
            }
          },
          {
            title:'确认意见',
            align:"center",
          align: 'center',
            dataIndex: 'confirmComment'
          },
           {
            title:'报废单状态',
            align:"center",
          align: 'center',
            dataIndex: 'orderStatus'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
          align: 'center',
          fixed: 'right',
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/cms/cuttingScrap/list",
          delete: "/cms/cuttingScrap/delete",
          deleteBatch: "/cms/cuttingScrap/deleteBatch",
          exportXlsUrl: "/cms/cuttingScrap/exportXls",
          importExcelUrl: "cms/cuttingScrap/importExcel",
        list: '/cms/cuttingScrap/list',
        delete: '/cms/cuttingScrap/delete',
        deleteBatch: '/cms/cuttingScrap/deleteBatch',
        exportXlsUrl: '/cms/cuttingScrap/exportXls',
        importExcelUrl: 'cms/cuttingScrap/importExcel'
          
        },
        dictOptions:{},
        superFieldList:[],
      superFieldList: []
      }
    },
    created() {
    this.getSuperFieldList();
    this.getSuperFieldList()
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
    },
    methods: {
     searchReset() {
      this.queryParam = {}
      this.$refs.cuttingScrapDetailList.dataSource = []
      this.loadData(1);
      this.loadData(1)
    },
      handleEdit: function (record) {
        this.$refs.modalForm.edit(record)
@@ -245,9 +247,9 @@
      this.$refs.modalForm.disableSubmit = false
    },
    handleDetail:function(record){
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title="详情";
      this.$refs.modalForm.disableSubmit = true;
      this.$refs.modalForm.edit(record)
      this.$refs.modalForm.title = '详情'
      this.$refs.modalForm.disableSubmit = true
    },
     customRow(record) {
      return {
@@ -266,10 +268,10 @@
            for (let i = 0; i < children.length; i++) {
              children[i].classList.add('checked-td-of-add-table')
            }
          },
        },
      }
    },
        }
      }
    }
    }
  }
</script>

 src/views/cms/modules/CuttingReceiveModal.vue

@@ -178,7 +178,6 @@
export default {
   name: 'CuttingInboundModal',
   components: {
      JSelectToolingModal,
      JSelectInventoryModal,
      JMultiSelectTag,
      JDictSelectTag,

 src/views/cms/modules/CuttingScrapModal.vue

@@ -26,7 +26,8 @@
        <a-row style="width: 100%">
          <a-col :span="24">
            <a-form-item label="申请说明" :labelCol="{span:3}" :wrapperCol="{span:21}">
              <a-textarea :disabled="disableSubmit" placeholder="请输入申请说明" v-decorator="['applicationComment', validatorRules.applicationComment]" />
              <a-textarea :disabled="disableSubmit" placeholder="请输入申请说明"
                          v-decorator="['applicationComment', validatorRules.applicationComment]" />
            </a-form-item>
          </a-col>
        </a-row>
@@ -54,14 +55,16 @@
        <a-row style="width: 100%">
          <a-col :span="24">
            <a-form-item label="确认意见" :labelCol="{span:3}" :wrapperCol="{span:21}">
              <a-textarea :disabled="disableSubmit" placeholder="请输入确认意见" v-decorator="['confirmComment', validatorRules.confirmComment]" />
              <a-textarea :disabled="disableSubmit" placeholder="请输入确认意见"
                          v-decorator="['confirmComment', validatorRules.confirmComment]" />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()"
      >选择刀具</a-button
    >选择报废刀具
    </a-button
    >
    <a-table
      ref="table"
@@ -98,7 +101,7 @@
    <template slot="footer" v-if="disableSubmit == true">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
    </template>
    <j-select-tooling-modal ref="toolingModalForm" @ok="modalFormOk"></j-select-tooling-modal>
    <j-select-scrap-modal ref="scrapModalForm" @ok="modalFormOk"></j-select-scrap-modal>
  </a-modal>
</template>

@@ -113,14 +116,16 @@
  import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
  import { filterObj } from '@/utils/util'
  import store from '@/store/'
import JSelectScrapModal from '@views/cms/modules/JSelectScrapModal.vue'

  export default {
    name: 'CuttingInboundModal',
    components: {
    JSelectToolingModal,
    JSelectScrapModal,
    JMultiSelectTag,
    JDictSelectTag,
    store,
    moment,
    moment
  },
    data () {
      return {
@@ -134,7 +139,7 @@
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0,
        total: 0
      },
      title:'新增',
         visible: false,
@@ -142,19 +147,18 @@
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 },
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 },
        sm: { span: 18 }
      },
      confirmLoading: false,
      loading: false,
      form: this.$form.createForm(this),
      dataSource: [],
      param: {},
      validatorRules: {
      },
      validatorRules: {},
      columns: [
        {
          title: '#',
@@ -164,30 +168,30 @@
          align: 'center',
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          },
          }
        },
        {
          title: '刀具编码',
          align: 'center',
          dataIndex: 'cuttingCode',
          width: 150,
          width: 150
        },
        {
          title: '刀具名称',
          align: 'center',
          dataIndex: 'cuttingName',
          dataIndex: 'cuttingName'
        },
        
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' },
        },
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        add: '/cms/cuttingScrap/add',
        detailList: '/cms/cuttingScrap/detailList',
        detailList: '/cms/cuttingScrap/detailList'
      },
      orderId:'',
      disableSubmit:false
@@ -240,10 +244,11 @@
      let ids = []
      for (let i = 0; i < this.dataSource.length; i++) {
        ids.push(this.dataSource[i].cuttingId)
        ids.push(this.dataSource[i].inventoryId)
      }
      this.$refs.toolingModalForm.showModal(ids)
      this.$refs.toolingModalForm.title = '选择刀具'
      this.$refs.toolingModalForm.disableSubmit = false
      this.$refs.scrapModalForm.showModal(ids)
      this.$refs.scrapModalForm.title = '选择报废刀具'
      this.$refs.scrapModalForm.disableSubmit = false
    },
    detailList(orderId) {
      this.param.orderId = orderId
@@ -262,17 +267,32 @@
        return
      }
      const that = this

      // è§¦å‘表单验证
      this.form.validateFields((err, values) => {
        if (!err) {
          that.confirmLoading = true
          let formData = Object.assign(this.model, values)
          formData.detailData = this.dataSource

          // ç¡®ä¿ä¼ é€’给后端的数据包含所有必要字段
          formData.detailData = this.dataSource.map(item => {
            return {
              // æ˜Žç¡®æŒ‡å®šæ¯ä¸ªå­—段，确保 inventoryId è¢«æ­£ç¡®ä¼ é€’
              inventoryId: item.inventoryId,
              cuttingId: item.cuttingId,
              cuttingCode: item.cuttingCode,
              cuttingName: item.cuttingName,
              // å¦‚果还有其他字段也需要包含
              ...item // åŒ…含其他可能存在的字段
            }
          })

          postAction(that.url.add, formData)
            .then((res) => {
              if (res.success) {
                that.$message.success('报废成功')
                that.$emit('ok', new Date())
                that.$message.success('报废成功')
              } else {
                that.$message.warning(res.message)
              }
@@ -292,19 +312,24 @@
      this.dataSource = []
      this.visible = false
      this.disableSubmit = false
    },
    }
    },
    mounted() {
    this.$bus.$on('selectionRows', (data) => {
      //getCurrSelected äº‹ä»¶ æŽ¥æ”¶ç»„件传递的参数
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          cuttingId: data[i].id,
          // cuttingId: data[i].id,
          // cuttingCode: data[i].cuttingCode,
          // cuttingName: data[i].cuttingName
          inventoryId: data[i].id,
          cuttingCode: data[i].cuttingCode,
          cuttingName: data[i].cuttingName
          cuttingName: data[i].cuttingName,
          cuttingId: data[i].cuttingId,
        })
      }
    })
  },
    console.log('更新后的数据源:', this.dataSource)
  }
  }
</script>

 src/views/cms/modules/JSelectScrapModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,261 @@
<template>
  <!--支持全屏缩放-->
  <!--选择刀具的弹窗，根据这个弹窗将选择刀具从刀具信息迁移到刀具库存，用来领用刀具库存里的刀具  -->
  <j-modal
    :visible="visible"
    :title="title"
    switchFullscreen
    :width="1200"
    @ok="handleSubmit"
    @cancel="close"
    style="top: 50px"
    cancelText="关闭"
  >
    <a-card :bordered="false">
      <div class="table-page-search-wrapper">
        <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="刀具编码">
                <a-input placeholder="请输入刀具编码,支持模糊查询" v-model="queryParam.cuttingCode"></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.cuttingName"></a-input>
              </a-form-item>
            </a-col>

            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
          </a-row>
        </a-form>
      </div>
      <!--刀具列表-->
      <a-table
        ref="table"
        :scroll="scrollTrigger"
        size="middle"
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :rowSelection="rowSelection"
        :loading="loading"
        @change="handleTableChange"
      >
      </a-table>
    </a-card>
  </j-modal>
</template>

<script>
import { filterObj } from '@/utils/util'
import { getAction } from '@/api/manage'

export default {
  name: 'JSelectScrapModal',
  components: {},
  props: {},
  data() {
    return {
      queryParam: {},
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 50,
          align: 'center',
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          },
        },
        {
          title: '刀具编码',
          align: 'center',
          dataIndex: 'cuttingCode',
          sorter: true,
        },
        {
          title: '刀具名称',
          align: 'center',
          dataIndex: 'cuttingName',
          sorter: true,
        },
        {
          title: '刀具分类',
          align: 'center',
          dataIndex: 'cuttingCategory',
          sorter: true,
        },
        {
          title:'刀具条码',
          align: 'center',
          dataIndex: 'cuttingBarcode',
          sorter: true,
        },
        {
          title:'刀具当前寿命（百分比）',
          align: 'center',
          dataIndex: 'currentLife',
          sorter: true,
        },
        {
          title:'库存id',
          align: 'center',
          dataIndex: 'id',
          sorter: true,
        }
      ],
      selectedRowKeys: [],
      oldSlelectRows: [],
      scrollTrigger: {},
      dataSource: [],
      selectionRows: [],
      title: '根据查询结果选择刀具',
      ipagination: {
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['5', '10', '20'],
        showTotal: (total, range) => {
          return range[0] + '-' + range[1] + ' å…±' + total + '条'
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0,
      },
      isorter: {
        column: 'num',
        order: 'desc',
      },
      departTree: [],
      visible: false,
      loading: false,
      url: {
        // list: '/cms/cuttingTool/getCuttingToolList',
        list:'/cms/cuttingReceive/getInventoryToolList'
      },
    }
  },
  computed: {
    rowSelection() {
      return {
        type: 'checkbox',
        onChange: (selectedRowKeys, selectedRows) => {
          this.selectedRowKeys = selectedRowKeys
          this.onSelectChange(selectedRows)
        },
        getCheckboxProps: (record) => ({
          props: {
            disabled: record.distable,
          },
        }),
        selectedRowKeys: this.selectedRowKeys,
      }
    },
  },
  watch: {},
  created() {},
  methods: {
    async loadData(arg) {
      if (arg === 1) {
        this.ipagination.current = 1
      }
      let that = this
      this.loading = true
      let params = this.getQueryParams() //查询条件
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          for (let i = 0; i < res.result.records.length; i++) {
            if (that.oldSlelectRows.indexOf(res.result.records[i].id) > -1) {
              res.result.records[i].distable = true
            } else {
              res.result.records[i].distable = false
            }
          }
          this.dataSource = res.result.records
          this.ipagination.total = res.result.total
        }
        if (res.code === 510) {
          this.$message.warning(res.message)
        }
        this.loading = false
      })
    },
    showModal(oldSlelectRows) {
      this.oldSlelectRows = oldSlelectRows
      this.visible = true
      this.loadData(1)
    },
    getQueryParams() {
      let param = Object.assign({}, this.queryParam, this.isorter)
      param.field = this.getQueryField()
      param.pageNo = this.ipagination.current
      param.pageSize = this.ipagination.pageSize
      return filterObj(param)
    },
    //查询条件处理
    getQueryField() {
      let str = 'id,'
      for (let a = 0; a < this.columns.length; a++) {
        str += ',' + this.columns[a].dataIndex
      }
      return str
    },
    searchReset(num) {
      let that = this
      if (num !== 0) {
        that.loadData(1)
      }
      that.selectborrowIds = []
    },
    close() {
      this.searchReset(0)
      this.selectedRowKeys = []
      this.visible = false
    },
    handleTableChange(pagination, filters, sorter) {
      if (Object.keys(sorter).length > 0) {
        this.isorter.column = sorter.field
        this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc'
      }
      this.ipagination = pagination
      this.loadData()
    },
    handleSubmit() {
      this.$bus.$emit('selectionRows', this.selectionRows)
      this.searchReset(0)
      this.close()
    },
    onSelectChange(selectionRows) {
      this.selectionRows = selectionRows
    },
    onSearch() {
      this.loadData(1)
    },
    searchQuery() {
      this.loadData(1);
    },
    // searchReset() {
    //   this.queryParam = {}
    //   this.loadData(1)
    // },
  },
}
</script>

<style scoped>
.ant-table-tbody .ant-table-row td {
  padding-top: 10px;
  padding-bottom: 10px;
}

#components-layout-demo-custom-trigger .trigger {
  font-size: 18px;
  line-height: 64px;
  padding: 0 24px;
  cursor: pointer;
  transition: color 0.3s;
}
</style>