Merge remote-tracking branch 'origin/master'

cuilei

2025-06-13 1e653db94c24389cc7615fd4a7ef1d63b00af534

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

@@ -46,6 +46,18 @@
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row style="width: 100%">
          <a-col :span="24 / 2">
            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="库位号" prop="locationCodeId">
              <a-select
                :triggerChange="true"
                :options="locationCodeOptions"
                v-model="model.locationCodeId"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectReturnList()" v-show="returnShow && !disableSubmit">选择借出工具</a-button>
@@ -174,6 +186,12 @@
              message: '请选择申请入库日期!',
            },
          ],
          locationCodeId:[
            {
              required: true,
              message: '请选择库位号!',
            },
          ]
      },
      url: {
        addInStorage: '/tms/inboundOrder/addInStorage',
@@ -233,12 +251,18 @@
          scopedSlots: { customRender: 'action' },
        },
      ],
      classifyId:''
      classifyId:'',
      locationCodeOptions:[]
    }
  },
  created() {
    //备份model原始值
    this.modelDefault = JSON.parse(JSON.stringify(this.model));
    ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
        if (res.success) {
          this.locationCodeOptions = res.result
        }
      })
  },
  methods: {
    modalFormOk() {
@@ -402,7 +426,7 @@
          toolModel: data[i].toolModel,
          applicationType: data[i].applicationTypeName,
          onlyCode:data[i].onlyCode,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity || 1,
          quantity:data[i].quantity,
          accuracyClass:data[i].accuracyClass
        })