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

cuijian

2 天以前 88a01935759943d38e1ab5d318ace12e3d948a60

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

@@ -47,7 +47,7 @@
          </a-col>
        </a-row>

        <a-row style="width: 100%">
        <!-- <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号" prop="locationCodeId">
              <a-select
@@ -57,7 +57,7 @@
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        </a-row> -->
      </a-form-model>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借出工具</a-button>
@@ -78,7 +78,7 @@
        <div :key="col.dataIndex">
          <a-input-number
            v-if="col.dataIndex == 'inStorageQuantity'"
            :disabled="record.accuracyClass == '1'"
            
            :value="text"
            @change="(e) => handleChange(e, record, col, index)"
            :min="1"
@@ -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,11 +104,13 @@
    <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">
        <p>{{ item.onlyCode }}</p>
        <p>{{ item.toolName }}</p>
        <img :src="item.base64" alt="QR Code">
        <p>{{ item.content }}</p>
      </div>
    </div>
  </a-modal>
@@ -116,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'
@@ -136,6 +141,7 @@
    JSelectReturnListModal,
    JSearchSelectTag,
    JSelectSharpenListModal,
    ChangeClassifyModal
  },
  data() {
    return {
@@ -248,10 +254,21 @@
          width: 150,
        },
        {
          title: '库位号',
          align: 'center',
          dataIndex: 'goodsShelvesId',
          width: 150,
        },
        {
          title: '入库数量',
          align: 'center',
          dataIndex: 'inStorageQuantity',
          scopedSlots: { customRender: 'inStorageQuantity' },
        },
        {
          title: '新工具编码',
          align: 'center',
          dataIndex: 'newToolCode',
        },
        {
          title: '操作',
@@ -341,12 +358,13 @@
              if (res.success) {
                if(this.model.inStorehouseType === '1'){
                  this.qrList = res.result.map((content, i) => ({
                  content:res.result[i].content,
                  onlyCode:res.result[i].onlyCode,
                  toolName:res.result[i].toolName,
                  base64: res.result[i].image
                  }));
                  this.handleBacthPrint();
                }else{
                   that.$message.success("保存成功")
                   that.$message.success("入库成功")
                }
                that.$emit('ok', new Date())
              } else {
@@ -452,6 +470,12 @@
          scanStyles: false
        });
      });
    },
    //刃磨后变更工具分类
    handleChangeClassify(record){
      this.$refs.changeClassifyModalForm.showModal(record.id)
      this.$refs.changeClassifyModalForm.title = '选择工具分类'
      this.$refs.changeClassifyModalForm.disableSubmit = false
    }
  },
  watch: {},
@@ -469,11 +493,27 @@
          onlyCode:data[i].onlyCode,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
          quantity:data[i].quantity,
          accuracyClass:data[i].accuracyClass
          accuracyClass:data[i].accuracyClass,
          goodsShelvesId:data[i].positionCode
        })
      }
      //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>