fix: 客户3.22提出的修改需求

spring

17 小时以前 a1131357b9e38c86e734816bae42d2fafcd48222

 src/pages/consumablesLogistics/stockManagement/subtract.vue

@@ -25,35 +25,6 @@
          <text class="form-label required">出库数量</text>
          <up-input v-model="form.stockOutNum" type="number" :placeholder="'最大' + stockRecord.unLockedQuantity" />
        </view>
        <view class="form-row" v-if="isQualified">
          <text class="form-label">车牌号</text>
          <up-input v-model="form.licensePlateNo" placeholder="请输入车牌号" />
        </view>
        <view class="form-row" v-if="isQualified">
          <text class="form-label">毛重(吨)</text>
          <up-input v-model="form.grossWeight" type="number" placeholder="请输入毛重" />
        </view>
        <view class="form-row" v-if="isQualified">
          <text class="form-label">皮重(吨)</text>
          <up-input v-model="form.tareWeight" type="number" placeholder="请输入皮重" />
        </view>
        <view class="form-row" v-if="isQualified">
          <text class="form-label">净重(吨)</text>
          <up-input v-model="form.netWeight" type="number" disabled placeholder="自动计算" />
        </view>
        <view class="form-row" v-if="isQualified">
          <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" v-if="isQualified">
          <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="选填" />
@@ -64,29 +35,17 @@
    <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";
import { subtractConsumablesUnInventory } from "@/api/consumablesLogistics/consumablesUninventory.js";

const type = ref("0");
const isQualified = computed(() => type.value === "0");
const isQualified = computed(() => true);

const stockRecord = reactive({
  id: "",
@@ -97,22 +56,11 @@

const form = reactive({
  stockOutNum: "",
  licensePlateNo: "",
  grossWeight: "",
  tareWeight: "",
  netWeight: "",
  weighingDate: "",
  weighingOperator: "",
  remark: "",
});

const showWeighingDatePicker = ref(false);
const weighingDateValue = ref(Date.now());

onLoad((options) => {
  if (options && options.type != null) {
    type.value = options.type;
  }
  type.value = "0";
  const cached = uni.getStorageSync("stockSubtractRecord");
  if (cached) {
    try {
@@ -129,51 +77,15 @@
  }
});

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)) {
    uni.showToast({ title: `请输入 1~${stockRecord.unLockedQuantity} 之间的数量`, icon: "none" });
    return;
  }
  const api = isQualified.value ? subtractConsumablesIn : subtractConsumablesUnInventory;
  api({
  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(() => {