root
/
cy_pda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

一些样式字体修改

Browse Source
master
Mr.sun 2 years ago
parent 876fe18935
commit c066d15e61
8 changed files with 36 additions and 52 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      common/config.js
  2. 42
      pages/checkAccept/checkHomework.vue
  3. 10
      pages/checkAccept/index.scss
  4. 24
      pages/checkAccept/index.vue
  5. 2
      pages/payInto/index.vue
  6. 1
      pages/receive/index22 .vue
  7. 6
      pages/receive/receiveHomeWork/receiveHomeWork.vue
  8. 2
      pages/receive/receiveHomeWorks/receiveHomeWork.vue

1
common/config.js
Unescape View File

@ -11,6 +11,7 @@ const config = {
// config.baseUrl = 'http://192.168.19.120:8030'; // config.baseUrl = 'http://192.168.19.120:8030';
// config.baseUrl = 'http://120.77.94.227:8030' // config.baseUrl = 'http://120.77.94.227:8030'
config.baseUrl = 'http://127.0.0.1:8030'; config.baseUrl = 'http://127.0.0.1:8030';
// config.baseUrl = 'http://192.168.7.29:8030';
// config.baseUrl = 'http://192.168.7.24:8030'; // config.baseUrl = 'http://192.168.7.24:8030';
// config.baseUrl = 'http://192.168.229.120:8030';0 // config.baseUrl = 'http://192.168.229.120:8030';0
// config.baseUrl = 'http://120.77.94.227:8030'; // config.baseUrl = 'http://120.77.94.227:8030';

42
pages/checkAccept/checkHomework.vue
Unescape View File

@ -11,61 +11,61 @@
<span class="goodsItemValue">{{ result.orderNo}}</span> <span class="goodsItemValue">{{ result.orderNo}}</span>
</view> </view>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">商品编号：</span> <span class="title">商品编号：</span>
<span class="value" v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.bgGoodNo}}</span> <span class="value" v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.bgGoodNo}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">商品名称：</span> <span class="title">商品名称：</span>
<span class="value" <span class="value"
v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.bgGoodName}}</span> v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.bgGoodName}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">规 格：</span> <span class="title" >规 格：</span>
<span class="value" <span class="value"
v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.bgSpecifications}}</span> v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.bgSpecifications}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">件装量：</span> <span class="title">件装量：</span>
<span v-if="result.businInReceivingDForPdaVo"> {{result.businInReceivingDForPdaVo.bpPackageQty}}</span> <span v-if="result.businInReceivingDForPdaVo"> {{result.businInReceivingDForPdaVo.bpPackageQty}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">单 位：</span> <span class="title">单 位：</span>
<span class="value" v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.unitName}}</span> <span class="value" v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.unitName}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">未验数量：</span> <span class="title">未验数量：</span>
<span class="value" v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.ableQty}}</span> <span class="value" v-if="result.businInReceivingDForPdaVo">{{result.businInReceivingDForPdaVo.ableQty}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">验收数量：</span> <span class="title">验收数量：</span>
<span class="value" v-if="result.businInReceivingDForPdaVo">{{dataForm.actualQty}}</span> <span class="value" v-if="result.businInReceivingDForPdaVo">{{dataForm.actualQty}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">件 数：</span> <span class="title">件 数：</span>
<u-input v-model="dataForm.actualCaseQty" border placeholder="请输入件数" @input="changeCase"></u-input> <u-input v-model="dataForm.actualCaseQty" border placeholder="请输入件数" @input="changeCase"></u-input>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">库 别：</span> <span class="title">库 别：</span>
<u-input v-model="kubevalue" type="select" placeholder="请选择库别" class="u-input" placeholder-style="color:#000000" <u-input v-model="kubevalue" type="select" placeholder="请选择库别" class="u-input" placeholder-style="color:#000000"
@click="kube = true" /> @click="kube = true" />
<u-select v-model="kube" :list="storageList" @confirm="confirmKube"></u-select> <u-select v-model="kube" :list="storageList" @confirm="confirmKube"></u-select>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">容 器：</span> <span class="title">容 器：</span>
<u-input v-model="dataForm.containerCode" border placeholder="请输入或扫描容器条码"></u-input> <u-input v-model="dataForm.containerCode" border placeholder="请输入或扫描容器条码"></u-input>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">抽检件数：</span> <span class="title">抽检件数：</span>
<u-input v-model="dataForm.checkCaseQty" :disabled="true" border placeholder="请输入数量"></u-input> <u-input v-model="dataForm.checkCaseQty" :disabled="true" border placeholder="请输入数量"></u-input>
</view> </view>
<view class="titleValue"> <view class="titleValue global-font">
<span class="title">抽检零散数：</span> <span class="title">抽检零散数：</span>
<u-input v-model="dataForm.checkPieceQty" :disabled="true" border placeholder="请输入数量"></u-input> <u-input v-model="dataForm.checkPieceQty" :disabled="true" border placeholder="请输入数量"></u-input>
</view> </view>
@ -122,8 +122,6 @@
}; };
}, },
onLoad: function(options) { onLoad: function(options) {
console.log(options)
this.sid = options.sid this.sid = options.sid
this.detailId = options.did this.detailId = options.did
this.getList(options) this.getList(options)
@ -174,7 +172,6 @@
//处理原因 //处理原因
getByDicAcceptanceReason() { getByDicAcceptanceReason() {
this.$u.api.getByDicAcceptanceReason().then(res => { this.$u.api.getByDicAcceptanceReason().then(res => {
// console.log(res)
if (res.code === 200) { if (res.code === 200) {
this.resustlist = res.data.map((item) => ({ this.resustlist = res.data.map((item) => ({
label: item.dictLabel, label: item.dictLabel,
@ -197,14 +194,12 @@
this.storageList.push(obj); this.storageList.push(obj);
} }
}); });
// console.log(this.storageList)
}, },
// 提报异常 // 提报异常
confirmError() { confirmError() {
this.$u.api.acceptance.confirmError({ this.$u.api.acceptance.confirmError({
id: this.sid id: this.sid
}).then((res) => { }).then((res) => {
console.log(res)
if (res.code === 200) { if (res.code === 200) {
this.$u.toast('提报异常成功'); this.$u.toast('提报异常成功');
this.dataForm = { this.dataForm = {
@ -276,8 +271,6 @@
// this.$u.toast('请选择有效期至'); // this.$u.toast('请选择有效期至');
// return // return
// } // }
console.log('这里执行了吗')
console.log(this.billingStatusValue)
this.$u.api.acceptance.confirmBilling({ this.$u.api.acceptance.confirmBilling({
id: this.sid, id: this.sid,
businInReceivingDetailTransBo: { businInReceivingDetailTransBo: {
@ -285,7 +278,6 @@
id: this.detailId id: this.detailId
} }
}).then(res => { }).then(res => {
console.log(res)
if (res.code === 200) { if (res.code === 200) {
this.$u.toast('验收成功'); this.$u.toast('验收成功');
this.result = {} this.result = {}
@ -312,7 +304,6 @@
}, },
getList(params) { getList(params) {
this.$u.api.acceptance.getReceiving(params).then(res => { this.$u.api.acceptance.getReceiving(params).then(res => {
console.log(res)
if (res.code === 200) { if (res.code === 200) {
this.result = res.data this.result = res.data
if (!this.result.businInReceivingDForPdaVo) { if (!this.result.businInReceivingDForPdaVo) {
@ -348,28 +339,24 @@
this.endtime = true this.endtime = true
}, },
change(e) { change(e) {
console.log(e.result)
this.endTimeValue = e.result this.endTimeValue = e.result
this.endtime = false this.endtime = false
this.dataForm.expiredDate = e.result this.dataForm.expiredDate = e.result
}, },
// 确定库别 // 确定库别
confirmKube(e) { confirmKube(e) {
console.log(e)
this.kube = false this.kube = false
this.kubevalue = e[0].label this.kubevalue = e[0].label
this.dataForm.storageId = e[0].value this.dataForm.storageId = e[0].value
}, },
// 验收结果 // 验收结果
confirmClusion(e) { confirmClusion(e) {
console.log(e)
this.receonclusion = false this.receonclusion = false
this.billingStatusValue = e[0].label this.billingStatusValue = e[0].label
this.dataForm.billingStatus = e[0].value this.dataForm.billingStatus = e[0].value
}, },
// 处理原因 // 处理原因
confirmResult(e) { confirmResult(e) {
console.log(e)
this.resust = false this.resust = false
this.resustValue = e[0].label this.resustValue = e[0].label
this.dataForm.reason = e[0].value this.dataForm.reason = e[0].value
@ -379,7 +366,6 @@
var pages = getCurrentPages(); //当前页面栈 var pages = getCurrentPages(); //当前页面栈
if (pages.length > 1) { if (pages.length > 1) {
var beforePage = pages[pages.length - 1]; //获取上一个页面实例对象 var beforePage = pages[pages.length - 1]; //获取上一个页面实例对象
console.log(beforePage)
beforePage._data.refreshIfNeeded = true; beforePage._data.refreshIfNeeded = true;
} }
} }
@ -446,7 +432,7 @@
.titleValue { .titleValue {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 28rpx; font-size: 32rpx;
padding: 0 50rpx; padding: 0 50rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;

10
pages/checkAccept/index.scss
Unescape View File

@ -70,11 +70,11 @@
flex-direction: row; flex-direction: row;
.receipt-number-title { .receipt-number-title {
color: #333333; color: #333333;
font-size: 24rpx; font-size: 32rpx;
} }
.receipt-number-value { .receipt-number-value {
color: #333333; color: #333333;
font-size: 28rpx; font-size: 32rpx;
font-weight: 600; font-weight: 600;
margin-left: 20rpx; margin-left: 20rpx;
} }
@ -132,11 +132,11 @@
align-items: center; align-items: center;
width: 50%; width: 50%;
.goods-title { .goods-title {
font-size: 28rpx; font-size: 32rpx;
color: #555555; color: #555555;
} }
.goods-value { .goods-value {
font-size: 28rpx; font-size: 32rpx;
color: #666666; color: #666666;
margin-left: 20rpx; margin-left: 20rpx;
} }
@ -159,7 +159,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
.item-title { .item-title {
font-size: 24rpx; font-size: 26rpx;
color: #555555; color: #555555;
} }
.item-value { .item-value {

24
pages/checkAccept/index.vue
Unescape View File

@ -1,10 +1,10 @@
<template> <template>
<view class="sh-content"> <view class="sh-content">
<view class="sh-search"> <view class="sh-search">
<u-form labelPosition="left" :model="dataForm" class="sh-form"> <u-form labelPosition="left" :model="dataForm" class="sh-form global-font">
<u-form-item label="商品条码" prop="barCode" labelWidth="150rpx"> <u-form-item label="商品条码" style="font-size: 32rpx;" prop="barCode" labelWidth="150rpx">
<u-input v-model="dataForm.barCode" border style="background-color: #ffffff;" <u-input v-model="dataForm.barCode" fontSize='32' border style="font-size: 32rpx;background-color: #ffffff;"
placeholder="请输入或扫描条码" @input="changeCode()"></u-input> placeholder="请输入或扫描条码" @input="changeCode()"></u-input>
</u-form-item> </u-form-item>
</u-form> </u-form>
@ -17,8 +17,7 @@
v-if="dataList.length > 0"> v-if="dataList.length > 0">
<view class="sh-card-title" > <view class="sh-card-title" >
<u-checkbox-group class="pad-checked" @change="checkboxGroupChange(item)"> <u-checkbox-group class="pad-checked" @change="checkboxGroupChange(item)">
<u-checkbox <u-checkbox
@ -27,10 +26,9 @@
></u-checkbox> ></u-checkbox>
</u-checkbox-group> </u-checkbox-group>
<!-- <checkbox v-if="" class="pad-checked" :checked="item.isChcked" @click="handleData(item)" /> --> <!-- <checkbox v-if="" class="pad-checked" :checked="item.isChcked" @click="handleData(item)" /> -->
<view style="font-size: 32rpx;" class="sh-center global-font">
<view class="sh-center">
<view class="receipt-number"> <view class="receipt-number">
<text class="receipt-number-title">收货单号</text> <text class="receipt-number-title ">收货单号</text>
<text class="receipt-number-value">{{item.orderNo}}</text> <text class="receipt-number-value">{{item.orderNo}}</text>
</view> </view>
<view class="card-content"> <view class="card-content">
@ -113,9 +111,11 @@
}, },
onLoad() { onLoad() {
// uni.startPullDownRefresh() // uni.startPullDownRefresh()\
this.dataList =[]
this.getDataList(); this.getDataList();
this.getDic() this.getDic()
}, },
//上拉刷新(当数据距离底部100时触发，距离在pages.json配置) //上拉刷新(当数据距离底部100时触发，距离在pages.json配置)
onReachBottom() { onReachBottom() {
@ -134,7 +134,8 @@
if ( currentPage._data.refreshIfNeeded) { if ( currentPage._data.refreshIfNeeded) {
currentPage._data.refreshIfNeeded = false; currentPage._data.refreshIfNeeded = false;
this.query.pageNum = 1 this.query.pageNum = 1
this.getDataList();; // 调用列表重置刷新页面 this.dataList =[]
this.getDataList(); // 调用列表重置刷新页面
// this.mescroll.scrollTo(0,0); // 滚动页面置顶 // this.mescroll.scrollTo(0,0); // 滚动页面置顶
} }
}, },
@ -300,6 +301,7 @@
}, },
//初始化数据 //初始化数据
getDataList() { getDataList() {
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
this.loadStatus = "loadmore"; this.loadStatus = "loadmore";
this.$u.api.acceptance.pageReceiving({ this.$u.api.acceptance.pageReceiving({

2
pages/payInto/index.vue
Unescape View File

@ -73,7 +73,7 @@
</view> --> </view> -->
<u-card :show-foot="false" > <u-card :show-foot="false" :title="index+1+''">
<view class="" slot="body"> <view class="" slot="body">
<!-- <view class="u-body-item u-flex u-border-bottom u-col-between u-p-t-0"> <!-- <view class="u-body-item u-flex u-border-bottom u-col-between u-p-t-0">
<view class="u-body-item-title u-line-2">瓶身描绘的牡丹一如你初妆，冉冉檀香透过窗心事我了然，宣纸上走笔至此搁一半</view> <view class="u-body-item-title u-line-2">瓶身描绘的牡丹一如你初妆，冉冉檀香透过窗心事我了然，宣纸上走笔至此搁一半</view>

1
pages/receive/index22 .vue
Unescape View File

@ -190,7 +190,6 @@
}, },
loadList() { loadList() {
this.$u.api.recevie.pageOrder(this.dataForm).then(res => { this.$u.api.recevie.pageOrder(this.dataForm).then(res => {
console.log(res);
if (!res.rows || res.rows.length == 0) { if (!res.rows || res.rows.length == 0) {
if (this.dataForm.sourceOrderNo !== "") { if (this.dataForm.sourceOrderNo !== "") {
this.$u.toast("扫描单号" + this.dataForm.sourceOrderNo + "不存在任务"); this.$u.toast("扫描单号" + this.dataForm.sourceOrderNo + "不存在任务");

6
pages/receive/receiveHomeWork/receiveHomeWork.vue
Unescape View File

@ -40,7 +40,7 @@
<span class="value">{{data.businInOrderDVo.bgGoodName || '-'}}</span> <span class="value">{{data.businInOrderDVo.bgGoodName || '-'}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue">
<span class="title">规 格：</span> <span class="title">规格：</span>
<span class="value">{{data.businInOrderDVo.bgSpecifications || '-'}}</span> <span class="value">{{data.businInOrderDVo.bgSpecifications || '-'}}</span>
</view> </view>
<view class="titleValue"> <view class="titleValue">
@ -290,7 +290,6 @@
}, },
//点击件装量 //点击件装量
choosePackage() { choosePackage() {
console.log(this.packages)
if (this.packages >= 2) { if (this.packages >= 2) {
this.$u.route({ this.$u.route({
url: 'pages/receive/choosePackaging/choosePackaging', url: 'pages/receive/choosePackaging/choosePackaging',
@ -335,10 +334,7 @@
const month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 const month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
this.toDay = year + '-' + month + '-' + day this.toDay = year + '-' + month + '-' + day
console.log(this.toDay, e.result)
const days = this.getDays(this.toDay, e.result) const days = this.getDays(this.toDay, e.result)
console.log(days)
if (this.toDay > e.result) { if (this.toDay > e.result) {
this.showOverdue = true this.showOverdue = true
return return

2
pages/receive/receiveHomeWorks/receiveHomeWork.vue
Unescape View File

@ -10,7 +10,7 @@
<span class="value">{{orderNoList[0].bgGoodName || '-'}}</span> <span class="value">{{orderNoList[0].bgGoodName || '-'}}</span>
</view> </view>
<view class="titleValue1" style="font-size: 32rpx;"> <view class="titleValue1" style="font-size: 32rpx;">
<span class="title">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</span> <span class="title">规&nbsp;&nbsp;&nbsp;&nbsp;格：</span>
<span class="value">{{orderNoList[0].bgSpecifications || '-'}}</span> <span class="value">{{orderNoList[0].bgSpecifications || '-'}}</span>
</view> </view>
<view class='recommend'> <view class='recommend'>

Write Preview
Loading…
Cancel
Save