Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

zuozhengqing

2023-10-13 51492045cda76a9b651990b075d69f5f3638f3b2

Merge branch 'dev' of ssh://192.168.5.5:29418/web/crm-web into dev

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

@@ -15,9 +15,7 @@
          @searchClick="onFilterSearch"
        >
          <template slot="leftButton">
            <el-button size="small" type="primary" @click="addBtnClick"
              >新建</el-button
            >
            <el-button size="small" type="primary" @click="addBtnClick">新建</el-button>
            <!--            <el-button size="small"  @click="delClick">删除</el-button>-->
          </template>
        </CommonSearch>
@@ -45,11 +43,7 @@
          </TableCommonView>
        </div>
        <div class="btn-pager">
          <PagerView
            class="page"
            :pager-options="pagerOptions"
            v-on="pagerEvents"
          />
          <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        </div>
      </div>
    </div>
@@ -59,27 +53,27 @@
</template>

<script>
import { getReceiptList } from "@/api/common/payment";
import pageMixin from "@/components/makepager/pager/mixin/pageMixin";
import AddReceipt from "@/views/other/payment/receipt/addReceipt.vue";
import { getReceiptList } from "@/api/common/payment"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import AddReceipt from "@/views/other/payment/receipt/addReceipt.vue"

export default {
  name: "ReceiptView",
  props: {
    isDetail: {
      type: Boolean,
      default: false,
      default: false
    },
    addConfig: {
      type: Object,
      default: () => {
        return {};
      },
        return {}
      }
    },
    sourceType: {
      type: Number,
      default: 1,
    },
      default: 1
    }
  },
  mixins: [pageMixin],
  components: { AddReceipt },
@@ -94,7 +88,7 @@
        { value: "1", label: "全部" },
        { value: "2", label: "今日联系" },
        { value: "3", label: "本周联系" },
        { value: "4", label: "本月联系" },
        { value: "4", label: "本月联系" }
      ],
      searchOptions: [],
      operatesList: [
@@ -105,26 +99,26 @@
        { id: "5", name: "更改创建人" },
        { id: "6", name: "树结构设置" },
        { id: "7", name: "审批设置" },
        { id: "8", name: "回访预设列宽" },
        { id: "8", name: "回访预设列宽" }
      ],
      editConfig: {
        visible: false,
        title: "新建",
        infomation: {},
        infomation: {}
      },
      saleChanceName: "",
      contactsDeail: {
        visible: false,
        infomation: {},
        infomation: {}
      },
      clientDeail: {
        visible: false,
        infomation: {},
        infomation: {}
      },
      selValueList: [],
      searchSel: {
        value: "topic",
        label: "",
        label: ""
      },
      search_map: {},
      keyword: "",
@@ -136,29 +130,21 @@
        { label: "实际收款金额", prop: "amount" },
        { label: "收款方式", prop: "paymentType_name" },
        { label: "销售负责人", prop: "principal_name" },
        { label: "收款日期", prop: "receiptDate" },
        { label: "收款日期", prop: "receiptDate" }
      ],
      showCol: [
        "收款单编号",
        "客户名称",
        "选择源单",
        "实际收款金额",
        "收款方式",
        "销售负责人",
        "收款日期",
      ],
    };
      showCol: ["收款单编号", "客户名称", "选择源单", "实际收款金额", "收款方式", "销售负责人", "收款日期"]
    }
  },
  created() {
    this.setTable();
    this.setTable()
    if (!this.isDetail) {
      this.keyword = "";
      this.keywordType = "";
      this.keyword = ""
      this.keywordType = ""
    } else {
      this.keyword = this.addConfig.keyword;
      this.keywordType = this.addConfig.keywordType;
      this.keyword = this.addConfig.keyword
      this.keywordType = this.addConfig.keywordType
    }
    this.getData();
    this.getData()
  },
  mounted() {
  },
@@ -168,95 +154,104 @@
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,
        tableColumn: this.setColumnVisible(this.showCol),
      };
      this.tableList.allcol = this.tableList.tableColumn
        .filter((ele) => !ele.default)
        .map((ele) => ele.label);
      this.searchOptions = [];
        tableColumn: this.setColumnVisible(this.showCol)
      }
      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;
        const value = this.tableList.tableColumn[i].prop;
        this.searchOptions.push({ value: value, label: label });
        const label = this.tableList.tableColumn[i].label
        const value = this.tableList.tableColumn[i].prop
        this.searchOptions.push({ value: value, label: label })
      }
    },
    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() {
      // console.log()
      this.loading = true;
      await getReceiptList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        client_id:this.addConfig.client_id,
        sourceId: this.addConfig.salesDetailsId,
        sourceIdType: this.addConfig.serviceContractId,
      })
      this.loading = true
      let params = {}
      let sourceTyle = this.addConfig.keywordType === "销售明细单" ? 1 : 2
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceType: sourceTyle,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize,
          client_id:this.addConfig.client_id,
        }
      } else {
        params = {
          keyword: this.keyword,
          keywordType: this.keywordType,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize,
          client_id:this.addConfig.client_id,
        }
      }
      await getReceiptList(params)
        .then((res) => {
          if (res.data.code === 200) {
            const resList = res?.data?.data?.data ?? [];
            const resList = res?.data?.data?.data ?? []
            if (resList.length > 0) {
              const list = resList.map((item) => {
                return {
                  ...item,
                  client_name: item.client.name,
                  paymentType_name: item.paymentType.name,
                  principal_name: item.principal.username,
                };
              });
              this.tableList.tableInfomation = list || [];
              this.pagerOptions.totalCount = res.data.data.count;
                  principal_name: item.principal.username
                }
              })
              this.tableList.tableInfomation = list || []
              this.pagerOptions.totalCount = res.data.data.count
            } else {
              this.tableList.tableInfomation = [];
              this.tableList.tableInfomation = []
            }
          } else {
            this.tableList.tableInfomation = [];
            this.tableList.tableInfomation = []
          }
          this.loading = false;
          this.loading = false
        })
        .catch((err) => {
          console.log(err);
          this.tableList.tableInfomation = [];
          this.loading = false;
        });
          console.log(err)
          this.tableList.tableInfomation = []
          this.loading = false
        })
    },
    // 搜索
    onFilterSearch(searchText) {
      this.keyword = searchText ?? "";
      this.keywordType = "收款单编号";
      this.pagerOptions.currPage = 1;
      this.getData();
      this.keyword = searchText ?? ""
      this.keywordType = "收款单编号"
      this.pagerOptions.currPage = 1
      this.getData()
    },
    getSelectArray(val) {
      console.log(val);
      this.selValueList = [];
      console.log(val)
      this.selValueList = []
      const list = val.map((item) => {
        return item.id;
      });
      this.selValueList = list;
        return item.id
      })
      this.selValueList = list
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true;
      this.editConfig.title = "新建";
      this.editConfig.sourceType = this.sourceType;
      this.editConfig.infomation = { ...this.addConfig, number: "" };
    },
  },
};
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.sourceType = this.sourceType
      this.editConfig.infomation = { ...this.addConfig, number: "" }
    }
  }
}
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->

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

@@ -169,13 +169,25 @@
    // 请求数据
    async getData() {
      this.loading = true
      await getInvoiceList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        sourceId:this.addConfig.id
      })
      console.log(this.addConfig)
      let params = {}
      let sourceTyle = this.addConfig.keywordType === "销售明细单" ? 1 : 2
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceType: sourceTyle,
          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 getInvoiceList(params)
        .then((res) => {
          if (res.data.code === 200) {
            if (res.data.data.data && res.data.data.data.length > 0) {

 src/views/sales/refundForm/index.vue

@@ -7,15 +7,15 @@
    <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" type="primary" @click="addBtnClick">新建</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
@@ -26,12 +26,12 @@
      <div class="body-card">
        <div class="list-view">
          <TableCommonView
              ref="tableListRef"
              :table-list="tableList"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
              @selTableCol="selTableCol"
            ref="tableListRef"
            :table-list="tableList"
            @selClientClick="selClientClick"
            @selCommonClick="selCommonClick"
            @getSelectArray="getSelectArray"
            @selTableCol="selTableCol"
          >
            <template slot="tableButton">
              <el-table-column label="操作" width="100">
@@ -136,7 +136,7 @@
        // { label: "修改时间", prop: "modifyTime" },
        { label: "价税合计", prop: "amountTotal" }
      ],
      showCol:["退款单编号", "客户名称", "退款日期", "账户", "是否开票", "付款方式", "销售负责人", "价税合计"]
      showCol: ["退款单编号", "客户名称", "退款日期", "账户", "是否开票", "付款方式", "销售负责人", "价税合计"]
    }
  },
  created() {
@@ -157,9 +157,9 @@
        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
@@ -167,27 +167,37 @@
        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 getSalesRefundList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
      let params = {}
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          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 getSalesRefundList(params)
        .then((res) => {
          console.log(res)
          if (res.code === 200) {
@@ -218,9 +228,9 @@
        })
    },
    // 搜索
    onFilterSearch(searchText){
    onFilterSearch(searchText) {
      this.keyword = searchText ?? ""
      this.keywordType = '退款单编号'
      this.keywordType = "退款单编号"
      this.getData()
    },
    // 新建
@@ -239,22 +249,22 @@
    // 删除
    delClick(rowID) {
      // if (this.selValueList && this.selValueList.length > 0) {
        this.$confirm("是否确认删除?", "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            getDelSalesRefund({ ids: [rowID] }).then((response) => {
              if (response.code === 200) {
                this.$message.success("删除成功")
                this.getData()
              } else {
                this.$message.warning("删除失败")
              }
            })
      this.$confirm("是否确认删除?", "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          getDelSalesRefund({ ids: [rowID] }).then((response) => {
            if (response.code === 200) {
              this.$message.success("删除成功")
              this.getData()
            } else {
              this.$message.warning("删除失败")
            }
          })
          .catch(() => {})
        })
        .catch(() => {})
      // } else {
      //   this.$message.warning("请至少选择一条记录")
      // }
@@ -293,12 +303,12 @@
.refund-form {
  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;
@@ -309,7 +319,7 @@
      background-color: #fff;
    }
  }
  .body{
  .body {
    box-sizing: border-box;
    padding: 10px 20px;
    border-radius: 12px;

 src/views/sales/salesDetails/DetailSpecification.vue

@@ -48,7 +48,7 @@
            <el-tab-pane label="销售发票" name="invoice"></el-tab-pane>
            <el-tab-pane label="销售退货单" name="return"> </el-tab-pane>
            <el-tab-pane label="服务合同" name="serviceContract"></el-tab-pane>
            <el-tab-pane label="销售退款单" name="refundForm"></el-tab-pane>
            <!-- <el-tab-pane label="销售退款单" name="refundForm"></el-tab-pane> -->
          </el-tabs>
        </div>
        <div v-if="activeName === 'first'" class="detail">

 src/views/sales/salesReturn/index.vue

@@ -7,15 +7,15 @@
    <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" type="primary" @click="addBtnClick">新建</el-button>
            <!-- <el-button size="small"  @click="delClick">删除</el-button> -->
          </template>
        </CommonSearch>
@@ -26,12 +26,12 @@
      <div class="body-card">
        <div class="list-view">
          <TableCommonView
              ref="tableListRef"
              :table-list="tableList"
              @selClientClick="selClientClick"
              @selCommonClick="selCommonClick"
              @getSelectArray="getSelectArray"
              @selTableCol="selTableCol"
            ref="tableListRef"
            :table-list="tableList"
            @selClientClick="selClientClick"
            @selCommonClick="selCommonClick"
            @getSelectArray="getSelectArray"
            @selTableCol="selTableCol"
          >
            <template slot="tableButton">
              <el-table-column label="操作" width="90">
@@ -131,7 +131,7 @@
      keyword: "",
      keywordType: "",
      tableColumn: [
        { label: "销售退货单编号", prop: "number", min: 120, isCommonClick: true ,default:true },
        { label: "销售退货单编号", prop: "number", min: 120, isCommonClick: true, default: true },
        { label: "客户名称", prop: "client_name", min: 90, isClientClick: true },
        { label: "退货日期", prop: "returnDate", min: 130 },
        { label: "状态", prop: "salesReturnStatus_name" },
@@ -141,7 +141,7 @@
        { label: "销售负责人", prop: "member_name" }
        // { label: "修改时间", prop: "modifyTime", isTime: true, min: 130 }
      ],
      showCol:["销售退货单编号", "客户名称", "退货日期", "状态", "退入仓库", "应退款", "已退款", "销售负责人"]
      showCol: ["销售退货单编号", "客户名称", "退货日期", "状态", "退入仓库", "应退款", "已退款", "销售负责人"]
    }
  },
  created() {
@@ -162,9 +162,9 @@
        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
@@ -172,27 +172,38 @@
        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 getSalesReturnList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
      let params = {}
      if (this.addConfig.id) {
        params = {
          sourceID: this.addConfig.id,
          sourceType: 1,
          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 getSalesReturnList(params)
        .then((res) => {
          console.log(res)
          if (res.code === 200) {
@@ -222,8 +233,8 @@
        })
    },
    // 搜索
    onFilterSearch(searchText){
      this.keyword = searchText ?? ''
    onFilterSearch(searchText) {
      this.keyword = searchText ?? ""
      this.keywordType = "销售退货单编号"
      this.pagerOptions.currPage = 1
      this.getData()
@@ -239,27 +250,27 @@
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row, currency: "人民币"}
      this.editConfig.infomation = { ...row, currency: "人民币" }
    },
    // 删除
    delClick(rowID) {
      // if (this.selValueList && this.selValueList.length > 0) {
        this.$confirm("是否确认删除?", "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            getDelSalesReturn({ ids:[rowID] }).then((response) => {
              if (response.code === 200) {
                this.$message.success("删除成功")
                this.getData()
              } else {
                this.$message.warning("删除失败")
              }
            })
      this.$confirm("是否确认删除?", "警告", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          getDelSalesReturn({ ids: [rowID] }).then((response) => {
            if (response.code === 200) {
              this.$message.success("删除成功")
              this.getData()
            } else {
              this.$message.warning("删除失败")
            }
          })
          .catch(() => {})
        })
        .catch(() => {})
      // } else {
      //   this.$message.warning("请至少选择一条记录")
      // }
@@ -299,12 +310,12 @@
.sales-return {
  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;
@@ -315,7 +326,7 @@
      background-color: #fff;
    }
  }
  .body{
  .body {
    box-sizing: border-box;
    padding: 10px 20px;
    border-radius: 12px;

 src/views/service/serviceContract/index.vue

@@ -198,13 +198,24 @@
    // 请求数据
    async getData() {
      this.loading = true
      await getServiceContractList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
        contactId:this.addConfig.client_id
      })
      let params = {}
      if (this.addConfig.id) {
        params = {
          salesDetailsId: this.addConfig.id,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize,
          contactId:this.addConfig.client_id
        }
      } else {
        params = {
          keyword: this.keyword,
          keywordType: this.keywordType,
          page: this.pagerOptions.currPage,
          pageSize: this.pagerOptions.pageSize,
          contactId:this.addConfig.client_id
        }
      }
      await getServiceContractList(params)
        .then((res) => {
          console.log(res)
          if (res.code === 200) {