新疆马铃薯 1.首页问题：挪新系统ui，需要确认一下页面数据完整。 2.协同办公：挪新系统 3.营销管理：客户往来取消回款金额字段，改为点击左侧客户时...

gaoluyang

16 小时以前 6a415a072a98d64d2f95d16eef73b6d7270b8d56

 src/views/procurementManagement/procurementLedger/index.vue

@@ -66,9 +66,9 @@
    </div>
    <div class="table_list">
      <div style="display: flex;justify-content: flex-end;margin-bottom: 20px;">
        <el-button type="success"
                   plain
                   @click="handleBatchGenerate">批量生成数据</el-button>
<!--        <el-button type="success"-->
<!--                   plain-->
<!--                   @click="handleBatchGenerate">批量生成数据</el-button>-->
        <el-button type="primary"
                   @click="openForm('add')">新增台账</el-button>
        <el-button type="primary"
@@ -103,12 +103,33 @@
                               label="序号"
                               type="index"
                               width="60" />
              <el-table-column label="类型"
                               prop="productType"
                               width="100">
                <template #default="scope">
                  <el-tag :type="scope.row.productType === 2 ? 'warning' : 'success'" size="small">
                    {{ scope.row.productType === 2 ? '设备备件' : '产品' }}
                  </el-tag>
                </template>
              </el-table-column>
              <el-table-column label="产品大类"
                               prop="productCategory" />
              <el-table-column label="规格型号"
                               prop="specificationModel" />
                               prop="specificationModel"
                               width="120">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">/</span>
                  <span v-else>{{ scope.row.specificationModel || '--' }}</span>
                </template>
              </el-table-column>
              <el-table-column label="单位"
                               prop="unit" />
                               prop="unit"
                               width="100">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ scope.row.unit || '--' }}</span>
                </template>
              </el-table-column>
              <el-table-column label="入库审核状态"
                               prop="stockInApprovalStatus"
                               width="120">
@@ -120,22 +141,59 @@
                </template>
              </el-table-column>
              <el-table-column label="数量"
                               prop="quantity" />
                               prop="quantity"
                               width="100" />
              <el-table-column label="可用数量"
                               prop="availableQuality" />
                               prop="availableQuality"
                               width="100">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ scope.row.availableQuality }}</span>
                </template>
              </el-table-column>
              <el-table-column label="退货数量"
                               prop="returnQuality" />
                               prop="returnQuality"
                               width="100">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ scope.row.returnQuality }}</span>
                </template>
              </el-table-column>
              <el-table-column label="税率(%)"
                               prop="taxRate" />
                               prop="taxRate"
                               width="100">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ scope.row.taxRate }}</span>
                </template>
              </el-table-column>
              <el-table-column label="含税单价(元)"
                               prop="taxInclusiveUnitPrice"
                               :formatter="formattedNumber" />
                               :formatter="formattedNumber"
                               width="130">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</span>
                </template>
              </el-table-column>
              <el-table-column label="含税总价(元)"
                               prop="taxInclusiveTotalPrice"
                               :formatter="formattedNumber" />
                               :formatter="formattedNumber"
                               width="130">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveTotalPrice) }}</span>
                </template>
              </el-table-column>
              <el-table-column label="不含税总价(元)"
                               prop="taxExclusiveTotalPrice"
                               :formatter="formattedNumber" />
                               :formatter="formattedNumber"
                               width="140">
                <template #default="scope">
                  <span v-if="scope.row.productType === 2">--</span>
                  <span v-else>{{ formattedNumber(null, null, scope.row.taxExclusiveTotalPrice) }}</span>
                </template>
              </el-table-column>
            </el-table>
          </template>
        </el-table-column>
@@ -403,40 +461,86 @@
                           label="序号"
                           type="index"
                           width="60" />
          <el-table-column label="类型"
                           prop="productType"
                           width="100">
            <template #default="scope">
              <el-tag :type="scope.row.productType === 2 ? 'warning' : 'success'" size="small">
                {{ scope.row.productType === 2 ? '设备备件' : '产品' }}
              </el-tag>
            </template>
          </el-table-column>
          <el-table-column label="产品大类"
                           prop="productCategory" />
          <el-table-column label="规格型号"
                           prop="specificationModel" />
                           prop="specificationModel"
                           width="120">
            <template #default="scope">
              <span v-if="scope.row.productType === 2">/</span>
              <span v-else>{{ scope.row.specificationModel || '--' }}</span>
            </template>
          </el-table-column>
          <el-table-column label="单位"
                           prop="unit"
                           width="70" />
                           width="70">
            <template #default="scope">
              <span v-if="scope.row.productType === 2">--</span>
              <span v-else>{{ scope.row.unit || '--' }}</span>
            </template>
          </el-table-column>
          <el-table-column label="数量"
                           prop="quantity"
                           width="70" />
          <el-table-column label="库存预警数量"
                           prop="warnNum"
                           width="120"
                           show-overflow-tooltip />
                           show-overflow-tooltip>
            <template #default="scope">
              <span v-if="scope.row.productType === 2">--</span>
              <span v-else>{{ scope.row.warnNum }}</span>
            </template>
          </el-table-column>
          <el-table-column label="税率(%)"
                           prop="taxRate"
                           width="80" />
                           width="80">
            <template #default="scope">
              <span v-if="scope.row.productType === 2">--</span>
              <span v-else>{{ scope.row.taxRate }}</span>
            </template>
          </el-table-column>
          <el-table-column label="含税单价(元)"
                           prop="taxInclusiveUnitPrice"
                           :formatter="formattedNumber"
                           width="150" />
                           width="130">
            <template #default="scope">
              <span v-if="scope.row.productType === 2">--</span>
              <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveUnitPrice) }}</span>
            </template>
          </el-table-column>
          <el-table-column label="含税总价(元)"
                           prop="taxInclusiveTotalPrice"
                           :formatter="formattedNumber"
                           width="150" />
                           width="130">
            <template #default="scope">
              <span v-if="scope.row.productType === 2">--</span>
              <span v-else>{{ formattedNumber(null, null, scope.row.taxInclusiveTotalPrice) }}</span>
            </template>
          </el-table-column>
          <el-table-column label="不含税总价(元)"
                           prop="taxExclusiveTotalPrice"
                           :formatter="formattedNumber"
                           width="150" />
                           width="140">
            <template #default="scope">
              <span v-if="scope.row.productType === 2">--</span>
              <span v-else>{{ formattedNumber(null, null, scope.row.taxExclusiveTotalPrice) }}</span>
            </template>
          </el-table-column>
          <el-table-column label="是否质检"
                           prop="isChecked"
                           width="150">
                           width="100">
            <template #default="scope">
              <el-tag :type="scope.row.isChecked ? 'success' : 'info'">
              <span v-if="scope.row.productType === 2">--</span>
              <el-tag v-else :type="scope.row.isChecked ? 'success' : 'info'">
                {{ scope.row.isChecked ? '是' : '否' }}
              </el-tag>
            </template>
@@ -533,9 +637,21 @@
               ref="productFormRef">
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="类型："
                          prop="productType">
              <el-radio-group v-model="productForm.productType" @change="handleProductTypeChange">
                <el-radio :label="1">产品</el-radio>
                <el-radio :label="2">设备备件</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="产品大类："
                          prop="productId">
              <el-tree-select v-model="productForm.productId"
              <el-tree-select v-if="productForm.productType !== 2"
                              v-model="productForm.productId"
                              placeholder="请选择"
                              clearable
                              filterable
@@ -544,10 +660,22 @@
                              :data="productOptions"
                              :render-after-expand="false"
                              style="width: 100%" />
              <el-select v-else
                         v-model="productForm.productId"
                         placeholder="请选择设备备件"
                         filterable
                         clearable
                         @change="handleSparePartsChange"
                         style="width: 100%">
                <el-option v-for="item in sparePartsOptions"
                           :key="item.id"
                           :label="item.name"
                           :value="item.id" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <el-row :gutter="30" v-if="productForm.productType !== 2">
          <el-col :span="24">
            <el-form-item label="规格型号："
                          prop="productModelId">
@@ -564,7 +692,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <el-row :gutter="30" v-if="productForm.productType !== 2">
          <el-col :span="12">
            <el-form-item label="单位："
                          prop="unit">
@@ -588,7 +716,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <el-row :gutter="30" v-if="productForm.productType !== 2">
          <el-col :span="12">
            <el-form-item label="含税单价(元)："
                          prop="taxInclusiveUnitPrice">
@@ -615,7 +743,21 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <el-row :gutter="30" v-if="productForm.productType === 2">
          <el-col :span="24">
            <el-form-item label="数量："
                          prop="quantity">
              <el-input-number :step="0.1"
                               clearable
                               :precision="2"
                               :min="0"
                               style="width: 100%"
                               v-model="productForm.quantity"
                               placeholder="请输入" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30" v-if="productForm.productType !== 2">
          <el-col :span="12">
            <el-form-item label="含税总价(元)："
                          prop="taxInclusiveTotalPrice">
@@ -655,7 +797,7 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
          <el-col :span="12" v-if="productForm.productType !== 2">
            <el-form-item label="库存预警数量："
                          prop="warnNum">
              <el-input-number v-model="productForm.warnNum"
@@ -667,7 +809,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
        <el-row :gutter="30" v-if="productForm.productType !== 2">
          <el-col :span="12">
            <el-form-item label="是否质检："
                          prop="isChecked">
@@ -740,6 +882,7 @@
  const modelOptions = ref([]);
  const userList = ref([]);
  const productOptions = ref([]);
  const sparePartsOptions = ref([]);
  const salesContractList = ref([]);
  const supplierList = ref([]);
  const tableLoading = ref(false);
@@ -753,6 +896,7 @@
  const fileList = ref([]);
  import useUserStore from "@/store/modules/user";
  import { modelList, productTreeList } from "@/api/basicData/product.js";
  import { getSparePartsList } from "@/api/equipmentManagement/spareParts.js";
  import dayjs from "dayjs";
  import FileUpload from "@/components/AttachmentUpload/file/index.vue";

@@ -956,6 +1100,7 @@
  const currentId = ref("");
  const productFormData = reactive({
    productForm: {
      productType: 1,
      productId: "",
      productCategory: "",
      productModelId: "",
@@ -987,10 +1132,27 @@
        { required: true, message: "请输入", trigger: "blur" },
      ],
      invoiceType: [{ required: true, message: "请选择", trigger: "change" }],
      isChecked: [{ required: true, message: "请选择", trigger: "change" }],
      // isChecked 默认传否，不需要验证
    },
  });
  const { productForm, productRules } = toRefs(productFormData);
  const { productForm } = toRefs(productFormData);
  
  // 动态计算验证规则
  const productRules = computed(() => {
    const isSpareParts = productForm.value.productType === 2;
    return {
      productId: [{ required: true, message: "请选择", trigger: "change" }],
      productModelId: isSpareParts ? [] : [{ required: true, message: "请选择", trigger: "change" }],
      unit: isSpareParts ? [] : [{ required: true, message: "请输入", trigger: "blur" }],
      quantity: [{ required: true, message: "请输入", trigger: "blur" }],
      taxInclusiveUnitPrice: isSpareParts ? [] : [{ required: true, message: "请输入", trigger: "blur" }],
      taxRate: isSpareParts ? [] : [{ required: true, message: "请选择", trigger: "change" }],
      warnNum: isSpareParts ? [] : [{ required: true, message: "请选择", trigger: "change" }],
      taxInclusiveTotalPrice: isSpareParts ? [] : [{ required: true, message: "请输入", trigger: "blur" }],
      taxExclusiveTotalPrice: isSpareParts ? [] : [{ required: true, message: "请输入", trigger: "blur" }],
      invoiceType: [{ required: true, message: "请选择", trigger: "change" }],
    };
  });
  const upload = reactive({
    // 上传的地址
    url: import.meta.env.VITE_APP_BASE_API + "/file/upload",
@@ -1472,16 +1634,27 @@
    await nextTick();

    if (type === "add") {
      productForm.value.isChecked = false;
      productForm.value.isChecked = false; // 是否质检默认传否
      productForm.value.productType = "product";
    }

    if (type === "edit") {
      // 复制行数据
      productForm.value = { ...row };

      // 如果没有 productType，默认为 product (1)
      if (!productForm.value.productType) {
        productForm.value.productType = 1;
      }

      // 如果是设备备件类型，加载设备备件列表
      if (productForm.value.productType === 2) {
        await getSparePartsOptions();
      }

      // 如果是从模板加载的数据，可能没有 productId 和 productModelId
      // 需要根据 productCategory 和 specificationModel 来查找对应的 ID
      if (!productForm.value.productId && productForm.value.productCategory) {
      if (!productForm.value.productId && productForm.value.productCategory && productForm.value.productType !== 2) {
        // 根据 productCategory 查找 productId
        const findProductIdByCategory = (nodes, categoryName) => {
          for (let i = 0; i < nodes.length; i++) {
@@ -1549,6 +1722,45 @@
      return res;
    });
  };

  // 获取设备备件列表
  const getSparePartsOptions = () => {
    return getSparePartsList({ current: -1, size: -1 }).then(res => {
      if (res.data && Array.isArray(res.data.rows)) {
        sparePartsOptions.value = res.data.rows;
      } else if (res.data && Array.isArray(res.data.records)) {
        sparePartsOptions.value = res.data.records;
      } else {
        sparePartsOptions.value = [];
      }
      return res;
    });
  };

  // 处理类型变化
  const handleProductTypeChange = (type) => {
    productForm.value.productId = "";
    productForm.value.productCategory = "";
    productForm.value.productModelId = "";
    productForm.value.specificationModel = "";
    modelOptions.value = [];
    
    if (type === 2) {
      getSparePartsOptions();
    }
  };

  // 处理设备备件选择
  const handleSparePartsChange = (value) => {
    const selectedSparePart = sparePartsOptions.value.find(item => item.id === value);
    if (selectedSparePart) {
      productForm.value.productCategory = selectedSparePart.name;
      productForm.value.specificationModel = "/";
    } else {
      productForm.value.productCategory = "";
      productForm.value.specificationModel = "";
    }
  };
  const getModels = value => {
    if (value) {
      productForm.value.productCategory =
@@ -1605,6 +1817,19 @@

  // 提交产品表单
  const submitProduct = () => {
    // 如果是设备备件，先设置默认值，再验证
    if (productForm.value.productType === 2) {
      productForm.value.specificationModel = "/";
      productForm.value.productModelId = null;
      productForm.value.unit = "";
      productForm.value.taxRate = "";
      productForm.value.taxInclusiveUnitPrice = 0;
      productForm.value.taxInclusiveTotalPrice = 0;
      productForm.value.taxExclusiveTotalPrice = 0;
      productForm.value.warnNum = 0;
      productForm.value.isChecked = false; // 是否质检默认传否
    }
    
    proxy.$refs["productFormRef"].validate(valid => {
      if (valid) {
        if (operationType.value === "edit") {