From 4103bc0d15badf05ff6a09a36ce36ce2066e1942 Mon Sep 17 00:00:00 2001
From: zhangwentao <1909118034@qq.com>
Date: Mon, 17 Nov 2025 17:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/content/selectTemp/selectTemp.vue | 32 +++++++-------
components/selectCustomer.vue | 4 +-
components/tabbar/tabbar.vue | 2 +-
pages.json | 6 +--
pages/index/contract/contract.vue | 15 +++----
pagesA/crm/contract/contract.vue | 42 +++++++++----------
pagesA/crm/createCustomer/createCustomer.vue | 22 +++++-----
.../customerManagement/customerManagement.vue | 6 +--
pagesA/crm/linkman/newLinkman/newLinkman.vue | 2 +-
pagesB/contract/baseInfo.vue | 8 ++--
pagesB/contract/contractDetail.vue | 24 +++++------
11 files changed, 82 insertions(+), 81 deletions(-)
diff --git a/components/content/selectTemp/selectTemp.vue b/components/content/selectTemp/selectTemp.vue
index e298747..e59d3a3 100644
--- a/components/content/selectTemp/selectTemp.vue
+++ b/components/content/selectTemp/selectTemp.vue
@@ -4,7 +4,7 @@
+ :class="name ? 'fontactive' : ''" v-model="name" placeholder="门店名称" class="li_box" />
@@ -16,11 +16,11 @@
- 客户星级
+ 门店星级
- 客户来源
+ 门店来源
@@ -63,7 +63,7 @@
- 新增客户时间
+ 新增门店时间
@@ -142,17 +142,17 @@
start_time: '', //开始时间
end_time: '', //结束时间
- name: '', //客户名称
- level: '', //客户星级
- source: '', //客户来源
+ name: '', //门店名称
+ level: '', //门店星级
+ source: '', //门店来源
sourceList: [],
sourceIndex: null,
follow: '', //跟进状态
followList: [],
followIndex: null,
- createtime: '', //新增客户时间
- new_start_time: '', //新增客户开始时间
- new_end_time: '', //新增客户结束时间
+ createtime: '', //新增门店时间
+ new_start_time: '', //新增门店开始时间
+ new_end_time: '', //新增门店结束时间
next_time: '', //下次跟进时间
@@ -223,8 +223,8 @@
},
getSelect() {
netSelect().then(res => {
- this.sourceList = res.data['客户来源']
- this.followList = res.data['客户状态']
+ this.sourceList = res.data['门店来源']
+ this.followList = res.data['门店状态']
})
},
//选择归属人
@@ -256,7 +256,7 @@
this.statusIndex = this.cusStatus
}
},
- // 新增客户 开始时间
+ // 新增门店 开始时间
changeNewStartTime(e) {
this.showIndex = 2
this.new_start_time = e.detail.value
@@ -264,7 +264,7 @@
this.new_end_time = e.detail.value
}
},
- //新增客户 结束时间
+ //新增门店 结束时间
changeNewEndTime(e) {
this.showIndex = 2
this.new_end_time = e.detail.value
@@ -288,7 +288,7 @@
this.start_time = e.detail.value
}
},
- //客户来源
+ //门店来源
changeSource(e) {
this.sourceIndex = e.detail.value
this.source = this.sourceList[e.detail.value]
@@ -298,7 +298,7 @@
this.followIndex = e.detail.value
this.follow = this.followList[e.detail.value]
},
- //客户 新增 时间
+ //门店 新增 时间
changeCreatetime(e) {
this.createtime = e.detail.value
},
diff --git a/components/selectCustomer.vue b/components/selectCustomer.vue
index 15e67a5..90505d9 100644
--- a/components/selectCustomer.vue
+++ b/components/selectCustomer.vue
@@ -1,11 +1,11 @@
-
+
+ :class="keyword ? 'fontactive' : ''" v-model="keyword" placeholder="门店名称" class="li_box" />
diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 3c7df50..82f85e5 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -40,7 +40,7 @@
pagePath: "/pagesA/crm/customerManagement/customerManagement",
iconPath: BASE_IMG_URL+"tab2.png",
selectedIconPath: BASE_IMG_URL+"tab2_a.png",
- text: "客户",
+ text: "门店",
isTip:true,
num:0
},
diff --git a/pages.json b/pages.json
index 8ea2f84..33d183f 100644
--- a/pages.json
+++ b/pages.json
@@ -429,7 +429,7 @@
{
"path": "crm/contract/contract",
"style": {
- "navigationBarTitleText": "新增合同",
+ "navigationBarTitleText": "新增采购",
"navigationBarBackgroundColor": "#008EFF"
}
},
@@ -454,7 +454,7 @@
{
"path": "crm/customerManagement/customerManagement",
"style": {
- "navigationBarTitleText": "我的客户",
+ "navigationBarTitleText": "我的门店",
"navigationBarBackgroundColor": "#008EFF",
"app-plus": {
"bounce": "none" // 将回弹属性关掉
@@ -909,7 +909,7 @@
{
"path": "contract/contractDetail",
"style": {
- "navigationBarTitleText": "合同详情",
+ "navigationBarTitleText": "采购详情",
"navigationBarBackgroundColor": "#008EFF"
}
},
diff --git a/pages/index/contract/contract.vue b/pages/index/contract/contract.vue
index fe49664..3fdf6ff 100644
--- a/pages/index/contract/contract.vue
+++ b/pages/index/contract/contract.vue
@@ -4,6 +4,7 @@
全部
我创建的
下属创建的
+ 抄送给我的
@@ -41,7 +42,7 @@
- 合同状态
+ 采购状态
@@ -84,9 +85,9 @@
- {{item.name?item.name:'--'}}
- 关联客户：{{item.customer?item.customer.name:'--'}}
- 合同编号：{{item.num}}
+ {{item.owner_staff?item.owner_staff.name:'--'}}
+ 门店名称：{{item.customer?item.customer.name:'--'}}
+ 采购编号：{{item.num}}
已回款：¥{{item.receivables.repayment_money}}
待回款：¥{{item.receivables.be_money}}
@@ -102,7 +103,7 @@
¥{{item.money}}
- 签约时间：{{item.order_date}}
+
待审核
@@ -125,7 +126,7 @@
- 合同总金额
+ 采购总金额
{{moneyInfo.allmoney?moneyInfo.allmoney:'0'}}元
@@ -339,7 +340,7 @@
this.$refs.screenpopup.close()
this.init()
},
- //合同详情
+ //采购详情
toContractDetail(id) {
uni.navigateTo({
url: '/pagesB/contract/contractDetail?id=' + id
diff --git a/pagesA/crm/contract/contract.vue b/pagesA/crm/contract/contract.vue
index 1253eb5..35d4c7e 100644
--- a/pagesA/crm/contract/contract.vue
+++ b/pagesA/crm/contract/contract.vue
@@ -4,7 +4,7 @@
只展示必填字段
- *店长名称
+ *门店名称
{{customerName ? customerName : '点击选择'}}
@@ -18,21 +18,21 @@
-->
- *客户签约人
-
+ *门店签约人
+
{{contactName ? contactName : '点击选择'}}
-
+
@@ -101,7 +101,7 @@
-
+
保存
@@ -530,25 +530,25 @@
})
return
}
- if (!order_staff_id) {
- uni.showToast({
- title: '请选择公司签约人',
- icon: 'none'
- })
- return
- }
+ // if (!order_staff_id) {
+ // uni.showToast({
+ // title: '请选择公司签约人',
+ // icon: 'none'
+ // })
+ // return
+ // }
let arrlist = []
let params = this.checkCommonForm(this.listForm)
if(!params){
return
}
- if (remindPeople.length == 0 && this.approvalPro.status == 0) {
- uni.showToast({
- title: '请选择审核人',
- icon: 'none'
- })
- return
- }
+ // if (remindPeople.length == 0 && this.approvalPro.status == 0) {
+ // uni.showToast({
+ // title: '请选择审核人',
+ // icon: 'none'
+ // })
+ // return
+ // }
let arr = []
remindPeople.forEach(ele => {
arr.push(ele.id)
@@ -599,7 +599,7 @@
console.log(params,'=====')
netCreateContract(params).then(res => {
uni.showToast({
- title: res.msg,
+ title: '添加采购成功',
icon: 'none',
duration: 2000
})
diff --git a/pagesA/crm/createCustomer/createCustomer.vue b/pagesA/crm/createCustomer/createCustomer.vue
index f619cf0..a316a55 100644
--- a/pagesA/crm/createCustomer/createCustomer.vue
+++ b/pagesA/crm/createCustomer/createCustomer.vue
@@ -4,7 +4,7 @@
只展示必填字段
-
+
@@ -76,7 +76,7 @@
@confirm="confirm"
>
-
+
@@ -122,11 +122,11 @@
return {
BASE_IMG_URL: BASE_IMG_URL,
noClick: true, //防止 重复点击
- name: '', //客户名称
+ name: '', //门店名称
subname: '', //助记名称
- industry: '', //客户行业
- level: '', //客户星级
- source: '', //客户来源
+ industry: '', //门店行业
+ level: '', //门店星级
+ source: '', //门店来源
follow: '', //跟进状态
address_dingwei: '', //地址定位
address_detail: '', //详细地址
@@ -144,7 +144,7 @@
remindPeople: [], //提醒谁看
remindType:'customer',
sourceIndex: null,
- listForm: [], //客户附加信息
+ listForm: [], //门店附加信息
isAddContact:false, //是否添加联系人
contactsForm:[], //联系人信息
list: [],
@@ -206,7 +206,7 @@
this.name = res.data.name
this.address_detail = res.data.address_detail
- //处理默认 客户附加信息
+ //处理默认 门店附加信息
this.listForm.forEach(item=>{
item.value = res.data[item.id]
})
@@ -302,7 +302,7 @@
let name = this.name
if (!name) {
uni.showToast({
- title: '请填写客户姓名',
+ title: '请填写门店姓名',
icon: 'none',
duration: 2000
})
@@ -356,7 +356,7 @@
//完成
subSave(type) {
let {
- name, //客户名称
+ name, //门店名称
location, //所在地区
address_dingwei,
address_detail, //详细地址
@@ -366,7 +366,7 @@
} = this
if (!name) {
uni.showToast({
- title: '请填写客户名称',
+ title: '请填写门店名称',
icon: 'none',
duration: 2000
})
diff --git a/pagesA/crm/customerManagement/customerManagement.vue b/pagesA/crm/customerManagement/customerManagement.vue
index 38cfedf..8c47785 100644
--- a/pagesA/crm/customerManagement/customerManagement.vue
+++ b/pagesA/crm/customerManagement/customerManagement.vue
@@ -16,9 +16,9 @@
全部
- 我的客户
- 下属的客户
- 我参与的客户
+ 我的门店
+ 下属的门店
+ 我参与的门店
diff --git a/pagesA/crm/linkman/newLinkman/newLinkman.vue b/pagesA/crm/linkman/newLinkman/newLinkman.vue
index 438010a..657d8d1 100644
--- a/pagesA/crm/linkman/newLinkman/newLinkman.vue
+++ b/pagesA/crm/linkman/newLinkman/newLinkman.vue
@@ -15,7 +15,7 @@
- *关联客户
+ *关联门店
{{relationName ? relationName : '点击选择'}}
diff --git a/pagesB/contract/baseInfo.vue b/pagesB/contract/baseInfo.vue
index 311f683..c3a31d6 100644
--- a/pagesB/contract/baseInfo.vue
+++ b/pagesB/contract/baseInfo.vue
@@ -2,15 +2,15 @@
- 客户名称
+ 门店名称
{{info.customer ? info.customer.name : ''}}
-
+
- 客户签约人
+ 门店签约人
{{info.contacts ? info.contacts.name : ''}}
diff --git a/pagesB/contract/contractDetail.vue b/pagesB/contract/contractDetail.vue
index 70fafaf..adb5aca 100644
--- a/pagesB/contract/contractDetail.vue
+++ b/pagesB/contract/contractDetail.vue
@@ -22,7 +22,7 @@
{{info && info.name}}
- 合同编号：{{info.num ? info.num : ''}}
+ 采购编号：{{info.num ? info.num : ''}}
@@ -40,7 +40,7 @@
- 合同金额：¥{{info.money ? info.money : ''}}
+ 采购金额：¥{{info.money ? info.money : ''}}
@@ -49,9 +49,9 @@
待回款：¥ {{info.receivables ? info.receivables.be_money : ''}}
-
+
@@ -111,7 +111,7 @@
-
+
@@ -164,7 +164,7 @@
},
data() {
return {
- id: '', //合同id
+ id: '', //采购id
contract_id:'',
relation_id:'',
relation_type: 3,
@@ -308,7 +308,7 @@
//操作 记录
getOperalist() {
let params = {
- relation_type: 3, //1客户 2联系人 3合同
+ relation_type: 3, //1客户 2联系人 3采购
relation_id: this.id
}
netOperationList(params).then(res => {
@@ -333,13 +333,13 @@
url: '/pagesB/contract/operation?id='+id +'&relation_type=' + this.type
})
},
- //新增合同
+ //新增采购
addContract(id) {
uni.navigateTo({
url: '/pagesA/crm/contract/contract?id=' + id
})
},
- //获取合同 详情信息
+ //获取采购 详情信息
getInfo() {
netContractDetail({
id: this.id
@@ -365,7 +365,7 @@
url: '/pagesB/contract/addPayment?id=' + id+'&kehuid='+this.info.customer.id
})
},
- //编辑合同
+ //编辑采购
toEditcontract(id) {
uni.navigateTo({
url: '/pagesB/contract/editContract?id=' + id + '&kehuid=' + this.info.customer.id