diff --git a/app.js b/app.js
index 431df83..48405bc 100644
--- a/app.js
+++ b/app.js
@@ -37,7 +37,7 @@ App({
})
};
if (res.cancel) {
- console.log('用户点击取消');
+ // console.log('用户点击取消');
}
}
})
diff --git a/app.wxss b/app.wxss
index 42bc5bd..223cc35 100644
--- a/app.wxss
+++ b/app.wxss
@@ -6,12 +6,12 @@ page{
.box{
background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1);
min-height: 1400rpx;
- padding: 20rpx;
+ padding: 5rpx;
font-size: 28rpx;
}
.back{
- padding: 20rpx;
+ padding: 10rpx;
border-radius: 5rpx;
background-color: #fff;
}
diff --git a/images/binding_wx.png b/images/binding_wx.png
index 19226c3..9062423 100644
Binary files a/images/binding_wx.png and b/images/binding_wx.png differ
diff --git a/images/意见反馈.png b/images/意见反馈.png
index 68601db..0395bda 100644
Binary files a/images/意见反馈.png and b/images/意见反馈.png differ
diff --git a/images/物流码.png b/images/物流码.png
new file mode 100644
index 0000000..e19c9f0
Binary files /dev/null and b/images/物流码.png differ
diff --git a/images/第三方物流.png b/images/第三方物流.png
index d6d1401..c2a3f23 100644
Binary files a/images/第三方物流.png and b/images/第三方物流.png differ
diff --git a/images/第三方物流_查询.png b/images/第三方物流_查询.png
new file mode 100644
index 0000000..0114d91
Binary files /dev/null and b/images/第三方物流_查询.png differ
diff --git a/images/自建物流.png b/images/自建物流.png
index f73b574..af1fcaa 100644
Binary files a/images/自建物流.png and b/images/自建物流.png differ
diff --git a/images/自建物流_查询.png b/images/自建物流_查询.png
new file mode 100644
index 0000000..fd10cc4
Binary files /dev/null and b/images/自建物流_查询.png differ
diff --git a/images/货运物流.png b/images/货运物流.png
index 8bb09a3..7c41ef0 100644
Binary files a/images/货运物流.png and b/images/货运物流.png differ
diff --git a/images/货运物流_查询.png b/images/货运物流_查询.png
new file mode 100644
index 0000000..437576e
Binary files /dev/null and b/images/货运物流_查询.png differ
diff --git a/pages/about/about.js b/pages/about/about.js
index e9b0834..3237134 100644
--- a/pages/about/about.js
+++ b/pages/about/about.js
@@ -35,7 +35,6 @@ Page({
login.bindWechat({
openid: app.globalData.openid
}).then(res1 => {
- console.log('res=' + JSON.stringify(res1));
this.onLoad()
})
}
@@ -122,7 +121,7 @@ Page({
})
var userInfo = app.globalData.userInfo
- console.log('userInfo' + JSON.stringify(app.globalData.userInfo));
+
if (userInfo != undefined && JSON.stringify(userInfo) != '{}') {
this.setData({
username: userInfo.nickname,
diff --git a/pages/about/about.wxml b/pages/about/about.wxml
index f94caff..ac340ea 100644
--- a/pages/about/about.wxml
+++ b/pages/about/about.wxml
@@ -15,18 +15,20 @@
绑定微信
+
-
- 自建物流查询
+
+ 自建查询
-
- 第三方物流查询
+
+ 第三方查询
-
- 货运物流查询
+
+ 货运查询
+
意见反馈
diff --git a/pages/about/about.wxss b/pages/about/about.wxss
index f774fc8..73e22bd 100644
--- a/pages/about/about.wxss
+++ b/pages/about/about.wxss
@@ -41,8 +41,8 @@
width: 200rpx;
}
.con image{
- width: 70rpx;
- height: 60rpx;
+ width: 100rpx;
+ height: 100rpx;
}
.con .text{
font-size: 22rpx;
diff --git a/pages/details/details.js b/pages/details/details.js
index 8adfba1..ac272ef 100644
--- a/pages/details/details.js
+++ b/pages/details/details.js
@@ -23,7 +23,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
- console.log(options.sample);
var item = JSON.parse(options.sample)
this.setData({
barCode:item.barCode,
diff --git a/pages/feedback/feedback.js b/pages/feedback/feedback.js
index 1085df2..9f08a69 100644
--- a/pages/feedback/feedback.js
+++ b/pages/feedback/feedback.js
@@ -49,7 +49,6 @@ Page({
//记录问题
problemUr(e) {
- console.log(e.detail.value);
this.setData({
problemStr: e.detail.value
})
diff --git a/pages/freiLogistics/freiLogistics.js b/pages/freiLogistics/freiLogistics.js
index ad55374..4e54dfc 100644
--- a/pages/freiLogistics/freiLogistics.js
+++ b/pages/freiLogistics/freiLogistics.js
@@ -308,6 +308,7 @@ Page({
request.post(`/batch/addTranLogistics`, tempData).then(res => {
console.log(JSON.stringify(res.data));
if (res.data.code == 200) {
+ this.data.selfOrderCode = res.data.data
//保存成功后,查询底部列表
this.selSampleList();
} else {
diff --git a/pages/handover/handover.js b/pages/handover/handover.js
index 8d907d5..3d1c027 100644
--- a/pages/handover/handover.js
+++ b/pages/handover/handover.js
@@ -1,4 +1,5 @@
// pages/handover/handover.js
+//样本交接
const request = require('../../utils/http')
import drawQrcode from '../../utils/weapp.qrcode.esm.js'
// var app = getApp();
@@ -38,7 +39,7 @@ Page({
// this.data.logisticsCodeList = res.data.data
if (res.data.data.length == 0) {
wx.showToast({
- title: '物流单列表无数据',
+ title: '无数据',
icon: 'error'
})
} else {
@@ -51,8 +52,6 @@ Page({
//查询物流单下的样本列表
selSampleList(e) {
- var _this = this;
- // console.log('selSampleList run' + JSON.stringify(e.target.dataset.id));
var reqData = {
'logisticsNo': e.target.dataset.id
}
diff --git a/pages/index/index.js b/pages/index/index.js
index 0f8b159..e8ccdde 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -37,17 +37,16 @@ function initChart(canvas, width, height, dpr) {
series: [{
name: '核收数',
type: 'bar',
- data: [10, 20, 46, 120, 90, 80]
+ data: [10, 20, 46, 120, 90, 80, 85, 23, 49, 98, 110, 32]
},
{
name: '接收数',
type: 'bar',
- data: [20, 56, 46, 30, 45, 60]
+ data: [20, 56, 46, 30, 45, 60, 10, 20, 46, 120, 90]
}
]
};
chart.setOption(option);
-
return chart;
};
diff --git a/pages/index/index.json b/pages/index/index.json
index 45c0c0f..6aaec87 100644
--- a/pages/index/index.json
+++ b/pages/index/index.json
@@ -2,5 +2,5 @@
"usingComponents": {
"ec-canvas":"../../components/echarts/ec-canvas"
},
- "navigationBarTitleText": "首页"
+ "navigationBarTitleText": "物流管理系统"
}
\ No newline at end of file
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ec06fa6..3e9702f 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,33 +1,57 @@
-
-
-
-
-
-
-消息：XXX医院样本转运完成，完成时间:2023年6月14日
-
-
-
-
-
-
- 自建物流
-
-
-
- 第三方物流
+
+
+
+
+
+
+
+ 消息：丛台医院样本转运完成，完成时间:2023年7月14日
+
+
+
+
+
+
+ 自建物流
+
+
+
+ 第三方物流
+
+
+
+ 货运物流
+
-
-
- 货运物流
+
+
+
+
+
+
+
+
+
+
+ 自建查询
+
+
+
+ 第三方查询
+
+
+
+ 货运查询
+
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index fec4a7f..728c87d 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -4,7 +4,7 @@ page {
}
.banner{
width: 100%;
- height: 350rpx;
+ height: 330rpx;
}
.banner image{
width: 100%;
@@ -12,8 +12,8 @@ page {
}
.msg{
- border-radius: 5px;
- margin: 20rpx 20rpx 0rpx;
+ border-radius: 2px;
+ margin: 10rpx 10rpx 0rpx;
height: 40rpx;
background-color: #fff;
font-size: 26rpx;
@@ -40,15 +40,16 @@ page {
justify-content: center;
}
.item image{
- width: 80rpx;
- height: 80rpx;
+ width: 100rpx;
+ height: 100rpx;
}
.btn{
background-color: #3ec6c9;
color: #fff;
- margin-top: 20rpx;
- width: 100% !important;
+ margin-top: 10rpx;
+ padding: 30rpx 10rpx;
+ width: 98% !important;
}
diff --git a/pages/meLogistics/meLogistics.js b/pages/meLogistics/meLogistics.js
index 900bf53..a71f92e 100644
--- a/pages/meLogistics/meLogistics.js
+++ b/pages/meLogistics/meLogistics.js
@@ -12,13 +12,15 @@ Page({
ins: [], //送检机构 服务端获取
insName: [], //机构列表名称
insIdx: 0, //当前所选机构下标
- bushList: ['私家车', '大巴', '顺丰', '其他'], //运输方式 服务端获取
- bush: '', //运输方式下标
+ bushList: ['自建物流'], //运输方式 服务端获取
+ bush: '0', //运输方式下标
date: '', //当天日期
start: '2020-01-01',
end: '',
boxNum: '', //转运箱号
+ boxList:['ZY1000020041','ZY1000020042','ZY1000020043','ZY1000020044','ZY1000020045'], //查询回来的转运箱列表
+ boxIdx:'', //选择的下标
time: '', //出发时间
multiArray: [],
@@ -29,8 +31,8 @@ Page({
multiArray1: [],
multiIndex1: [0, 0, 0, 0, 0],
choose_year1: "",
- numberplate: '', //车牌号
- logisticsMen: '', //物流员
+ numberplate: '京B3333F3', //车牌号
+ logisticsMen: '检验门诊岳医生', //物流员
number: '', //数量
notes: '', //备注
driverMen: '', //驾驶员
@@ -42,8 +44,8 @@ Page({
//样本列表
sampleList: [{
'id': 1,
- 'number': '2023050002',
- 'time': '2023-5-12 11:32',
+ 'barCode': '2023050002',
+ 'receiveTime': '2023-5-12 11:32',
'status': '已签收',
'name': '张三',
'num': 'M2023055568'
@@ -110,10 +112,18 @@ Page({
//物流车、转运箱拍照
photograph(e) {
var potoIdx = 0;
- if (e.target.dataset.id == 'car_1') potoIdx = 0
- if (e.target.dataset.id == 'car_2') potoIdx = 1
- if (e.target.dataset.id == 'box_1') potoIdx = 2
- if (e.target.dataset.id == 'box_2') potoIdx = 3
+ if (e.target.dataset.id == 'car_0') potoIdx = 0
+ if (e.target.dataset.id == 'car_1') potoIdx = 1
+ if (e.target.dataset.id == 'car_2') potoIdx = 2
+ if (e.target.dataset.id == 'car_3') potoIdx = 3
+ if (e.target.dataset.id == 'box_0') potoIdx = 4
+ if (e.target.dataset.id == 'box_1') potoIdx = 5
+ if (e.target.dataset.id == 'box_2') potoIdx = 6
+ if (e.target.dataset.id == 'box_3') potoIdx = 7
+ if (e.target.dataset.id == 'sam_0') potoIdx = 8
+ if (e.target.dataset.id == 'sam_1') potoIdx = 9
+ if (e.target.dataset.id == 'sam_2') potoIdx = 10
+ if (e.target.dataset.id == 'sam_3') potoIdx = 11
//回显所拍摄照片
var _this = this;
@@ -338,6 +348,15 @@ Page({
}
},
+ //转运箱号下拉选择
+ bindBoxNumber(e){
+ // console.log(JSON.stringify(e.detail.value))
+ this.setData({
+ boxIdx:e.detail.value,
+ boxNum:this.data.boxList[e.detail.value]
+ })
+ },
+
//显示必选项为空提示
showErrInfo(field, errInfo) {
if (field === undefined || field.length == 0) {
@@ -383,8 +402,8 @@ Page({
"entryDate": temp.date, // 录入日期
"endDate": '2023-07-06 14:52:53', //startTime
"expectedEndTime": endTime, //预计到达时间 endTime
- "institutionName": temp.ins[temp.insIdx].orgName, //送检机构名称
- "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
+ // "institutionName": temp.ins[temp.insIdx].orgName, //送检机构名称
+ // "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号
"logisticsMen": temp.logisticsMen, //物流员
"logisticsNo": temp.selfOrderCode, //物流编号
"logisticsWay": 1, //物流方式 1自建 2第三方 3货运
@@ -417,15 +436,14 @@ Page({
})
},
- //查询底部列表数据
+ //查询样本列表数据
selSampleList() {
var reqData = {
'logisticsNo': this.data.selfOrderCode
}
request.post(`/logistics/selectTranLogistics`, reqData).then(res => {
- console.log(res.data);
this.setData({
- sampleList: res.data.data,
+ // sampleList: res.data.data,
sampleCount: res.data.data.length
})
})
@@ -462,12 +480,17 @@ Page({
request.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => {
console.log('getBatchsNumber=' + JSON.stringify(res.data))
if (res.data.code == 200) {
+ this.data.selfOrderCode = res.data.data
this.setData({
selfOrderCode: res.data.data
})
+
+ this.selSampleList(); //查询物流批次列表
}
})
+
+
//获取送检机构列表
request.post(`/institution/selectInstitution`).then(res => {
var array = res.data.data
@@ -478,13 +501,14 @@ Page({
this.setData({
ins: tempArr
})
-
- //查询物流批次列表
- this.selSampleList();
})
//初始化照片按钮
- var tempSrc = [this.data.potoSrc, this.data.potoSrc, this.data.potoSrc, this.data.potoSrc]
+ var tempSrc = []
+ for (let index = 0; index < 12; index++) {
+ tempSrc.push(this.data.potoSrc)
+ }
+
this.setData({
poto: tempSrc
})
diff --git a/pages/meLogistics/meLogistics.wxml b/pages/meLogistics/meLogistics.wxml
index d3d3b6c..99446da 100644
--- a/pages/meLogistics/meLogistics.wxml
+++ b/pages/meLogistics/meLogistics.wxml
@@ -8,110 +8,154 @@
-
-
-
-
+
+
+
+ 总计：{{sampleCount}}/管数
+
+
+
+
+
+
+
+ 样本条码号
+ 接收时间
+ 样本状态
+ 物流员
+ 物流单号
+
+
+ {{index + 1}}
+ {{item.barCode}}
+ {{item.receiveTime}}
+ 未采样
+ 已采样
+ 已发货
+ 已接收
+ 重新采样
+ 其它
+ {{item.logisticsMen}}
+ {{item.logisticsNo}}
+
+
+
+
+
+
+
+ 物流车拍照
+
+
+
+
+
+
+
+
+
+ 转运箱拍照
+
+
+
+
+
+
+
+
+
+
+ 样本拍照
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ 送检机构：
-
+
+
+ 物流单号：
+
+
+
+
-
+ 数 量：
+
-
+ 运输方式：
-
-
-
-
+
+
+
+
+ 转运箱号：
+
+
+
+
+
+
-
+
+ 出发时间：
+
-
+
+ 到达时间：
+
-
-
+ 车 牌 号：
+
+
-
-
+ 驾 驶 员：
+
+
-
-
+ 物 流 员：
+
+
-
+ 备 注：
-
-
-
- 物流车拍照
-
-
-
-
-
-
-
-
-
-
- 转运箱拍照
-
-
-
-
-
-
-
-
-
-
- 总计：{{sampleCount}}/管数
-
-
-
-
-
-
- 序号
- 样本条码号
- 接收时间
- 样本状态
- 物流员
- 物流单号
-
-
- {{index + 1}}
- {{item.barCode}}
- {{item.receiveTime}}
- 未采样
- 已采样
- 已发货
- 已接收
- 重新采样
- 其它
- {{item.logisticsMen}}
- {{item.logisticsNo}}
-
-
-
\ No newline at end of file
diff --git a/pages/meLogistics/meLogistics.wxss b/pages/meLogistics/meLogistics.wxss
index 04d4b9e..ec5ca58 100644
--- a/pages/meLogistics/meLogistics.wxss
+++ b/pages/meLogistics/meLogistics.wxss
@@ -39,10 +39,20 @@
.from-con label{
position: absolute;
top: 5rpx;
+ color: red;
+ font-weight: 900;
+ font-size: 28rpx;
+}
+
+.from-con text{
+ position: absolute;
+ padding-left: 20rpx;
+ top: 5rpx;
font-weight: 900;
font-size: 28rpx;
color: #333;
}
+
.from-con input{
text-align: right;
padding: 10rpx;
@@ -55,6 +65,7 @@
display: flex;
justify-content:space-between;
align-items: center;
+ padding-left: 40rpx;
}
.bush button{
width: 200rpx !important;
@@ -67,23 +78,31 @@
height: 55rpx;
}
.bush-img{
+
display: flex;
flex-wrap: wrap;
justify-content:space-around;
- padding: 10rpx 10rpx;
+ padding: 20rpx 10rpx;
width: 100%;
}
.bush-img image{
- width: 270rpx;
- height: 230rpx;
+ width: 100rpx;
+ height: 100rpx;
margin-top: 5rpx;
border: 1rpx solid #999;
- border-radius: 15rpx;
+ border-radius: 5rpx;
}
.back{
margin-top: 15rpx;
}
+.back_img_box{
+ margin-top: 20rpx;
+ padding-top: 10rpx;
+ background-color: #e6e6e6;
+ border-radius: 5rpx;
+}
+
.con{
display: flex;
align-items: center;
@@ -138,5 +157,6 @@
align-items: center;
flex-wrap: nowrap;
white-space: nowrap;
- min-width: 70rpx;
+ padding: 0rpx 2rpx;
+ min-width: 30rpx;
}
diff --git a/pages/threeLogistics/threeLogistics.js b/pages/threeLogistics/threeLogistics.js
index fdc5e3a..49df07c 100644
--- a/pages/threeLogistics/threeLogistics.js
+++ b/pages/threeLogistics/threeLogistics.js
@@ -347,6 +347,7 @@ Page({
request.post(`/batch/addTranLogistics`, tempData).then(res => {
console.log(JSON.stringify(res.data));
if (res.data.code == 200) {
+ this.data.selfOrderCode = res.data.data
//保存成功后,查询底部列表
this.selSampleList();
} else {
diff --git a/pages/threeLogistics/threeLogistics.wxml b/pages/threeLogistics/threeLogistics.wxml
index 4c4b5e9..8c669b3 100644
--- a/pages/threeLogistics/threeLogistics.wxml
+++ b/pages/threeLogistics/threeLogistics.wxml
@@ -71,7 +71,7 @@
- 总计：200/管数
+ 总计：{{sampleCount}}/管数
diff --git a/utils/dateSetting.js b/utils/dateSetting.js
index 4b28fef..a114488 100644
--- a/utils/dateSetting.js
+++ b/utils/dateSetting.js
@@ -3,7 +3,7 @@
const date = new Date();
const year = date.getFullYear();
const month = date.getMonth() + 1;
-const day = date.getDay() + 9; //不知道为什么 + 1 的话,时间不是当前日
+const day = date.getDay() + 16; //不知道为什么 + 1 的话,时间不是当前日
const hour = date.getHours();
const minute = date.getMinutes();
//确定月份呈现