gongchunyi
15 小时以前 bcb3a93be2c9ed2635761517d4b3f4683c6c382d
fix: 销售/采购产品添加件数字段
已修改7个文件
54 ■■■■■ 文件已修改
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/purchaseApproval/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/detail.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/procurementManagement/procurementLedger/index.vue 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/deliveryLedger/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/salesManagement/salesLedger/index.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -158,6 +158,8 @@
                                   label="规格型号" />
                  <el-table-column prop="unit"
                                   label="单位" />
                  <el-table-column prop="packagingSpec"
                                   label="件数" />
                  <el-table-column prop="quantity"
                                   label="数量" />
                  <el-table-column prop="taxInclusiveUnitPrice"
@@ -219,6 +221,9 @@
                                   show-overflow-tooltip />
                  <el-table-column prop="specificationModel"
                                   label="规格型号"
                                   show-overflow-tooltip />
                  <el-table-column prop="packagingSpec"
                                   label="件数"
                                   show-overflow-tooltip />
                  <el-table-column prop="deliveryQuantity"
                                   label="发货数量"
@@ -544,6 +549,8 @@
      productName: item.productName ?? row.productName ?? "--",
      specificationModel:
        item.specificationModel ?? item.model ?? row.specificationModel ?? "--",
      packagingSpec:
        item.packagingSpec ?? row.packagingSpec ?? "--",
      deliveryQuantity:
        item.deliveryQuantity ??
        item.quantity ??
src/views/collaborativeApproval/approvalProcess/components/viewDetailDia.vue
@@ -118,6 +118,8 @@
                                   label="规格型号" />
                  <el-table-column prop="unit"
                                   label="单位" />
                  <el-table-column prop="packagingSpec"
                                   label="件数" />
                  <el-table-column prop="quantity"
                                   label="数量" />
                  <el-table-column prop="taxInclusiveUnitPrice"
@@ -179,6 +181,9 @@
                                   show-overflow-tooltip />
                  <el-table-column prop="specificationModel"
                                   label="规格型号"
                                   show-overflow-tooltip />
                  <el-table-column prop="packagingSpec"
                                   label="件数"
                                   show-overflow-tooltip />
                  <el-table-column prop="deliveryQuantity"
                                   label="发货数量"
@@ -516,6 +521,8 @@
      productName: item.productName ?? row.productName ?? "--",
      specificationModel:
        item.specificationModel ?? item.model ?? row.specificationModel ?? "--",
      packagingSpec:
        item.packagingSpec ?? row.packagingSpec ?? "--",
      deliveryQuantity:
        item.deliveryQuantity ??
        item.quantity ??
src/views/collaborativeApproval/purchaseApproval/index.vue
@@ -77,6 +77,8 @@
                               prop="specificationModel" />
              <el-table-column label="单位"
                               prop="unit" />
              <el-table-column label="件数"
                               prop="packagingSpec" />
              <el-table-column label="数量"
                               prop="quantity" />
              <el-table-column label="税率(%)"
src/views/procurementManagement/procurementLedger/detail.vue
@@ -58,6 +58,7 @@
        <el-table-column label="产品大类" prop="productCategory" />
        <el-table-column label="规格型号" prop="specificationModel" />
        <el-table-column label="单位" prop="unit" />
        <el-table-column label="件数" prop="packagingSpec" />
        <el-table-column label="数量" prop="quantity" />
        <el-table-column label="库存预留数量" prop="stockReservedQuantity" />
        <el-table-column label="税率(%)" prop="taxRate" />
src/views/procurementManagement/procurementLedger/index.vue
@@ -58,6 +58,7 @@
              <el-table-column label="产品大类" prop="productCategory" />
              <el-table-column label="规格型号" prop="specificationModel" />
              <el-table-column label="单位" prop="unit" />
              <el-table-column label="件数" prop="packagingSpec" />
              <el-table-column label="入库审核状态" prop="stockInApprovalStatus" width="120">
                <template #default="scope">
                  <el-tag :type="getStockInApprovalStatusType(scope.row.stockInApprovalStatus)" size="small">
@@ -208,6 +209,7 @@
          <el-table-column label="产品大类" prop="productCategory" />
          <el-table-column label="规格型号" prop="specificationModel" />
          <el-table-column label="单位" prop="unit" width="70" />
          <el-table-column label="件数" prop="packagingSpec" width="120" show-overflow-tooltip />
          <el-table-column label="数量" prop="quantity" width="70" />
<!--          <el-table-column label="库存预警数量" prop="warnNum" width="120" show-overflow-tooltip />-->
          <el-table-column label="税率(%)" prop="taxRate" width="80" />
@@ -307,6 +309,13 @@
              <el-select v-model="productForm.taxRate" placeholder="请选择" clearable @change="mathNum">
                <el-option v-for="dict in tax_rate" :key="dict.value" :label="dict.label" :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="件数:" prop="packagingSpec">
              <el-input v-model="productForm.packagingSpec"  clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -671,6 +680,7 @@
    productModelId: "",
    specificationModel: "",
    unit: "",
    packagingSpec: "",
    quantity: "",
    taxInclusiveUnitPrice: "",
    taxRate: "",
src/views/salesManagement/deliveryLedger/index.vue
@@ -82,6 +82,11 @@
          show-overflow-tooltip
        />
        <el-table-column
          label="件数"
          prop="packagingSpec"
          show-overflow-tooltip
        />
        <el-table-column
          label="发货时间"
          prop="shippingDate"
          show-overflow-tooltip
@@ -342,6 +347,12 @@
            show-overflow-tooltip
          />
          <el-table-column
            label="件数"
            prop="packagingSpec"
            min-width="120"
            show-overflow-tooltip
          />
          <el-table-column
            label="发货数量"
            prop="deliveryQuantity"
            min-width="120"
@@ -576,6 +587,8 @@
    productName: item.productName ?? row.productName ?? "--",
    specificationModel:
      item.specificationModel ?? item.model ?? row.specificationModel ?? "--",
    packagingSpec:
      item.packagingSpec ?? row.packagingSpec ?? "--",
    deliveryQuantity:
      item.deliveryQuantity ??
      item.quantity ??
src/views/salesManagement/salesLedger/index.vue
@@ -108,6 +108,8 @@
                               prop="specificationModel" />
              <el-table-column label="单位"
                               prop="unit" />
              <el-table-column label="件数"
                               prop="packagingSpec" />
              <el-table-column label="产品状态"
                               width="100px"
                               align="center">
@@ -477,6 +479,8 @@
                           prop="specificationModel" />
          <el-table-column label="单位"
                           prop="unit" />
          <el-table-column label="件数"
                           prop="packagingSpec" />
          <el-table-column label="数量"
                           prop="quantity" />
          <el-table-column label="税率(%)"
@@ -671,6 +675,15 @@
                           :label="dict.label"
                           :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="件数:"
                          prop="packagingSpec">
              <el-input v-model="productForm.packagingSpec"
                        clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -1195,6 +1208,7 @@
      productModelId: "",
      specificationModel: "",
      unit: "",
      packagingSpec: "",
      quantity: "",
      taxInclusiveUnitPrice: "",
      taxRate: "",