Merge remote-tracking branch 'origin/master'

cuilei

2025-06-16 1b8b8bafca4fe4c3556bda5e66e3ff6252bd7acc

 src/views/tms/modules/outBound/OutboundModal.vue

@@ -51,7 +51,21 @@
        <div :key="col.dataIndex">
          <a-input-number
            v-if="col.dataIndex === 'outboundQuantity'"
            :disabled="record.quantity <= 1"
            :disabled="record.accuracyClass === '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.accuracyClass != '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.accuracyClass != '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
@@ -162,6 +176,18 @@
          align:"center",
          dataIndex: 'outboundLocation'
        },
        {
          title:'额定寿命',
          align:"center",
          dataIndex: 'ratedLife',
          scopedSlots: { customRender: 'ratedLife' },
        },
        {
          title:'使用寿命',
          align:"center",
          dataIndex: 'useLife',
          scopedSlots: { customRender: 'useLife' },
        },
        // {
        //   title:'出库状态;1.未出库；2.部分出库；3.出库完成',
        //   align:"center",
@@ -208,7 +234,8 @@
          outboundQuantity: data[i].quantity,
          storageLocation: data[i].warehouseId,
          warehouseName: data[i].warehouseName,
          outboundLocation: data[i].positionCode
          outboundLocation: data[i].positionCode,
          accuracyClass:data[i].accuracyClass
        })
      }
      this.ipagination.total = this.dataSource.length
@@ -302,7 +329,9 @@
              toolId: item.toolId,
              outboundQuantity: item.outboundQuantity,
              outStorehouseType: this.model.outStorehouseType,
              storageLocation: item.storageLocation
              storageLocation: item.storageLocation,
              ratedLife:item.ratedLife,
              useLife:item.useLife
            }
          })
          this.confirmLoading = true;