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

yangfeng

2024-02-28 7979474ca5570945126d7f087fa4363272d964b4

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -91,8 +91,17 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售机会" prop="sale_chance_name"
                :rules="[{ required: autoCodeHeadersObj.Ywjh=='yes'?true:false, message: '请选择销售机会', trigger: 'change' }]">
                <el-form-item
                  label="销售机会"
                  prop="sale_chance_name"
                  :rules="[
                    {
                      required: autoCodeHeadersObj.Ywjh == 'yes' ? true : false,
                      message: '请选择销售机会',
                      trigger: 'change'
                    }
                  ]"
                >
                  <div class="custom-name">
                    <el-autocomplete
                      style="width: 100%"
@@ -106,8 +115,9 @@
                      @select="handleSelectClient('chance', $event)"
                      :disabled="isNameChanceEdit || isView"
                    ></el-autocomplete>
                    <!-- &&editConfig.infomation.client_name -->
                    <div
                      v-if="!isNameChanceEdit && !isView&&editConfig.infomation.client_name"
                      v-if="!isNameChanceEdit && !isView"
                      class="common-select-btn"
                      @click="selClientClick('chance')"
                    >
@@ -161,8 +171,18 @@
                </el-form-item>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="销售报价单" prop="quotation_number"
                :rules="[{ required: autoCodeHeadersObj.Bjd=='yes'?true:false, message: '请选择销售报价单', trigger: 'change' }]">
                <el-form-item
                  label="销售报价单"
                  prop="quotation_number"
                  :rules="[
                    {
                      required: autoCodeHeadersObj.Bjd == 'yes' ? true : false,
                      message: '请选择销售报价单',
                      trigger: 'change'
                    }
                  ]"
                >
                <!-- isAddQuatation || -->
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.quotation_number"
@@ -174,21 +194,22 @@
                      value-key="number"
                      @select="handleSelectClient('quotation', $event)"
                      style="width: 100%"
                      placeholder="请先选择销售机会"
                      :disabled="isAddQuatation || isView"
                      placeholder="请选择销售报价单"
                      :disabled=" isView"
                    ></el-autocomplete>
                    <!-- !isAddQuatation && editConfig.infomation.sale_chance_name &&-->
                    <div
                      v-if="!isAddQuatation && !isView&&editConfig.infomation.sale_chance_name"
                      v-if=" !isView"
                      class="common-select-btn"
                      @click="selClientClick('quotation')"
                    >
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <!-- !isAddQuatation && -->
                    <div
                      v-if="
                        editConfig.infomation.quotation_number &&
                        editConfig.infomation.quotation_number.length > 0 &&
                        !isAddQuatation &&
                        !isView
                      "
                      class="common-select-btn"
@@ -407,13 +428,18 @@
            <!-- :detail-enter="true" -->
            <CommonFormTableView
              ref="commonFormTableView"
              :detail-enter="isView?true:false"
              :detail-enter="isView ? true : false"
              :selectBox="false"
              :addTypeIdMultiple="true"
              :show-summary="showSummary"
              pageName="quotation"
              :isOperate="((autoCodeHeadersObj.Bjd=='yes'&&editConfig.infomation.quotation_number)||autoCodeHeadersObj.Bjd!='yes')?true:false"
              :quotationNumber="autoCodeHeadersObj.Bjd=='yes'?editConfig.infomation.quotation_number:''"
              :isOperate="
                (autoCodeHeadersObj.Bjd == 'yes' && editConfig.infomation.quotation_number) ||
                autoCodeHeadersObj.Bjd != 'yes'
                  ? true
                  : false
              "
              :quotationNumber="autoCodeHeadersObj.Bjd == 'yes' ? editConfig.infomation.quotation_number : ''"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
@@ -606,25 +632,41 @@
      thatMember: {},
      pickerOptions: {
        disabledDate(time) {
          return time.getTime() <  Date.now() - 8.64e7;
        },
          return time.getTime() < Date.now() - 8.64e7
        }
      },
      pickerOptionsBefore:{
      pickerOptionsBefore: {
        disabledDate(time) {
          return time.getTime() >  Date.now();
        },
          return time.getTime() > Date.now()
        }
      }
    }
  },
  created() {
    if (this.editConfig.title !== "新建") {
      this.productTableList.tableData=[
        {
          productId: this.productId,
          id: 0,
          amount: 0,
          desc: "",
          name: "",
          number: "",
          price: 0,
          cost: "",
          profit: "",
          margin: "",
          total: 0,
          unit: ""
        }
      ]
      this.isAddQuatation = false
    }
    this.$store.dispatch("geClient")
    this.setTableForm()
    this.getCommonData()
    this.formInfo()
    this.getUseSystemSet({modeType:'xsmx'})
    this.getUseSystemSet({ modeType: "xsmx" })
    if (this.editConfig.title === "编辑") {
      this.productTableList.tableData = this.editConfig.infomation.products
    }
@@ -692,11 +734,10 @@
          } else {
            for (let i = 0; i < this.tableData.length; i++) {
              if (this.tableData[i].cost) {
                let reg =
            /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;
                if(!reg.test(this.tableData[i].cost)){
                let reg = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/
                if (!reg.test(this.tableData[i].cost)) {
                  this.$message.error("成本单价需要填写大于0的2位小数！")
                  return true;
                  return true
                }
              }
            }
@@ -790,19 +831,17 @@
          this.count=res.data.count;
          if (value === "全部产品") {
            // this.quotationList.map((item) => {
              // if (item.id === this.editConfig.infomation.quotationId) {
             
              //   this.tableData.map((item, index) => {
              //     item.productId = index + 1
              //     this.tableData.forEach((key) => {
              //       if (item.number === key.number) {
              //         item.amount = key.amount
              //         item.id = key.id
              //       }
              //     })
              //   })
               
              // }
            // if (item.id === this.editConfig.infomation.quotationId) {
            //   this.tableData.map((item, index) => {
            //     item.productId = index + 1
            //     this.tableData.forEach((key) => {
            //       if (item.number === key.number) {
            //         item.amount = key.amount
            //         item.id = key.id
            //       }
            //     })
            //   })
            // }
            // })
          }
        }
@@ -891,7 +930,9 @@
      if (value === "client") {
        this.editSelectClientConfig.editVisible = true
      } else if (value === "chance") {
        this.editSelectChanceConfig.clientId = this.clientId
        if(this.clientId){
          this.editSelectChanceConfig.clientId = this.clientId
        }
        this.editSelectChanceConfig.editVisible = true
      } else if (value === "subbill") {
        this.editSelCommonConfig.title = "销售子单"
@@ -899,24 +940,37 @@
        this.editSelCommonConfig.clientId = this.clientId
      } else if (value === "quotation") {
        this.editSelCommonConfig.title = "报价单"
        if(this.saleChanceId&&this.clientId){
          this.editSelCommonConfig.clientId = this.clientId
          // 正向选择客户 销售机会  报价单
          this.editSelCommonConfig.isRequest = false
          this.editSelCommonConfig.count=this.count
          this.editSelCommonConfig.tableInfomation = [...this.quotationList]
        }else{
           // 反向选择
          this.editSelCommonConfig.isRequest = true;
        }
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.clientId = this.clientId
        this.editSelCommonConfig.isRequest = false
        this.editSelCommonConfig.count=this.count
        this.editSelCommonConfig.tableInfomation = [...this.quotationList]
      }
    },
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name = ""
        this.saleChanceId=''
        this.editConfig.infomation.subbill_name = ""
        // 清空报价单
        this.editConfig.infomation.quotation_number =''
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.getSaleChanceList(row)
        this.getSubOrderList(row)
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.editConfig.infomation.client_name = row.client.name
        this.clientId = row.client.id
        this.saleChanceId = row.id
        // 清空报价单
        this.editConfig.infomation.quotation_number =''
        this.isAddQuatation = false
        this.getQuotation(row.id)
      } else if (value === "subbill") {
@@ -926,6 +980,12 @@
        this.productTableList.tableData = row.products
        // this.tableData = row.products
        this.editConfig.infomation.quotation_number = row.number
        //反向 客户名称
        this.editConfig.infomation.client_name = row.client.name
        this.clientId = row.client.id
        //反向 销售机会
        this.editConfig.infomation.sale_chance_name = row.sale_chance.name
        this.saleChanceId = row.sale_chance.id
        this.quotationId = row.id
      }
    },
@@ -970,9 +1030,9 @@
            name: "",
            number: "",
            price: 0,
            cost:'',
            profit:'',
            margin:'',
            cost: "",
            profit: "",
            margin: "",
            total: 0,
            unit: ""
          }
@@ -985,21 +1045,23 @@
        this.getQuotation(this.editConfig.infomation.saleChanceId, "全部产品")
      }
      // let productData = this.quotationList.products
      let isBjdRequird=false
      if(this.autoCodeHeadersObj.Bjd=='yes'){
        isBjdRequird=true
      let isBjdRequird = false
      if (this.autoCodeHeadersObj.Bjd == "yes") {
        isBjdRequird = true
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true,min:110, },
          { label: "产品名称", prop: "name", productName: true, isRequird: true, min: 110 },
          { label: "规格", prop: "specs" },
          { label: "型号", prop: "type" },
          { label: "产品编号", prop: "number" },
          { label: "单位", prop: "unit" },
          { label: "销售单价", prop: "price",inputFloat: !isBjdRequird, isRequird: true },
          { label: "成本单价", prop: "cost",input: !isBjdRequird},
          { label: "销售单价", prop: "price", inputFloat: !isBjdRequird, isRequird: true },
          { label: "成本单价", prop: "cost", input: !isBjdRequird },
          { label: "毛利", prop: "profit" },
          { label: "毛利率(%)", prop: "margin",min:90},
          { label: "毛利率(%)", prop: "margin", min: 90 },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "价税合计", prop: "total" }
        ]
@@ -1034,14 +1096,14 @@
      // this.showSummary.show = true
    },
    // 新增方式修改
    getSelectArray(val){
      if(val.length>0){
    getSelectArray(val) {
      if (val.length > 0) {
        val.map((item, index) => {
          item.productId = this.tableData.length + index+1
          item.productId = this.tableData.length + index + 1
        })
      }
      this.tableData=this.tableData.concat(val);
      this.productTableList.tableData=this.tableData
      this.tableData = this.tableData.concat(val)
      this.productTableList.tableData = this.tableData
      this.showSummary.show = true
    },
    //  产品清空
@@ -1056,9 +1118,9 @@
          name: "",
          number: "",
          price: 0,
          cost:'',
          profit:'',
          margin:'',
          cost: "",
          profit: "",
          margin: "",
          total: 0,
          unit: ""
        }