Merge branch 'dev' of http://192.168.5.5:10010/r/web/crm-web into wn

haoxuan

2023-10-17 8c292eed724fa44557487811b82c8a6c343dab0d

 src/views/sales/salesDetails/index.vue

@@ -7,16 +7,16 @@
    <div v-else class="filter">
      <div class="filter-card">
        <CommonSearch
            :show-add="false"
            :show-download="false"
            :amount-view="false"
            :show-action-btn="false"
            placeholder="请输入订单编号"
            @searchClick="onFilterSearch"
          :show-add="false"
          :show-download="false"
          :amount-view="false"
          :show-action-btn="false"
          placeholder="请输入订单编号"
          @searchClick="onFilterSearch"
        >
          <template slot="leftButton">
            <el-button size="small" type="primary"  @click="addBtnClick">新建</el-button>
            <el-button size="small"  @click="delClick">删除</el-button>
            <el-button size="small" type="primary" @click="addBtnClick">新建</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
      </div>
@@ -26,20 +26,19 @@
      <div class="body-card">
        <div class="list-view">
          <TableCommonView
              ref="tableListRef"
              :show-summary="showSummary"
              :table-list="tableList"
              :select-box="!isDetail"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
              @selTableCol="selTableCol"
            ref="tableListRef"
            :show-summary="showSummary"
            :table-list="tableList"
            @selClientClick="selClientClick"
            @selCommonClick="selCommonClick"
            @getSelectArray="getSelectArray"
            @selTableCol="selTableCol"
          >
            <template slot="tableButton">
              <el-table-column label="操作" width="90">
                <template slot-scope="scope">
                  <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
                  <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button> -->
                  <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button>
                </template>
              </el-table-column>
            </template>
@@ -126,7 +125,7 @@
        infomation: {}
      },
      showSummary: {
        show: true,
        show: false,
        sumProp: [
          "receiveTotalAmount",
          "total",
@@ -162,7 +161,7 @@
        infomation: {}
      },
      tableColumn: [
        { label: "订单编号", prop: "number", isCommonClick: true ,default: true},
        { label: "订单编号", prop: "number", isCommonClick: true, default: true },
        { label: "客户名称", prop: "client_name", isClientClick: true },
        { label: "签约日期", prop: "signTime", width: 150 },
        { label: "销售负责人", prop: "member_name" },
@@ -177,7 +176,21 @@
        { label: "销售单价", prop: "taxUnitPrice", isProductPrice: true },
        { label: "价税合计", prop: "priceTax", isProductTotal: true }
      ],
      showCol:["订单编号", "客户名称", "签约日期", "销售负责人", "已收总额", "合计", "应收余额", "已开票金额", "未开票金额", "产品名称", "数量", "销售单价", "价税合计"]
      showCol: [
        "订单编号",
        "客户名称",
        "签约日期",
        "销售负责人",
        "已收总额",
        "合计",
        "应收余额",
        "已开票金额",
        "未开票金额",
        "产品名称",
        "数量",
        "销售单价",
        "价税合计"
      ]
    }
  },
  created() {
@@ -194,12 +207,13 @@
  methods: {
    setTable() {
      this.tableList = {
        selectIndex: true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,
        tableColumn:this.setColumnVisible(this.showCol)
        tableColumn: this.setColumnVisible(this.showCol)
      }
      this.tableList.allcol = this.tableList.tableColumn.filter(ele=>!ele.default).map(ele=>ele.label);
      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
      this.searchOptions = []
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
        const label = this.tableList.tableColumn[i].label
@@ -207,27 +221,51 @@
        this.searchOptions.push({ value: value, label: label })
      }
    },
    setColumnVisible(showCol){
      return  this.tableColumn.map(ele=>{
    setColumnVisible(showCol) {
      return this.tableColumn.map((ele) => {
        return {
          ...ele,
          isShowColumn:showCol.includes(ele.label)
          isShowColumn: showCol.includes(ele.label)
        }
      })
    },
    selTableCol(val) {
      this.showcol = val;
      this.tableList.tableColumn = this.setColumnVisible(val);
      this.showcol = val
      this.tableList.tableColumn = this.setColumnVisible(val)
    },
    // 请求数据
    async getData() {
      this.loading = true
      await getSalesDetailsList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
      let params = {}
      console.log("ssssssssssss")
      console.log(this.addConfig)
      if (this.addConfig.keywordType === "客户名称") {
        params = {
          clientId: this.addConfig.client_id,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }
      } else if (this.addConfig.keywordType === "销售机会") {
        params = {
          saleChanceId: this.addConfig.sale_chance_id,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }
      } else if (this.addConfig.keywordType === "销售子单") {
        params = {
          number: this.addConfig.subbill_name,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }
      } else {
        params = {
          keyword: this.keyword,
          keywordType: this.keywordType,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize
        }
      }
      await getSalesDetailsList(params)
        .then((res) => {
          console.log(res)
          if (res.code === 200) {
@@ -256,8 +294,8 @@
        })
    },
    // 搜索
    onFilterSearch(searchText){
      this.keyword = searchText ?? ''
    onFilterSearch(searchText) {
      this.keyword = searchText ?? ""
      this.keywordType = "订单编号"
      this.pagerOptions.currPage = 1
      this.getData()
@@ -266,7 +304,14 @@
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = { ...this.addConfig, currency: "人民币" }
      console.log(this.addConfig)
      this.editConfig.infomation = {
        ...this.addConfig,
        currency: "人民币",
        sale_chance_name:"",
        subbill_name:"",
        client_name: Object.keys(this.addConfig).length === 0 ? "" : this.addConfig.client_name
      }
    },
    // 编辑
    handleClick(row) {
@@ -276,27 +321,28 @@
      this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "人民币" }
    },
    // 删除
    delClick() {
      if (this.selValueList && this.selValueList.length > 0) {
        this.$confirm("是否确认删除?", "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            getDelSalesDetails({ ids: this.selValueList }).then((response) => {
              if (response.code === 200) {
                this.$message.success("删除成功")
                this.getData()
              } else {
                this.$message.warning("删除失败")
              }
            })
    delClick(rowID) {
      console.log(rowID, "xxxxshanchu")
      // if (this.selValueList && this.selValueList.length > 0) {
      this.$confirm("是否确认删除?", "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          getDelSalesDetails({ ids: [rowID] }).then((response) => {
            if (response.code === 200) {
              this.$message.success("删除成功")
              this.getData()
            } else {
              this.$message.warning("删除失败")
            }
          })
          .catch(() => {})
      } else {
        this.$message.warning("请至少选择一条记录")
      }
        })
        .catch(() => {})
      // } else {
      //   this.$message.warning("请至少选择一条记录")
      // }
    },
    getSelectArray(val) {
      console.log(val)
@@ -348,12 +394,12 @@
.sales-details {
  height: 100%;
  overflow: hidden;
  .filter{
  .filter {
    height: 80px;
    display: flex;
    align-items: center;
    padding: 12px 20px 0 20px;
    &-card{
    &-card {
      height: 80px;
      display: flex;
      align-items: center;
@@ -364,7 +410,7 @@
      background-color: #fff;
    }
  }
  .body{
  .body {
    box-sizing: border-box;
    padding: 10px 20px;
    border-radius: 12px;