Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventor...

zhangwencui

8 天以前 4ce344581a59622b17eab10e2b2f4cdc84cc9a69

Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro

 src/api/inventoryManagement/stockInventory.js

@@ -87,3 +87,11 @@
    });
};

export const getStockInventoryByModelId = (productModelId) => {
    return request({
        url: "/stockInventory/getByModelId",
        method: "get",
        params: { productModelId },
    });
};


 src/layout/index.vue

@@ -16,7 +16,7 @@
      <app-main />
      <settings ref="settingRef" />
    </div>
    <AIChatSidebar />
    <AIChatSidebar v-if="aiEnabled" />
  </div>
</template>

@@ -28,15 +28,18 @@
  import defaultSettings from "@/settings";

  import useAppStore from "@/store/modules/app";
  import useUserStore from "@/store/modules/user";
  import useSettingsStore from "@/store/modules/settings";

  const settingsStore = useSettingsStore();
  const userStore = useUserStore();
  const theme = computed(() => settingsStore.theme);
  const sideTheme = computed(() => settingsStore.sideTheme);
  const sidebar = computed(() => useAppStore().sidebar);
  const device = computed(() => useAppStore().device);
  const needTagsView = computed(() => settingsStore.tagsView);
  const fixedHeader = computed(() => settingsStore.fixedHeader);
  const aiEnabled = computed(() => Number(userStore.aiEnabled) === 1);

  const classObj = computed(() => ({
    hideSidebar: !sidebar.value.opened,

 src/store/modules/permission.js

@@ -4,6 +4,7 @@
import Layout from '@/layout/index'

import ParentView from '@/components/ParentView'

import InnerLink from '@/layout/components/InnerLink'

import useUserStore from '@/store/modules/user'


// 匹配views里面所有的.vue文件

const modules = import.meta.glob('./../../views/**/*.vue')

@@ -36,9 +37,11 @@
        return new Promise(resolve => {

          // 向后端请求路由数据

          getRouters().then(res => {

            const sdata = JSON.parse(JSON.stringify(res.data))

            const rdata = JSON.parse(JSON.stringify(res.data))

            const defaultData = JSON.parse(JSON.stringify(res.data))

            const aiEnabled = Number(useUserStore().aiEnabled) === 1
            const rawRoutes = filterAiFeatureRoutes(res.data, aiEnabled)
            const sdata = JSON.parse(JSON.stringify(rawRoutes))
            const rdata = JSON.parse(JSON.stringify(rawRoutes))
            const defaultData = JSON.parse(JSON.stringify(rawRoutes))
            const sidebarRoutes = filterAsyncRouter(sdata)

            const rewriteRoutes = filterAsyncRouter(rdata, false, true)

            const defaultRoutes = filterAsyncRouter(defaultData)

@@ -57,6 +60,37 @@
  })



// 遍历后台传来的路由字符串，转换为组件对象

function filterAiFeatureRoutes(routes = [], aiEnabled = false) {
  if (aiEnabled) {
    return routes
  }
  return routes.reduce((acc, route) => {
    if (!route || isAiFeatureRoute(route)) {
      return acc
    }
    const nextRoute = { ...route }
    if (Array.isArray(nextRoute.children) && nextRoute.children.length > 0) {
      nextRoute.children = filterAiFeatureRoutes(nextRoute.children, aiEnabled)
    }
    acc.push(nextRoute)
    return acc
  }, [])
}

function isAiFeatureRoute(route = {}) {
  const path = String(route.path || '').toLowerCase()
  const component = String(route.component || '').toLowerCase()
  const name = String(route.name || '').toLowerCase()
  const title = String(route?.meta?.title ?? route?.title ?? '')

  return (
    path.includes('chathome') ||
    component.includes('chathome') ||
    name.includes('chathome') ||
    title.includes('AI')
  )
}

function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {

  return asyncRouterMap.filter(route => {

    if (type && route.children) {


 src/store/modules/user.js

@@ -13,7 +13,8 @@
      name: '',

      avatar: '',

      roles: [],

      permissions: []

      permissions: [],
      aiEnabled: 0
    }),

    actions: {

      // 登录

@@ -63,6 +64,7 @@
            this.roleName = user.roles[0].roleName

            this.currentDeptId = user.tenantId

            this.currentLoginTime = this.getCurrentTime()

            this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
            resolve(res)

          }).catch(error => {

            reject(error)

@@ -76,6 +78,7 @@
            this.token = ''

            this.roles = []

            this.permissions = []

            this.aiEnabled = 0
            removeToken()

            resolve()

          }).catch(error => {


 src/views/customerService/feedbackRegistration/components/formDia.vue

@@ -212,6 +212,7 @@
    taxInclusiveUnitPrice: row?.taxInclusiveUnitPrice ?? 0,
    taxInclusiveTotalPrice: row?.taxInclusiveTotalPrice ?? 0,
    taxExclusiveTotalPrice: row?.taxExclusiveTotalPrice ?? 0,
    noQuantity: row?.noQuantity ?? 0,
  }
}


 src/views/equipmentManagement/ledger/Form.vue

@@ -100,22 +100,18 @@
      </el-col>
      <el-col :span="12">
        <el-form-item label="税率(%)" prop="taxRate">
          <!-- <el-input
            v-model="form.taxRate"
            placeholder="请输入税率"
            type="number"
          >
            <template #append> % </template>
          </el-input> -->
          <el-select
            v-model="form.taxRate"
            placeholder="请选择"
            clearable
            @change="mathNum"
          >
            <el-option label="1" :value="1" />
            <el-option label="6" :value="6" />
            <el-option label="13" :value="13" />
            <el-option
              v-for="dict in tax_rate"
              :key="dict.value"
              :label="dict.label"
              :value="Number(dict.value)"
            />
          </el-select>
        </el-form-item>
      </el-col>
@@ -174,7 +170,10 @@
  calculateTaxExclusiveTotalPrice,
} from "@/utils/summarizeTable";
import { ElMessage } from "element-plus";
import {ref} from "vue";
import {ref, getCurrentInstance} from "vue";

const { proxy } = getCurrentInstance();
const { tax_rate } = proxy.useDict("tax_rate");

defineOptions({
  name: "设备台账表单",

 src/views/financialManagement/payable/input-invoice.vue

@@ -104,11 +104,12 @@
          <el-col :span="8">
            <el-form-item label="税率" prop="taxRate">
              <el-select v-model="form.taxRate" placeholder="请选择税率" style="width: 100%;" @change="calculateTax">
                <el-option label="0%" :value="0" />
                <el-option label="3%" :value="3" />
                <el-option label="6%" :value="6" />
                <el-option label="9%" :value="9" />
                <el-option label="13%" :value="13" />
                <el-option
                  v-for="dict in tax_rate"
                  :key="dict.value"
                  :label="dict.label"
                  :value="Number(dict.value)"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -150,7 +151,7 @@
</template>

<script setup>
import { ref, reactive, onMounted } from "vue";
import { ref, reactive, onMounted, getCurrentInstance } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import FormDialog from "@/components/Dialog/FormDialog.vue";

@@ -158,6 +159,9 @@
  name: "进项发票",
});

const { proxy } = getCurrentInstance();
const { tax_rate } = proxy.useDict("tax_rate");

const filters = reactive({
  invoiceCode: "",
  invoiceNo: "",

 src/views/financialManagement/receivable/invoiceApply.vue

@@ -86,11 +86,12 @@
          <el-col :span="12">
            <el-form-item label="税率" prop="taxRate">
              <el-select v-model="form.taxRate" placeholder="请选择税率" style="width: 100%;">
                <el-option label="0%" :value="0" />
                <el-option label="3%" :value="3" />
                <el-option label="6%" :value="6" />
                <el-option label="9%" :value="9" />
                <el-option label="13%" :value="13" />
                <el-option
                  v-for="dict in tax_rate"
                  :key="dict.value"
                  :label="dict.label"
                  :value="Number(dict.value)"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -127,7 +128,7 @@
</template>

<script setup>
import { ref, reactive, onMounted } from "vue";
import { ref, reactive, onMounted, getCurrentInstance } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import FormDialog from "@/components/Dialog/FormDialog.vue";

@@ -135,6 +136,9 @@
  name: "开票申请",
});

const { proxy } = getCurrentInstance();
const { tax_rate } = proxy.useDict("tax_rate");

const filters = reactive({
  applyCode: "",
  customerId: "",

 src/views/financialManagement/receivable/outputInvoice.vue

@@ -98,11 +98,12 @@
          <el-col :span="12">
            <el-form-item label="税率" prop="taxRate">
              <el-select v-model="form.taxRate" placeholder="请选择税率" style="width: 100%;" @change="calculateTax">
                <el-option label="0%" :value="0" />
                <el-option label="3%" :value="3" />
                <el-option label="6%" :value="6" />
                <el-option label="9%" :value="9" />
                <el-option label="13%" :value="13" />
                <el-option
                  v-for="dict in tax_rate"
                  :key="dict.value"
                  :label="dict.label"
                  :value="Number(dict.value)"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -140,7 +141,7 @@
</template>

<script setup>
import { ref, reactive, onMounted, computed } from "vue";
import { ref, reactive, onMounted, computed, getCurrentInstance } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import FormDialog from "@/components/Dialog/FormDialog.vue";

@@ -148,6 +149,9 @@
  name: "销项发票",
});

const { proxy } = getCurrentInstance();
const { tax_rate } = proxy.useDict("tax_rate");

const filters = reactive({
  invoiceCode: "",
  invoiceNo: "",

 src/views/procurementManagement/procurementLedger/index.vue

@@ -526,12 +526,12 @@
                         placeholder="请选择"
                         clearable
                         @change="mathNum">
                <el-option label="1"
                           value="1"/>
                <el-option label="6"
                           value="6"/>
                <el-option label="13"
                           value="13"/>
                <el-option
                  v-for="dict in tax_rate"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -673,6 +673,7 @@
  const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));

const {proxy} = getCurrentInstance();
const { tax_rate } = proxy.useDict("tax_rate");
const tableData = ref([]);
const productData = ref([]);
const selectedRows = ref([]);

 src/views/projectManagement/Management/components/formDia.vue

@@ -571,9 +571,12 @@
        <el-col :span="12">
          <el-form-item label="税率(%)：" prop="taxRate">
            <el-select v-model="productForm.taxRate" placeholder="请选择" clearable @change="calculateFromTaxRate">
              <el-option label="1" value="1" />
              <el-option label="6" value="6" />
              <el-option label="13" value="13" />
              <el-option
                v-for="dict in tax_rate"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
@@ -650,7 +653,7 @@

const emit = defineEmits(['completed'])
const { proxy } = getCurrentInstance()
const { bill_status, project_management, plan_status } = proxy.useDict('bill_status', 'project_management', 'plan_status')
const { bill_status, project_management, plan_status, tax_rate } = proxy.useDict('bill_status', 'project_management', 'plan_status', 'tax_rate')

const dialogVisible = ref(false)
const operationType = ref('add')

 src/views/salesManagement/returnOrder/components/formDia.vue

@@ -405,7 +405,7 @@
  }).then(res => {
    if(res.code === 200){
      outboundOptions.value = res.data.map(item => ({
        label: item.salesContractNo, // Or whatever the outbound number field is
        label: item.shippingNo, // Or whatever the outbound number field is
        value: item.id,
      }))
    }

 src/views/salesManagement/salesLedger/index.vue

@@ -35,7 +35,8 @@
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
                     @click="handleQuery"> 搜索 </el-button>
                     @click="handleQuery"> 搜索
          </el-button>
        </el-form-item>
      </el-form>
    </div>
@@ -49,14 +50,17 @@
          </el-button>
          <el-button type="primary"
                     plain
                     @click="handleImport">导入</el-button>
                     @click="handleImport">导入
          </el-button>
          <el-button @click="handleOut">导出</el-button>
          <el-button type="danger"
                     plain
                     @click="handleDelete">删除</el-button>
                     @click="handleDelete">删除
          </el-button>
          <el-button type="primary"
                     plain
                     @click="handlePrint">打印</el-button>
                     @click="handlePrint">打印
          </el-button>
        </div>
      </div>
      <el-table :data="tableData"
@@ -96,12 +100,17 @@
                               width="100px"
                               align="center">
                <template #default="scope">
                  <el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
                          type="success">充足</el-tag>
                  <el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
                          type="success">已出库</el-tag>
                  <el-tag
                      v-if="scope.row.approveStatus === 1 && scope.row.noQuantity !== 0"
                      type="success">充足
                  </el-tag>
                  <el-tag
                      v-else-if="scope.row.approveStatus === 0 && scope.row.noQuantity === 0"
                      type="success">已出库
                  </el-tag>
                  <el-tag v-else
                          type="danger">不足</el-tag>
                          type="danger">不足
                  </el-tag>
                </template>
              </el-table-column>
              <el-table-column label="发货状态"
@@ -126,9 +135,11 @@
                <template #default="scope">
                  <div>
                    <el-tag type="success"
                            v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}</el-tag>
                            v-if="scope.row.shippingCarNumber">{{ scope.row.shippingCarNumber }}
                    </el-tag>
                    <el-tag v-else
                            type="info">-</el-tag>
                            type="info">-
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
@@ -139,12 +150,15 @@
                  <div>
                    <div v-if="scope.row.shippingDate">{{ scope.row.shippingDate }}</div>
                    <el-tag v-else
                            type="info">-</el-tag>
                            type="info">-
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
              <el-table-column label="数量"
                               prop="quantity" />
              <el-table-column label="待发货数量"
                               prop="noQuantity"/>
              <el-table-column label="税率(%)"
                               prop="taxRate" />
              <el-table-column label="含税单价(元)"
@@ -228,10 +242,12 @@
            <el-button link
                       type="primary"
                       @click="openForm('edit', scope.row)"
                       :disabled="!scope.row.isEdit || scope.row.hasProductionRecord || !canEditLedger(scope.row)">编辑</el-button>
                       :disabled="!scope.row.isEdit || scope.row.hasProductionRecord || !canEditLedger(scope.row)">编辑
            </el-button>
            <el-button link
                       type="primary"
                       @click="openFileDialog(scope.row)">附件</el-button>
                       @click="openFileDialog(scope.row)">附件
            </el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -395,11 +411,13 @@
                        prop="entryDate">
            <el-button v-if="operationType !== 'view'"
                       type="primary"
                       @click="openProductForm('add')">添加</el-button>
                       @click="openProductForm('add')">添加
            </el-button>
            <el-button v-if="operationType !== 'view'"
                       plain
                       type="danger"
                       @click="deleteProduct">删除</el-button>
                       @click="deleteProduct">删除
            </el-button>
          </el-form-item>
        </el-row>
        <el-table :data="productData"
@@ -454,7 +472,8 @@
                         type="primary"
                         size="small"
                         :disabled="isProductShipped(scope.row)"
                         @click="openProductForm('edit', scope.row,scope.$index)">编辑</el-button>
                         @click="openProductForm('edit', scope.row,scope.$index)">编辑
              </el-button>
            </template>
          </el-table-column>
        </el-table>
@@ -498,7 +517,8 @@
                  style="max-width: 260px;"
                  @change="fetchQuotationList" />
        <el-button type="primary"
                   @click="fetchQuotationList">搜索</el-button>
                   @click="fetchQuotationList">搜索
        </el-button>
        <el-button @click="resetQuotationSearch">重置</el-button>
      </div>
      <el-table :data="quotationList"
@@ -544,7 +564,8 @@
          <template #default="scope">
            <el-button type="primary"
                       link
                       @click="applyQuotation(scope.row)">选择</el-button>
                       @click="applyQuotation(scope.row)">选择
            </el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -619,12 +640,12 @@
                         placeholder="请选择"
                         clearable
                         @change="calculateFromTaxRate">
                <el-option label="1"
                           value="1" />
                <el-option label="6"
                           value="6" />
                <el-option label="13"
                           value="13" />
                <el-option
                  v-for="dict in tax_rate"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
@@ -733,14 +754,16 @@
            仅支持 xls/xlsx，大小不超过 10MB。
            <el-button link
                       type="primary"
                       @click="downloadTemplate">下载导入模板</el-button>
                       @click="downloadTemplate">下载导入模板
            </el-button>
          </div>
        </template>
      </el-upload>
    </FormDialog>
<!-- // todo 附件预览相关 -->
    <!-- 附件列表弹窗 -->
    <FileList v-if="fileDialogVisible"  v-model:visible="fileDialogVisible" record-type="sales_ledger" :record-id="recordId"  />
    <FileList v-if="fileDialogVisible" v-model:visible="fileDialogVisible" record-type="sales_ledger"
              :record-id="recordId"/>
    <!-- 打印预览弹窗 -->
    <el-dialog v-model="printPreviewVisible"
               title="打印预览"
@@ -750,7 +773,8 @@
      <div class="print-preview-container">
        <div class="print-preview-header">
          <el-button type="primary"
                     @click="executePrint">执行打印</el-button>
                     @click="executePrint">执行打印
          </el-button>
          <el-button @click="printPreviewVisible = false">关闭预览</el-button>
        </div>
        <div class="print-preview-content">
@@ -813,7 +837,8 @@
                    </tr>
                    <tr v-if="!item.products || item.products.length === 0">
                      <td colspan="6"
                          style="text-align: center; color: #999;">暂无产品数据</td>
                        style="text-align: center; color: #999;">暂无产品数据
                    </td>
                    </tr>
                  </tbody>
                  <tfoot>
@@ -884,11 +909,49 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="批号："
                          prop="batchNo">
              <el-table :data="deliveryForm.batchNoList"
                        border
                        size="small"
                        max-height="260"
                        style="width: 100%;">
                <el-table-column label="批号"
                                 prop="batchNo"
                                 min-width="180"/>
                <el-table-column label="数量"
                                 min-width="120"
                                 align="center">
                  <template #default="scope">
                    {{ getDeliveryBatchQuantity(scope.row) }}
                  </template>
                </el-table-column>
                <el-table-column label="发货数量"
                                 min-width="160"
                                 align="center">
                  <template #default="scope">
                    <el-input-number v-model="scope.row.deliveryQuantity"
                                     :min="0"
                                     :max="getDeliveryBatchDeliveryMax(scope.row)"
                                     :precision="2"
                                     :step="0.01"
                                     controls-position="right"
                                     @change="handleDeliveryBatchQuantityChange(scope.row)"
                                     style="width: 100%;"/>
                  </template>
                </el-table-column>
              </el-table>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
          <el-button type="primary"
                     @click="submitDelivery">确认发货</el-button>
                     @click="submitDelivery">确认发货
          </el-button>
          <el-button @click="closeDeliveryDia">取消</el-button>
        </div>
      </template>
@@ -918,6 +981,7 @@
    delLedgerFile,
    getProductInventory,
  } from "@/api/salesManagement/salesLedger.js";
import {getStockInventoryByModelId} from "@/api/inventoryManagement/stockInventory.js";
  import { modelList, productTreeList } from "@/api/basicData/product.js";
  import useFormData from "@/hooks/useFormData.js";
  import dayjs from "dayjs";
@@ -932,6 +996,7 @@
  const route = useRoute();
  const userStore = useUserStore();
  const { proxy } = getCurrentInstance();
const { tax_rate } = proxy.useDict("tax_rate");
  const tableData = ref([]);
  const productData = ref([]);
  const selectedRows = ref([]);
@@ -1047,6 +1112,65 @@
  // 发货相关
  const deliveryFormVisible = ref(false);
  const currentDeliveryRow = ref(null);
const getDeliveryBatchQuantity = item => {
  const quantity = item?.qualitity
      ?? item?.quantity
      ?? item?.unLockedQuantity
      ?? item?.qualifiedUnLockedQuantity
      ?? item?.qualifiedQuantity
      ?? item?.stockQuantity;
  return quantity ?? 0;
};
const getCurrentDeliveryRowQuantity = () => {
  return Number(currentDeliveryRow.value?.noQuantity || 0);
};
const getDeliveryBatchDeliveryMax = row => {
  const productQuantity = getCurrentDeliveryRowQuantity();
  const batchQuantity = Number(getDeliveryBatchQuantity(row) || 0);
  const otherBatchTotal = (deliveryForm.value.batchNoList || []).reduce(
      (sum, item) => {
        if (item?.id === row?.id) return sum;
        return sum + Number(item?.deliveryQuantity || 0);
      },
      0
  );
  const remainingProductQuantity = Math.max(
      0,
      productQuantity - otherBatchTotal
  );
  return Math.max(0, Math.min(batchQuantity, remainingProductQuantity));
};
const handleDeliveryBatchQuantityChange = row => {
  const max = getDeliveryBatchDeliveryMax(row);
  const currentValue = Number(row?.deliveryQuantity || 0);
  if (currentValue > max) {
    row.deliveryQuantity = max;
    proxy.$modal.msgWarning("发货数量不能超过这个产品的数量");
  }
};
const getSelectedDeliveryBatchRows = () => {
  return (deliveryForm.value.batchNoList || []).filter(
      item => Number(item?.deliveryQuantity || 0) > 0
  );
};
const getDeliveryBatchNoList = async productModelId => {
  if (!productModelId) return [];
  const res = await getStockInventoryByModelId(productModelId);
  const rawList = Array.isArray(res?.data)
      ? res.data
      : res?.data?.records || res?.data?.rows || [];
  const seenIds = new Set();
  return rawList.filter(item => {
    if (!item?.id || !item?.batchNo || seenIds.has(item.id)) {
      return false;
    }
    seenIds.add(item.id);
    return true;
  }).map(item => ({
    ...item,
    deliveryQuantity: 0,
  }));
};
  const deliveryFormData = reactive({
    deliveryForm: {
      type: "货车", // 货车, 快递
@@ -1251,6 +1375,7 @@
    }
    return null; // 没有找到节点，返回null
  };

  function convertIdToValue(data) {
    return data.map(item => {
      const { id, children, ...rest } = item;
@@ -1265,6 +1390,7 @@
      return newItem;
    });
  }

  // 根据名称反查产品大类 id，便于仅存名称时的反显
  function findNodeIdByLabel(nodes, label) {
    if (!label) return null;
@@ -1278,6 +1404,7 @@
    }
    return null;
  }

  // 表格选择数据
  const handleSelectionChange = selection => {
    // 过滤掉子数据
@@ -1502,9 +1629,11 @@

    quotationDialogVisible.value = false;
  };

  function changs(val) {
    console.log(val);
  }

  // 提交表单
  const submitForm = () => {
    proxy.$refs["formRef"].validate(valid => {
@@ -2359,9 +2488,9 @@
   */
  const getShippingStatusText = row => {
    // 如果已发货（有发货日期或车牌号），显示"已发货"
    if (row.shippingDate || row.shippingCarNumber) {
      return "已发货";
    }
  // if (row.shippingDate || row.shippingCarNumber) {
  //   return "已发货";
  // }

    // 获取发货状态字段
    const status = row.shippingStatus;
@@ -2390,7 +2519,7 @@
   */
  const getShippingStatusType = row => {
    // 如果已发货（有发货日期或车牌号），显示绿色
    if (row.shippingDate || row.shippingCarNumber) {
  if (row.shippingStatus === "已发货") {
      return "success";
    }

@@ -2430,7 +2559,7 @@
    const shippingStatus = row.shippingStatus;

    // 如果已发货（有发货日期或车牌号），不能再次发货
    if (row.shippingDate || row.shippingCarNumber) {
  if (shippingStatus === "已发货") {
      return false;
    }

@@ -2450,7 +2579,7 @@
  }

  // 打开发货弹框
  const openDeliveryForm = row => {
const openDeliveryForm = async row => {
    // 检查是否可以发货
    if (!canShip(row)) {
      proxy.$modal.msgWarning(
@@ -2460,8 +2589,13 @@
    }

    currentDeliveryRow.value = row;
  const batchNoList = await getDeliveryBatchNoList(
      row.productModelId || row.modelId
  );
    deliveryForm.value = {
      type: "货车",
    batchNo: [],
    batchNoList,
    };
    deliveryFormVisible.value = true;
  };
@@ -2470,13 +2604,36 @@
  const submitDelivery = () => {
    proxy.$refs["deliveryFormRef"].validate(valid => {
      if (valid) {
      const selectedBatchRows = getSelectedDeliveryBatchRows();
      if (selectedBatchRows.length === 0) {
        proxy.$modal.msgWarning("请至少填写一个批号的发货数量");
        return;
      }
      const totalDeliveryQuantity = selectedBatchRows.reduce(
          (sum, item) => sum + Number(item.deliveryQuantity || 0),
          0
      );
      const currentRowQuantity = Number(currentDeliveryRow.value?.quantity || 0);
      if (currentRowQuantity > 0 && totalDeliveryQuantity > currentRowQuantity) {
        proxy.$modal.msgWarning("批号发货总数不能超过当前产品数量");
        return;
      }
        // 保存当前展开的行ID，以便发货后重新加载子表格数据
        const currentExpandedKeys = [...expandedRowKeys.value];
        const salesLedgerId = currentDeliveryRow.value.salesLedgerId;
      deliveryForm.value.batchNo = selectedBatchRows.map(item => item.id);
      const productModelId = currentDeliveryRow.value.productModelId || currentDeliveryRow.value.modelId;
        addShippingInfo({
          salesLedgerId: salesLedgerId,
          salesLedgerProductId: currentDeliveryRow.value.id,
          type: deliveryForm.value.type,
        batchNo: deliveryForm.value.batchNo,
        batchNoDetailList: selectedBatchRows.map(item => ({
          stockInventoryId: item.id,
          batchNo: item.batchNo,
          quantity: Number(item.deliveryQuantity || 0),
          productModelId: productModelId,
        })),
        }).then(() => {
          proxy.$modal.msgSuccess("发货成功");
          closeDeliveryDia();
@@ -2559,6 +2716,7 @@
    justify-content: space-between;
    margin-bottom: 10px;
  }

  .print-preview-dialog {
    .el-dialog__body {
      padding: 0;