Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-03 e27722cc75b3090ed3eca54fc5651fa636b40453

 src/views/tms/modules/inboundOrder/InboundOrderModel.vue

@@ -109,9 +109,9 @@
        </a-row>
      </a-form>
    </a-spin>
    <a-button type="primary" :style="{ marginBottom: '8px' }" @click="selectTooling()" 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="selectTooling()" 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
@@ -235,7 +235,7 @@
      barcodeCurrentType: false,
      inboundOrderId:'',
      validatorRules: {
        type: {
        inStorehouseType: {
          rules: [
            {
              required: true,
@@ -243,19 +243,19 @@
            },
          ],
        },
        inboundDate: {
        inboundTime: {
          rules: [
            {
              required: true,
              message: '请选择申请入库日期!',
              message: '请选择申请入库时间!',
            },
          ],
        },
        applicant: {
        applicationReason: {
          rules: [
            {
              required: true,
              message: '请选择申请人!',
              message: '请填写申请原因!',
            },
          ],
        },
@@ -263,11 +263,9 @@
      url: {
        add: '/tms/inboundOrder/add',
        edit: '/tms/inboundOrder/edit',
        queryByUserName: '/sys/user/queryByUserName',
        toolingList:'/tms/baseTools/list',
        queryAccountList:'/tms/baseTools/list',
        querySharpenList:'/tms/baseTools/list',
        queryReturnList:'/tms/baseTools/list',
        querySharpenList:'/tms/toolLedgerDetail/list',
        queryReturnList:'/tms/toolLedgerDetail/list',
        detailList:'/tms/inboundDetail/list',
      },
      toolingOptions:[],
@@ -556,15 +554,12 @@
      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,
          chineseName: data[i].chineseName || data[i].toolName,
          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
          onlyCode:data[i].toolNum,
          inStorageQuantity:data[i].storageQuantity || data[i].quantity
        })
      }
      //this.ipaginationm.total = this.dataSource.length