刀具刃磨功能，增加刃磨后刀具信息变更

cuijian

昨天 88a01935759943d38e1ab5d318ace12e3d948a60

刀具刃磨功能，增加刃磨后刀具信息变更

 src/views/tms/modules/inbound/ChangeClassifyModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,257 @@
<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.toolCode"></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.groupCompanySign"></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.shortCalled"></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="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
        :loading="loading"
        @change="handleTableChange"
      >
      </a-table>
    </a-card>
  </j-modal>
</template>

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

export default {
  name: 'ChangeClassifyModal',
  mixins: [JeecgListMixin],
  components: {},
  props: {
    classifyId:{
        type:String
      }
  },
  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: 'toolCode',
        },
        {
          title: '工具名称',
          align: 'center',
          dataIndex: 'chineseName',
        },
        {
          title: '工具简称',
          align: 'center',
          dataIndex: 'shortCalled',
        },
        {
          title: '标记',
          align: 'center',
          dataIndex: 'groupCompanySign',
        },
        {
          title: '库位号',
          align: 'center',
          dataIndex: 'positionCode',
        },
        {
          title: '型号/图号',
          align: 'center',
          dataIndex: 'toolModel',
        },
        {
          title: '工具类型',
          align: 'center',
          dataIndex: 'applicationTypeName',
        },
      ],
      selectedRowKeys: [],
      oldSlelectRows: [],
      scrollTrigger: {},
      dataSource: [],
      selectionRows: [],
      allSelectionRows: [],
      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: 'toolCode',
        order: 'desc',
      },
      departTree: [],
      visible: false,
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/tms/baseTools/paraCommonToolList',
      },
      oldId:''
    }
  },
  computed: {
    
  },
  watch: {},
  created() {},
  methods: {
    
    
    showModal(oldId) {
      this.oldId = oldId
      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
    },
    async loadData(arg) {
      if (arg === 1) {
        this.ipagination.current = 1
      }
      let that = this
      this.loading = true
      let params = this.getQueryParams() //查询条件
      params.classifyId = this.classifyId
      await getAction(this.url.list, params).then((res) => {
        if (res.success) {
          this.dataSource = res.result.records
          this.ipagination.total = res.result.total
        }
        if (res.code === 510) {
          this.$message.warning(res.message)
        }
        this.loading = false
      })
    },
    searchReset(num) {
      let that = this
      if (num !== 0) {
        that.loadData(1)
      }
      that.selectborrowIds = []
    },
    onSelectChange(selectedRowKeys, selectionRows) {
      this.selectedRowKeys = selectedRowKeys;
      this.selectionRows = selectionRows;
      this.selectionRows[0].oldId = this.oldId
    },
    close() {
      this.searchReset(0)
      this.selectedRowKeys = []
      this.visible = false
    },
    handleTableChange(pagination, filters, sorter) {
      //TODO ç­›é€‰
      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('selectionToolCode', this.selectionRows[0]);
      this.searchReset(0)
      this.close()
    },
    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>

 src/views/tms/modules/inbound/InboundModel.vue

@@ -86,6 +86,8 @@
        </div>
      </template>
      <span slot="action" slot-scope="text, record, index">
        <a @click="handleChangeClassify(record)" v-if="sharpenShow && !disableSubmit">变更工具分类</a>
        <a-divider type="vertical" v-if="sharpenShow && !disableSubmit"/>
        <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record, index)" :disabled="disableSubmit">
          <a>删除</a>
        </a-popconfirm>
@@ -102,6 +104,7 @@
    <j-select-tooling-modal ref="toolingModalForm" @ok="modalFormOk" :classifyId="classifyId"></j-select-tooling-modal>
    <j-select-return-list-modal ref="returnModalForm" @ok="modalFormOk" :classifyId="classifyId"></j-select-return-list-modal>
    <j-select-sharpen-list-modal ref="sharpenModalForm" @ok="modalFormOk" :classifyId="classifyId"></j-select-sharpen-list-modal>
    <change-classify-modal ref="changeClassifyModalForm" @ok="modalFormOk" :classifyId="classifyId"></change-classify-modal>
  
    <div id="printArea" style="display: block;">
      <div v-for="(item, index) in qrList" :key="index" class="qrcode-item">
@@ -117,6 +120,7 @@
<script>
import pick from 'lodash.pick'
import JSelectToolingModal from '.././inboundOrder/JSelectToolingModal'
import ChangeClassifyModal from './ChangeClassifyModal'
import { ajaxGetDictItems } from '@/api/api'
import moment from 'moment'
import { getAction, postAction, requestPut } from '@/api/manage'
@@ -137,6 +141,7 @@
    JSelectReturnListModal,
    JSearchSelectTag,
    JSelectSharpenListModal,
    ChangeClassifyModal
  },
  data() {
    return {
@@ -259,6 +264,11 @@
          align: 'center',
          dataIndex: 'inStorageQuantity',
          scopedSlots: { customRender: 'inStorageQuantity' },
        },
        {
          title: '新工具编码',
          align: 'center',
          dataIndex: 'newToolCode',
        },
        {
          title: '操作',
@@ -460,6 +470,12 @@
          scanStyles: false
        });
      });
    },
    //刃磨后变更工具分类
    handleChangeClassify(record){
      this.$refs.changeClassifyModalForm.showModal(record.id)
      this.$refs.changeClassifyModalForm.title = '选择工具分类'
      this.$refs.changeClassifyModalForm.disableSubmit = false
    }
  },
  watch: {},
@@ -483,6 +499,21 @@
      }
      //this.ipaginationm.total = this.dataSource.length
    })
    this.$bus.$on('selectionToolCode', (data) => {
      //getCurrSelected äº‹ä»¶ æŽ¥æ”¶ç»„件传递的参数
      for (let i = 0; i < this.dataSource.length; i++) {
        console.log("1111",this.dataSource.length,data,this.dataSource[i])
        if(this.dataSource[i].id == data.oldId){
          this.dataSource[i].newToolCode = data.toolCode
          this.dataSource[i].newToolCodeId = data.toolCodeId
          this.dataSource[i].goodsShelvesId = data.positionCode
          this.$set(this.dataSource[i],'newToolClassify',data.toolCode)
        }
      }
      // å¼ºåˆ¶æ›´æ–°è§†å›¾
      this.$forceUpdate();
      //this.ipaginationm.total = this.dataSource.length
    })
  },
}
</script>

 src/views/tms/modules/outBound/OutboundListRight.vue

@@ -357,7 +357,7 @@
      onSelectChange(selectedRowKeys, selectionRows) {
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;
        const toolCode = this.selectionRows[0].toolCode
        const toolCode = this.selectionRows[0].toolCodeId
        //通过id查询管理参数和参数数据
        getAction(this.url.queryParaByToolCode, { toolCode: toolCode,paraTypeFlag:this.paraTypeFlag}).then((res) => {
          if (res.success) {

 src/views/tms/requirement/ToolSharpeningList .vue

@@ -142,6 +142,11 @@
          dataIndex: 'supplierId',
        },
        {
          title:'刃磨状态',
          align:"center",
          dataIndex: 'sharpeningStatus_dictText'
        },
        {
          title:'刃磨时间',
          align:"center",
          dataIndex: 'sharpeningTime'