spring
16 小时以前 a1131357b9e38c86e734816bae42d2fafcd48222
fix: 客户3.22提出的修改需求
已修改13个文件
459 ■■■■ 文件已修改
src/pages/consumablesLogistics/dispatchLog/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/consumablesLogistics/dispatchLog/view.vue 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/consumablesLogistics/receiptManagement/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/consumablesLogistics/receiptManagement/view.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/consumablesLogistics/stockManagement/add.vue 113 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/consumablesLogistics/stockManagement/subtract.vue 86 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inventoryManagement/dispatchLog/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inventoryManagement/dispatchLog/view.vue 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inventoryManagement/receiptManagement/components/formDiaManual.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inventoryManagement/receiptManagement/detail.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inventoryManagement/stockManagement/add.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/inventoryManagement/stockManagement/subtract.vue 113 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/qualityManagement/rawMaterial/form.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/pages/consumablesLogistics/dispatchLog/index.vue
@@ -29,13 +29,9 @@
              <view class="row"><text class="l">规格型号</text><text class="r">{{ item.model }}</text></view>
              <view class="row"><text class="l">单位</text><text class="r">{{ item.unit }}</text></view>
              <view class="row"><text class="l">出库数量</text><text class="r highlight">{{ item.stockOutNum }}</text></view>
              <!-- <view class="row"><text class="l">采购员</text><text class="r">{{ item.purchaser || '-' }}</text></view> -->
              <view class="row"><text class="l">出库人</text><text class="r">{{ item.createBy }}</text></view>
              <view class="row" v-if="item.recordType !== undefined"><text class="l">来源</text><text class="r">{{ getRecordType(item.recordType) || item.recordType }}</text></view>
              <view class="row"><text class="l">毛重(吨)</text><text class="r">{{ item.grossWeight ?? '-' }}</text></view>
              <view class="row"><text class="l">皮重(吨)</text><text class="r">{{ item.tareWeight ?? '-' }}</text></view>
              <view class="row"><text class="l">净重(吨)</text><text class="r">{{ item.netWeight ?? '-' }}</text></view>
              <view class="row"><text class="l">过磅日期</text><text class="r">{{ item.weighingDate || '-' }}</text></view>
              <view class="row"><text class="l">过磅员</text><text class="r">{{ item.weighingOperator || '-' }}</text></view>
            </view>
          </view>
          <view class="card-actions">
src/pages/consumablesLogistics/dispatchLog/view.vue
@@ -49,38 +49,6 @@
          </view>
        </view>
      </view>
      <view class="section-card">
        <view class="section-head">
          <view class="section-dot"></view>
          <text class="section-title">出库信息</text>
        </view>
        <view class="section-body">
          <view class="detail-row">
            <text class="label">车牌号</text>
            <text class="value">{{ detail.licensePlateNo || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">毛重(吨)</text>
            <text class="value">{{ detail.grossWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">皮重(吨)</text>
            <text class="value">{{ detail.tareWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">净重(吨)</text>
            <text class="value">{{ detail.netWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">过磅日期</text>
            <text class="value">{{ detail.weighingDate || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">过磅员</text>
            <text class="value">{{ detail.weighingOperator || '-' }}</text>
          </view>
        </view>
      </view>
    </view>
    <view v-else class="empty">
      <text class="empty-text">暂无详情数据</text>
@@ -111,12 +79,7 @@
    stockOutNum: d.stockOutNum,
    createBy: d.createBy,
    recordType: d.recordType,
    licensePlateNo: d.licensePlateNo,
    grossWeight: d.grossWeight,
    tareWeight: d.tareWeight,
    netWeight: d.netWeight,
    weighingDate: d.weighingDate,
    weighingOperator: d.weighingOperator,
    purchaser: d.purchaser,
  };
}
src/pages/consumablesLogistics/receiptManagement/index.vue
@@ -29,6 +29,7 @@
              <view class="row"><text class="l">规格型号</text><text class="r">{{ item.model }}</text></view>
              <view class="row"><text class="l">单位</text><text class="r">{{ item.unit }}</text></view>
              <view class="row"><text class="l">入库数量</text><text class="r highlight">{{ item.stockInNum }}</text></view>
              <view class="row"><text class="l">采购员</text><text class="r">{{ item.purchaser || '-' }}</text></view>
              <view class="row"><text class="l">入库人</text><text class="r">{{ item.createBy }}</text></view>
              <view class="row" v-if="item.recordType !== undefined"><text class="l">来源</text><text class="r">{{ getRecordType(item.recordType) || item.recordType }}</text></view>
            </view>
src/pages/consumablesLogistics/receiptManagement/view.vue
@@ -56,28 +56,8 @@
        </view>
        <view class="section-body">
          <view class="detail-row">
            <text class="label">车牌号</text>
            <text class="value">{{ detail.licensePlateNo || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">毛重(吨)</text>
            <text class="value">{{ detail.grossWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">皮重(吨)</text>
            <text class="value">{{ detail.tareWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">净重(吨)</text>
            <text class="value">{{ detail.netWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">过磅日期</text>
            <text class="value">{{ detail.weighingDate || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">过磅员</text>
            <text class="value">{{ detail.weighingOperator || '-' }}</text>
            <text class="label">采购员</text>
            <text class="value">{{ detail.purchaser || '-' }}</text>
          </view>
        </view>
      </view>
@@ -111,12 +91,7 @@
    stockInNum: d.stockInNum,
    createBy: d.createBy,
    recordType: d.recordType,
    licensePlateNo: d.licensePlateNo,
    grossWeight: d.grossWeight,
    tareWeight: d.tareWeight,
    netWeight: d.netWeight,
    weighingDate: d.weighingDate,
    weighingOperator: d.weighingOperator,
    purchaser: d.purchaser,
  };
}
src/pages/consumablesLogistics/stockManagement/add.vue
@@ -24,35 +24,14 @@
      </view>
      <view class="form-section">
        <view class="section-title">过磅信息</view>
        <view class="section-title">入库信息</view>
        <view class="form-row">
          <text class="form-label required">车牌号</text>
          <up-input v-model="form.licensePlateNo" placeholder="请输入车牌号" />
          <text class="form-label required">数量</text>
          <up-input v-model="form.qualitity" type="number" placeholder="请输入数量" />
        </view>
        <view class="form-row">
          <text class="form-label required">毛重(吨)</text>
          <up-input v-model="form.grossWeight" type="digit" placeholder="请输入毛重" />
        </view>
        <view class="form-row">
          <text class="form-label required">皮重(吨)</text>
          <up-input v-model="form.tareWeight" type="digit" placeholder="请输入皮重" />
        </view>
        <view class="form-row">
          <text class="form-label">净重(吨)</text>
          <up-input v-model="form.netWeight" type="digit" disabled placeholder="自动计算" />
        </view>
        <view class="form-row">
          <text class="form-label required">过磅日期</text>
          <view class="selector-trigger" @click="openWeighingDatePicker">
            <text class="selector-text" :class="{ placeholder: !form.weighingDate }">
              {{ form.weighingDate || "请选择过磅日期" }}
            </text>
            <up-icon name="calendar" size="16" color="#999"></up-icon>
          </view>
        </view>
        <view class="form-row">
          <text class="form-label required">过磅员</text>
          <up-input v-model="form.weighingOperator" placeholder="请输入过磅员" />
          <text class="form-label required">采购员</text>
          <up-input v-model="form.purchaser" placeholder="请输入采购员" />
        </view>
      </view>
@@ -96,22 +75,12 @@
      </view>
    </up-popup>
    <up-popup :show="showWeighingDatePicker" mode="bottom" @close="showWeighingDatePicker = false">
      <up-datetime-picker
        :show="true"
        v-model="weighingDateValue"
        mode="datetime"
        @confirm="onWeighingDateConfirm"
        @cancel="showWeighingDatePicker = false"
      />
    </up-popup>
  </view>
</template>
<script setup>
import { computed, reactive, ref, watch } from "vue";
import { computed, reactive, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import dayjs from "dayjs";
import PageHeader from "@/components/PageHeader.vue";
import { createConsumablesIn } from "@/api/consumablesLogistics/consumablesIn.js";
import { productModelList } from "@/api/basicData/productModel.js";
@@ -123,12 +92,8 @@
  productModelName: "",
  unit: "",
  productType: undefined,
  licensePlateNo: "",
  grossWeight: "",
  tareWeight: "",
  netWeight: "",
  weighingDate: "",
  weighingOperator: "",
  qualitity: "",
  purchaser: "",
  remark: "",
});
@@ -142,9 +107,6 @@
});
const productList = ref([]);
const productLoading = ref(false);
const showWeighingDatePicker = ref(false);
const weighingDateValue = ref(Date.now());
onLoad((options) => {
  type.value = "0";
@@ -184,60 +146,17 @@
  showProductPopup.value = false;
};
const computeNetWeight = () => {
  const gross = Number(form.grossWeight);
  const tare = Number(form.tareWeight);
  if (!isNaN(gross) && !isNaN(tare)) {
    const net = Number((gross - tare).toFixed(2));
    form.netWeight = net > 0 ? net : 0;
  } else {
    form.netWeight = "";
  }
};
watch(
  () => [form.grossWeight, form.tareWeight],
  () => {
    computeNetWeight();
  }
);
const openWeighingDatePicker = () => {
  weighingDateValue.value = form.weighingDate
    ? dayjs(form.weighingDate, "YYYY-MM-DD HH:mm:ss").valueOf()
    : Date.now();
  showWeighingDatePicker.value = true;
};
const onWeighingDateConfirm = (e) => {
  const ts = e?.value ?? weighingDateValue.value;
  form.weighingDate = dayjs(ts).format("YYYY-MM-DD HH:mm:ss");
  showWeighingDatePicker.value = false;
};
const handleSubmit = () => {
  if (!form.productName || !form.productModelId) {
    uni.showToast({ title: "请选择产品", icon: "none" });
    return;
  }
  if (!form.licensePlateNo) {
    uni.showToast({ title: "请输入车牌号", icon: "none" });
  if (!form.qualitity || Number(form.qualitity) <= 0) {
    uni.showToast({ title: "请输入数量", icon: "none" });
    return;
  }
  if (!form.grossWeight || Number(form.grossWeight) <= 0) {
    uni.showToast({ title: "请输入毛重", icon: "none" });
    return;
  }
  if (!form.tareWeight || Number(form.tareWeight) <= 0) {
    uni.showToast({ title: "请输入皮重", icon: "none" });
    return;
  }
  if (!form.weighingDate) {
    uni.showToast({ title: "请选择过磅日期", icon: "none" });
    return;
  }
  if (!form.weighingOperator) {
    uni.showToast({ title: "请输入过磅员", icon: "none" });
  if (!form.purchaser) {
    uni.showToast({ title: "请输入采购员", icon: "none" });
    return;
  }
  const payload = {
@@ -247,12 +166,8 @@
    productModelName: form.productModelName,
    unit: form.unit,
    productType: form.productType,
    licensePlateNo: form.licensePlateNo,
    grossWeight: form.grossWeight,
    tareWeight: form.tareWeight,
    netWeight: form.netWeight,
    weighingDate: form.weighingDate,
    weighingOperator: form.weighingOperator,
    qualitity: Number(form.qualitity),
    purchaser: form.purchaser,
    remark: form.remark,
  };
  createConsumablesIn(payload)
src/pages/consumablesLogistics/stockManagement/subtract.vue
@@ -26,35 +26,6 @@
          <up-input v-model="form.stockOutNum" type="number" :placeholder="'最大' + stockRecord.unLockedQuantity" />
        </view>
        <view class="form-row">
          <text class="form-label">车牌号</text>
          <up-input v-model="form.licensePlateNo" placeholder="请输入车牌号" />
        </view>
        <view class="form-row">
          <text class="form-label">毛重(吨)</text>
          <up-input v-model="form.grossWeight" type="digit" placeholder="请输入毛重" />
        </view>
        <view class="form-row">
          <text class="form-label">皮重(吨)</text>
          <up-input v-model="form.tareWeight" type="digit" placeholder="请输入皮重" />
        </view>
        <view class="form-row">
          <text class="form-label">净重(吨)</text>
          <up-input v-model="form.netWeight" type="digit" disabled placeholder="自动计算" />
        </view>
        <view class="form-row">
          <text class="form-label">过磅日期</text>
          <view class="selector-trigger" @click="openWeighingDatePicker">
            <text class="selector-text" :class="{ placeholder: !form.weighingDate }">
              {{ form.weighingDate || "请选择过磅日期" }}
            </text>
            <up-icon name="calendar" size="16" color="#999"></up-icon>
          </view>
        </view>
        <view class="form-row">
          <text class="form-label">过磅员</text>
          <up-input v-model="form.weighingOperator" placeholder="请输入过磅员" />
        </view>
        <view class="form-row">
          <text class="form-label">备注</text>
          <up-input v-model="form.remark" type="textarea" placeholder="选填" />
        </view>
@@ -64,23 +35,12 @@
    <view class="bottom-bar">
      <view class="btn-submit" @click="handleSubmit">提交</view>
    </view>
    <up-popup :show="showWeighingDatePicker" mode="bottom" @close="showWeighingDatePicker = false">
      <up-datetime-picker
        :show="true"
        v-model="weighingDateValue"
        mode="datetime"
        @confirm="onWeighingDateConfirm"
        @cancel="showWeighingDatePicker = false"
      />
    </up-popup>
  </view>
</template>
<script setup>
import { computed, reactive, ref, watch } from "vue";
import { computed, reactive, ref } from "vue";
import { onLoad } from "@dcloudio/uni-app";
import dayjs from "dayjs";
import PageHeader from "@/components/PageHeader.vue";
import { subtractConsumablesIn } from "@/api/consumablesLogistics/consumablesIn.js";
@@ -96,17 +56,8 @@
const form = reactive({
  stockOutNum: "",
  licensePlateNo: "",
  grossWeight: "",
  tareWeight: "",
  netWeight: "",
  weighingDate: "",
  weighingOperator: "",
  remark: "",
});
const showWeighingDatePicker = ref(false);
const weighingDateValue = ref(Date.now());
onLoad((options) => {
  type.value = "0";
@@ -126,35 +77,6 @@
  }
});
const computeNetWeight = () => {
  const gross = Number(form.grossWeight);
  const tare = Number(form.tareWeight);
  if (!isNaN(gross) && !isNaN(tare)) {
    const net = Number((gross - tare).toFixed(2));
    form.netWeight = net > 0 ? net : 0;
  } else {
    form.netWeight = "";
  }
};
watch(
  () => [form.grossWeight, form.tareWeight],
  () => computeNetWeight()
);
const openWeighingDatePicker = () => {
  weighingDateValue.value = form.weighingDate
    ? dayjs(form.weighingDate, "YYYY-MM-DD HH:mm:ss").valueOf()
    : Date.now();
  showWeighingDatePicker.value = true;
};
const onWeighingDateConfirm = (e) => {
  const ts = e?.value ?? weighingDateValue.value;
  form.weighingDate = dayjs(ts).format("YYYY-MM-DD HH:mm:ss");
  showWeighingDatePicker.value = false;
};
const handleSubmit = () => {
  const outNum = Number(form.stockOutNum);
  if (!outNum || outNum <= 0 || outNum > Number(stockRecord.unLockedQuantity)) {
@@ -164,12 +86,6 @@
  subtractConsumablesIn({
    id: stockRecord.id,
    stockOutNum: outNum,
    licensePlateNo: form.licensePlateNo,
    grossWeight: form.grossWeight,
    tareWeight: form.tareWeight,
    netWeight: form.netWeight,
    weighingDate: form.weighingDate,
    weighingOperator: form.weighingOperator,
    remark: form.remark,
  })
    .then(() => {
src/pages/inventoryManagement/dispatchLog/index.vue
@@ -41,13 +41,8 @@
              <view class="row"><text class="l">规格型号</text><text class="r">{{ item.model }}</text></view>
              <view class="row"><text class="l">单位</text><text class="r">{{ item.unit }}</text></view>
              <view class="row"><text class="l">出库数量</text><text class="r highlight">{{ item.stockOutNum }}</text></view>
              <view class="row"><text class="l">出库人</text><text class="r">{{ item.createBy }}</text></view>
              <view class="row"><text class="l">采购员</text><text class="r">{{ item.purchaser || item.createBy }}</text></view>
              <view class="row" v-if="item.recordType !== undefined"><text class="l">来源</text><text class="r">{{ getRecordType(item.recordType) || item.recordType }}</text></view>
              <view class="row"><text class="l">毛重(吨)</text><text class="r">{{ item.grossWeight ?? '-' }}</text></view>
              <view class="row"><text class="l">皮重(吨)</text><text class="r">{{ item.tareWeight ?? '-' }}</text></view>
              <view class="row"><text class="l">净重(吨)</text><text class="r">{{ item.netWeight ?? '-' }}</text></view>
              <view class="row"><text class="l">过磅日期</text><text class="r">{{ item.weighingDate || '-' }}</text></view>
              <view class="row"><text class="l">过磅员</text><text class="r">{{ item.weighingOperator || '-' }}</text></view>
            </view>
          </view>
          <view class="card-actions">
src/pages/inventoryManagement/dispatchLog/view.vue
@@ -41,45 +41,12 @@
            <text class="value value-num">{{ detail.stockOutNum ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">出库人</text>
            <text class="value">{{ detail.createBy || '-' }}</text>
            <text class="label">采购员</text>
            <text class="value">{{ detail.purchaser || detail.createBy || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">来源</text>
            <text class="value">{{ getRecordType(detail.recordType) || '-' }}</text>
          </view>
        </view>
      </view>
      <!-- 出库信息 -->
      <view class="section-card">
        <view class="section-head">
          <view class="section-dot"></view>
          <text class="section-title">出库信息</text>
        </view>
        <view class="section-body">
          <view class="detail-row">
            <text class="label">车牌号</text>
            <text class="value">{{ detail.licensePlateNo || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">毛重(吨)</text>
            <text class="value">{{ detail.grossWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">皮重(吨)</text>
            <text class="value">{{ detail.tareWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">净重(吨)</text>
            <text class="value">{{ detail.netWeight ?? '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">过磅日期</text>
            <text class="value">{{ detail.weighingDate || '-' }}</text>
          </view>
          <view class="detail-row">
            <text class="label">过磅员</text>
            <text class="value">{{ detail.weighingOperator || '-' }}</text>
          </view>
        </view>
      </view>
@@ -115,12 +82,7 @@
    stockOutNum: d.stockOutNum,
    createBy: d.createBy,
    recordType: d.recordType,
    licensePlateNo: d.licensePlateNo,
    grossWeight: d.grossWeight,
    tareWeight: d.tareWeight,
    netWeight: d.netWeight,
    weighingDate: d.weighingDate,
    weighingOperator: d.weighingOperator
    purchaser: d.purchaser
  }
}
src/pages/inventoryManagement/receiptManagement/components/formDiaManual.vue
@@ -1,4 +1,4 @@
<template>
<template>
  <up-popup :show="dialogFormVisible" mode="bottom" :round="10" closeable @close="closeDia">
    <view class="form-popup">
      <view class="popup-header">
@@ -160,7 +160,7 @@
    supplierName: form.value.supplierName || '',
    itemType: '',
    inboundNum: 0,
    inboundDate: '',
    inboundDate: getCurrentDate(),
    taxRate: null,
    taxInclusiveUnitPrice: 0,
    taxInclusiveTotalPrice: 0,
@@ -195,6 +195,8 @@
const openDatePicker = (index) => {
  currentEditIndex.value = index
  const currentDate = productList.value[index]?.inboundDate
  dateValue.value = currentDate ? new Date(currentDate).getTime() : Date.now()
  showDatePicker.value = true
}
src/pages/inventoryManagement/receiptManagement/detail.vue
@@ -56,10 +56,10 @@
            v-model="form.inboundDate"
            readonly
            placeholder="请选择入库日期"
            @click="showDatePicker = true"
            @click="openInboundDatePicker"
          />
          <template #right>
            <up-icon name="calendar" @click="showDatePicker = true"></up-icon>
            <up-icon name="calendar" @click="openInboundDatePicker"></up-icon>
          </template>
        </u-form-item>
      </view>
@@ -245,6 +245,11 @@
  showDatePicker.value = false
}
const openInboundDatePicker = () => {
  dateValue.value = form.value.inboundDate ? new Date(form.value.inboundDate).getTime() : Date.now()
  showDatePicker.value = true
}
// 计算含税总价
const calculateTotalPrice = () => {
  const num = parseFloat(form.value.inboundNum) || 0
src/pages/inventoryManagement/stockManagement/add.vue
@@ -163,7 +163,7 @@
  grossWeight: '',
  tareWeight: '',
  netWeight: '',
  weighingDate: '',
  weighingDate: dayjs().format('YYYY-MM-DD HH:mm:ss'),
  weighingOperator: '',
  qualitity: '',
  remark: ''
src/pages/inventoryManagement/stockManagement/subtract.vue
@@ -19,48 +19,10 @@
      </view>
      <view class="form-section">
        <view class="section-title">出库/过磅信息</view>
        <view class="section-title">出库信息</view>
        <view class="form-row">
          <text class="form-label">车牌号</text>
          <up-input v-model="form.licensePlateNo" placeholder="请输入车牌号" />
        </view>
        <view class="form-row">
          <text class="form-label">毛重(吨)</text>
          <up-input
            v-model="form.grossWeight"
            type="digit"
            placeholder="请输入毛重"
          />
        </view>
        <view class="form-row">
          <text class="form-label">皮重(吨)</text>
          <up-input
            v-model="form.tareWeight"
            type="digit"
            placeholder="请输入皮重"
          />
        </view>
        <view class="form-row">
          <text class="form-label">净重(吨)</text>
          <up-input
            v-model="form.netWeight"
            type="digit"
            disabled
            placeholder="自动计算"
          />
        </view>
        <view class="form-row">
          <text class="form-label">过磅日期</text>
          <view class="selector-trigger" @click="openWeighingDatePicker">
            <text class="selector-text" :class="{ placeholder: !form.weighingDate }">
              {{ form.weighingDate || '请选择过磅日期' }}
            </text>
            <up-icon name="calendar" size="16" color="#999"></up-icon>
          </view>
        </view>
        <view class="form-row">
          <text class="form-label">过磅员</text>
          <up-input v-model="form.weighingOperator" placeholder="请输入过磅员" />
          <text class="form-label">出库数量</text>
          <up-input v-model="form.stockOutNum" type="number" :placeholder="'最大' + (form.unLockedQuantity ?? 0)" />
        </view>
        <view class="form-row">
          <text class="form-label">备注</text>
@@ -72,24 +34,12 @@
    <view class="bottom-bar">
      <view class="btn-submit" @click="handleSubmit">出库</view>
    </view>
    <!-- 过磅日期选择器 -->
    <up-popup :show="showWeighingDatePicker" mode="bottom" @close="showWeighingDatePicker = false">
      <up-datetime-picker
        :show="true"
        v-model="weighingDateValue"
        mode="datetime"
        @confirm="onWeighingDateConfirm"
        @cancel="showWeighingDatePicker = false"
      />
    </up-popup>
  </view>
</template>
<script setup>
import { ref, reactive, watch, computed } from 'vue'
import { ref, reactive, computed } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import dayjs from 'dayjs'
import PageHeader from '@/components/PageHeader.vue'
import { subtractStockInventory } from '@/api/inventoryManagement/stockInventory.js'
@@ -113,19 +63,12 @@
  createTime: '',
  updateTime: '',
  version: undefined,
  // 出库/过磅信息
  licensePlateNo: '',
  grossWeight: '',
  tareWeight: '',
  netWeight: '',
  weighingDate: '',
  weighingOperator: '',
  // 出库信息
  stockOutNum: '',
  remark: ''
})
const type = ref('0') // 固定合格库存
const showWeighingDatePicker = ref(false)
const weighingDateValue = ref(Date.now())
onLoad((options) => {
  type.value = '0'
@@ -143,44 +86,22 @@
  }
})
// 净重 = 毛重 - 皮重
const computeNetWeight = () => {
  const gross = Number(form.grossWeight)
  const tare = Number(form.tareWeight)
  if (!isNaN(gross) && !isNaN(tare)) {
    const net = Number((gross - tare).toFixed(2))
    form.netWeight = net > 0 ? net : 0
  } else {
    form.netWeight = ''
  }
}
watch(
  () => [form.grossWeight, form.tareWeight],
  () => {
    computeNetWeight()
  }
)
const openWeighingDatePicker = () => {
  weighingDateValue.value = form.weighingDate
    ? dayjs(form.weighingDate, 'YYYY-MM-DD HH:mm:ss').valueOf()
    : Date.now()
  showWeighingDatePicker.value = true
}
const onWeighingDateConfirm = (e) => {
  const ts = e?.value ?? weighingDateValue.value
  form.weighingDate = dayjs(ts).format('YYYY-MM-DD HH:mm:ss')
  showWeighingDatePicker.value = false
}
const handleSubmit = () => {
  if (!form.id) {
    uni.showToast({ title: '记录信息缺失,无法出库', icon: 'none' })
    return
  }
  const payload = { ...form }
  const outNum = Number(form.stockOutNum)
  const max = Number(form.unLockedQuantity ?? 0)
  if (!outNum || outNum <= 0 || outNum > max) {
    uni.showToast({ title: `请输入 1~${max} 之间的数量`, icon: 'none' })
    return
  }
  const payload = {
    id: form.id,
    stockOutNum: outNum,
    remark: form.remark
  }
  subtractStockInventory(payload)
    .then(() => {
      uni.showToast({ title: '出库成功', icon: 'success' })
src/pages/qualityManagement/rawMaterial/form.vue
@@ -200,7 +200,7 @@
  checkType: '',
  checkResult: '',
  checkUserName: userStore?.nickName || '',
  checkTime: ''
  checkTime: dayjs().format('YYYY-MM-DD')
})
const inspectItems = ref([]) // qualityInspectItem