Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web

haoxuan

2024-02-28 fb20919d312b7f3bf81805eda670f42fa2d18e39

Merge branch 'master' of http://192.168.5.5:10010/r/web/crm-web

 src/components/makepager/CommonFormTableView.vue

@@ -67,15 +67,23 @@
                      }
                    "
                  ></el-autocomplete>
                  <div class="common-select-btn" v-if="isOperate" @click="selClientClick(scope.row, item.prop)">
                    <i class="el-icon-circle-plus-outline" title="选择"></i>

                  <div
                    v-if="scope.row[item.prop] && scope.row[item.prop].length > 0 && isOperate"
                    class="common-select-btn"
                    @click="handleEditClient(scope, item.prop)"
                  >
                    <i class="el-icon-edit" title="编辑"></i>
                  </div>
                  <div
                    v-if="scope.row[item.prop] && scope.row[item.prop].length > 0&&isOperate"
                    class="common-select-btn"
                    @click="clearupClient(scope.row)"
                    @click="clearupClient(scope)"
                  >
                    <i class="el-icon-remove-outline" title="清除"></i>
                  </div>
                  <div class="common-select-btn" v-else @click="selClientClick(scope, item.prop)">
                    <i class="el-icon-circle-plus-outline" title="选择"></i>
                  </div>
                </div>
              </el-form-item>
@@ -86,7 +94,13 @@
                :rules="[{ required: item.isRequird ? true : false, message: '输入不能为空' }]"
              >
                <!-- <el-input v-model.trim="scope.row[item.prop]" maxlength="50" size="mini"></el-input> -->
                <el-date-picker :disabled="!isOperate" v-model="scope.row[item.prop]" type="date" size="mini" style="width: 110px">
                <el-date-picker
                  :disabled="!isOperate"
                  v-model="scope.row[item.prop]"
                  type="date"
                  size="mini"
                  style="width: 110px"
                >
                </el-date-picker>
              </el-form-item>
              <el-form-item
@@ -164,12 +178,7 @@
        </el-table-column>
        <el-table-column  label="操作" width="40" v-if="!detailEnter" align="center">
          <template slot-scope="scope">
            <el-button
              type="text"
              size="small"
              :disabled="!isOperate"
              @click="deleteClick(scope)"
              >删除</el-button>
            <el-button type="text" size="small" :disabled="!isOperate" @click="deleteClick(scope)">删除</el-button>
          </template>
        </el-table-column>
        <slot name="tableButton" />
@@ -179,7 +188,7 @@
      <el-button size="small" type="primary" :disabled="!isOperate" @click="add">新增</el-button>
      <!-- <el-button size="small" type="primary" disabled>导入明细</el-button> -->
      <el-button size="small" type="primary" :disabled="!isOperate" @click="empty">清空</el-button>
      <el-button size="small" type="primary" @click="recalculate" :disabled="(isRecalculate&&!isOperate) ? false : true"
      <el-button size="small" type="primary" @click="recalculate" :disabled="isRecalculate && !isOperate ? false : true"
        >重算</el-button
      >
    </div>
@@ -199,6 +208,7 @@
    <SelectCommonDialog
      v-if="editSelCommonConfig.editVisible"
      :edit-common-config="editSelCommonConfig"
      :selectBoxList="tableList.tableData"
      :quotationNumber="quotationNumber"
      @selClient="selClient"
      @getSelectArray="getSelectArray"
@@ -224,22 +234,22 @@
    // 那个页面 用来判断计算方式
    pageName:{
      type:String,
      default:''
      default: ""
    },
    // 列表新增是否多选
    addTypeIdMultiple:{
      type:Boolean,
      default:false,
      default: false
    },
    // 根据报价单查询产品
    quotationNumber:{
      type:[String,Number],
      default:''
      default: ""
    },
    // 是否可以操作 添加等 
    isOperate:{
      type:Boolean,
      default:true,
      default: true
    },
    productTableList: {
      type: Object,
@@ -344,13 +354,13 @@
          sums[index] = "小计:"
          return
        }
        const title = ["#", "产品名称",'产品编号','单位','销售单价','成本单价']
        const title = ["#", "产品名称", "产品编号", "单位", "销售单价", "成本单价"]
        // 去除某些不需要计算的数据
        if (title.includes(column.label)) {
          sums[index] = ""
          return
        }
        if(this.pageName=='quotation'&&column.label=='毛利'){
        if (this.pageName == "quotation" && column.label == "毛利") {
          sums[index] = ""
          return
        }
@@ -407,8 +417,9 @@
    // 新增
    add() {
      if(this.addTypeIdMultiple){
        this.productIndex = this.tableList.tableData.length
        this.editSelCommonConfig.title = "产品名称"
        this.editSelCommonConfig.isSelectBox=true;
        this.editSelCommonConfig.isSelectBox = true
        this.editSelCommonConfig.editVisible = true
      }else{
        this.$emit("addProductClick")
@@ -422,23 +433,24 @@
          }
        })
      }
      if(this.pageName=='quotation'&&prop=='cost'&&scope.row.cost){
      if (this.pageName == "quotation" && prop == "cost" && scope.row.cost) {
        let value=scope.row.cost
        let reg2 =
            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
        let reg2 = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
          if (!reg2.test(value)||value==0) {
            this.$message.error("成本单价需要填写大于0的2位小数！")
            return true;
          return true
          } 
        this.$forceUpdate()
      }
      if(this.pageName=='quotation'){
        if(prop=='price'||prop=='cost'){
      if (this.pageName == "quotation") {
        if (prop == "price" || prop == "cost") {
          if(scope.row.price&&scope.row.cost){
            let profit=Number(scope.row.price)-Number(scope.row.cost)
            scope.row.profit=profit+'';
            let margin=((Number(scope.row.price)-Number(scope.row.cost))*100/Number(scope.row.cost)).toFixed(2)
            scope.row.margin=margin+'';
            scope.row.profit = profit + ""
            let margin = (((Number(scope.row.price) - Number(scope.row.cost)) * 100) / Number(scope.row.cost)).toFixed(
              2
            )
            scope.row.margin = margin + ""
          }
        }
      }
@@ -452,8 +464,8 @@
    // 删除
    deleteClick(scope){
      this.tableList.tableData.splice(scope.$index,1)
      this.$forceUpdate();
      this.$message.success('删除成功！')
      this.$forceUpdate()
      this.$message.success("删除成功！")
      this.$emit("deleteClick",scope)
    },
    // 重算
@@ -496,16 +508,25 @@
        }
      })
    },
    selClientClick(row, prop) {
      console.log(row, prop)
      this.productIndex = row.productId - 1
    // 新增
    selClientClick(scope, prop) {
      console.log(scope, prop)
      this.productIndex = scope.$index
      this.editSelCommonConfig.title = "产品名称"
      this.editSelCommonConfig.isSelectBox=false;
      this.editSelCommonConfig.isSelectBox = true
      this.editSelCommonConfig.editVisible = true
    },
    // 编辑
    handleEditClient(scope, prop) {
      console.log(scope, prop)
      this.productIndex = scope.$index
      this.editSelCommonConfig.title = "产品名称"
      this.editSelCommonConfig.isSelectBox = false
      this.editSelCommonConfig.editVisible = true
    },
    selClient(item) {
      console.log(item)
      console.log(this.tableList.tableData)
      let list = this.tableList.tableData.map((item) => item.number)
      if (list.findIndex((v) => v == item.number) == -1) {
      this.isRecalculate = true
      // this.editConfig.infomation.client_name = row.name
      this.tableList.tableData.map((ite, index) => {
@@ -518,13 +539,16 @@
          ite.unit = item.unit
        }
      })
      } else {
        this.$message.error("不能选择重复的产品， 请重新选择")
      }
    },
    getSelectArray(val){
      this.$emit("getSelectArray",val)
      this.$emit("getSelectArray", val, this.productIndex)
    },
    // 清除已选择用户
    clearupClient(row) {
      this.productIndex = row.productId - 1
    clearupClient(scope) {
      this.productIndex = scope.$index
      this.tableList.tableData.map((ite, index) => {
        if (index === this.productIndex) {
          ite.name = ""
@@ -555,7 +579,6 @@
<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
.page-view {
  
  .el-form-item {
    margin-bottom: 0;
    .custom-name {

 src/components/makepager/TableCommonView.vue

@@ -19,7 +19,7 @@
      @row-click="tableRowClick"
      :row-class-name="tableRowClassName"
    >
      <el-table-column v-if="selectBox" type="selection" width="40"> </el-table-column>
      <el-table-column v-if="selectBox" type="selection" width="40" :selectable="selectable"> </el-table-column>
      <el-table-column v-if="tableList.selectIndex" type="index" label="序号" width="50"></el-table-column>
      <el-table-column
        v-for="(item, i) in tableList.tableColumn"
@@ -188,8 +188,13 @@
    loading:{
      type: Boolean,
      default: false
    },
    selectBoxList: {
      type: Array,
      default: () => []
    }
  },

  data() {
    return {
      iscolopen: false,
@@ -391,6 +396,14 @@
        }
      }
      this.$emit("tableRowClassName", row)
    },
    selectable(row) {
      let list = this.selectBoxList.map((item) => item.number)
      if (list.findIndex((v) => v == row.number) == -1) {
        return true
      } else {
        return false
      }
    }
  }
}

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -33,6 +33,7 @@
          ref="tableListRef"
          :table-list="tableList"
          :select-box="editCommonConfig.isSelectBox"
          :selectBoxList="selectBoxList"
          @selCommonClick="selNameClick"
          @selTableCol="selTableCol"
          @getSelectArray="getSelectArray"
@@ -84,8 +85,12 @@
    // 根据报价单查询产品
    quotationNumber:{
      type:[String,Number],
      default:''
      default: ""
    },
    selectBoxList: {
      type: Array,
      default: () => []
    }
  },
  components: {},
  computed: {},
@@ -106,7 +111,7 @@
      keywordType: "",
      tableColumn: [],
      showCol: [],
      selectArray:[],
      selectArray: []
    }
  },
  created() {
@@ -177,9 +182,9 @@
          { label: "客户名称", prop: "client_name" },
          { label: "所属业务机会", prop: "sale_chance_name" },
          { label: "报价单状态", prop: "quotationStatus" },
          { label: "合计", prop: "amountTotal" },
          { label: "合计", prop: "amountTotal" }
        ]
        this.showCol = ["报价单号","报价名称","销售负责人",'客户名称','所属业务机会','报价单状态','合计']
        this.showCol = ["报价单号", "报价名称", "销售负责人", "客户名称", "所属业务机会", "报价单状态", "合计"]
        this.tableList = {
          selectIndex: true,

@@ -212,10 +217,12 @@
        this.tableColumn = [
          { label: "产品名称", prop: "name", isClick: this.editCommonConfig.isSelectBox?false:true, default: true }, // 产品名称
          { label: "产品编号", prop: "number" },
          { label: "规格", prop: "specs" },
          { label: "销售单价", prop: "price" },
          { label: "单位", prop: "unit" },
          { label: "产品规格", prop: "specs" },
          { label: "型号", prop: "type" }
        ]
        this.showCol = ["产品名称", "产品编号",'规格','型号']
        this.showCol = ["产品名称", "产品编号", "销售单价", "单位", "产品规格", "型号"]
        this.tableList = {
          selectIndex: true,
          tableInfomation: [],
@@ -277,10 +284,10 @@
    },
    // 列表多选
    getSelectArray(val){
      this.selectArray=val;
      this.selectArray = val
    },
    saveClick(){
      this.$emit('getSelectArray',this.selectArray)
      this.$emit("getSelectArray", this.selectArray)
      this.editConfig.editVisible = false
    },
    // 请求数据
@@ -368,7 +375,7 @@
              }
            })
        this.pagerOptions.totalCount =this.editConfig.count?this.editConfig.count:0
        return true;
        return true
      }
      await getQuotationList({
        search_map: this.search_map,
@@ -533,7 +540,7 @@
    },
    selNameClick(row) {
      if(this.editCommonConfig.isSelectBox){
        return true;
        return true
      }
      this.editConfig.editVisible = false
      if (this.editConfig.title === "销售总单") {

 src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue

@@ -327,9 +327,11 @@
          <div class="product-view">
            <CommonFormTableView
              :show-summary="showSummary"
              :addTypeIdMultiple="true"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @getSelectArray="getSelectArray"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
@@ -1000,17 +1002,28 @@
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0
      // this.productId++
      // this.tableData.push({
      //   productId: this.productId,
      //   id: 0,
      //   amount: 0,
      //   desc: "",
      //   name: "",
      //   number: "",
      //   price: 0,
      //   total: 0
      // })
      // this.showSummary.show = true
    },
    // 新增方式修改
    getSelectArray(val) {
      if (val.length > 0) {
        val.map((item, index) => {
          item.productId = this.tableData.length + index + 1
      })
      }
      this.tableData = this.tableData.concat(val)
      this.productTableList.tableData = this.tableData
      this.showSummary.show = true
    },
    //  产品清空

 src/views/service/serviceContract/AddServiceContractDialog.vue

@@ -368,9 +368,11 @@
          <div class="product-view">
            <CommonFormTableView
              :show-summary="showSummary"
              :addTypeIdMultiple="true"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @getSelectArray="getSelectArray"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
@@ -613,17 +615,17 @@
      this.$refs[formName].validate((valid) => {
        if (valid) {
          console.log(this.editConfig.infomation)
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].name.length === 0) {
              this.isNoProduct = true
              break
            } else {
              this.isNoProduct = false
            }
          }
          if (this.isNoProduct) {
            this.$message.error("产品名称不能为空")
          } else {
          // for (let i = 0; i < this.tableData.length; i++) {
          //   if (this.tableData[i].name.length === 0) {
          //     this.isNoProduct = true
          //     break
          //   } else {
          //     this.isNoProduct = false
          //   }
          // }
          // if (this.isNoProduct) {
          //   this.$message.error("产品名称不能为空")
          // } else {
            const params = this.saveParams()
            if (this.editConfig.title === "新建") {
              getAddServiceContract(params).then((res) => {
@@ -645,14 +647,20 @@
              })
            }
          }
        } else {
          console.log("error submit")
          return false
        }
        // } else {
        //   console.log("error submit")
        //   return false
        // }
      })
    },
    saveParams() {
      let data = this.editConfig.infomation
      let products = []
      this.tableData.map((item) => {
        if (item.number.length > 0) {
          products.push(item)
        }
      })
      let params = {
        id: this.editConfig.title === "新建" ? 0 : data.id,
        clientId: this.clientId || 0,
@@ -660,7 +668,7 @@
        endTime: data.endTime || "",
        memberId: data.memberId || 0,
        number: data.number || "",
        products: this.tableData,
        products: products,
        quotationId: this.quotationId || 0,
        remark: data.remark || "",
        saleChanceId: this.saleChanceId || 0,
@@ -800,8 +808,9 @@
      }
      this.productTableList = {
        tableData: this.tableData,
        isReturn: true,
        tableColumn: [
          { label: "#", prop: "productId", width: 40 },
          // { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
@@ -813,27 +822,43 @@
    },
    // 产品列表输入
    inputContent(val, prop, row) {
      this.productId = row.productId
      // this.productId = row.productId
      this.tableData.map((item) => {
        if (item.productId === row.productId) {
        if (item.number === row.number) {
          item[prop] = val
        }
      })
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0,
        unit: ""
      // this.productId++
      // this.tableData.push({
      //   productId: this.productId,
      //   id: 0,
      //   amount: 0,
      //   desc: "",
      //   name: "",
      //   number: "",
      //   price: 0,
      //   total: 0,
      //   unit: ""
      // })
      // this.showSummary.show = true
    },
    // 新增方式修改
    getSelectArray(val, index) {
      if (this.tableData.length == 1 && this.tableData[0].number.length == 0) {
        this.tableData = []
      }
      if (index < this.tableData.length) {
        this.tableData.splice(index, 1)
        val.map((item, ind) => {
          this.tableData.splice(index + ind, 0, item)
      })
      } else {
        this.tableData = this.tableData.concat(val)
      }
      this.productTableList.tableData = this.tableData
      this.showSummary.show = true
    },
    //  产品清空