Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-03 e27722cc75b3090ed3eca54fc5651fa636b40453

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

@@ -34,19 +34,11 @@
            </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 placeholder="请输入入库数量"  :disabled="disableSubmit" v-decorator="['in_number', validatorRules.applicationReason]" />
            </a-form-item>
          </a-col>
        </a-row>
       
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借用出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借出工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" v-show="toolingShow && !disableSubmit">选择工具</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">选择刃磨出库单</a-button>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectSharpenList()" v-show="sharpenShow && !disableSubmit">选择刃磨工具</a-button>
    <a-table
      ref="table"
      bordered
@@ -170,7 +162,7 @@
      barcodeCurrentType: false,
      inboundOrderId:'',
      validatorRules: {
        type: {
        inStorehouseType: {
          rules: [
            {
              required: true,
@@ -178,7 +170,7 @@
            },
          ],
        },
        inboundDate: {
        inboundTime: {
          rules: [
            {
              required: true,
@@ -186,23 +178,12 @@
            },
          ],
        },
        applicant: {
          rules: [
            {
              required: true,
              message: '请选择申请人!',
            },
          ],
        },
      },
      url: {
        add: '/tms/inboundOrder/add',
        edit: '/tms/inboundOrder/edit',
        queryByUserName: '/sys/user/queryByUserName',
        addInStorage: '/tms/inboundOrder/addInStorage',
        toolingList:'/tms/baseTools/list',
        queryAccountList:'/tooling/storage/queryAccountList',
        querySharpenList:'/sharpen/sharpenDetail/querySharpenList',
        queryReturnList:'/returnInventory/queryReturnList',
        querySharpenList:'/tms/toolLedgerDetail/list',
        queryReturnList:'/tms/toolLedgerDetail/list',
        detailList:'/tms/inboundDetail/list',
      },
      toolingOptions:[],
@@ -325,13 +306,7 @@
          that.confirmLoading = true
          let formData = Object.assign(this.model, values)
          formData.detailData = this.dataSource
          let http = ''
          if(this.model.id){
            http = this.url.edit
          }else{
            http = this.url.add
          }
          postAction(http, formData)
          postAction(this.url.addInStorage, formData)
            .then((res) => {
              if (res.success) {
                that.$message.success(res.message)
@@ -491,14 +466,11 @@
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          toolCodeId:data[i].id,
          toolingId: data[i].toolingId || data[i].id,
          toolCode: data[i].toolCode,
          chineseName: data[i].chineseName,
          toolModel: data[i].toolModel,
          applicationType: data[i].applicationTypeName,
          unitName: data[i].unitName || data[i].unitId_dictText,
          onlyCode:data[i].onlyCode,
          noAccountQuantity:data[i].noAccountQuantity,
          inStorageQuantity:data[i].storageQuantity
        })
      }