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

lixiangyu

2 天以前 a0c8a2eb778d529f77a347cba7382acde0916742

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

 src/views/cms/CuttingReceiveDetailList.vue

@@ -1,48 +1,48 @@
<template>
   <a-card :bordered="false">
      <!-- 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>项
            <a style="margin-left: 24px" @click="onClearSelected">清空</a>
         </div>
  <a-card :bordered="false">
    <!-- 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>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

         <a-table
            ref="table"
            size="middle"
            :scroll="{x:true}"
            bordered
            rowKey="id"
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
            :loading="loading"
            class="j-table-force-nowrap"
            @change="handleTableChange">
      <a-table
        ref="table"
        size="middle"
        :scroll="{x:true}"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        @change="handleTableChange">

            <template slot="htmlSlot" slot-scope="text">
               <div v-html="text"></div>
            </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;" />
            </template>
            <template slot="fileSlot" slot-scope="text">
               <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
               <a-button
                  v-else
                  :ghost="true"
                  type="primary"
                  icon="download"
                  size="small"
                  @click="downloadFile(text)">
                  ä¸‹è½½
               </a-button>
            </template>
        <template slot="htmlSlot" slot-scope="text">
          <div v-html="text"></div>
        </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;" />
        </template>
        <template slot="fileSlot" slot-scope="text">
          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
          <a-button
            v-else
            :ghost="true"
            type="primary"
            icon="download"
            size="small"
            @click="downloadFile(text)">
            ä¸‹è½½
          </a-button>
        </template>

            <span slot="action" slot-scope="text, record">
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>

          <a-divider type="vertical" />
@@ -61,11 +61,11 @@
          </a-dropdown>
        </span>

         </a-table>
      </div>
      </a-table>
    </div>

      <cutting-receive-detail-modal ref="modalForm" @ok="modalFormOk"></cutting-receive-detail-modal>
   </a-card>
    <cutting-receive-detail-modal ref="modalForm" @ok="modalFormOk"></cutting-receive-detail-modal>
  </a-card>
</template>

<script>
@@ -75,93 +75,93 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'

export default {
   name: 'CuttingReceiveDetailList',
   mixins: [JeecgListMixin, mixinDevice],
   components: {},
   data() {
      return {
         description: '领用单明细管理页面',
         // è¡¨å¤´
         columns: [
            {
               title: '#',
               dataIndex: '',
               key: 'rowIndex',
               width: 60,
               align: 'center',
               customRender: function(t, r, index) {
                  return parseInt(index) + 1
               }
            },
            {
               title: '刀具编码',
               align: 'center',
               dataIndex: 'cuttingCode'
            },
            {
               title: '刀具名称',
               align: 'center',
               dataIndex: 'cuttingName'
            },
            {
               title: '刀具条码',
               align: 'center',
               dataIndex: 'cuttingBarcode'
            },
            {
               title: '工件材质',
               align: 'center',
               dataIndex: 'workpieceMaterial'
            },
            {
               title: '使用寿命',
               align: 'center',
               dataIndex: 'usedLife'
            }
         ],
         url: {
            list: '/cms/cuttingReceive/detailList',
            delete: '/cms/cuttingReceiveDetail/delete',
            deleteBatch: '/cms/cuttingReceiveDetail/deleteBatch',
            exportXlsUrl: '/cms/cuttingReceiveDetail/exportXls',
            importExcelUrl: 'cms/cuttingReceiveDetail/importExcel'
  name: 'CuttingReceiveDetailList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {},
  data() {
    return {
      description: '领用单明细管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        },
        {
          title: '刀具编码',
          align: 'center',
          dataIndex: 'cuttingCode'
        },
        {
          title: '刀具名称',
          align: 'center',
          dataIndex: 'cuttingName'
        },
        {
          title: '刀具条码',
          align: 'center',
          dataIndex: 'cuttingBarcode'
        },
        {
          title: '工件材质',
          align: 'center',
          dataIndex: 'workpieceMaterial'
        },
        {
          title: '使用寿命',
          align: 'center',
          dataIndex: 'usedLife'
        }
      ],
      url: {
        list: '/cms/cuttingReceive/detailList',
        delete: '/cms/cuttingReceiveDetail/delete',
        deleteBatch: '/cms/cuttingReceiveDetail/deleteBatch',
        exportXlsUrl: '/cms/cuttingReceiveDetail/exportXls',
        importExcelUrl: 'cms/cuttingReceiveDetail/importExcel'

         },
         dictOptions: {},
         superFieldList: [],
         disableMixinCreated: true
      }
   },
   created() {
      this.getSuperFieldList()
   },
   computed: {
      importExcelUrl: function() {
         return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
      }
   },
   methods: {
      initDictConfig() {
      },
      getSuperFieldList() {
         let fieldList = []
         fieldList.push({ type: 'string', value: 'orderId', text: '领用单ID' })
         fieldList.push({ type: 'string', value: 'cuttingId', text: '刀具ID' })
         fieldList.push({ type: 'string', value: 'cuttingCode', text: '刀具编码' })  // æ·»åŠ è¿™ä¸€è¡Œ
         fieldList.push({ type: 'string', value: 'cuttingName', text: '刀具名称' })  // æ·»åŠ è¿™ä¸€è¡Œ
         fieldList.push({ type: 'string', value: 'cuttingBarcode', text: '刀具条码' })  // æ·»åŠ è¿™ä¸€è¡Œ
         fieldList.push({ type: 'string', value: 'inventoryId', text: '库存ID' })
         fieldList.push({ type: 'string', value: 'workpieceMaterial', text: '工件材质' })
         fieldList.push({ type: 'int', value: 'usedLife', text: '使用寿命' })
         this.superFieldList = fieldList
      }
   },
   mounted() {
      this.$bus.$on('getToolingStorageData', (data) => {
         this.queryParam.orderId = data.id
         this.searchQuery()
      })
   }
      dictOptions: {},
      superFieldList: [],
      disableMixinCreated: true
    }
  },
  created() {
    this.getSuperFieldList()
  },
  computed: {
    importExcelUrl: function() {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },
  methods: {
    initDictConfig() {
    },
    getSuperFieldList() {
      let fieldList = []
      fieldList.push({ type: 'string', value: 'orderId', text: '领用单ID' })
      fieldList.push({ type: 'string', value: 'cuttingId', text: '刀具ID' })
      fieldList.push({ type: 'string', value: 'cuttingCode', text: '刀具编码' })  // æ·»åŠ è¿™ä¸€è¡Œ
      fieldList.push({ type: 'string', value: 'cuttingName', text: '刀具名称' })  // æ·»åŠ è¿™ä¸€è¡Œ
      fieldList.push({ type: 'string', value: 'cuttingBarcode', text: '刀具条码' })  // æ·»åŠ è¿™ä¸€è¡Œ
      fieldList.push({ type: 'string', value: 'inventoryId', text: '库存ID' })
      fieldList.push({ type: 'string', value: 'workpieceMaterial', text: '工件材质' })
      fieldList.push({ type: 'int', value: 'usedLife', text: '使用寿命' })
      this.superFieldList = fieldList
    }
  },
  mounted() {
    this.$bus.$on('getToolingStorageData', (data) => {
      this.queryParam.orderId = data.id
      this.searchQuery()
    })
  }
}
</script>
<style scoped>

 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>

@@ -137,7 +136,7 @@
          deleteBatch: "/cms/cuttingScrapDetail/deleteBatch",
          exportXlsUrl: "/cms/cuttingScrapDetail/exportXls",
          importExcelUrl: "cms/cuttingScrapDetail/importExcel",
          

        },
        dictOptions:{},
        superFieldList:[],

 src/views/cms/CuttingScrapList.vue

@@ -7,22 +7,22 @@
          <a-col :md="6" :sm="8">
            <a-form-item label="报废单状态">
              <j-search-select-tag
                  placeholder="请选择报废单状态"
                  v-model="queryParam.orderStatus"
                  dict="order_status"
                />
                placeholder="请选择报废单状态"
                v-model="queryParam.orderStatus"
                dict="order_status"
              />
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="8">
              <a-form-item label="申请人">
                <j-search-select-tag
                  placeholder="请选择申请人"
                  v-model="queryParam.applicant"
                  dict="sys_user,realname,id,del_flag!=1"
                />
              </a-form-item>
            </a-col>
            <a-col
            <a-form-item label="申请人">
              <j-search-select-tag
                placeholder="请选择申请人"
                v-model="queryParam.applicant"
                dict="sys_user,realname,id,del_flag!=1"
              />
            </a-form-item>
          </a-col>
          <a-col
            :md="6"
            :sm="8"
          >
@@ -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>
@@ -119,7 +121,7 @@

      </a-table>
    </div>
<a-tabs defaultActiveKey="1">
    <a-tabs defaultActiveKey="1">
      <a-tab-pane tab="刀具报废明细" key="1">
        <cutting-scrap-detail-list ref="cuttingScrapDetailList"></cutting-scrap-detail-list>
      </a-tab-pane>
@@ -130,126 +132,126 @@

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import CuttingScrapModal from './modules/CuttingScrapModal'
  import CuttingScrapDetailList from './CuttingScrapDetailList'
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CuttingScrapModal from './modules/CuttingScrapModal'
import CuttingScrapDetailList from './CuttingScrapDetailList'

  export default {
    name: 'CuttingScrapList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      CuttingScrapModal,
      CuttingScrapDetailList
    },
    data () {
      return {
        description: '刀具报废管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'申请人',
            align:"center",
            dataIndex: 'applicant_dictText'
          },
          {
            title:'申请时间',
            align:"center",
            dataIndex: 'applicationTime',
            customRender:function (text) {
              return !text?"":(text.length>10?text.substr(0,10):text)
            }
          },
          {
            title:'申请说明',
            align:"center",
            dataIndex: 'applicationComment'
          },
          {
            title:'确认人',
            align:"center",
            dataIndex: 'confirmer_dictText'
          },
          {
            title:'确认时间',
            align:"center",
            dataIndex: 'confirmTime',
            customRender:function (text) {
              return !text?"":(text.length>10?text.substr(0,10):text)
            }
          },
          {
            title:'确认意见',
            align:"center",
            dataIndex: 'confirmComment'
          },
           {
            title:'报废单状态',
            align:"center",
            dataIndex: 'orderStatus'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
export default {
  name: 'CuttingScrapList',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    CuttingScrapModal,
    CuttingScrapDetailList
  },
  data() {
    return {
      description: '刀具报废管理页面',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        ],
        url: {
          list: "/cms/cuttingScrap/list",
          delete: "/cms/cuttingScrap/delete",
          deleteBatch: "/cms/cuttingScrap/deleteBatch",
          exportXlsUrl: "/cms/cuttingScrap/exportXls",
          importExcelUrl: "cms/cuttingScrap/importExcel",
          
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
        {
          title: '申请人',
          align: 'center',
          dataIndex: 'applicant_dictText'
        },
        {
          title: '申请时间',
          align: 'center',
          dataIndex: 'applicationTime',
          customRender: function(text) {
            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
          }
        },
        {
          title: '申请说明',
          align: 'center',
          dataIndex: 'applicationComment'
        },
        {
          title: '确认人',
          align: 'center',
          dataIndex: 'confirmer_dictText'
        },
        {
          title: '确认时间',
          align: 'center',
          dataIndex: 'confirmTime',
          customRender: function(text) {
            return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
          }
        },
        {
          title: '确认意见',
          align: 'center',
          dataIndex: 'confirmComment'
        },
        {
          title: '报废单状态',
          align: 'center',
          dataIndex: 'orderStatus'
        },
        {
          title: '操作',
          dataIndex: 'action',
          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'

      },
    },
    methods: {
     searchReset() {
      dictOptions: {},
      superFieldList: []
    }
  },
  created() {
    this.getSuperFieldList()
  },
  computed: {
    importExcelUrl: function() {
      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)
        this.$refs.modalForm.title = '编辑'
        this.$refs.modalForm.disableSubmit = false
    handleEdit: function(record) {
      this.$refs.modalForm.edit(record)
      this.$refs.modalForm.title = '编辑'
      this.$refs.modalForm.disableSubmit = false
    },
    handleAdd() {
      this.$refs.modalForm.add()
      this.$refs.modalForm.title = '新增'
      this.$refs.modalForm.disableSubmit = false
    },
    handleDetail:function(record){
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title="详情";
      this.$refs.modalForm.disableSubmit = true;
    handleDetail: function(record) {
      this.$refs.modalForm.edit(record)
      this.$refs.modalForm.title = '详情'
      this.$refs.modalForm.disableSubmit = true
    },
     customRow(record) {
    customRow(record) {
      return {
        on: {
          click: (e) => {
@@ -266,13 +268,13 @@
            for (let i = 0; i < children.length; i++) {
              children[i].classList.add('checked-td-of-add-table')
            }
          },
        },
          }
        }
      }
    },
    }
  }
}
</script>
<style scoped>
  @import '~@assets/less/common.less';
@import '~@assets/less/common.less';
</style>

 src/views/cms/modules/CuttingReceiveModal.vue

@@ -1,165 +1,165 @@
<template>
   <a-modal :title="title" :visible="visible" :fullScreen="true" :width="1200" @ok="handleOk" @cancel="handleCancel">
      <a-spin :spinning="confirmLoading">
         <a-form :form="form">
            <a-row style="width: 100%">
               <a-col :span="24 / 2">
                  <a-form-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <j-search-select-tag
                        :disabled="disableSubmit"
                        placeholder="请选择领用人"
                        v-decorator="['receiver', { rules: [{ required: true, message: '请选择领用人' }] }]"
                        dict="sys_user,realname,id,del_flag=0"
                     />
                  </a-form-item>
               </a-col>
               <a-col :span="24 / 2">
                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="领用日期">
                     <a-date-picker
                        :disabled="disableSubmit"
                        style="width: 100%"
                        v-decorator="['receiveTime', validatorRules.receiveTime]"
                     />
                  </a-form-item>
               </a-col>
            </a-row>
            <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="['receiveComment', validatorRules.receiveComment]" />
                  </a-form-item>
               </a-col>
            </a-row>
            <a-row style="width: 100%">
               <a-col :span="24 / 2">
                  <a-form-item label="确认人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <j-search-select-tag
                        :disabled="disableSubmit"
                        placeholder="请选择确认人"
                        v-decorator="['confirmer', { rules: [{ required: false, message: '请选择确认人' }] }]"
                        dict="sys_user,realname,id,del_flag=0"
                     />
                  </a-form-item>
               </a-col>
               <a-col :span="24 / 2">
                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="确认日期">
                     <a-date-picker
                        :disabled="disableSubmit"
                        style="width: 100%"
                        v-decorator="['confirmTime', validatorRules.confirmTime]"
                     />
                  </a-form-item>
               </a-col>
            </a-row>
            <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-form-item>
               </a-col>
            </a-row>
            <a-row style="width: 100%">
               <a-col :span="24 / 2">
                  <a-form-item label="是否会归还" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input :disabled="disableSubmit" placeholder="请输入是否会归还"
                              v-decorator="['returnFlag', validatorRules.returnFlag]"></a-input>
                  </a-form-item>
               </a-col>
               <a-col :span="24 / 2">
                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="归还日期">
                     <a-date-picker
                        :disabled="disableSubmit"
                        style="width: 100%"
                        v-decorator="['returnTime', validatorRules.returnTime]"
                     />
                  </a-form-item>
               </a-col>
            </a-row>
            <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="['returnComment', validatorRules.returnComment]" />
                  </a-form-item>
               </a-col>
            </a-row>
            <a-row style="width: 100%">
               <a-col :span="24 / 2">
                  <a-form-item label="归还确认人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <j-search-select-tag
                        :disabled="disableSubmit"
                        placeholder="请选择归还确认人"
                        v-decorator="['returnConfirmer', { rules: [{ required: false, message: '请选择归还确认人' }] }]"
                        dict="sys_user,realname,id,del_flag=0"
                     />
                  </a-form-item>
               </a-col>
               <a-col :span="24 / 2">
                  <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="归还确认日期">
                     <a-date-picker
                        :disabled="disableSubmit"
                        style="width: 100%"
                        v-decorator="['returnConfirmTime', validatorRules.returnConfirmTime]"
                     />
                  </a-form-item>
               </a-col>
            </a-row>
            <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="['returnConfirmComment', validatorRules.returnConfirmComment]" />
                  </a-form-item>
               </a-col>
            </a-row>
         </a-form>
      </a-spin>
      <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()">选择库存刀具</a-button>
      <a-table
         ref="table"
         bordered
         size="middle"
         rowKey="id"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
      >
         <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
            <div :key="col.dataIndex">
               <a-input
                  :value="text"
                  :disabled="disableSubmit"
                  v-if="col.dataIndex === 'workpieceMaterial'"
                  @change="(e)=>handleChange(e.target.value, record.key, col, index)"
               />
               <a-input-number
                  v-if="col.dataIndex === 'usedLife'"
                  :value="text"
                  @change="(e) => handleChange(e, record.key, col, index)"
                  :min="1"
               />
            </div>
         </template>
         <span slot="action" slot-scope="text, record, index">
  <a-modal :title="title" :visible="visible" :fullScreen="true" :width="1200" @ok="handleOk" @cancel="handleCancel">
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="领用人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="disableSubmit"
                placeholder="请选择领用人"
                v-decorator="['receiver', { rules: [{ required: true, message: '请选择领用人' }] }]"
                dict="sys_user,realname,id,del_flag=0"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="领用日期">
              <a-date-picker
                :disabled="disableSubmit"
                style="width: 100%"
                v-decorator="['receiveTime', validatorRules.receiveTime]"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <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="['receiveComment', validatorRules.receiveComment]" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="确认人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="disableSubmit"
                placeholder="请选择确认人"
                v-decorator="['confirmer', { rules: [{ required: false, message: '请选择确认人' }] }]"
                dict="sys_user,realname,id,del_flag=0"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="确认日期">
              <a-date-picker
                :disabled="disableSubmit"
                style="width: 100%"
                v-decorator="['confirmTime', validatorRules.confirmTime]"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <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-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="是否会归还" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" placeholder="请输入是否会归还"
                       v-decorator="['returnFlag', validatorRules.returnFlag]"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="归还日期">
              <a-date-picker
                :disabled="disableSubmit"
                style="width: 100%"
                v-decorator="['returnTime', validatorRules.returnTime]"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <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="['returnComment', validatorRules.returnComment]" />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="归还确认人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="disableSubmit"
                placeholder="请选择归还确认人"
                v-decorator="['returnConfirmer', { rules: [{ required: false, message: '请选择归还确认人' }] }]"
                dict="sys_user,realname,id,del_flag=0"
              />
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="归还确认日期">
              <a-date-picker
                :disabled="disableSubmit"
                style="width: 100%"
                v-decorator="['returnConfirmTime', validatorRules.returnConfirmTime]"
              />
            </a-form-item>
          </a-col>
        </a-row>
        <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="['returnConfirmComment', validatorRules.returnConfirmComment]" />
            </a-form-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()">选择库存刀具</a-button>
    <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
    >
      <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
        <div :key="col.dataIndex">
          <a-input
            :value="text"
            :disabled="disableSubmit"
            v-if="col.dataIndex === 'workpieceMaterial'"
            @change="(e)=>handleChange(e.target.value, record.key, col, index)"
          />
          <a-input-number
            v-if="col.dataIndex === 'usedLife'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
        </div>
      </template>
      <span slot="action" slot-scope="text, record, index">
        <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record, index)">
          <a>删除</a>
        </a-popconfirm>
      </span>
      </a-table>
      <template slot="footer" v-if="disableSubmit == false">
         <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
         <a-button @click="handleOk" type="primary">提交</a-button>
      </template>
    </a-table>
    <template slot="footer" v-if="disableSubmit == false">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
      <a-button @click="handleOk" type="primary">提交</a-button>
    </template>

      <template slot="footer" v-if="disableSubmit == true">
         <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
      </template>
      <j-select-inventory-modal ref="inventoryModalForm" @ok="modalFormOk"></j-select-inventory-modal>
      <!--    <j-select-tooling-modal ref="toolingModalForm" @ok="modalFormOk"></j-select-tooling-modal>-->
   </a-modal>
    <template slot="footer" v-if="disableSubmit == true">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
    </template>
    <j-select-inventory-modal ref="inventoryModalForm" @ok="modalFormOk"></j-select-inventory-modal>
    <!--    <j-select-tooling-modal ref="toolingModalForm" @ok="modalFormOk"></j-select-tooling-modal>-->
  </a-modal>
</template>

<script>
@@ -176,226 +176,225 @@
import JSelectInventoryModal from '@views/cms/modules/JSelectInventoryModal.vue'

export default {
   name: 'CuttingInboundModal',
   components: {
      JSelectToolingModal,
      JSelectInventoryModal,
      JMultiSelectTag,
      JDictSelectTag,
      store,
      moment
   },
   data() {
      return {
         /* åˆ†é¡µå‚æ•° */
         ipagination: {
            current: 1,
            pageSize: 10,
            pageSizeOptions: ['10', '20', '30'],
            showTotal: (total, range) => {
               return range[0] + '-' + range[1] + ' å…±' + total + '条'
            },
            showQuickJumper: true,
            showSizeChanger: true,
            total: 0
         },
         title: '新增',
         visible: false,
         selectedRowKeys: {},
         model: {},
         labelCol: {
            xs: { span: 24 },
            sm: { span: 6 }
         },
         wrapperCol: {
            xs: { span: 24 },
            sm: { span: 18 }
         },
         confirmLoading: false,
         loading: false,
         form: this.$form.createForm(this),
         dataSource: [],
         param: {},
         validatorRules: {},
         columns: [
            {
               title: '#',
               dataIndex: '',
               key: 'rowIndex',
               width: 50,
               align: 'center',
               customRender: function(t, r, index) {
                  return parseInt(index) + 1
               }
            },
            {
               title: '刀具编码',
               align: 'center',
               dataIndex: 'cuttingCode',
               width: 150
            },
            {
               title: '刀具名称',
               align: 'center',
               dataIndex: 'cuttingName'
            },
            {
               title: '工件材质',
               align: 'center',
               dataIndex: 'workpieceMaterial',
               scopedSlots: { customRender: 'workpieceMaterial' }
            },
            {
               title: '使用寿命',
               align: 'center',
               dataIndex: 'usedLife',
               scopedSlots: { customRender: 'usedLife' }
            },
            {
               title: '操作',
               align: 'center',
               dataIndex: 'action',
               scopedSlots: { customRender: 'action' }
            }
         ],
         url: {
            add: '/cms/cuttingReceive/add',
            detailList: '/cms/cuttingReceive/detailList'
         },
         orderId: '',
         disableSubmit: false
  name: 'CuttingInboundModal',
  components: {
    JSelectInventoryModal,
    JMultiSelectTag,
    JDictSelectTag,
    store,
    moment
  },
  data() {
    return {
      /* åˆ†é¡µå‚æ•° */
      ipagination: {
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['10', '20', '30'],
        showTotal: (total, range) => {
          return range[0] + '-' + range[1] + ' å…±' + total + '条'
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
      title: '新增',
      visible: false,
      selectedRowKeys: {},
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      confirmLoading: false,
      loading: false,
      form: this.$form.createForm(this),
      dataSource: [],
      param: {},
      validatorRules: {},
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 50,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        },
        {
          title: '刀具编码',
          align: 'center',
          dataIndex: 'cuttingCode',
          width: 150
        },
        {
          title: '刀具名称',
          align: 'center',
          dataIndex: 'cuttingName'
        },
        {
          title: '工件材质',
          align: 'center',
          dataIndex: 'workpieceMaterial',
          scopedSlots: { customRender: 'workpieceMaterial' }
        },
        {
          title: '使用寿命',
          align: 'center',
          dataIndex: 'usedLife',
          scopedSlots: { customRender: 'usedLife' }
        },
        {
          title: '操作',
          align: 'center',
          dataIndex: 'action',
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        add: '/cms/cuttingReceive/add',
        detailList: '/cms/cuttingReceive/detailList'
      },
      orderId: '',
      disableSubmit: false
    }
  },
  methods: {
    modalFormOk() {

    },
    getQueryParams() {
      this.param.pageNo = this.ipagination.current
      this.param.pageSize = this.ipagination.pageSize
      return filterObj(this.param)
    },
    add() {
      let receiver = store.getters.userInfo.id
      let receiveTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
      this.edit({ receiver: receiver, receiveTime: receiveTime })
    },
    edit(record) {
      record.receiver = store.getters.userInfo.id
      record.receiveTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
      this.form.resetFields()
      this.model = Object.assign({}, record)
      this.visible = true
      this.disableSubmit = false
      if (record.id) {
        this.orderId = record.id
        this.detailList(this.orderId)
      }
   },
   methods: {
      modalFormOk() {

      },
      getQueryParams() {
         this.param.pageNo = this.ipagination.current
         this.param.pageSize = this.ipagination.pageSize
         return filterObj(this.param)
      },
      add() {
         let receiver = store.getters.userInfo.id
         let receiveTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         this.edit({ receiver: receiver, receiveTime: receiveTime })
      },
      edit(record) {
         record.receiver = store.getters.userInfo.id
         record.receiveTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         this.form.resetFields()
         this.model = Object.assign({}, record)
         this.visible = true
         this.disableSubmit = false
         if (record.id) {
            this.orderId = record.id
            this.detailList(this.orderId)
         }
         this.$nextTick(() => {
            this.form.setFieldsValue(
               pick(this.model, 'receiver', 'receiveTime', 'receiveComment', 'confirmer', 'confirmTime', 'confirmComment'
                  , 'returnFlag', 'returnTime', 'returnComment', 'returnConfirmer', 'returnConfirmTime', 'returnConfirmComment')
            )
         })
      },
      handleDelete(record, index) {
         this.dataSource.splice(index, 1)
      },
      handleChange(value, key, column, index) {
         //let t = (this.ipaginationm.current - 1) * this.ipaginationm.pageSize + index
         const temp = [...this.dataSource]
         const target = temp.filter((item) => key === item.key)[index]
         if (target) {
            target[column.dataIndex] = value
            this.dataSource = temp
         }
      },
      selectTooling: function() {
         let ids = []
         for (let i = 0; i < this.dataSource.length; i++) {
            ids.push(this.dataSource[i].inventoryId)
            console.log('当前数据源:', this.dataSource)
         }
         // this.$refs.toolingModalForm.showModal(ids)
         // this.$refs.toolingModalForm.title = '选择刀具'
         // this.$refs.toolingModalForm.disableSubmit = false

         this.$refs.inventoryModalForm.showModal(ids)
         this.$refs.inventoryModalForm.title = '选择库存刀具'
         this.$refs.inventoryModalForm.disableSubmit = false

      },
      detailList(orderId) {
         this.param.orderId = orderId
         getAction(this.url.detailList, this.getQueryParams()).then((res) => {
            if (res.success) {
               this.dataSource = res.result
            }
         })
      },
      filterOption(input, option) {
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
      },
      handleOk() {
         if (this.dataSource.length == 0) {
            this.$message.error('请先选择入库刀具')
            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

               // ç¡®ä¿ detailData åŒ…含 inventoryId
               formData.detailData = this.dataSource.map(item => ({
                  ...item,
                  // ç¡®ä¿ inventoryId è¢«æ­£ç¡®ä¼ é€’
                  inventoryId: item.inventoryId
               }))

               postAction(that.url.add, formData)
                  .then((res) => {
                     if (res.success) {
                        that.$message.success('领用成功')
                        that.$emit('ok', new Date())
                     } else {
                        that.$message.warning(res.message)
                     }
                  })
                  .finally(() => {
                     that.confirmLoading = false
                     that.close()
                  })
            }
         })
      },
      handleCancel() {
         this.close()
      },
      close() {
         this.$emit('close')
         this.dataSource = []
         this.visible = false
         this.disableSubmit = false
      }
   },
   mounted() {
      this.$bus.$on('selectionRows', (data) => {
         console.log('接收到的选择数据:', data)
         //getCurrSelected äº‹ä»¶ æŽ¥æ”¶ç»„件传递的参数
         for (let i = 0; i < data.length; i++) {
            this.dataSource.push({
               inventoryId: data[i].id,
               cuttingCode: data[i].cuttingCode,
               cuttingName: data[i].cuttingName,
               cuttingId: data[i].cuttingId
            })
         }
         console.log('更新后的数据源:', this.dataSource)
      this.$nextTick(() => {
        this.form.setFieldsValue(
          pick(this.model, 'receiver', 'receiveTime', 'receiveComment', 'confirmer', 'confirmTime', 'confirmComment'
            , 'returnFlag', 'returnTime', 'returnComment', 'returnConfirmer', 'returnConfirmTime', 'returnConfirmComment')
        )
      })
   }
    },
    handleDelete(record, index) {
      this.dataSource.splice(index, 1)
    },
    handleChange(value, key, column, index) {
      //let t = (this.ipaginationm.current - 1) * this.ipaginationm.pageSize + index
      const temp = [...this.dataSource]
      const target = temp.filter((item) => key === item.key)[index]
      if (target) {
        target[column.dataIndex] = value
        this.dataSource = temp
      }
    },
    selectTooling: function() {
      let ids = []
      for (let i = 0; i < this.dataSource.length; i++) {
        ids.push(this.dataSource[i].inventoryId)
        console.log('当前数据源:', this.dataSource)
      }
      // this.$refs.toolingModalForm.showModal(ids)
      // this.$refs.toolingModalForm.title = '选择刀具'
      // this.$refs.toolingModalForm.disableSubmit = false

      this.$refs.inventoryModalForm.showModal(ids)
      this.$refs.inventoryModalForm.title = '选择库存刀具'
      this.$refs.inventoryModalForm.disableSubmit = false

    },
    detailList(orderId) {
      this.param.orderId = orderId
      getAction(this.url.detailList, this.getQueryParams()).then((res) => {
        if (res.success) {
          this.dataSource = res.result
        }
      })
    },
    filterOption(input, option) {
      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
    },
    handleOk() {
      if (this.dataSource.length == 0) {
        this.$message.error('请先选择入库刀具')
        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

          // ç¡®ä¿ detailData åŒ…含 inventoryId
          formData.detailData = this.dataSource.map(item => ({
            ...item,
            // ç¡®ä¿ inventoryId è¢«æ­£ç¡®ä¼ é€’
            inventoryId: item.inventoryId
          }))

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

 src/views/cms/modules/CuttingScrapModal.vue

@@ -3,7 +3,7 @@
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row style="width: 100%">
           <a-col :span="24 / 2">
          <a-col :span="24 / 2">
            <a-form-item label="申请人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="disableSubmit"
@@ -26,12 +26,13 @@
        <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>
        <a-row style="width: 100%">
           <a-col :span="24 / 2">
          <a-col :span="24 / 2">
            <a-form-item label="确认人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="disableSubmit"
@@ -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"
@@ -75,13 +78,13 @@
    >
      <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
        <div :key="col.dataIndex">
         <a-input
                    :value="text"
                    :disabled="disableSubmit"
                    v-if="col.dataIndex == 'newCuttingId'"
                    @change="(e)=>handleChange(e.target.value, record.key, col, index)"
                  />
                 
          <a-input
            :value="text"
            :disabled="disableSubmit"
            v-if="col.dataIndex == 'newCuttingId'"
            @change="(e)=>handleChange(e.target.value, record.key, col, index)"
          />

        </div>
      </template>
      <span slot="action" slot-scope="text, record, index">
@@ -98,33 +101,35 @@
    <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>

<script>

  import pick from 'lodash.pick'
  import JSelectToolingModal from './JSelectToolingModal'
  import moment from 'moment'
  import { getAction, postAction, requestPut } from '@/api/manage'
  import JDictSelectTag from '@/components/dict/JDictSelectTag'
  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
  import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
  import { filterObj } from '@/utils/util'
  import store from '@/store/'
  export default {
    name: 'CuttingInboundModal',
    components: {
    JSelectToolingModal,
import pick from 'lodash.pick'
import JSelectToolingModal from './JSelectToolingModal'
import moment from 'moment'
import { getAction, postAction, requestPut } from '@/api/manage'
import JDictSelectTag from '@/components/dict/JDictSelectTag'
import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
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: {
    JSelectScrapModal,
    JMultiSelectTag,
    JDictSelectTag,
    store,
    moment,
    moment
  },
    data () {
      return {
         /* åˆ†é¡µå‚æ•° */
  data() {
    return {
      /* åˆ†é¡µå‚æ•° */
      ipagination: {
        current: 1,
        pageSize: 10,
@@ -134,27 +139,26 @@
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0,
        total: 0
      },
      title:'新增',
         visible: false,
         selectedRowKeys: {},
      title: '新增',
      visible: false,
      selectedRowKeys: {},
      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: '#',
@@ -162,47 +166,47 @@
          key: 'rowIndex',
          width: 50,
          align: 'center',
          customRender: function (t, r, index) {
          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
      }
    },
    methods: {
      modalFormOk(){
      orderId: '',
      disableSubmit: false
    }
  },
  methods: {
    modalFormOk() {

      },
       getQueryParams() {
    },
    getQueryParams() {
      this.param.pageNo = this.ipagination.current
      this.param.pageSize = this.ipagination.pageSize
      return filterObj(this.param)
    },
      add() {
    add() {
      let applicant = store.getters.userInfo.id
      let applicationTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
      this.edit({ applicant: applicant, applicationTime: applicationTime })
@@ -224,7 +228,7 @@
        )
      })
    },
     handleDelete(record, index) {
    handleDelete(record, index) {
      this.dataSource.splice(index, 1)
    },
    handleChange(value, key, column, index) {
@@ -236,14 +240,15 @@
        this.dataSource = temp
      }
    },
    selectTooling: function () {
    selectTooling: function() {
      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() {
    }
  },
  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>