songshankun
2023-10-21 d05d95424986dc6e8defefb24fab6dc62e37ee08
Merge branch 'dev' into songshankun/adjust-style
6个文件已修改
42 ■■■■■ 已修改文件
src/views/client/followupRecords/AddFollowupRecordsDialog.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/collectionPlan/AddCollectionPlan.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/other/payment/collectionPlan/index.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesDetails/AddSalesDetailsDialog.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesDetails/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesReturn/AddSalesReturnDialog.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/client/followupRecords/AddFollowupRecordsDialog.vue
@@ -632,7 +632,9 @@
    },
    async handleSelectClient(value, item) {
      if (value === "client") {
        console.log(item, "item")
        this.editConfig.infomation.contact_name = ""
        this.editConfig.infomation.sales_leads_name=""
        this.editConfig.infomation.sale_chance_name=""
        this.editSelectContactConfig.search_map.client_id = item.id
        this.editSelectChanceConfig.search_map.client_id = item.id
        this.editSelectLeadConfig.search_map.name = item.name
@@ -669,9 +671,9 @@
        this.editConfig.infomation.contact_name = row.name
        this.contactId = row.id
      } else if (value === "client") {
        // this.editConfig.infomation.client_name = row.name;
        // this.clientId = row.id;
        // this.isChance = false;
        this.editConfig.infomation.contact_name = ""
        this.editConfig.infomation.sales_leads_name=""
        this.editConfig.infomation.sale_chance_name=""
        this.editSelectContactConfig.search_map.client_id = row.id
        this.editSelectChanceConfig.search_map.client_id = row.id
        this.editSelectLeadConfig.search_map.name = row.name
@@ -692,6 +694,9 @@
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.contact_name = ""
        this.editConfig.infomation.sales_leads_name=""
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.client_name = ""
        this.clientId = 0
        this.isChance = true
src/views/other/payment/collectionPlan/AddCollectionPlan.vue
@@ -142,7 +142,7 @@
        </div>
        <div class="btn-view">
          <el-button type="primary" size="small" @click="saveClick">保存</el-button>
          <el-button size="small" @click="editConfig.visible = false">取消</el-button>
          <el-button size="small" @click="droppedClick">取消</el-button>
        </div>
      </div>
    </el-dialog>
@@ -247,6 +247,10 @@
        }
      }
    },
    droppedClick(){
      this.editConfig.visible = false
      this.$parent.getData()
    },
    // 计算计划总额
    sumTotalAmount() {
      this.planAmount = 0
src/views/other/payment/collectionPlan/index.vue
@@ -178,8 +178,10 @@
          if (res.code === 200) {
            if (res.data.data && res.data.data.length > 0) {
              const list = res.data.data.map((item) => {
                item.client_name=this.addConfig.client_name
                item.number=item.term
                return {
                  ...item
                  ...item,
                }
              })
              this.tableList.tableInfomation = list || []
src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -24,7 +24,7 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="订单编号" prop="number">
                <el-form-item label="明细单编号" prop="number">
                  <WordInput
                    v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                    :codenumer="codenumer"
@@ -701,13 +701,15 @@
    },
    handleSelectClient(value, item) {
      if (value === "client") {
        this.editConfig.infomation.subbill_name =""
        this.editConfig.infomation.sale_chance_name=""
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
        this.getSaleChanceList(item)
        this.getSubOrderList(item)
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.client_name = item.name
        this.editConfig.infomation.sale_chance_name = item.name
      } else if (value === "subbill") {
        console.log("下拉框点击", item)
        this.subbillId = item.id
@@ -728,6 +730,8 @@
    },
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.subbill_name=""
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.getSaleChanceList(row)
@@ -743,7 +747,9 @@
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.client_name = ""
        this.editConfig.infomation.subbill_name =""
        this.clientId = 0
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = ""
src/views/sales/salesDetails/index.vue
@@ -318,7 +318,7 @@
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "人民币" }
      this.editConfig.infomation = { ...row, sale_chance_name: "", currency: "人民币",sale_chance_name:row.saleChance.name,}
    },
    // 删除
    delClick(rowID) {
src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -460,6 +460,7 @@
    },
    async handleSelectClient(value, item) {
      if (value === "client") {
        this.editConfig.infomation.salesDetailNumber = ""
        this.clientId = item.id
        this.editSelCommonConfig.clientId = item.id
        await getSalesDetailsList({
@@ -486,6 +487,7 @@
    async selClient(row, value) {
      console.log(row, value)
      if (value === "client") {
        this.editConfig.infomation.salesDetailNumber = ""
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.editSelCommonConfig.clientId = row.id
@@ -504,14 +506,11 @@
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        // this.editConfig.infomation = {}
        this.editConfig.infomation.salesDetailNumber = ""
        this.editConfig.infomation.client_name = ""
        this.clientId = 0
      } else if (value === "contract") {
        this.editConfig.infomation.salesDetailNumber = ""
        // this.productTableList.tableData = []
        // this.tableData = []
        // this.SalesDetailsId = 0
      }
    },
    // 添加附件