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

zuozhengqing

2023-11-06 2fb4239e828bcfa9711ce4cecc4b942767621d62

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

 src/assets/style/reset-element.scss

@@ -64,3 +64,8 @@
  background-color: #2a78fb !important;
  border-color: #2a78fb !important;
}

// 颜色
.el-table .onSelect {
  background: #ebf2ff;
}

 src/components/makepager/DetailListCommonBtn.vue

@@ -25,7 +25,13 @@
    },
    queryClassOptions: {
      type: Array,
      default: () => []
      default: () => [
        // { value: "1", label: "全部" },
        // { value: "2", label: "已发货" },
        // { value: "3", label: "待采购" },
        // { value: "4", label: "本月交付" },
        // { value: "5", label: "已作废" }
      ]
    }
  },
  data() {

 src/components/makepager/TableCommonView.vue

@@ -15,6 +15,8 @@
      @selection-change="handleSelectionChange"
      :header-cell-style="{ background: '#f1f3f8', color: '#000009', 'font-size': '12px', 'font-family': 'PingFangSC' }"
      size="mini"
      @row-click="tableRowClick"
      :row-class-name="tableRowClassName"
    >
      <el-table-column v-if="tableList.selectIndex" type="index" label="序号" width="50"></el-table-column>
      <el-table-column v-if="selectBox" type="selection" width="40"> </el-table-column>
@@ -117,6 +119,12 @@
            </ul>
            <div v-else class="no-product">{{ "--" }}</div>
          </div>
          <!-- 调用方法显示文字 -->
          <div v-else-if="item.isCallMethod">
            <span :class="item.isClass ? item.getClassName(scope.row[item.prop], scope.row) : ''">{{
              item.getCallMethod(scope.row[item.prop], scope.row)
            }}</span>
          </div>
          <span v-else>{{ scope.row[item.prop] ? scope.row[item.prop] : "--" }}</span>
        </template>
      </el-table-column>
@@ -167,6 +175,13 @@
          sumProp: [],
          mergeNumber: 1
        }
      }
    },
    // 选中的样式
    selectClassRow: {
      type: Object,
      default: () => {
        return {}
      }
    }
  },
@@ -358,6 +373,19 @@
    // 公共（销售机会、报价单、销售总单、销售子单。。。）
    selCommonClick(row) {
      this.$emit("selCommonClick", row)
    },
    // 行点击
    tableRowClick(row, column, event) {
      this.$emit("tableRowClick", row, column, event)
    },
    // 单选行相关
    tableRowClassName({ row }) {
      if (Object.keys(this.selectClassRow).length > 0) {
        if (row.id == this.selectClassRow.id) {
          return "onSelect"
        }
      }
      this.$emit("tableRowClassName", row)
    }
  }
}

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -27,10 +27,11 @@
                <el-form-item label="明细单编号" prop="number">
                  <el-input
                    v-if="
                      isView ||
                      editConfig.title == '编辑' ||
                      (editConfig.title == '新建' && codenumer && (explain != '' || isIdDisabled))
                    "
                    :disabled="editConfig.title == '编辑'"
                    :disabled="editConfig.title == '编辑' || isView"
                    v-model="editConfig.infomation.number"
                    placeholder="请输入编码"
                  >
@@ -65,16 +66,21 @@
                      "
                      value-key="name"
                      @select="handleSelectClient('client', $event)"
                      :disabled="isNameChanceEdit"
                      :disabled="isNameChanceEdit || isView"
                    ></el-autocomplete>
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('client')">
                    <div
                      v-if="!isNameChanceEdit && !isView"
                      class="common-select-btn"
                      @click="selClientClick('client')"
                    >
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.client_name &&
                        editConfig.infomation.client_name.length > 0 &&
                        !isNameChanceEdit
                        !isNameChanceEdit &&
                        !isView
                      "
                      class="common-select-btn"
                      @click="clearupClient('client')"
@@ -98,16 +104,21 @@
                      "
                      value-key="name"
                      @select="handleSelectClient('chance', $event)"
                      :disabled="isNameChanceEdit"
                      :disabled="isNameChanceEdit || isView"
                    ></el-autocomplete>
                    <div v-if="!isNameChanceEdit" class="common-select-btn" @click="selClientClick('chance')">
                    <div
                      v-if="!isNameChanceEdit && !isView"
                      class="common-select-btn"
                      @click="selClientClick('chance')"
                    >
                      <i class="el-icon-circle-plus-outline"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.sale_chance_name &&
                        editConfig.infomation.sale_chance_name.length > 0 &&
                        !isNameChanceEdit
                        !isNameChanceEdit &&
                        !isView
                      "
                      class="common-select-btn"
                      @click="clearupClient('chance')"
@@ -163,16 +174,21 @@
                      @select="handleSelectClient('quotation', $event)"
                      style="width: 100%"
                      placeholder="请先选择销售机会"
                      :disabled="isAddQuatation"
                      :disabled="isAddQuatation || isView"
                    ></el-autocomplete>
                    <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
                    <div
                      v-if="!isAddQuatation && !isView"
                      class="common-select-btn"
                      @click="selClientClick('quotation')"
                    >
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.quotation_number &&
                        editConfig.infomation.quotation_number.length > 0 &&
                        !isAddQuatation
                        !isAddQuatation &&
                        !isView
                      "
                      class="common-select-btn"
                      @click="clearupClient('quotation')"
@@ -190,6 +206,7 @@
                    type="date"
                    placeholder="选择日期"
                    style="width: 100%"
                    :disabled="isView"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -201,6 +218,7 @@
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="isView"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
@@ -215,6 +233,7 @@
                    type="date"
                    placeholder="选择日期"
                    style="width: 100%"
                    :disabled="isView"
                  >
                  </el-date-picker>
                </el-form-item>
@@ -226,6 +245,7 @@
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                    :disabled="isView"
                  >
                    <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
@@ -240,12 +260,12 @@
            <el-row>
              <el-col :span="12">
                <el-form-item label="收货人" prop="addressee">
                  <el-input v-model="editConfig.infomation.addressee"></el-input>
                  <el-input v-model="editConfig.infomation.addressee" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="收货人联系方式" prop="phone">
                  <el-input v-model="editConfig.infomation.phone"></el-input>
                  <el-input v-model="editConfig.infomation.phone" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -255,17 +275,18 @@
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.address"
                    :disabled="isView"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="物流公司" prop="logisticCompany">
                  <el-input v-model="editConfig.infomation.logisticCompany"></el-input>
                  <el-input v-model="editConfig.infomation.logisticCompany" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="物流单号" prop="logisticNumber">
                  <el-input v-model="editConfig.infomation.logisticNumber"></el-input>
                  <el-input v-model="editConfig.infomation.logisticNumber" :disabled="isView"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
@@ -277,6 +298,7 @@
                    :precision="2"
                    :controls="false"
                    style="width: 100%; margin-right: 5px"
                    :disabled="isView"
                  ></el-input-number>
                </el-form-item>
              </el-col>
@@ -293,6 +315,7 @@
                    type="textarea"
                    :autosize="{ minRows: 4 }"
                    v-model="editConfig.infomation.conditions"
                    :disabled="isView"
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -308,6 +331,7 @@
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.remark"
                    :disabled="isView"
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -345,7 +369,13 @@
            产品管理
            <div style="margin-left: 400px">
              币种
              <el-select v-model="editConfig.infomation.currency" placeholder="请选择" size="mini" style="width: 63%">
              <el-select
                v-model="editConfig.infomation.currency"
                placeholder="请选择"
                size="mini"
                style="width: 63%"
                :disabled="isView"
              >
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
@@ -355,7 +385,7 @@
            <CommonFormTableView
              ref="commonFormTableView"
              :detail-enter="true"
              :select-box="true"
              :select-box="selectBox"
              :show-summary="showSummary"
              :product-table-list="productTableList"
              @inputContent="inputContent"
@@ -540,7 +570,9 @@
      quotationList: [],
      quotationId: this.editCommonConfig.infomation.quotationId,
      tableData: [],
      selProductData: []
      selProductData: [],
      isView: this.editCommonConfig.title === "查看",
      selectBox: this.editCommonConfig.title !== "查看"
    }
  },
  created() {

 src/views/sales/salesDetails/index.vue

@@ -1,7 +1,7 @@
<template>
  <div class="sales-details">
    <div v-if="isDetail" class="detail-top">
      <DetailListCommonBtn :query-class-options="queryClassOptions" />
      <DetailListCommonBtn />
    </div>

    <div v-else class="filter">
@@ -23,7 +23,8 @@
    </div>

    <div class="body">
      <div class="body-card">
      <!-- <div class="body-card"> -->
      <div class="content-top">
        <div class="list-view">
          <TableCommonView
            ref="tableListRef"
@@ -33,20 +34,71 @@
            @selCommonClick="selCommonClick"
            @getSelectArray="getSelectArray"
            @selTableCol="selTableCol"
            @tableRowClick="tableRowClick"
            :selectClassRow="selectRow"
          >
            <template slot="tableButton">
              <el-table-column label="操作" width="90">
              <el-table-column label="操作" width="180">
                <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="handleClick(scope.row, '查看')" type="text" size="small">查看</el-button>
                  <template v-if="scope.row.status === 1">
                    <el-button @click="handleClick(scope.row, '编辑')" type="text" size="small">编辑</el-button>
                    <el-button @click="submitClick(scope.row)" type="text" size="small">确认提交</el-button>
                    <!-- <el-button @click="delClick(scope.row.id)" type="text" size="small">删除</el-button> -->
                    <el-button @click="closeClick(scope.row.id)" type="text" size="small">关闭</el-button>
                  </template>
                </template>
              </el-table-column>
            </template>
          </TableCommonView>
        </div>

        <div class="btn-pager">
          <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        </div>
      </div>
      <div class="content-bottom">
        <div class="bottom-tabs" :class="!isDetail ? 'bgcGrey' : 'bgcWhite'">
          <div
            class="tab-pane"
            @click="getTab(0)"
            :style="{
              background: isClickProduct ? '#2a78fb' : '#F1F3F8',
              color: isClickProduct ? '#fff' : '#666'
            }"
          >
            产品信息
          </div>
          <div
            class="tab-pane"
            @click="getTab(1)"
            :style="{
              background: isClickInventory ? '#2a78fb' : '#F1F3F8',
              color: isClickInventory ? '#fff' : '#666'
            }"
          >
            库存信息
          </div>
          <div
            class="tab-pane"
            @click="getTab(2)"
            :style="{
              background: isClickMake ? '#2a78fb' : '#F1F3F8',
              color: isClickMake ? '#fff' : '#666'
            }"
          >
            制造信息
          </div>
        </div>
        <div class="list-view">
          <TableCommonView :loading="loading" :table-list="productTableList" @selTableCol="selBottomTableCol">
            <!-- <template slot="tableButton">
              <el-table-column label="操作" width="160" fixed="right">
                <template slot-scope="scope">
                  <el-button @click="viewClick(scope.row)" type="text" size="small">查看</el-button>
                </template>
              </el-table-column>
            </template> -->
          </TableCommonView>
        </div>
      </div>
    </div>
@@ -99,26 +151,41 @@
    }
  },
  data() {
    // 产品信息
    const productColumn = [
      { label: "产品编号", prop: "number", default: true },
      { label: "产品名称", prop: "client_name" },
      { label: "数量", prop: "signTime" },
      { label: "单位", prop: "member_name" },
      { label: "发货单", prop: "outboundStatus" },
      { label: "承运商", prop: "receiveTotalAmount", price: true },
      { label: "运单号", prop: "total", price: true },
      { label: "销售单价", prop: "taxUnitPrice", isProductPrice: true },
      { label: "价税合计", prop: "priceTax", isProductTotal: true }
    ]
    // 库存信息
    const inventoryColumn = [
      { label: "产品编号", prop: "number", default: true },
      { label: "产品名称", prop: "client_name" },
      { label: "订单数量", prop: "signTime" },
      { label: "仓库", prop: "member_name" },
      { label: "在库数量", prop: "outboundStatus" },
      { label: "可用库存", prop: "receiveTotalAmount", price: true },
      { label: "单位", prop: "total", price: true }
    ]
    // 制造信息
    const makeColumn = [
      { label: "生产订单", prop: "number", default: true },
      { label: "产品名称", prop: "client_name" },
      { label: "订单状态", prop: "signTime" },
      { label: "工单编号", prop: "member_name" },
      { label: "工单状态", prop: "outboundStatus" },
      { label: "计划开始时间", prop: "receiveTotalAmount", price: true },
      { label: "计划结束时间", prop: "total", price: true }
    ]
    return {
      tableList: {},
      queryClassOptions: [
        { value: "1", label: "全部" },
        { value: "2", label: "已发货" },
        { value: "3", label: "待采购" },
        { value: "4", label: "本月交付" },
        { value: "5", label: "已作废" }
      ],
      searchOptions: [],
      operatesList: [
        { id: "1", name: "共享" },
        { id: "2", name: "批量编辑" },
        { id: "3", name: "导出" },
        { id: "4", name: "下载全部附件" },
        { id: "5", name: "更改创建人" },
        { id: "6", name: "树结构设置" },
        { id: "7", name: "审批设置" },
        { id: "8", name: "恢复预设列宽" }
      ],
      editConfig: {
        visible: false,
        title: "新建",
@@ -162,35 +229,28 @@
      },
      tableColumn: [
        { label: "订单编号", prop: "number", isCommonClick: true, default: true },
        { label: "客户名称", prop: "client_name", isClientClick: true },
        { label: "签约日期", prop: "signTime", width: 150 },
        { label: "销售负责人", prop: "member_name" },
        // { label: "出库状态", prop: "outboundStatus" },
        { label: "已收总额", prop: "receiveTotalAmount", price: true },
        { label: "签约日期", prop: "signTime" },
        { label: "交付日期", prop: "deliveryDate" },
        { label: "订单来源", prop: "source" },
        { label: "合计", prop: "total", price: true },
        { label: "应收余额", prop: "amountReceivable", price: true },
        { label: "已开票金额", prop: "invoicedAmount", price: true },
        { label: "未开票金额", prop: "uninvoicedAmount", price: true },
        { label: "产品名称", prop: "productName", isProductName: true },
        { label: "数量", prop: "productNumber", isProductAmount: true },
        { label: "销售单价", prop: "taxUnitPrice", isProductPrice: true },
        { label: "价税合计", prop: "priceTax", isProductTotal: true }
        { label: "状态", prop: "status", isCallMethod: true, getCallMethod: this.getStatus }
      ],
      showCol: [
        "订单编号",
        "客户名称",
        "签约日期",
        "销售负责人",
        "已收总额",
        "合计",
        "应收余额",
        "已开票金额",
        "未开票金额",
        "产品名称",
        "数量",
        "销售单价",
        "价税合计"
      ]
      showCol: ["订单编号", "销售负责人", "签约日期", "交付日期", "订单来源", "合计", "状态"],
      tableBottomColumn: [],
      showBottomCol: [],
      isClickProduct: true, // 产品信息
      isClickInventory: false, // 库存信息
      isClickMake: false, // 制造信息
      TabsIndex: "0",
      productTableList: {},
      productColumn: productColumn,
      showProductCol: ["产品编号", "产品名称", "数量", "单位", "发货单", "承运商", "运单号", "销售单价", "价税合计"],
      inventoryColumn: inventoryColumn,
      showInventoryCol: ["产品编号", "产品名称", "订单数量", "仓库", "在库数量", "可用库存", "单位"],
      makeColumn: makeColumn,
      showMakeCol: ["生产订单", "产品名称", "订单状态", "工单编号", "工单状态", "计划开始时间", "计划结束时间"],
      selectRow: {}
    }
  },
  created() {
@@ -206,38 +266,63 @@
  },
  methods: {
    setTable() {
      // top 明细单列表
      this.tableList = {
        selectIndex: true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showCol,
        tableColumn: this.setColumnVisible(this.showCol)
        tableColumn: this.setColumnVisible(this.showCol, this.tableColumn)
      }
      this.tableList.allcol = this.tableList.tableColumn.filter((ele) => !ele.default).map((ele) => ele.label)
      this.setTableList(this.tableList)

      // bottom 产品信息/库存信息/制造信息列表
      this.tableBottomColumn = this.productColumn
      this.showBottomCol = this.showProductCol
      this.setBottomList()
    },
    // bom 列表
    setBottomList() {
      this.productTableList = {
        selectIndex: true,
        tableInfomation: [],
        allcol: [],
        showcol: this.showBottomCol,
        tableColumn: this.setColumnVisible(this.showBottomCol, this.tableBottomColumn)
      }
      this.setTableList(this.productTableList)
    },
    setTableList(tableList) {
      tableList.allcol = 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
      for (let i = 0; i < tableList.tableColumn.length; i++) {
        const label = tableList.tableColumn[i].label
        const value = tableList.tableColumn[i].prop
        this.searchOptions.push({ value: value, label: label })
      }
    },
    setColumnVisible(showCol) {
      return this.tableColumn.map((ele) => {
    setColumnVisible(showCol, tableColumn) {
      return tableColumn.map((ele) => {
        return {
          ...ele,
          isShowColumn: showCol.includes(ele.label)
        }
      })
    },
    // top 明细单
    selTableCol(val) {
      this.showcol = val
      this.tableList.tableColumn = this.setColumnVisible(val)
      this.tableList.tableColumn = this.setColumnVisible(val, this.tableColumn)
    },
    // bottom 产品信息
    selBottomTableCol(val) {
      this.showcol = val
      this.productTableList.tableColumn = this.setColumnVisible(val, this.tableBottomColumn)
    },
    // 请求数据
    async getData() {
      this.loading = true
      let params = {}
      console.log("ssssssssssss")
      console.log(this.addConfig)
      if (this.addConfig.keywordType === "客户名称") {
        params = {
@@ -274,11 +359,18 @@
                return {
                  ...item,
                  client_name: item.client.name,
                  member_name: item.Member.username
                  member_name: item.Member.username,
                  source: "CRM同步",
                  status: 2
                }
              })
              this.tableList.tableInfomation = list || []
              this.pagerOptions.totalCount = res.data.count
              if (res.data.count > 0) {
                this.selectRow = this.tableList.tableInfomation.length > 0 ? this.tableList.tableInfomation[0] : {}
                // let row = this.tableList.tableInfomation[0];
                // this.getPointinspectionRecord(row.id);
              }
            } else {
              this.tableList.tableInfomation = []
            }
@@ -314,11 +406,11 @@
        quotation_number: ""
      }
    },
    // 编辑
    handleClick(row) {
      console.log(row)
    // 查看 编辑
    handleClick(row, title) {
      console.log(row, title)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.title = title
      this.editConfig.infomation = {
        ...row,
        currency: "人民币",
@@ -326,6 +418,14 @@
        deliverType: row.deliverType === 0 ? "" : row.deliverType,
        quotation_number: row.quotation.number
      }
    },
    // 确认提交
    submitClick(row) {
      console.log(row, "确认提交")
    },
    // 关闭
    closeClick(row) {
      console.log(row, "关闭")
    },
    // 删除
    delClick(rowID) {
@@ -381,6 +481,45 @@
      this.addCollectionConfig.title = "新建"
      this.addCollectionConfig.sourceType = 1
      this.addCollectionConfig.infomation = { ...row }
    },
    //获取当前选中资源的id
    getTab(tab) {
      this.TabsIndex = tab
      if (this.TabsIndex == 0) {
        this.isClickProduct = true
        this.isClickInventory = false
        this.isClickMake = false
        // 产品信息列表
        this.tableBottomColumn = this.productColumn
        this.showBottomCol = this.showProductCol
        this.setBottomList()
      } else if (this.TabsIndex == 1) {
        this.isClickProduct = false
        this.isClickInventory = true
        this.isClickMake = false
        // 库存信息列表
        this.tableBottomColumn = this.inventoryColumn
        this.showBottomCol = this.showInventoryCol
        this.setBottomList()
      } else if (this.TabsIndex == 2) {
        this.isClickProduct = false
        this.isClickInventory = false
        this.isClickMake = true
        // 制造信息列表
        this.tableBottomColumn = this.makeColumn
        this.showBottomCol = this.showMakeCol
        this.setBottomList()
      }
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "待确认" : val === 2 ? "待出库" : val === 3 ? "出库完成" : val === 4 ? "已关闭" : "--"
    },
    // top 行点击
    tableRowClick(row, column, event) {
      console.log(row, column, event)
      this.selectRow = row
      // this.getPointinspectionRecord(row.id);
    }
  }
}
@@ -420,16 +559,51 @@
    box-sizing: border-box;
    padding: 10px 20px;
    border-radius: 12px;
    height: calc(100% - 92px);
    .body-card {
    height: calc(100% - 70px);
    .content-top {
      background-color: #fff;
      border-radius: 12px;
      height: 100%;
      overflow: hidden;
    }
      min-height: 70px;
      height: 48%;
      position: relative;
    .list-view {
      height: calc(100% - 60px);
      overflow: hidden;
      }
    }
    .content-bottom {
      .bottom-tabs {
        height: 40px;
        line-height: 40px;
        background: #e6ecf2;
        display: flex;
        .tab-pane {
          width: 100px;
          margin-right: 20px;
          font-size: 14px !important;
          text-align: center;
          background: #2a78fb;
          border-top-left-radius: 20px;
          border-top-right-radius: 20px;
        }
      }
      .lable-view {
        background: #e6ecf2;
        height: 40px;
        line-height: 40px;
        .name {
          border-left: 4px solid #2a78fb;
          padding-left: 10px;
        }
      }
      background-color: #fff;
      border-radius: 12px;
      min-height: 70px;
      height: calc(52% - 60px);
      margin-top: 10px;
      // padding: 10px 20px;
      .list-view {
        height: calc(100% - 10px);
      }
    }
    .btn-pager {
      display: flex;
@@ -440,4 +614,11 @@
    }
  }
}

.bgcGrey {
  background: #e6ecf2;
}
.bgcWhite {
  background: #fff !important;
}
</style>