fix: 入库单位可选择

spring

7 天以前 5fffe75d01be84ad2de0b097f41428698384e218

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -28,8 +28,8 @@
         </div>
         <div>
            <el-button @click="handleOut">导出</el-button>
            <el-button type="danger" plain @click="handleDelete">删除</el-button>
            <el-button type="primary" plain @click="handlePrint">打印</el-button>
            <el-button type="danger" plain @click="handleDelete" v-if="hasDispatchCancel">删除</el-button>
            <!-- <el-button type="primary" plain @click="handlePrint">打印</el-button> -->
         </div>
      </div>
      <div class="table_list">
@@ -71,9 +71,29 @@
               prop="unit"
               show-overflow-tooltip
            />
            <el-table-column
            <!-- <el-table-column
               label="出库数量"
               prop="stockOutNum"
               show-overflow-tooltip
            /> -->
            <el-table-column
               label="车牌号"
               prop="licensePlateNo"
               show-overflow-tooltip
            />
            <el-table-column
               label="毛重"
               prop="grossWeight"
               show-overflow-tooltip
            />
            <el-table-column
               label="皮重"
               prop="tareWeight"
               show-overflow-tooltip
            />
            <el-table-column
               label="净重"
               prop="netWeight"
               show-overflow-tooltip
            />
            <el-table-column
@@ -88,7 +108,154 @@
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column
            label="过磅日期"
            prop="weighingDate"
            show-overflow-tooltip
        />
        <el-table-column
            label="过磅员"
            prop="weighingOperator"
            show-overflow-tooltip
        />
      <el-table-column label="操作"
                         width="260"
                         align="center">
          <template #default="scope">
            <el-button
              v-if="scope.row.recordType === '0' && hasDispatchEdit"
              type="primary"
              size="mini"
              @click="handleEdit(scope.row)"
            >编辑</el-button>
            <el-button
              v-if="scope.row.recordType === '0'"
              type="primary"
              size="mini"
              @click="handlePreview(scope.row)"
            >导出过磅单</el-button>
          </template>
      </el-table-column>
         </el-table>
      <el-dialog
        v-model="isShowEditModal"
        title="编辑出库"
        width="800"
        @close="closeEditModal"
      >
        <el-form label-width="140px" :model="editForm" label-position="top" ref="editFormRef">
          <!-- <el-form-item
            label="出库数量"
            prop="stockOutNum"
          >
            <el-input-number
              v-model="editForm.stockOutNum"
              :min="0"
              :step="1"
              :precision="0"
              controls-position="right"
              style="width: 100%"
              disabled
            />
          </el-form-item> -->

          

          <el-form-item
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
          >
            <el-input v-model="editForm.licensePlateNo" />
          </el-form-item>
          <el-form-item
            label="单位"
            prop="unit"
          >
            <el-select
              v-model="editForm.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
            </el-select>
          </el-form-item>
          <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
          >
            <el-input-number
              v-model="editForm.grossWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeightEdit"
            />
          </el-form-item>

          <el-form-item
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
            <el-input-number
              v-model="editForm.tareWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeightEdit"
            />
          </el-form-item>

          <el-form-item
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
          >
            <el-input-number
              v-model="editForm.netWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              disabled
            />
          </el-form-item>

          <el-form-item
            label="过磅日期"
            prop="weighingDate"
            :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
          >
            <el-date-picker
              style="width: 100%"
              v-model="editForm.weighingDate"
              value-format="YYYY-MM-DD HH:mm:ss"
              format="YYYY-MM-DD HH:mm:ss"
              type="datetime"
              placeholder="请选择过磅日期"
              clearable
            />
          </el-form-item>

          <el-form-item
            label="过磅员"
            prop="weighingOperator"
            :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
          >
            <el-input v-model="editForm.weighingOperator" />
          </el-form-item>
        </el-form>

        <template #footer>
          <div class="dialog-footer">
            <el-button type="primary" @click="handleEditSubmit">确认</el-button>
            <el-button @click="closeEditModal">取消</el-button>
          </div>
        </template>
      </el-dialog>
         <pagination
            v-show="total > 0"
            :total="total"
@@ -103,18 +270,18 @@

<script setup>
import pagination from "@/components/PIMTable/Pagination.vue";
import { ref } from "vue";
import { ref, computed } from "vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { getCurrentDate } from "@/utils/index.js";
import { checkPermi } from "@/utils/permission.js";
import {
   getStockOutPage,
   delStockOut,
  editStockOut,
} from "@/api/inventoryManagement/stockOut.js";
import {
  findAllQualifiedStockRecordTypeOptions,
  findAllStockRecordTypeOptions,
  findAllUnqualifiedStockRecordTypeOptions
  findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions,
} from "@/api/basicData/enum.js";

const userStore = useUserStore();
@@ -137,6 +304,9 @@
    default: '0'
  }
})

const hasDispatchEdit = computed(() => checkPermi(['dispatch_edit']));
const hasDispatchCancel = computed(() => checkPermi(['dispatch_cancel']));

// 打印相关
const printPreviewVisible = ref(false);
@@ -186,13 +356,13 @@
// 获取来源类型选项
const fetchStockRecordTypeOptions = () => {
  if (props.type === '0') {
    findAllQualifiedStockRecordTypeOptions()
    findAllQualifiedStockOutRecordTypeOptions()
        .then(res => {
          stockRecordTypeOptions.value = res.data;
        })
    return
  }
  findAllUnqualifiedStockRecordTypeOptions()
  findAllUnQualifiedStockOutRecordTypeOptions()
      .then(res => {
        stockRecordTypeOptions.value = res.data;
      })
@@ -206,6 +376,53 @@
};
const expandedRowKeys = ref([]);

// 导出过磅单
const handlePreview = (row) => {
  proxy.$download.name(row.weighbridgeDocPath);
}

// 编辑出库
const isShowEditModal = ref(false);
const editFormRef = ref(null);
const editForm = ref({});

// 毛重 - 皮重 计算净重（保留两位小数，且不为负）
const computeNetWeightEdit = () => {
  const gross = Number(editForm.value?.grossWeight ?? NaN);
  const tare = Number(editForm.value?.tareWeight ?? NaN);
  if (Number.isFinite(gross) && Number.isFinite(tare)) {
    const net = gross - tare;
    const safeNet = Number(net.toFixed(2));
    editForm.value.netWeight = safeNet > 0 ? safeNet : 0;
  } else {
    editForm.value.netWeight = undefined;
  }
};

const handleEdit = (row) => {
  editForm.value = { ...row };
  computeNetWeightEdit();
  isShowEditModal.value = true;
};

const closeEditModal = () => {
  isShowEditModal.value = false;
  editForm.value = {};
  editFormRef.value?.clearValidate?.();
};

const handleEditSubmit = () => {
  editFormRef.value?.validate?.((valid) => {
    if (!valid) return;
    const { stockOutNum, ...payload } = editForm.value || {};
    editStockOut(payload).then(() => {
      closeEditModal();
      proxy.$modal.msgSuccess("编辑成功");
      getList();
    });
  });
};

// 导出
const handleOut = () => {
   ElMessageBox.confirm("是否确认导出？", "导出", {