From 718c7be6668cf591c41a7aeab080018d3eff8c2e Mon Sep 17 00:00:00 2001
From: tangyi <275503107@qq.com>
Date: Thu, 31 Mar 2022 10:38:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/dataQuery/client.vue | 62 +++++++++--
pages/dataQuery/details.vue | 91 +++++++++-------
pages/dataQuery/projectQuery.vue | 168 ++++++++++++++++--------------
pages/dataQuery/queryFunction.vue | 9 +-
4 files changed, 196 insertions(+), 134 deletions(-)
diff --git a/pages/dataQuery/client.vue b/pages/dataQuery/client.vue
index b7ff8e7..2fdd1f7 100644
--- a/pages/dataQuery/client.vue
+++ b/pages/dataQuery/client.vue
@@ -3,22 +3,20 @@
-
+
- 湖南争鸣光电科技有限公司
- 编号：KH20220304-002
-
- 弱电安防
- 弱电安防
- 弱电安防
+ {{item.name}}
+ 编号：{{item.code}}
+
+ {{key}}
- 13
+ {{item.num}}
- 湖南省长沙市高新开发区谷园路109号像素大厦1205
+ {{item.address}}
@@ -39,11 +37,53 @@
dataList:[
{
name:'湖南争鸣光电科技有限公司',
- code:"KH20220304-002"
- }
+ code:"KH20220304-002",
+ icon:["弱电安防","弱电安防","弱电安防"],
+ num:"12",
+ address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
+ },
+ {
+ name:'湖南争鸣光电科技有限公司',
+ code:"KH20220304-002",
+ icon:["弱电安防","弱电安防","弱电安防"],
+ num:"11",
+ address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
+ },
+ {
+ name:'湖南争鸣光电科技有限公司',
+ code:"KH20220304-002",
+ icon:["弱电安防","弱电安防","弱电安防"],
+ num:"12",
+ address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
+ },
+ {
+ name:'湖南争鸣光电科技有限公司',
+ code:"KH20220304-002",
+ icon:["弱电安防","弱电安防","弱电安防"],
+ num:"14",
+ address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
+ },
+ {
+ name:'湖南争鸣光电科技有限公司',
+ code:"KH20220304-002",
+ icon:["弱电安防","弱电安防","弱电安防"],
+ num:"15",
+ address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
+ },
+ {
+ name:'湖南争鸣光电科技有限公司',
+ code:"KH20220304-002",
+ icon:["弱电安防","弱电安防","弱电安防"],
+ num:"16",
+ address:"湖南省长沙市高新开发区谷园路109号像素大厦1205"
+ },
],
}
},
+ onLoad(option) {
+ console.log(option)
+ console.log( option.key_word,"--------")
+ },
methods: {
// 前往客户详情
goDetail(index){
diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue
index 15aba7e..a7fe196 100644
--- a/pages/dataQuery/details.vue
+++ b/pages/dataQuery/details.vue
@@ -1,23 +1,23 @@
-
+
-
-
+
+
基本信息
-
+
联系人
-
+
项目列表
-
+
@@ -55,7 +55,7 @@
-
+
联系人
@@ -90,7 +90,7 @@
-
+
@@ -106,31 +106,7 @@
-
-
-
- 南城校区液晶显示屏
-
-
- 2022/3/1
-
-
-
-
- 南城校区液晶显示屏
-
-
- 2022/3/1
-
-
-
-
- 南城校区液晶显示屏
-
-
- 2022/3/1
-
-
+
南城校区液晶显示屏
@@ -141,13 +117,13 @@
-
+
客户微信
-
+
客户电话
@@ -170,16 +146,55 @@
},
data() {
return {
- time: '12:01'
+ time: '12:01',
+ // dataArr:{
+ // customerName:"长沙警校",
+ // customerCode:"xxxxxxxxx",
+ // customerVIP:"VIP1",
+ // industryInvolved:"安防",
+ // customerType:"xxxx",
+ // warehouseTime:"2022.3.1" ,
+
+ // }
+ projectList:[],
}
},
methods: {
getData(){
},
- bindTimeChange() {
-
+ // 拨打电话
+ telFun(){
+ uni.makePhoneCall({
+ phoneNumber: '13608235524' //仅为示例
+ });
+ },
+ // 选择年份
+ bindTimeChange(data) {
+ console.log(data.detail.value)
+ },
+ essentialInformation(classText){
+
+ // uni.createSelectorQuery().select('.'+classText).boundingClientRect(data=>{//目标位置的节点：类或者id
+ // uni.createSelectorQuery().select(".arc-content").boundingClientRect(res=>{//最外层盒子的节点：类或者id
+ // uni.pageScrollTo({
+ // duration: 100,//过渡时间
+ // scrollTop:data.top - res.top -uni.getSystemInfoSync().statusBarHeight-40,//到达距离顶部的top值
+ // })
+ // }).exec()
+ // }).exec();
+ },
+
+ // 复制微信
+ copyWxFun(){
+ uni.setClipboardData({
+ data: 'hello',
+ success: function () {
+ console.log('success');
+ }
+ });
}
+
}
}
diff --git a/pages/dataQuery/projectQuery.vue b/pages/dataQuery/projectQuery.vue
index c69e643..e9dd29d 100644
--- a/pages/dataQuery/projectQuery.vue
+++ b/pages/dataQuery/projectQuery.vue
@@ -4,102 +4,33 @@
-
+
- 湖南工业大学化工学院会议室P2.5全彩LED显示屏
- 项目编号：20220108-1001
- 规格型号：DS-CK25FI/H
- 产品尺寸：3.94ｍ*2.02ｍ
- 安装位置：xxx综合楼2楼会议室
+ {{item.name}}
+ 项目编号：{{item.code}}
+ 规格型号：{{item.model}}
+ 产品尺寸：{{item.size}}
+ 安装位置：{{item.installationSite}}
- 湖南省长沙市高新开发区谷园路109号像素大厦1205
+ {{item.address}}
- 2022/01/08
+ {{item.date}}
- 质保到期
-
-
-
-
-
-
-
- 湖南工业大学化工学院会议室P2.5全彩LED显示屏
-
-
- 项目编号：20220108-1001
-
-
- 规格型号：DS-CK25FI/H
-
-
- 产品尺寸：3.94ｍ*2.02ｍ
-
-
- 安装位置：xxx综合楼2楼会议室
-
-
-
-
-
-
-
-
- 湖南省长沙市高新开发区谷园路109号像素大厦1205
-
-
-
- 2022/01/08
-
-
-
+ 质保到期
+
质保中
-
-
-
-
-
-
-
- 湖南工业大学化工学院会议室P2.5全彩LED显示屏
-
-
- 项目编号：20220108-1001
-
-
- 规格型号：DS-CK25FI/H
-
-
- 产品尺寸：3.94ｍ*2.02ｍ
-
-
- 安装位置：xxx综合楼2楼会议室
-
-
-
-
-
-
-
-
- 湖南省长沙市高新开发区谷园路109号像素大厦1205
-
-
-
- 2022/01/08
-
-
-
+
临时项目
+
@@ -117,7 +48,73 @@
data() {
return {
+ dataPage:{
+ page:1,
+ list_rows:20
+ },
+ projectQuery: [
+ {
+ name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+ img: "../../static/del/img001.png",
+ code: "20220108-1001",
+ model: "DS-CK25FI/H",
+ size: "3.94ｍ*2.02ｍ",
+ installationSite: "xxx综合楼2楼会议室",
+ address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+ date: "2022/01/08",
+ state: 1
+ },
+ {
+ name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+ img: "../../static/del/img001.png",
+ code: "20220108-1001",
+ model: "DS-CK25FI/H",
+ size: "3.94ｍ*2.02ｍ",
+ installationSite: "xxx综合楼2楼会议室",
+ address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+ date: "2022/01/08",
+ state: 2
+
+ },
+ {
+ name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+ img: "../../static/del/img001.png",
+ code: "20220108-1001",
+ model: "DS-CK25FI/H",
+ size: "3.94ｍ*2.02ｍ",
+ installationSite: "xxx综合楼2楼会议室",
+ address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+ date: "2022/01/08",
+ state: 2
+
+ },
+ {
+ name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+ img: "../../static/del/img001.png",
+ code: "20220108-1001",
+ model: "DS-CK25FI/H",
+ size: "3.94ｍ*2.02ｍ",
+ installationSite: "xxx综合楼2楼会议室",
+ address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+ date: "2022/01/08",
+ state: 1
+
+ },
+ {
+ name: "湖南工业大学化工学院会议室P2.5全彩LED显示屏",
+ img: "../../static/del/img001.png",
+ code: "20220108-1001",
+ model: "DS-CK25FI/H",
+ size: "3.94ｍ*2.02ｍ",
+ installationSite: "xxx综合楼2楼会议室",
+ address: "湖南省长沙市高新开发区谷园路109号像素大厦1205",
+ date: "2022/01/08",
+ state: 0
+
+ },
+
+ ],
}
},
methods: {
@@ -126,6 +123,15 @@
url:"/pages/project/details"
})
},
+ // 获取列表数据
+ getData(){
+ this.$requst.get('', {
+ page: dataPage.page,
+ list_rows:dataPage.list_rows
+ }).then(res => {
+
+ })
+ },
bindPickerChange(data){
console.log(data)
},
diff --git a/pages/dataQuery/queryFunction.vue b/pages/dataQuery/queryFunction.vue
index 454302f..e999e19 100644
--- a/pages/dataQuery/queryFunction.vue
+++ b/pages/dataQuery/queryFunction.vue
@@ -12,7 +12,7 @@
-
+
查询
@@ -166,6 +166,7 @@
},
onLoad(op) {
if (op.index != undefined) this.dataIndex = op.index;
+ this.recentlyQuery = [...this.customerQuery]
},
methods: {
// 查询类型切换
@@ -177,7 +178,6 @@
this.recentlyQuery = [...this.projectQuery]
} else {
this.recentlyQuery = [...this.spareQuery]
-
}
},
@@ -192,11 +192,12 @@
'/pages/dataQuery/projectQuery',
'/pages/dataQuery/dataQuery'
]
+
uni.navigateTo({
- url: `${urls[index]}?key_word=${this.key_word}`
+ url: `${urls[index]}?key_word='${this.key_word}'`
})
},
-
+ // 最近查询跳转
goDetail() {
if (this.dataIndex == 1) {
uni.navigateTo({
From 3f34c421320ef55a716268674c8cc69a99a0b37a Mon Sep 17 00:00:00 2001
From: tangyi <275503107@qq.com>
Date: Thu, 31 Mar 2022 11:15:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jsFile/requst.js | 2 +-
pages/dataQuery/details.vue | 18 ++++++++-------
pages/workOrder/workOrderLlsit.vue | 37 +++++++++++++++++++++++++++++-
3 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/jsFile/requst.js b/jsFile/requst.js
index d3811bb..325795e 100644
--- a/jsFile/requst.js
+++ b/jsFile/requst.js
@@ -63,7 +63,7 @@ const request = (method, url, options) => {
methods = 'GET'
headers = {
'Content-Type': 'application/json; charset=UTF-8',
- 'Authorization': 'Bearer '+uni.getStorageSync('token') || ''
+ 'token':uni.getStorageSync('token') || ''
}
break;
case 'post':
diff --git a/pages/dataQuery/details.vue b/pages/dataQuery/details.vue
index a7fe196..d6d6e38 100644
--- a/pages/dataQuery/details.vue
+++ b/pages/dataQuery/details.vue
@@ -147,15 +147,17 @@
data() {
return {
time: '12:01',
- // dataArr:{
- // customerName:"长沙警校",
- // customerCode:"xxxxxxxxx",
- // customerVIP:"VIP1",
- // industryInvolved:"安防",
- // customerType:"xxxx",
- // warehouseTime:"2022.3.1" ,
+ dataArr:{
+ customerName:"长沙警校",
+ customerCode:"xxxxxxxxx",
+ customerVIP:"VIP1",
+ industryInvolved:"安防",
+ customerType:"xxxx",
+ warehouseTime:"2022.3.1" ,
+ projectNum:"50",
+ area:"长沙",
- // }
+ },
projectList:[],
}
},
diff --git a/pages/workOrder/workOrderLlsit.vue b/pages/workOrder/workOrderLlsit.vue
index 9a7a8d9..a72c751 100644
--- a/pages/workOrder/workOrderLlsit.vue
+++ b/pages/workOrder/workOrderLlsit.vue
@@ -105,6 +105,10 @@
{id:12,title:'超时单'}
],
workeOrderStatusIndex: 0,
+ dataPage:{
+ list_rows:10,
+ page:1,
+ },
dataList:[
{
id:1,
@@ -239,8 +243,39 @@
onLoad(op) {
this.workeOrderStatusIndex = this.array.findIndex(item=>item.title==op.status);
if(this.workeOrderStatusIndex!=-1) this.workeOrderStatus = '';
+
+ this.getDatalist()
+ this.getType()
},
methods: {
+ getType(){
+
+ this.$requst.get('/universal/api.order/order_type', {
+ list_rows: this.dataPage.list_rows,
+ page: this.dataPage.page,
+ }).then(res => {
+ // this.$toolAll.tools.showToast(res.msg);
+ if (res.code == 1) {
+ this.dataList = res.data.data
+ } else {
+
+ }
+ })
+ },
+
+ getDatalist(){
+ this.$requst.get('/universal/api.order/order_list', {
+ list_rows: this.dataPage.list_rows,
+ page: this.dataPage.page,
+ }).then(res => {
+ // this.$toolAll.tools.showToast(res.msg);
+ if (res.code == 1) {
+ this.dataList = res.data.data
+ } else {
+
+ }
+ })
+ },
// 催一催事件
hurryUpEv(id) {
this.$toolAll.tools.showToast(`已催单成功`);
@@ -272,7 +307,7 @@
}
},
bindPickerChange(data) {
- console.log(data)
+
this.workeOrderStatus = '';
this.workeOrderStatusIndex = data.detail.value;
},