diff --git a/app.js b/app.js index 48405bc..46624a4 100644 --- a/app.js +++ b/app.js @@ -15,7 +15,7 @@ App({ globalData: { // 本地环境 - baseUrl: 'http://192.168.51.200:8201/mall-portal', + baseUrl: 'http://192.168.51.4:8201/mall-portal', // 线上环境 // baseUrl:'https://portal-api.macrozheng.com', token: '', diff --git a/app.json b/app.json index f6f76f2..4f27185 100644 --- a/app.json +++ b/app.json @@ -11,7 +11,8 @@ "pages/queryfrei/queryfrei", "pages/feedback/feedback", "pages/handover/handover", - "pages/login/login" + "pages/login/login", + "pages/otherLogistics/otherLogistics" ], "window": { "backgroundTextStyle": "light", diff --git a/images/qrcode.jpg b/images/qrcode.jpg deleted file mode 100644 index 3725d3c..0000000 Binary files a/images/qrcode.jpg and /dev/null differ diff --git a/images/样本交接.png b/images/样本交接.png new file mode 100644 index 0000000..fd7e63b Binary files /dev/null and b/images/样本交接.png differ diff --git a/pages/about/about.wxml b/pages/about/about.wxml index ac340ea..4a38885 100644 --- a/pages/about/about.wxml +++ b/pages/about/about.wxml @@ -11,11 +11,6 @@ - - - 绑定微信 - - 自建查询 @@ -29,6 +24,16 @@ 货运查询 + + + 绑定微信 + + + + + 样本交接查询 + + 意见反馈 diff --git a/pages/about/about.wxss b/pages/about/about.wxss index 73e22bd..bd68245 100644 --- a/pages/about/about.wxss +++ b/pages/about/about.wxss @@ -31,14 +31,14 @@ width: 100%; display: flex; flex-wrap: wrap; + justify-content: center; height: 350rpx; } .con{ - width: 140rpx; + width: 220rpx; margin-left: 10rpx; text-align: center; margin-top: 40rpx; - width: 200rpx; } .con image{ width: 100rpx; diff --git a/pages/handover/handover.js b/pages/handover/handover.js index 3d1c027..875b107 100644 --- a/pages/handover/handover.js +++ b/pages/handover/handover.js @@ -13,7 +13,8 @@ Page({ end: '', logisticsCodeList: [], //物流单列表 sampleList: [], //样本列表 - showDialog: false + showDialog: false, //默认不显示物流列表弹窗 + logisticsNo:'', //记录当前物流单号 }, //刷新按钮 @@ -35,9 +36,13 @@ Page({ pageSize: 100 } request.post(`/batch/selectTranLogistics`, reqData).then(res => { - // console.log(JSON.stringify(res)); - // this.data.logisticsCodeList = res.data.data if (res.data.data.length == 0) { + + this.setData({ + logisticsCodeList: [], + sampleList:[] + }) + wx.showToast({ title: '无数据', icon: 'error' @@ -52,12 +57,12 @@ Page({ //查询物流单下的样本列表 selSampleList(e) { + this.data.logisticsNo = e.target.dataset.id var reqData = { 'logisticsNo': e.target.dataset.id } request.post(`/logistics/selectTranLogistics`, reqData).then(res => { - console.log(res.data.data); this.setData({ sampleList: res.data.data, // sampleCount: res.data.data.length @@ -118,6 +123,16 @@ Page({ }); }, + //TODO 核收样本,测试通过后删除 + collectionSam(e){ + var tempLogisticsNo = this.data.logisticsNo + var reqData = {"logisticsNo":tempLogisticsNo, "note":"测试核收"} + request.post(`/sample/receiveSample`, reqData).then(res => { + console.log("样本核收==>" + JSON.stringify(res)); + this.selTranLogistics() + }) + }, + /** * 生命周期函数--监听页面加载 */ diff --git a/pages/handover/handover.wxml b/pages/handover/handover.wxml index 1b83d36..6b7fc86 100644 --- a/pages/handover/handover.wxml +++ b/pages/handover/handover.wxml @@ -12,9 +12,13 @@ 物流单号 - + - {{item.logisticsNo}} + + {{item.logisticsNo}} - [未核收] + + {{item.logisticsNo}} - [已核收] + @@ -52,7 +56,7 @@ - + diff --git a/pages/index/index.js b/pages/index/index.js index e8ccdde..36416cb 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -119,6 +119,35 @@ Page({ }) }, + //查询跳转 + goSelNav(e) { + var tag = e.currentTarget.dataset.id + var url + //自建物流查询 + if (tag == 'goQueryme') { + url = '../queryme/queryme' + } + + //第三方物流查询 + if (tag == 'goQuerythree') { + url = '../querythree/querythree' + } + + //货运物流查询 + if (tag == 'goQueryfrei') { + url = '../queryfrei/queryfrei' + } + + //合作物流 + if(tag == 'goOtherLogistics'){ + url = '../otherLogistics/otherLogistics' + } + + wx.navigateTo({ + url: url, + }) + }, + /** * 生命周期函数--监听页面加载 */ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 3e9702f..3e925d3 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,5 +1,5 @@ - + + + + 合作物流 + + diff --git a/pages/meLogistics/meLogistics.js b/pages/meLogistics/meLogistics.js index a71f92e..042cee4 100644 --- a/pages/meLogistics/meLogistics.js +++ b/pages/meLogistics/meLogistics.js @@ -10,7 +10,7 @@ Page({ pipenum: '', selfOrderCode: '', //物流单号 ins: [], //送检机构 服务端获取 - insName: [], //机构列表名称 + insName: '', //机构列表名称 insIdx: 0, //当前所选机构下标 bushList: ['自建物流'], //运输方式 服务端获取 bush: '0', //运输方式下标 @@ -19,8 +19,8 @@ Page({ end: '', boxNum: '', //转运箱号 - boxList:['ZY1000020041','ZY1000020042','ZY1000020043','ZY1000020044','ZY1000020045'], //查询回来的转运箱列表 - boxIdx:'', //选择的下标 + boxList: [], //查询回来的转运箱列表 + boxIdx: '', //选择的下标 time: '', //出发时间 multiArray: [], @@ -31,32 +31,29 @@ Page({ multiArray1: [], multiIndex1: [0, 0, 0, 0, 0], choose_year1: "", - numberplate: '京B3333F3', //车牌号 - logisticsMen: '检验门诊岳医生', //物流员 + + numberplate: '', //车牌号 + numberplateIdx:'', //牌照角标 + numberplateArr:[], //牌照号组 + numberplateList:[], //车辆集合 + + logisticsMen: '', //物流员 number: '', //数量 notes: '', //备注 driverMen: '', //驾驶员 // srcArray: [], //样本组？ potoSrc: '../../images/addPoto.png', //默认图片 - poto: [], //车辆&转运箱照片 最大长度 4 + poto: [], //车辆&转运箱照片&样本 最大长度 12 tableArr: [], //扫码表数据 sampleCount: '0', //样本数量 //样本列表 - sampleList: [{ - 'id': 1, - 'barCode': '2023050002', - 'receiveTime': '2023-5-12 11:32', - 'status': '已签收', - 'name': '张三', - 'num': 'M2023055568' - }], + sampleList: [], }, - //调用摄像头 + //调用摄像头扫描样本码 scacode() { wx.scanCode({ success: (res) => { - console.log(res.result); this.setData({ pipenum: res.result }) @@ -144,8 +141,6 @@ Page({ var _this = this; request.upImgFile(`/feedBack/upload`, imageSrc).then(res => { var resObj = JSON.parse(res.data) - console.log('upImgFile data =' + resObj.data.url); - console.log('upImgFile res=' + JSON.stringify(res.data)); if (resObj.code > 400) { wx.showModal({ title: '提示', @@ -158,7 +153,6 @@ Page({ }) } else { //保存图片路径到数组 - // this.data.upImageArr.push(resObj.data.url); _this.data.poto[potoIdx] = resObj.data.url _this.setData({ poto: _this.data.poto @@ -319,13 +313,6 @@ Page({ }) } - //车牌号 - if (data_id == 'numberplate') { - this.setData({ - numberplate: value - }) - } - //物流员 if (data_id == 'logisticsMen') { this.setData({ @@ -349,14 +336,23 @@ Page({ }, //转运箱号下拉选择 - bindBoxNumber(e){ + bindBoxNumber(e) { // console.log(JSON.stringify(e.detail.value)) this.setData({ - boxIdx:e.detail.value, - boxNum:this.data.boxList[e.detail.value] + boxIdx: e.detail.value, + boxNum: this.data.boxList[e.detail.value] }) }, + //车辆下拉选择 + bindNumberplate(e) { + // console.log(JSON.stringify(e.detail.value)) + this.setData({ + numberplateIdx: e.detail.value, + numberplate: this.data.boxList[e.detail.value] + }) + }, + //显示必选项为空提示 showErrInfo(field, errInfo) { if (field === undefined || field.length == 0) { @@ -384,11 +380,16 @@ Page({ var boxPoto = [] var array = this.data.poto; for (let index = 0; index < array.length; index++) { - if (index < 2 && array[index] != this.data.potoSrc) { + //物流车照片 + if (index < 4 && array[index] != this.data.potoSrc) { carPoto.push(array[index]) + + //转运箱照片 } else if (array[index] != this.data.potoSrc) { boxPoto.push(array[index]) } + //TODO 样本照片 + } var tempData = { @@ -402,14 +403,14 @@ 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.insName, //送检机构名称 + "institutionNo": temp.ins[temp.insIdx].id, //送检机构编号 "logisticsMen": temp.logisticsMen, //物流员 "logisticsNo": temp.selfOrderCode, //物流编号 "logisticsWay": 1, //物流方式 1自建 2第三方 3货运 "notes": temp.notes, // 物流备注 "number": temp.number, // 数量 - "numberplate": "", // 车牌号 + "numberplate": temp.numberplate, // 车牌号 "phone": "", //物流电话 "startTime": startTime, //出发时间 "tranType": "1", //物流方式 @@ -443,7 +444,7 @@ Page({ } request.post(`/logistics/selectTranLogistics`, reqData).then(res => { this.setData({ - // sampleList: res.data.data, + sampleList: res.data.data, sampleCount: res.data.data.length }) }) @@ -478,7 +479,6 @@ Page({ //获取物流单号 1.自建物流 2.第三方物流 3.货运物流 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({ @@ -490,7 +490,6 @@ Page({ }) - //获取送检机构列表 request.post(`/institution/selectInstitution`).then(res => { var array = res.data.data @@ -512,6 +511,31 @@ Page({ this.setData({ poto: tempSrc }) + + //获取转运箱信息 + request.post(`/box/selectTranBox`).then(res => { + var array = res.data.data + var tempBoxList = [] + for (let index = 0; index < array.length; index++) { + tempBoxList.push(array[index].boxNum) + } + this.setData({ + boxList: tempBoxList + }) + + }) + + //获取车辆信息 + request.post(`/vehicle/selectTranVehicle`).then(res => { + var array = res.data.data + var tempNumberplatArr = [] + for (let index = 0; index < array.length; index++) { + tempNumberplatArr.push(array[index].numberplate) + } + this.setData({ + numberplateArr :tempNumberplatArr + }) + }) }, /** diff --git a/pages/meLogistics/meLogistics.wxml b/pages/meLogistics/meLogistics.wxml index 99446da..4303646 100644 --- a/pages/meLogistics/meLogistics.wxml +++ b/pages/meLogistics/meLogistics.wxml @@ -13,7 +13,7 @@ 总计：{{sampleCount}}/管数 - + @@ -105,7 +105,7 @@ --> - 数 量： + 数 量： @@ -114,15 +114,13 @@ - - - + + 转运箱号： - - + @@ -136,10 +134,12 @@ - - 车 牌 号： - - + + + + 车 牌 号： + + 驾 驶 员： @@ -152,10 +152,14 @@ - 备 注： + 备 注： + + + + \ No newline at end of file diff --git a/pages/meLogistics/meLogistics.wxss b/pages/meLogistics/meLogistics.wxss index ec5ca58..6b756f0 100644 --- a/pages/meLogistics/meLogistics.wxss +++ b/pages/meLogistics/meLogistics.wxss @@ -1,18 +1,20 @@ /* pages/meLogistics/meLogistics.wxss */ -.top{ +.top { display: flex; justify-content: left; font-size: 28rpx; } -.top input{ + +.top input { border: 1rpx #333 solid; height: 60rpx; width: 700rpx; border-radius: 5rpx; padding: 5rpx 10rpx; } -.top view{ + +.top view { width: 305rpx; margin-left: 20rpx; background-color: #eee; @@ -24,19 +26,21 @@ font-weight: 700; } -.form{ +.form { background-color: #fff; border-radius: 15rpx; padding: 0rpx 30rpx; margin-bottom: 15rpx; } -.form .from-con{ + +.form .from-con { font-size: 28rpx; border-bottom: 2rpx #eee solid; position: relative; margin-top: 25rpx; } -.from-con label{ + +.from-con label { position: absolute; top: 5rpx; color: red; @@ -44,7 +48,7 @@ font-size: 28rpx; } -.from-con text{ +.from-con text { position: absolute; padding-left: 20rpx; top: 5rpx; @@ -53,61 +57,67 @@ color: #333; } -.from-con input{ +.from-con input { text-align: right; padding: 10rpx; } -.place{ - color:#c4bfbf; + +.place { + color: #c4bfbf; } -.bush{ +.bush { display: flex; - justify-content:space-between; + justify-content: space-between; align-items: center; padding-left: 40rpx; } -.bush button{ + +.bush button { width: 200rpx !important; display: flex; justify-content: center; align-items: center; font-size: 28rpx; background-color: #23c559; - color:#fff; + color: #fff; height: 55rpx; } -.bush-img{ - + +.bush-img { + display: flex; flex-wrap: wrap; - justify-content:space-around; + justify-content: space-around; padding: 20rpx 10rpx; width: 100%; } -.bush-img image{ + +.bush-img image { width: 100rpx; height: 100rpx; margin-top: 5rpx; border: 1rpx solid #999; border-radius: 5rpx; } -.back{ + +.back { margin-top: 15rpx; } -.back_img_box{ +.back_img_box { margin-top: 20rpx; padding-top: 10rpx; background-color: #e6e6e6; border-radius: 5rpx; } -.con{ +.con { display: flex; align-items: center; } -.con button{ + +.con button { width: 170rpx !important; display: flex; justify-content: center; @@ -118,19 +128,33 @@ margin-left: 10rpx !important; } -.tabel{ +.bottomButton { + margin-top: 30rpx; + margin-bottom: 80rpx; + padding: 0rpx 10rpx; + display: block; + display: inline-flex; + align-items: center; + justify-content: center; + text-align: center; + background-color: #7f96d3; +} + +.tabel { margin-top: 20rpx; width: 100%; border: 1rpx #ddd solid; } -.tabel .tr{ + +.tabel .tr { display: flex; flex-wrap: nowrap; white-space: nowrap; } -.tr .td{ - border-right:#ddd solid 1rpx ; + +.tr .td { + border-right: #ddd solid 1rpx; border-top: #ddd solid 1rpx; padding: 15rpx 0; font-size: 22rpx; @@ -141,14 +165,16 @@ white-space: nowrap; min-width: 250rpx; } -.tab-top view{ + +.tab-top view { background-color: #51bdbe; - color:#fff; + color: #fff; font-weight: 700; font-size: 28rpx; } -.td1{ - border-right:#ddd solid 1rpx ; + +.td1 { + border-right: #ddd solid 1rpx; border-top: #ddd solid 1rpx; padding: 15rpx 0; font-size: 22rpx; @@ -159,4 +185,4 @@ white-space: nowrap; padding: 0rpx 2rpx; min-width: 30rpx; -} +} \ No newline at end of file diff --git a/pages/otherLogistics/otherLogistics.js b/pages/otherLogistics/otherLogistics.js new file mode 100644 index 0000000..4088677 --- /dev/null +++ b/pages/otherLogistics/otherLogistics.js @@ -0,0 +1,192 @@ +// pages/otherLogistics/otherLogistics.js +//重写第三方物流 +var datePicker = require('../../utils/dateSetting') +var request = require('../../utils/http') +var dateUtils = require('../../utils/dateUtils') +Page({ + + /** + * 页面的初始数据 + */ + data: { + + selfOrderCode: '', //物流单号 + list: [{ + 'id': 1, + 'number': '2023050002', + 'time': '2023-5-12 11:32', + 'status': '已签收', + 'name': '张三', + 'num': 'M2023055568' + }], + pipenum: '', + ins: ['顺丰','京东'], + insIdx: 0, //物流所选下标 + date: '', + start: '2023-07-01', // 时间选择器开始时间 + end: '', // 时间选择器结束时间 + + potoSrc: '../../images/addPoto.png', //默认图片 + poto: [], //车辆&转运箱照片 最大长度 4 + + expectedEndTime: '', //预计到达时间 + multiArray: [], + multiIndex: [0, 0, 0, 0, 0], + choose_year: "", + srcArray: [], //照片临时路径 + phone: '', //物流电话 + boxNum: '', //转运箱号 + cost: '', //物流费用 + logisticsMen: '', //物流员 + notes: '', //备注 + + sampleCount: '0', //样本数量 + //样本列表 + sampleList: [{ + 'id': 1, + 'number': '2023050002', + 'time': '2023-5-12 11:32', + 'status': '已签收', + 'name': '张三', + 'num': 'M2023055568' + }] + }, + + //扫描物流单号 + qrLogisticsCode(e){ + console.log(JSON.stringify(e)); + wx.scanCode({ + success: (res) => { + this.setData({ + pipenum: res.result + }) + } + }) + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + let now = new Date(); //获取时间 + let year = now.getFullYear(); //获取当前年 + let month = now.getMonth() + 1; //获取当前月份 + this.setData({ + end: '' + year + '-' + (Array(2).join(0) + month).slice(-2) + '-' + (Array(2).join(0) + now.getDate()).slice(-2), //当前的时间 + //开始 + multiArray: [ + [year + "年", year + 1 + "年", year + 2 + "年"], + datePicker.determineMonth(), + datePicker.determineDay(year, month), + datePicker.determineHour(), + datePicker.determineMinute() + ], + //结束 + multiArray1: [ + [year + "年", year + 1 + "年", year + 2 + "年"], + datePicker.determineMonth(), + datePicker.determineDay(year, month), + datePicker.determineHour(), + datePicker.determineMinute() + ], + }) + + //获取物流单号 1.自建物流 2.第三方物流 3.货运物流 [录入第三方物流号] + // request.get(`/batch/getBatchsNumber?logisticsWay=1`).then(res => { + // 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 + // var tempArr = [] + // for (let index = 0; index < array.length; index++) { + // tempArr.push(array[index].orgName) + // } + // this.setData({ + // ins: tempArr + // }) + // }) + + //初始化照片按钮 + var tempSrc = [] + for (let index = 0; index < 12; index++) { + tempSrc.push(this.data.potoSrc) + } + + this.setData({ + poto: tempSrc + }) + + //获取转运箱信息 + request.post(`/box/selectTranBox`).then(res => { + var array = res.data.data + var tempBoxList = [] + for (let index = 0; index < array.length; index++) { + tempBoxList.push(array[index].boxNum) + } + this.setData({ + boxList: tempBoxList + }) + + }) + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/otherLogistics/otherLogistics.json b/pages/otherLogistics/otherLogistics.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/otherLogistics/otherLogistics.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/otherLogistics/otherLogistics.wxml b/pages/otherLogistics/otherLogistics.wxml new file mode 100644 index 0000000..ac803e3 --- /dev/null +++ b/pages/otherLogistics/otherLogistics.wxml @@ -0,0 +1,96 @@ + + + + + + + 扫 码 + + + + + 总计：{{sampleCount}}/管数 + + + + + + + + 序号 + 样本条码号 + 接收时间 + 样本状态 + 物流员 + 物流单号 + + + {{item.id}} + {{item.number}} + {{item.time}} + {{item.status}} + {{item.name}} + {{item.num}} + + + + + + + + 转运箱拍照 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/otherLogistics/otherLogistics.wxss b/pages/otherLogistics/otherLogistics.wxss new file mode 100644 index 0000000..c6a8cc1 --- /dev/null +++ b/pages/otherLogistics/otherLogistics.wxss @@ -0,0 +1,140 @@ +/* pages/otherLogistics/otherLogistics.wxss */ +.top{ + display: flex; + justify-content: center; + font-size: 28rpx; +} +.top input{ + border: 1rpx #333 solid; + height: 60rpx; + width: 700rpx; + border-radius: 5rpx; + padding: 5rpx 10rpx; +} +.top view{ + width: 305rpx; + margin-left: 20rpx; + background-color: #eee; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10rpx; + color: #333; + font-weight: 700; +} + +.form{ + background-color: #fff; + border-radius: 15rpx; + padding: 0rpx 30rpx; + margin-bottom: 15rpx; +} +.form .from-con{ + font-size: 28rpx; + border-bottom: 2rpx #eee solid; + position: relative; + margin-top: 25rpx; +} +.from-con label{ + position: absolute; + top: 5rpx; + font-weight: 900; + font-size: 28rpx; + color: #333; +} +.from-con input{ + text-align: right; + padding: 10rpx; +} +.place{ + color:#c4bfbf; +} + +.bush{ + display: flex; + justify-content:space-between; + align-items: center; +} +.bush button{ + width: 200rpx !important; + display: flex; + justify-content: center; + align-items: center; + font-size: 28rpx; + background-color: #23c559; + color:#fff; + height: 55rpx; +} +.bush-img{ + display: flex; + flex-wrap: wrap; + justify-content:space-around; + padding: 20rpx 10rpx; +} +.bush-img image{ + width: 100rpx; + height: 100rpx; + margin-top: 5rpx; + border: 1rpx solid #999; + border-radius: 5rpx; +} +.back{ + margin-top: 15rpx; +} + +.con{ + display: flex; + align-items: center; +} +.con button{ + width: 170rpx !important; + display: flex; + justify-content: center; + align-items: center; + font-size: 28rpx; + background-color: rgb(245, 90, 90); + height: 55rpx; + margin-left: 10rpx !important; +} + +.tabel{ + margin-top: 20rpx; + width: 100%; + border: 1rpx #ddd solid; + +} +.tabel .tr{ + display: flex; + flex-wrap: nowrap; + white-space: nowrap; +} +.tr .td{ + border-right:#ddd solid 1rpx ; + border-top: #ddd solid 1rpx; + padding: 15rpx 0; + font-size: 22rpx; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + white-space: nowrap; + min-width: 200rpx; +} +.tab-top view{ + background-color: #51bdbe; + color:#fff; + font-weight: 700; + font-size: 28rpx; +} +.td1{ + border-right:#ddd solid 1rpx ; + border-top: #ddd solid 1rpx; + padding: 15rpx 0; + font-size: 22rpx; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + white-space: nowrap; + min-width: 100rpx; +} diff --git a/pages/queryme/queryme.wxml b/pages/queryme/queryme.wxml index 56eb443..c501d9b 100644 --- a/pages/queryme/queryme.wxml +++ b/pages/queryme/queryme.wxml @@ -11,7 +11,7 @@ - + @@ -35,14 +35,14 @@ - 序号 + 物流单号 送检机构 - 日期 - 样本管数 + 创建日期 + 样本管数 转运方式 转运箱号 - 出发时间 + 预计出发时间 到达时间 车牌号 备注 @@ -53,22 +53,20 @@ {{index + 1}} {{item.logisticsNo}} {{item.institutionName}} - {{item.entryDate}} - {{item.number}} + {{item.createTime}} + {{item.number}} - 私家车 + 自建物流 其他 {{item.boxNum}} {{item.startTime}} - {{item.endTime}} + {{item.collTime == '' ? '未核收':item.collTime}} {{itme.numberplate}} {{itme.notes}} - + 共 {{sampleList.length}} 条 - - \ No newline at end of file diff --git a/pages/queryme/queryme.wxss b/pages/queryme/queryme.wxss index 4e78062..cb850b6 100644 --- a/pages/queryme/queryme.wxss +++ b/pages/queryme/queryme.wxss @@ -60,17 +60,23 @@ page{ align-items: center; flex-wrap: nowrap; white-space: nowrap; - min-width: 150rpx; + min-width: 200rpx; } + .top view{ background-color: #6bc9ca; color: #fff; } .td1{ + min-width: 50rpx !important; +} + +.td2{ min-width: 100rpx !important; } + .td_date{ - min-width: 200rpx !important; + min-width: 250rpx !important; } .td_time{ min-width: 300rpx !important; diff --git a/pages/querythree/querythree.wxml b/pages/querythree/querythree.wxml index a33f6f9..df07cbe 100644 --- a/pages/querythree/querythree.wxml +++ b/pages/querythree/querythree.wxml @@ -32,13 +32,13 @@ - + 序号 物流单号 送检机构 - 日期 + 日期 物流费用 转运方式 diff --git a/pages/querythree/querythree.wxss b/pages/querythree/querythree.wxss index 4e78062..a22b31a 100644 --- a/pages/querythree/querythree.wxss +++ b/pages/querythree/querythree.wxss @@ -5,7 +5,7 @@ page{ .form{ background-color: #fff; - border-radius: 15rpx; + border-radius: 5rpx; padding: 20rpx 50rpx; margin-bottom: 15rpx; } @@ -67,7 +67,7 @@ page{ color: #fff; } .td1{ - min-width: 100rpx !important; + min-width: 50rpx !important; } .td_date{ min-width: 200rpx !important; diff --git a/pages/threeLogistics/threeLogistics.wxml b/pages/threeLogistics/threeLogistics.wxml index 8c669b3..0f949c2 100644 --- a/pages/threeLogistics/threeLogistics.wxml +++ b/pages/threeLogistics/threeLogistics.wxml @@ -4,8 +4,63 @@ 扫 码 - + + + + 总计：{{sampleCount}}/管数 + + + + + + + + 序号 + 样本条码号 + 接收时间 + 样本状态 + 物流员 + 物流单号 + + + {{item.id}} + {{item.number}} + {{item.time}} + {{item.status}} + {{item.name}} + {{item.num}} + + + + + + + + 物流车拍照 + + + + + + + + + + + + + 转运箱拍照 + + + + + + + + + + @@ -15,13 +70,15 @@ - + + + - + @@ -47,53 +104,8 @@ - - - 物流车拍照 - - - - - - - - - - - 转运箱拍照 - - - - - - - + - - - 总计：{{sampleCount}}/管数 - - - - - - 序号 - 样本条码号 - 接收时间 - 样本状态 - 物流员 - 物流单号 - - - {{item.id}} - {{item.number}} - {{item.time}} - {{item.status}} - {{item.name}} - {{item.num}} - - - \ No newline at end of file diff --git a/pages/threeLogistics/threeLogistics.wxss b/pages/threeLogistics/threeLogistics.wxss index 84e27f7..c1390d8 100644 --- a/pages/threeLogistics/threeLogistics.wxss +++ b/pages/threeLogistics/threeLogistics.wxss @@ -73,11 +73,11 @@ padding: 20rpx 10rpx; } .bush-img image{ - width: 270rpx; - height: 230rpx; - margin-top: 10rpx; + width: 100rpx; + height: 100rpx; + margin-top: 5rpx; border: 1rpx solid #999; - border-radius: 15rpx; + border-radius: 5rpx; } .back{ margin-top: 15rpx; diff --git a/utils/http.js b/utils/http.js index 8da1414..d25a0ad 100644 --- a/utils/http.js +++ b/utils/http.js @@ -55,10 +55,13 @@ const post = function(url, data, header) { } -//上传图片文件 +/** + * 上传图片文件 + * @param {*} url 请求地址 + * @param {*} imgSrc 本地图片临时路径 + */ const upImgFile = function(url, imgSrc) { let header = { - // 'content-type': 'multipart/form-data' 'content-type': 'application/json;charset=utf-8' }; @@ -95,7 +98,7 @@ const upImgFile = function(url, imgSrc) { }); }; -//暴露出去 +//暴露方法 module.exports = { get, post,