yangfeng
2023-08-24 3a46ae62a484b4ea1a9dbfb39859275f5c70ba03
bug修复
9个文件已修改
55 ■■■■ 已修改文件
src/components/makepager/CommonFormTableView.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/collectionPlan/AddCollectionPlan.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/saleInvoice/addSaleInvoice.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/contractManage/AddContractManageDialog.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/contractManage/index.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/refundForm/AddRefundFormDialog.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesDetails/index.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesOpportunity/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/service/serviceContract/AddServiceContractDialog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/makepager/CommonFormTableView.vue
@@ -328,6 +328,13 @@
    commonInputChange(val, prop, row) {
      console.log(val, prop)
      console.log(row)
      if (prop === "amount") {
        this.tableList.tableData.map((ite) => {
          if (ite.name === row.name) {
            ite.total = row.amount * row.price
          }
        })
      }
      this.$emit("inputContent", val, prop, row)
    },
    // 清空
src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -264,6 +264,7 @@
    },
    handleClose() {
      this.editConfig.visible = false
      this.$parent.getData()
    },
    setTableForm() {
      this.setTableInfomation(this.firstDate)
src/views/other/payment/saleInvoice/addSaleInvoice.vue
@@ -413,8 +413,7 @@
      clientId: this.editCommonConfig.infomation.client_id,
      SalesDetailsId: this.editCommonConfig.infomation.SalesDetailsId,
      serviceContractId: this.editCommonConfig.infomation.id,
      tableData: [],
      productId: 1
      tableData: []
    }
  },
  created() {
@@ -652,7 +651,7 @@
      this.productId = 1
      this.tableData = [
        {
          id: 1,
          id: 0,
          Amount: 0,
          IsSale: true,
          MaterialMode: "",
src/views/sales/contractManage/AddContractManageDialog.vue
@@ -101,7 +101,7 @@
            </el-row>
          </div>
          <!-- 附件信息 -->
          <!-- <div v-if="isUnflod" class="basic-info-title">附件信息</div>
          <div v-if="isUnflod" class="basic-info-title">附件信息</div>
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
@@ -126,7 +126,7 @@
                </el-form-item>
              </el-col>
            </el-row>
          </div> -->
          </div>
          <!-- 展开收起 -->
          <!-- <div v-if="editConfig.title === '新建'" class="unflod-collapse" @click="unflodCollapseClick">
            <div>{{ unflodCollapseStr }}</div>
src/views/sales/contractManage/index.vue
@@ -119,8 +119,8 @@
        tableColumn: [
          { label: "单据编号", prop: "number", min: 120, isCommonClick: true },
          { label: "负责人", prop: "member_name", min: 90 },
          // { label: "审批状态", prop: "approvalStatus" },
          { label: "创建人", prop: "creator", min: 100 },
          { label: "客户名称", prop: "client_name" },
          { label: "合同状态", prop: "serviceContractStatus_name", min: 100 },
          { label: "创建时间", prop: "created_at" }
        ]
      }
@@ -148,7 +148,8 @@
                  ...item,
                  member_name: item.member.username,
                  client_name: item.client.name,
                  quotation_number: item.quotation.number
                  quotation_number: item.quotation.number,
                  serviceContractStatus_name: item.serviceContractStatus.name
                }
              })
              this.tableList.tableInfomation = list || []
src/views/sales/refundForm/AddRefundFormDialog.vue
@@ -365,8 +365,6 @@
    },
    async getPaymentTypeList() {
      await getPaymentTypeList().then((res) => {
        console.log("支付方式")
        console.log(res.data)
        if (res.data.code === 200) {
          this.paymentTypeListOptions = res.data.data.data
        }
src/views/sales/salesDetails/index.vue
@@ -37,11 +37,17 @@
      </template>
    </TableCommonView>
    <!-- 新建/编辑 -->
    <AddSalesDetailsDialog v-if="editConfig.visible" :edit-common-config="editConfig" />
    <AddSalesDetailsDialog
      v-if="editConfig.visible"
      :edit-common-config="editConfig"
      @addCollectionPlanClick="addCollectionPlanClick"
    />
    <!-- 销售明细详情 -->
    <DetailSpecification v-if="specificationDetail.visible" :specification-detail="specificationDetail" />
    <!-- 客户详情 -->
    <DetailClientManage v-if="clientDeail.visible" :client-manage-detail="clientDeail" />
    <!-- 新建 收款计划 -->
    <AddCollectionPlan v-if="addCollectionConfig.visible" :edit-common-config="addCollectionConfig" />
  </div>
</template>
@@ -50,6 +56,7 @@
import { getSalesDetailsList, getDelSalesDetails } from "@/api/sales/salesDetails"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailSpecification from "@/views/sales/salesDetails/DetailSpecification"
import AddCollectionPlan from "@/views/other/payment/collectionPlan/AddCollectionPlan"
export default {
  name: "SalesDetails",
@@ -69,7 +76,8 @@
  components: {
    AddSalesDetailsDialog,
    DetailSpecification,
    DetailClientManage: () => import("@/views/client/client/DetailClientManage")
    DetailClientManage: () => import("@/views/client/client/DetailClientManage"),
    AddCollectionPlan
  },
  computed: {
    searchCommonHeight() {
@@ -132,7 +140,12 @@
        label: "订单编号"
      },
      keyword: "",
      keywordType: ""
      keywordType: "",
      addCollectionConfig: {
        visible: false,
        title: "新建",
        infomation: {}
      }
    }
  },
  created() {
@@ -282,6 +295,12 @@
      console.log(row)
      this.specificationDetail.visible = true
      this.specificationDetail.infomation = { ...row }
    },
    addCollectionPlanClick(row) {
      this.addCollectionConfig.visible = true
      this.addCollectionConfig.title = "新建"
      this.addCollectionConfig.sourceType = 1
      this.addCollectionConfig.infomation = { ...row }
    }
  }
}
src/views/sales/salesOpportunity/index.vue
@@ -162,7 +162,7 @@
          { label: "可能性(%)", prop: "possibility_name" }, // 可能性
          { label: "预计成交日期", prop: "expected_time", min: 130 }, // 预计成交日期
          { label: "预计合同金额", prop: "projected_amount" }, // 预计合同金额
          { label: "预算绝对值", prop: "capital_budget" }, // 预算绝对值
          { label: "预算绝对值", prop: "budget" }, // 预算绝对值
          { label: "销售负责人", prop: "member_name" } // 销售负责人
        ]
      }
src/views/service/serviceContract/AddServiceContractDialog.vue
@@ -460,7 +460,7 @@
        show: true,
        total: true,
        sumProp: ["Amount", "Unit", "total"],
        mergeNumber: 3
        mergeNumber: 2
      },
      editSelectClientConfig: {
        editVisible: false,