feat(cms): 选择刀具库存替代刀具信息

lixiangyu

2 天以前 9aa6fe72192ec6b5160a127070002fde1765115b

 src/views/cms/modules/CuttingReceiveModal.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="['receiveComment', validatorRules.receiveComment]" />
              <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-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-row style="width: 100%">
           <a-col :span="24 / 2">
        <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-input :disabled="disableSubmit" placeholder="请输入是否会归还"
                       v-decorator="['returnFlag', validatorRules.returnFlag]"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="24 / 2">
@@ -77,12 +80,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="['returnComment', validatorRules.returnComment]" />
              <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-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-item label="归还确认人" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-search-select-tag
                :disabled="disableSubmit"
@@ -102,18 +106,17 @@
            </a-form-item>
          </a-col>
        </a-row>
         <a-row style="width: 100%">
        <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-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-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()">选择刀具</a-button>
    <a-table
      ref="table"
      bordered
@@ -124,16 +127,16 @@
      :pagination="ipagination"
      :loading="loading"
    >
      <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
      <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'"
          <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"
@@ -154,33 +157,37 @@
    <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-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>

  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: {
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 JSelectInventoryModal from '@views/cms/modules/JSelectInventoryModal.vue'

export default {
  name: 'CuttingInboundModal',
  components: {
    JSelectToolingModal,
    JSelectInventoryModal,
    JMultiSelectTag,
    JDictSelectTag,
    store,
    moment,
    moment
  },
    data () {
      return {
         /* 分页参数 */
  data() {
    return {
      /* 分页参数 */
      ipagination: {
        current: 1,
        pageSize: 10,
@@ -190,27 +197,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: '#',
@@ -218,59 +224,58 @@
          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: '工件材质',
          align: 'center',
          dataIndex: 'workpieceMaterial',
          scopedSlots: { customRender: 'workpieceMaterial' },

          scopedSlots: { customRender: 'workpieceMaterial' }
        },
        {
          title: '使用寿命',
          align: 'center',
          dataIndex: 'usedLife',
          scopedSlots: { customRender: 'usedLife' },
          scopedSlots: { customRender: 'usedLife' }
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' },
        },
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        add: '/cms/cuttingReceive/add',
        detailList: '/cms/cuttingReceive/detailList',
        detailList: '/cms/cuttingReceive/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 receiver = store.getters.userInfo.id
      let receiveTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
      this.edit({ receiver: receiver, receiveTime: receiveTime })
@@ -293,7 +298,7 @@
        )
      })
    },
     handleDelete(record, index) {
    handleDelete(record, index) {
      this.dataSource.splice(index, 1)
    },
    handleChange(value, key, column, index) {
@@ -305,14 +310,20 @@
        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)
        console.log('当前数据源:', this.dataSource)
      }
      this.$refs.toolingModalForm.showModal(ids)
      this.$refs.toolingModalForm.title = '选择刀具'
      this.$refs.toolingModalForm.disableSubmit = false
      // 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
@@ -337,19 +348,30 @@
          that.confirmLoading = true
          let formData = Object.assign(this.model, values)
          formData.detailData = this.dataSource
          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()
            })

          // 添加更新库存状态的逻辑
          const inventoryIds = this.dataSource.map(item => item.inventoryId)
          const updateInventoryStatus = inventoryIds.length > 0 ?
            //需要写一个更新库存状态的接口在后端（还没写25/9/9）
            postAction('/cms/inventory/updateStatus', {
              ids: inventoryIds,
              status: '待出库' //设为待出库
            }) : Promise.resolve()
          updateInventoryStatus.then(() => {
            return postAction(that.url.add, formData)
          }).then((res) => {
                if (res.success) {
                  that.$message.success('领用成功')
                  that.$emit('ok', new Date())
                } else {
                  that.$message.warning(res.message)
                }
              }).catch((error) => {
                that.$message.error('操作失败: ' + error.message)
              }).finally(() => {
                that.confirmLoading = false
                that.close()
              })
        }
      })
    },
@@ -361,19 +383,22 @@
      this.dataSource = []
      this.visible = false
      this.disableSubmit = false
    },
    },
    mounted() {
    }
  },
  mounted() {
    this.$bus.$on('selectionRows', (data) => {
      console.log('接收到的选择数据:', data)
      //getCurrSelected 事件 接收组件传递的参数
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          cuttingId: data[i].id,
          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>