yangfeng
2023-08-17 79b0a1a4f81ec7750e6deeb02bc9865785b6fee9
bug修复
9个文件已修改
184 ■■■■■ 已修改文件
src/views/client/client/DetailClientManage.vue 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/client/contacts/DetailContacts.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/client/salesLead/DetailSalesLead.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/quotation/AddQuotationDialog.vue 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesDetails/AddSalesDetailsDialog.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesOpportunity/DetailOpportunity.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/salesOpportunity/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sales/subOrder/AddSubOrderDialog.vue 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/client/client/DetailClientManage.vue
@@ -118,6 +118,10 @@
                  </div>
                </li>
              </ul>
              <div class="business_scope">
                <div class="content-title">{{ "经营范围:" }}</div>
                <div class="content-data">{{ detailConfig.infomation.business_scope }}</div>
              </div>
            </div>
          </div>
          <!-- 地址信息 -->
@@ -140,6 +144,10 @@
                  </div>
                </li>
              </ul>
              <div class="business_scope">
                <div class="content-title">{{ "地址信息" }}</div>
                <div class="content-data">{{ detailConfig.infomation.detail_address }}</div>
              </div>
            </div>
          </div>
          <!-- 备注信息 -->
@@ -200,6 +208,9 @@
        <div v-if="activeName === 'detail'" class="second">
          <SalesDetails :isDetail="true" :add-config="addConfig" />
        </div>
        <div v-if="activeName === 'receipt'" class="second">
          <Receipt :isDetail="true" :add-config="addConfig" :source-type="1" />
        </div>
      </div>
    </el-drawer>
  </div>
@@ -213,6 +224,7 @@
import MasterOrder from "@/views/sales/masterOrder"
import SubOrder from "@/views/sales/subOrder"
import SalesDetails from "@/views/sales/salesDetails"
import Receipt from "@/views/other/payment/receipt"
export default {
  name: "DetailClientManage",
  props: {
@@ -226,7 +238,7 @@
      }
    }
  },
  components: { FollowupRecords, Contacts, SalesOpportunity, Quotation, MasterOrder, SubOrder, SalesDetails },
  components: { FollowupRecords, Contacts, SalesOpportunity, Quotation, MasterOrder, SubOrder, SalesDetails, Receipt },
  computed: {},
  data() {
    return {
@@ -293,20 +305,14 @@
        {
          leftStr: "所属公海",
          leftValue: "",
          rightStr: "服务代表",
          rightValue: ""
        },
        {
          leftStr: "签到",
          leftValue: "",
          rightStr: "下次回访日期",
          rightValue: this.processTime(item.next_visit_time)
        },
        {
          leftStr: "创建时间",
          leftValue: "",
          rightStr: "最晚服务到期日",
          rightValue: this.processTime(item.latest_service_time)
          leftStr: "最晚服务到期日",
          leftValue: this.processTime(item.latest_service_time),
          rightStr: "创建时间",
          rightValue: ""
        },
        {
          leftStr: "创建人",
@@ -367,12 +373,6 @@
          leftValue: item.EnterpriseNature.name,
          rightStr: "客户规模",
          rightValue: item.EnterpriseScale.name
        },
        {
          leftStr: "经营范围",
          leftValue: item.business_scope,
          rightStr: "",
          rightValue: ""
        }
      ]
      this.addressInfoList = [
@@ -387,13 +387,13 @@
          leftValue: item.City.name,
          rightStr: "",
          rightValue: ""
        },
        {
          leftStr: "详细地址",
          leftValue: item.detail_address,
          rightStr: "",
          rightValue: ""
        }
        // {
        //   leftStr: "详细地址",
        //   leftValue: item.detail_address,
        //   rightStr: "",
        //   rightValue: ""
        // }
      ]
    },
    handleClose() {
@@ -546,10 +546,29 @@
                  color: #333;
                }
              }
              .remark {
              .remark,
              .all {
                width: 100%;
              }
            }
            .business_scope {
              display: flex;
              align-items: center;
              font-size: 14px;
              min-height: 40px;
              .content-title {
                width: 320px;
                text-align: right;
                color: #555;
              }
              .content-data {
                flex: 1;
                padding: 5px;
                text-align: left;
                margin-left: 25px;
                color: #333;
              }
            }
          }
        }
      }
src/views/client/contacts/DetailContacts.vue
@@ -191,7 +191,7 @@
        },
        {
          leftStr: "首要联系人",
          leftValue: item.is_first,
          leftValue: item.is_first ? "是" : "否",
          rightStr: "微信号",
          rightValue: item.wechat
        },
@@ -202,15 +202,15 @@
          rightValue: item.email
        },
        {
          leftStr: "签到",
          leftStr: "下次回访日期",
          leftValue: "",
          rightStr: "下次回访日期",
          rightStr: "最新联系日期",
          rightValue: ""
        },
        {
          leftStr: "最新联系日期",
          leftStr: "未联系天数",
          leftValue: "",
          rightStr: "未联系天数",
          rightStr: "",
          rightValue: ""
        }
      ]
src/views/client/salesLead/DetailSalesLead.vue
@@ -201,7 +201,7 @@
        {
          leftStr: "关闭原因",
          leftValue: "",
          rightStr: "签到",
          rightStr: "",
          rightValue: ""
        }
      ]
src/views/sales/quotation/AddQuotationDialog.vue
@@ -190,7 +190,7 @@
            <div style="margin-left: 400px">
              币种
              <el-select v-model="editConfig.infomation.currency" placeholder="请选择" size="mini" style="width: 63%">
                <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </div>
@@ -201,6 +201,8 @@
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
            />
          </div>
          <!-- 选择审批流程 -->
@@ -319,7 +321,7 @@
      },
      memberOptions: [],
      quotationStatusOptions: [{ id: 1, name: "不知道" }], // 报价单状态
      currencyOptions: [], // 币种
      currencyOptions: [{ id: 1, name: "人民币" }], // 币种
      approvalWorkflowOptions: [], // 审批流程
      productTableList: {},
      showSummary: {
@@ -512,7 +514,7 @@
    // 设置允许上传文件格式
    setFormatClick() {},
    setTableForm() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建" || this.editConfig.infomation.products === null) {
        this.tableData = [
          {
            id: 1,
@@ -538,7 +540,7 @@
          { label: "产品编号", prop: "Number" },
          { label: "数量", prop: "Amount", input: true, isRequird: true },
          { label: "销售单价", prop: "Unit", input: true },
          { label: "价税合计", prop: "other3", input: true },
          { label: "价税合计", prop: "total", input: true },
          { label: "描述", prop: "other8" }
        ]
      }
@@ -570,7 +572,28 @@
        SalePrice: 0,
        Unit: ""
      })
    }
    },
    //  产品清空
    emptyProductClick() {
      this.productId = 1
      this.tableData = [
        {
          id: 1,
          Amount: 0,
          IsSale: true,
          MaterialMode: "",
          MinInventory: 0,
          Name: "",
          Number: "",
          PurchaseType: "",
          SalePrice: 0,
          Unit: ""
        }
      ]
      this.productTableList.tableData = this.tableData
    },
    // 产品重算
    recalculateProductClick() {}
  }
}
</script>
src/views/sales/salesDetails/AddSalesDetailsDialog.vue
@@ -205,7 +205,7 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="备注" prop="notes">
                <el-form-item label="备注" prop="remark">
                  <el-input type="textarea" :autosize="{ minRows: 2 }" v-model="editConfig.infomation.notes"></el-input>
                </el-form-item>
              </el-col>
@@ -243,14 +243,8 @@
            产品管理
            <div style="margin-left: 400px">
              币种
              <el-select
                v-model="editConfig.infomation.currency"
                placeholder="请选择"
                size="mini"
                style="width: 63%"
                disabled
              >
                <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
              <el-select v-model="editConfig.infomation.currency" placeholder="请选择" size="mini" style="width: 63%">
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </div>
@@ -396,7 +390,8 @@
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId
      saleChanceId: this.editCommonConfig.infomation.saleChanceId,
      productId: 1
    }
  },
  created() {
src/views/sales/salesOpportunity/AddSalesOpportunityDialog.vue
@@ -337,7 +337,7 @@
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.advantage"
                    v-model="editConfig.infomation.advantages"
                  ></el-input>
                </el-form-item>
              </el-col>
src/views/sales/salesOpportunity/DetailOpportunity.vue
@@ -374,19 +374,19 @@
        {
          leftStr: "老客户营销",
          leftValue: item.regular_customers_id,
          rightStr: "签到",
          rightStr: "审批状态",
          rightValue: ""
        },
        {
          leftStr: "审批状态",
          leftStr: "竞争对手",
          leftValue: "",
          rightStr: "竞争对手",
          rightStr: "创建人",
          rightValue: ""
        },
        {
          leftStr: "创建人",
          leftStr: "创建时间",
          leftValue: "",
          rightStr: "创建时间",
          rightStr: "",
          rightValue: ""
        }
      ]
src/views/sales/salesOpportunity/index.vue
@@ -159,7 +159,7 @@
          { label: "销售机会编号", prop: "number" }, // 销售机会编号
          { label: "联系人姓名", prop: "contact_name", min: 100, isContactClick: true }, // 联系人姓名
          { label: "销售阶段", prop: "sale_stage_name" }, // 销售阶段
          { label: "可能性(%)", prop: "possibilities" }, // 可能性
          { label: "可能性(%)", prop: "possibility_name" }, // 可能性
          { label: "预计成交日期", prop: "expected_time", min: 130 }, // 预计成交日期
          { label: "预计合同金额", prop: "projected_amount" }, // 预计合同金额
          { label: "预算绝对值", prop: "capital_budget" }, // 预算绝对值
@@ -190,7 +190,9 @@
                  ...item,
                  client_name: item.client.name,
                  contact_name: item.contact.name,
                  sale_stage_name: item.sale_stage.name
                  sale_stage_name: item.sale_stage.name,
                  member_name: item.member.username,
                  possibility_name: item.possibility.name
                }
              })
              this.tableList.tableInfomation = list || []
src/views/sales/subOrder/AddSubOrderDialog.vue
@@ -118,14 +118,8 @@
            产品管理
            <div style="margin-left: 400px">
              币种
              <el-select
                v-model="editConfig.infomation.currency"
                placeholder="请选择"
                size="mini"
                style="width: 63%"
                disabled
              >
                <el-option v-for="item in currencyOptions" :key="item.value" :label="item.label" :value="item.value">
              <el-select v-model="editConfig.infomation.currency" placeholder="请选择" size="mini" style="width: 63%">
                <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                </el-option>
              </el-select>
            </div>
@@ -135,6 +129,8 @@
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
            />
          </div>
          <!-- 合计 -->
@@ -257,7 +253,7 @@
      },
      memberOptions: [],
      discount: "2",
      currencyOptions: [],
      currencyOptions: [{ id: 1, name: "人民币" }], // 币种
      discountOptions: [
        { value: "1", label: "百分比降价" },
        { value: "2", label: "直接降价" }
@@ -460,7 +456,7 @@
          { label: "产品编号", prop: "Number" },
          { label: "数量", prop: "Amount", input: true, isRequird: true },
          { label: "销售单价", prop: "Unit", input: true },
          { label: "价税合计", prop: "other3", input: true },
          { label: "价税合计", prop: "total", input: true },
          { label: "描述", prop: "other8" }
        ]
      }
@@ -492,7 +488,28 @@
        SalePrice: 0,
        Unit: ""
      })
    }
    },
    //  产品清空
    emptyProductClick() {
      this.productId = 1
      this.tableData = [
        {
          id: 1,
          Amount: 0,
          IsSale: true,
          MaterialMode: "",
          MinInventory: 0,
          Name: "",
          Number: "",
          PurchaseType: "",
          SalePrice: 0,
          Unit: ""
        }
      ]
      this.productTableList.tableData = this.tableData
    },
    // 产品重算
    recalculateProductClick() {}
  }
}
</script>