From 68d1f5718be1061c3bb54098f9753910d58c00c3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 03 十一月 2023 14:23:45 +0800
Subject: [PATCH] #
---
components/y-title/y-title.vue | 2
pages/business/cstmr/addCsmtr.vue | 35 ++++++++
pages/business/saleManage/addSaleManage.vue | 89 ++++++++++++++++++++--
pages/business/cstmr/csmtr.vue | 20 +++--
pages.json | 2
pages/business/business.vue | 4
pages/business/saleManage/saleManage.vue | 83 ++++++++++++++++++--
7 files changed, 203 insertions(+), 32 deletions(-)
diff --git a/components/y-title/y-title.vue b/components/y-title/y-title.vue
index 5eee0bd..c120ff6 100644
--- a/components/y-title/y-title.vue
+++ b/components/y-title/y-title.vue
@@ -44,7 +44,7 @@
line-height: 55rpx;
font-size: 32rpx;
font-weight: 900;
- font-family: SimHei , Helvetica, sans-serif;
+ font-family: Helvetica;
letter-spacing: 3rpx;
color: #303133;
}
diff --git a/pages.json b/pages.json
index d40e72b..9ccd954 100644
--- a/pages.json
+++ b/pages.json
@@ -40,7 +40,7 @@
"path": "pages/business/cstmr/csmtr",
"style": {
"navigationStyle": "custom",
- "navigationBarTitleText": "鐢叉柟鍗曚綅"
+ "navigationBarTitleText": "淇℃伅鍏捣"
}
},
{
diff --git a/pages/business/business.vue b/pages/business/business.vue
index a225200..6de432f 100644
--- a/pages/business/business.vue
+++ b/pages/business/business.vue
@@ -5,14 +5,14 @@
</view> -->
<view class="item-sort">
<view>
- <y-title title="鍏徃璧勬枡搴�" />
+ <y-title title="瀹㈡埛绠＄悊" />
</view>
<view class="grid-container">
<view class="item" @click="select(1)">
<view class="img">
<image src="../../static/image/jiafangdanwei.png" mode="aspectFit"></image>
</view>
- <view>鐢叉柟鍗曚綅</view>
+ <view>淇℃伅鍏捣</view>
</view>
<view class="item" @click="select(4)">
diff --git a/pages/business/cstmr/addCsmtr.vue b/pages/business/cstmr/addCsmtr.vue
index e0b00a5..09dcad1 100644
--- a/pages/business/cstmr/addCsmtr.vue
+++ b/pages/business/cstmr/addCsmtr.vue
@@ -2,8 +2,15 @@
<view>
<view class="container">
<uni-forms ref="baseForm" :modelValue="baseFormData">
- <uni-forms-item label="瀹㈡埛鍚嶇О" required name="name">
+ <!-- <uni-forms-item label="瀹㈡埛鍚嶇О" required name="name">
<uni-easyinput v-model="baseFormData.name" placeholder="璇疯緭鍏ュ鎴峰悕绉�" />
+ </uni-forms-item> -->
+
+ <uni-forms-item label="瀹㈡埛鍚嶇О" required name="name">
+ <view>
+ <uni-combox :candidates="names" placeholder="璇疯緭鍏ュ鎴峰悕绉�"
+ v-model="baseFormData.name" @input="cstmrSearch()"></uni-combox>
+ </view>
</uni-forms-item>
<uni-forms-item label="瀹㈡埛绫诲埆" required name="cstmrType">
@@ -70,9 +77,12 @@
director: '',
cstmrTypeList: [],
directorList: [],
+ names: [],
+ nameList: [],
industrys: ['鍖昏嵂涓�','鍒堕�犱笟','绾虹粐涓�'],
productCategorys: ['绔嬩綋搴擄紙璐ф灦锛�','绔嬩綋搴擄紙闆嗘垚锛�','鍥涘悜绌挎搴�/涓ゅ悜绌挎搴�','闃佹ゼ璐ф灦/閽㈠钩鍙�','鍛ㄨ浆瀹瑰櫒','骞冲簱'],
baseFormData: {
+ name: '',
citysData: [],
cstmrType: '',
director: '',
@@ -178,6 +188,29 @@
this.autoLoad('user','')
},
methods: {
+ cstmrSearch() {
+ this.names = []
+ let _this = this
+ if(_this.baseFormData.name.length < 4) {
+ return
+ }
+ uni.request({
+ url: `${_this.baseUrl}/cstmrSearch/auth`,
+ header:{'token':uni.getStorageSync('token'),'content-type':'application/x-www-form-urlencoded',},
+ data: {condition: _this.baseFormData.name},
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200 && res.data.length > 0) {
+ for(let element of res.data) {
+ _this.names.push(element.name)
+ _this.nameList.push(element)
+ }
+ }
+ }
+ })
+
+ },
bindPickerChange: function(e) {
this.cstmrTypeIndex = e.detail.value
this.baseFormData.cstmrType = this.cstmrTypes[e.detail.value].id
diff --git a/pages/business/cstmr/csmtr.vue b/pages/business/cstmr/csmtr.vue
index 9029ad2..9d83065 100644
--- a/pages/business/cstmr/csmtr.vue
+++ b/pages/business/cstmr/csmtr.vue
@@ -80,13 +80,13 @@
that.user.type = data.key
that.falg = false
})
- if (this.falg) {
- this.getDetail()
- }
+
setTimeout(()=> {
this.getCsmtr1()
},50)
-
+ if (this.falg) {
+ this.getDetail()
+ }
},
onReachBottom() {
this.status = 'more';
@@ -136,12 +136,14 @@
let param = {curr:1,limit:4,dept_id: 0,user_id: 67}
if (this.user.type == 'user_id') {
param = {curr:1,limit:4,user_id: that.user.id}
- } else {
+ } else if(this.user.type == 'dept_id') {
param = {curr:1,limit:4,dept_id: that.user.id}
+ } else {
+ param = {curr:1,limit:4}
}
uni.request({
url: that.baseUrl + '/cstmr/page/auth',
- header: {'token' : uni.getStorageSync('token'),},
+ header: {'token' : uni.getStorageSync('token')},
data: param,
method:'GET',
success(result) {
@@ -182,9 +184,11 @@
let that = this
let param = {curr:that.curr,limit:4,dept_id: 0,user_id: 67}
if (this.user.type == 'user_id') {
- param = {curr:that.curr,limit:4,user_id: that.user.id}
+ param = {curr:1,limit:4,user_id: that.user.id}
+ } else if(this.user.type == 'dept_id') {
+ param = {curr:1,limit:4,dept_id: that.user.id}
} else {
- param = {curr:that.curr,limit:4,dept_id: that.user.id}
+ param = {curr:1,limit:4}
}
uni.request({
url: that.baseUrl + '/cstmr/page/auth',
diff --git a/pages/business/saleManage/addSaleManage.vue b/pages/business/saleManage/addSaleManage.vue
index 7317116..fdc6ef2 100644
--- a/pages/business/saleManage/addSaleManage.vue
+++ b/pages/business/saleManage/addSaleManage.vue
@@ -17,27 +17,39 @@
@input="autoLoad('company',baseFormData.company)"></uni-combox>
</view>
</uni-forms-item>
- <uni-forms-item label="椤圭洰鎬婚噾棰�" name="money">
- <uni-easyinput v-model="baseFormData.money" placeholder="璇疯緭鍏ラ」鐩�婚噾棰�" />
+ <uni-forms-item label="棰勭畻閲戦(涓囧厓)" name="money" required>
+ <uni-easyinput v-model="baseFormData.money" placeholder="璇疯緭鍏ラ绠楅噾棰�(涓囧厓)" />
</uni-forms-item>
- <uni-forms-item label="璐熻矗浜�" name="director">
+ <uni-forms-item label="棰勮鎴愪氦鐜�" name="transactionRate" required>
+ <view>
+ <uni-combox :candidates="transactionRates" placeholder="璇烽�夋嫨棰勮鎴愪氦鐜�"
+ v-model="baseFormData.transactionRate" ></uni-combox>
+ </view>
+ </uni-forms-item>
+ <uni-forms-item label="璐熻矗浜�" name="director" required>
<view @click="autoLoad('user','')">
<uni-combox :candidates="directors" placeholder="璇烽�夋嫨璐熻矗浜�" v-model="baseFormData.director"
@input="autoLoad('user',baseFormData.director)"></uni-combox>
</view>
</uni-forms-item>
- <uni-forms-item label="鐪佸競鍖�" name="citysData">
+ <uni-forms-item label="浜у搧绫诲瀷" name="orderProductTypeId" required>
+ <view @click="autoLoad('orderProductType','')">
+ <uni-combox :candidates="orderProductTypeIds" placeholder="璇烽�夋嫨浜у搧绫诲瀷"
+ v-model="baseFormData.orderProductTypeId"
+ @input="autoLoad('orderProductType',baseFormData.orderProductTypeId)"></uni-combox>
+ </view>
+ </uni-forms-item>
+ <uni-forms-item label="鐪佸競鍖�" name="citysData" required>
<uni-data-picker @change="areaChange" placeholder="璇烽�夋嫨鐪佸競鍖�" popup-title="璇烽�夋嫨鎵�鍦ㄥ湴鍖�"
:localdata="citysData" v-model="baseFormData.pcd">
</uni-data-picker>
</uni-forms-item>
- <uni-forms-item label="椤圭洰鎬婚噾棰�" name="money">
- <uni-easyinput v-model="baseFormData.money" placeholder="璇疯緭鍏ラ」鐩�婚噾棰�" />
- </uni-forms-item>
<uni-forms-item label="椤圭洰鍦板潃" name="addr">
<uni-easyinput v-model="baseFormData.addr" placeholder="璇疯緭鍏ラ」鐩湴鍧�" />
</uni-forms-item>
-
+ <uni-forms-item label="蹇冨緱浣撲細" name="memoExperience">
+ <uni-easyinput type="textarea" v-model="baseFormData.memoExperience" placeholder="璇疯緭鍏ュ績寰椾綋浼�" />
+ </uni-forms-item>
<uni-forms-item label="澶囨敞" name="remarks">
<uni-easyinput type="textarea" v-model="baseFormData.remarks" placeholder="璇疯緭鍏ュ娉�" />
</uni-forms-item>
@@ -49,6 +61,7 @@
<script>
import test from '../../../static/js/citys-data.js'
+ import user from '@/pages/api/user/user.js'
export default {
data() {
return {
@@ -63,6 +76,8 @@
cstmrList: [],
directorList: [],
companyList: [],
+ orderProductTypeIds: [],
+ orderProductTypeList: [],
baseFormData: {
citysData: [],
cstmrType: '',
@@ -70,10 +85,12 @@
director: '',
rela: '',
remarks: '',
+ transactionRate: '',
cstmrId: '',
addr: '',
money: ''
},
+ transactionRates: ['30%','40%','50%','60%','70%','80%','90%','100%'],
rules: {
name: {
rules: [{
@@ -93,6 +110,36 @@
errorMessage: '璇烽�夋墍灞炲叕鍙�',
}]
},
+ money: {
+ rules: [{
+ required: true,
+ errorMessage: '璇疯緭鍏ラ绠楅噾棰�',
+ }]
+ },
+ transactionRate: {
+ rules: [{
+ required: true,
+ errorMessage: '璇烽�夋嫨棰勮鎴愪氦鐜�',
+ }]
+ },
+ director: {
+ rules: [{
+ required: true,
+ errorMessage: '璇烽�夋嫨璐熻矗浜�',
+ }]
+ },
+ orderProductTypeId: {
+ rules: [{
+ required: true,
+ errorMessage: '璇烽�夋嫨浜у搧绫诲瀷',
+ }]
+ },
+ citysData: {
+ rules: [{
+ required: true,
+ errorMessage: '璇烽�夋嫨鎵�鍦ㄥ湴鍖�',
+ }]
+ }
},
// 鍗曢�夋暟鎹簮
type$: [{
@@ -113,8 +160,18 @@
onShow() {
// 鑾峰彇鐪佸競鍖�
this.citysData = test.citysData
+ this.getDetail()
},
methods: {
+ async getDetail() {
+ let res = await user.getDetail()
+ if (res.code === 200) {
+ this.baseFormData.director = res.data.username
+ res.data['value'] = res.data.username
+ this.directors.push(res.data.username)
+ this.directorList.push(res.data)
+ }
+ },
bindPickerChange: function(e) {
this.cstmrTypeIndex = e.detail.value
this.baseFormData.cstmrType = this.cstmrTypes[e.detail.value].id
@@ -128,6 +185,7 @@
that.companies = []
that.directors = []
that.cstmrs = []
+ that.orderProductTypeIds = []
var a = that.baseUrl + '/' + type + 'Query/auth'
uni.request({
url: that.baseUrl + '/' + type + 'Query' + '/auth',
@@ -164,6 +222,13 @@
}
return
}
+ if (type == 'orderProductType') {
+ for (element of res.data) {
+ that.orderProductTypeIds.push(element.value)
+ that.orderProductTypeList.push(element)
+ }
+ return
+ }
}
}
@@ -188,10 +253,18 @@
}
}
for (element of that.directorList) {
+ console.log(that.directorList);
+ console.log(that.baseFormData.director);
if (element.value == that.baseFormData.director) {
that.baseFormData.director = element.id
}
}
+ for (element of that.orderProductTypeList) {
+ if (element.value == that.baseFormData.orderProductTypeId) {
+ that.baseFormData.orderProductTypeId = element.id
+ }
+ }
+ that.baseFormData.transactionRate = Number(that.baseFormData.transactionRate.split('%')[0])
this.$refs.baseForm.validate().then(res => {
if (res.addr == undefined) {
res.addr = ''
diff --git a/pages/business/saleManage/saleManage.vue b/pages/business/saleManage/saleManage.vue
index d5683b2..ca09395 100644
--- a/pages/business/saleManage/saleManage.vue
+++ b/pages/business/saleManage/saleManage.vue
@@ -25,14 +25,66 @@
<view class="titles">
<y-title :title="item.name"></y-title>
</view>
- <view style="display: grid;grid-template-columns: 1fr 3fr;">
- <view class="list-item1">椤圭洰浠ｅ彿</view><view class="list-item2">{{item.uuid}}</view>
- <view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2">{{item.cstmrId$ ? item.cstmrId$ : '--'}}</view>
- <view class="list-item1">鎵�灞炲尯鍩�</view><view class="list-item2">{{item.pcd$ ? item.pcd$ : '--'}}</view>
- <view class="list-item1">椤圭洰鍦板潃</view><view class="list-item2">{{item.addr ? item.addr : '--'}}</view>
- <view class="list-item1">椤圭洰璐熻矗浜�</view><view class="list-item2">{{item.director$ ? item.director$ : '--'}}</view>
- <view class="list-item1">鍒涘缓浜�</view><view class="list-item2">{{item.createBy$}}</view>
- <view class="list-item1">鍒涘缓鏃堕棿</view><view class="list-item2">{{item.createTime$}}</view>
+ <view class="cstmrs">
+ <view class="cstmrs-item">
+ <view class="list-item1">椤圭洰鍙�</view><view class="list-item2">{{item.id}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">璺熻釜椤圭洰鍚嶇О</view><view class="list-item2">{{item.name}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">椤圭洰浠ｅ彿</view><view class="list-item2">{{item.uuid}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">鐢叉柟鍗曚綅</view><view class="list-item2">{{item.cstmrId$ ? item.cstmrId$ : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">鎵�灞炲尯鍩�</view><view class="list-item2">{{item.pcd$ ? item.pcd$ : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">椤圭洰鍦板潃</view><view class="list-item2">{{item.addr ? item.addr : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">椤圭洰棰勭畻閲戦(涓�)</view><view class="list-item2">{{item.money ? item.money : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">椤圭洰棰勪及鎴愪氦鐜�</view><view class="list-item2">{{item.transactionRate ? item.transactionRate : '--'}}%</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">椤圭洰璐熻矗浜�</view><view class="list-item2">{{item.userId$ ? item.userId$ : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">澶囨敞</view><view class="list-item2">{{item.memo ? item.memo : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">娣诲姞鏃堕棿</view><view class="list-item2">{{item.createTime$ ? item.createTime$ : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">鎵�灞炲叕鍙�</view><view class="list-item2">{{item.company$ ? item.company$ : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">浜у搧绫诲瀷</view><view class="list-item2">{{item.orderProductTypeId$ ? item.orderProductTypeId$ : '--'}}</view>
+ </view>
+ <view class="cstmrs-item">
+ <view class="list-item1">鐘舵��</view><view class="list-item2">{{item.status$ ? item.status$ : '--'}}</view>
+ </view>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
</view>
</view>
</view>
@@ -226,14 +278,15 @@
margin-bottom: 20px;
}
.list-item1 {
-
- height: 45rpx;
+ flex: 1;
+ min-height: 45rpx;
line-height: 45rpx;
color: #909399;
text-indent: 30rpx;
}
.list-item2 {
- height: 45rpx;
+ flex: 3;
+ min-height: 45rpx;
line-height: 45rpx;
color: black;
}
@@ -242,6 +295,14 @@
text-indent: 5rpx;
margin-top: 10rpx;
}
+ .cstmrs {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ }
+ .cstmrs-item {
+ display: flex;
+ }
/* .title {
height: 60rpx;
line-height: 70rpx;
--
Gitblit v1.9.1