bug修复

yangfeng

2023-08-18 b76f9d153dd40cef8864cecd168242850679047d

bug修复

 src/components/makepager/TableCommonView.vue

@@ -92,11 +92,21 @@
            </ul>
            <div v-else class="no-product">{{ "--" }}</div>
          </div>
          <div v-else-if="item.isProductCommon" class="product-view">
          <div v-else-if="item.isProductPrice" class="product-view">
            <ul v-if="scope.row.products && scope.row.products.length > 0">
              <li v-for="(item, index) in scope.row.products" :key="index">
                <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
                  {{ item.prop === "price" ? item.price : item.total }}
                  {{ item.price }}
                </div>
              </li>
            </ul>
            <div v-else class="no-product">{{ "--" }}</div>
          </div>
          <div v-else-if="item.isProductTotal" class="product-view">
            <ul v-if="scope.row.products && scope.row.products.length > 0">
              <li v-for="(item, index) in scope.row.products" :key="index">
                <div :class="scope.row.products.length === 1 ? 'name-view no-bottom' : 'name-view'">
                  {{ item.total }}
                </div>
              </li>
            </ul>
@@ -194,6 +204,39 @@
              }
            }, 0)
            sums[index + 1]
            if (column.property === "taxUnitPrice") {
              let sumPrice = 0
              this.tableList.tableInfomation.map((item) => {
                item.products.map((val) => {
                  console.log(val.price)
                  sumPrice += parseFloat(val.price)
                })
              })
              console.log((sums[index + 1] = sumPrice))
              console.log(sumPrice)
            }
            if (column.property === "priceTax") {
              let sumPrice = 0
              this.tableList.tableInfomation.map((item) => {
                item.products.map((val) => {
                  console.log(val.price)
                  sumPrice += parseFloat(val.total)
                })
              })
              console.log((sums[index + 1] = sumPrice))
              console.log(sumPrice)
            }
            if (column.property === "productAmount") {
              let sumPrice = 0
              this.tableList.tableInfomation.map((item) => {
                item.products.map((val) => {
                  console.log(val.price)
                  sumPrice += parseFloat(val.amount)
                })
              })
              console.log((sums[index + 1] = sumPrice))
              console.log(sumPrice)
            }
          }
        })
        // console.log(sums)

 src/views/client/followupRecords/index.vue

@@ -185,8 +185,8 @@
                  contact_name: item.contact.name,
                  client_status: item.client_status.name,
                  phone: item.contact.phone,
                  member_name: item.member.username
                  // contact_information_name: item.contact_information.name
                  member_name: item.member.username,
                  contact_information_name: item.contact_information.name
                }
              })
              this.tableList.tableInfomation = list || []

 src/views/other/payment/saleInvoice/index.vue

@@ -135,8 +135,8 @@
          { label: "销售负责人", prop: "principalId" },
          { label: "产品名称", prop: "name", isProductName: true },
          { label: "数量", prop: "amount", isProductAmount: true },
          { label: "含税单价", prop: "price", isProductCommon: true },
          { label: "价税合计", prop: "total", isProductCommon: true }
          { label: "含税单价", prop: "price", isProductPrice: true },
          { label: "价税合计", prop: "total", isProductTotal: true }
        ]
      }
      this.searchOptions = []

 src/views/sales/quotation/index.vue

@@ -146,7 +146,7 @@
          // { label: "合计", prop: "total" }, // 合计
          { label: "产品名称", prop: "productName", isProductName: true },
          { label: "数量", prop: "productNumber", isProductAmount: true },
          { label: "价税合计", prop: "priceTax", isProductCommon: true }
          { label: "价税合计", prop: "priceTax", isProductTotal: true }
        ]
      }
      this.searchOptions = []

 src/views/sales/refundForm/AddRefundFormDialog.vue

@@ -385,7 +385,7 @@
          isInvoice: data.isInvoice || "",
          memberId: data.memberId || 0,
          number: data.number || "",
          products: data.products || [],
          products: this.tableData,
          reason: data.reason || "",
          refundDate: data.refundDate || "",
          refundMethod: data.refundMethod || ""

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -180,7 +180,14 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="物流费用" prop="logisticCost">
                  <el-input v-model="editConfig.infomation.logisticCost"></el-input>
                  <el-input-number
                    v-model="editConfig.infomation.logisticCost"
                    placeholder="请输入"
                    :min="0"
                    :precision="2"
                    :controls="false"
                    style="width: 100%; margin-right: 5px"
                  ></el-input-number>
                </el-form-item>
              </el-col>
            </el-row>
@@ -692,6 +699,9 @@
      height: 55px;
      line-height: 55px;
    }
    .el-input__inner {
      text-align: left;
    }
  }
}
</style>

 src/views/sales/salesDetails/index.vue

@@ -112,6 +112,7 @@
          "uninvoicedAmount",
          "number",
          "unOutoundNo",
          "taxUnitPrice",
          "priceTax"
        ],
        mergeNumber: 6
@@ -154,7 +155,7 @@
          { label: "客户名称", prop: "client_name", isClientClick: true },
          { label: "签约日期", prop: "signTime", width: 150 },
          { label: "销售负责人", prop: "member_name" },
          { label: "出库状态", prop: "outboundStatus" },
          // { label: "出库状态", prop: "outboundStatus" },
          { label: "已收总额", prop: "receiveTotalAmount", price: true },
          { label: "合计", prop: "total", price: true },
          { label: "应收余额", prop: "amountReceivable", price: true },
@@ -162,8 +163,8 @@
          { label: "未开票金额", prop: "uninvoicedAmount", price: true },
          { label: "产品名称", prop: "productName", isProductName: true },
          { label: "数量", prop: "productNumber", isProductAmount: true },
          { label: "销售单价", prop: "taxUnitPrice", isProductCommon: true },
          { label: "价税合计", prop: "priceTax", isProductCommon: true }
          { label: "销售单价", prop: "taxUnitPrice", isProductPrice: true },
          { label: "价税合计", prop: "priceTax", isProductTotal: true }
        ]
      }
      this.searchOptions = []

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -341,17 +341,7 @@
          clientId: data.clientId || 0,
          memberId: data.memberId || 0,
          number: data.number || "",
          products: [
            {
              amount: 0,
              desc: "",
              id: 0,
              name: "",
              number: "",
              price: 0,
              total: 0
            }
          ],
          products: this.tableData,
          reason: data.reason || "",
          repository: data.repository || "",
          returnDate: data.returnDate || "",

 src/views/sales/subOrder/index.vue

@@ -20,8 +20,8 @@
    </div>
    <TableCommonView
      ref="tableListRef"
      :show-summary="showSummary"
      :table-list="tableList"
      :show-summary="showSummary"
      :select-box="!isDetail"
      @selClientClick="selClientClick"
      @selMasterClick="selMasterClick"
@@ -109,7 +109,7 @@
      },
      showSummary: {
        show: true,
        sumProp: ["number1"],
        sumProp: ["productAmount"],
        mergeNumber: 6
      },
      subOrderDeail: {
@@ -311,5 +311,8 @@
  .el-table__header th {
    height: 48px;
  }
  .el-table__footer-wrapper tbody td.el-table__cell {
    height: 48px;
  }
}
</style>

 src/views/service/serviceContract/AddServiceContractDialog.vue

@@ -569,17 +569,7 @@
        endTime: data.endTime || "",
        memberId: data.memberId || 0,
        number: data.number || "",
        products: [
          {
            amount: 0,
            desc: "",
            id: 0,
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ],
        products: this.tableData,
        quotationId: this.quotationId || 0,
        remark: data.remark || "",
        saleChanceId: this.saleChanceId || 0,