按钮样式修改
This commit is contained in:
@@ -30,7 +30,7 @@ uni-button:after {
|
||||
color: #bbb;
|
||||
}
|
||||
.icon_eye_active {
|
||||
color: #ff6a00;
|
||||
color: #D7592F ;
|
||||
}
|
||||
.icon_unchecked {
|
||||
color: #fff;
|
||||
@@ -41,8 +41,8 @@ uni-button:after {
|
||||
border: 1rpx solid #bbb;
|
||||
}
|
||||
.icon_checked {
|
||||
color: #ff6a00;
|
||||
border: 1rpx solid #ff6a00;
|
||||
color: #D7592F ;
|
||||
border: 1rpx solid #D7592F ;
|
||||
}
|
||||
.icon_back {
|
||||
font-size: 52rpx;
|
||||
@@ -116,6 +116,11 @@ uni-button:after {
|
||||
border-radius: 24rpx;
|
||||
padding: 14rpx;
|
||||
margin-bottom: 20rpx;
|
||||
box-shadow: 0px 3px 3px 0px rgba(160,160,160,0.20);
|
||||
}
|
||||
.zd_wrapper-1 {
|
||||
padding: 0 14rpx;
|
||||
border-radius: 0;
|
||||
}
|
||||
.filter_item {
|
||||
display: flex;
|
||||
@@ -154,7 +159,7 @@ uni-button:after {
|
||||
color: #323232;
|
||||
text-align: center;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ff6a00;
|
||||
border: 1px solid #D7592F ;
|
||||
border-radius: 10rpx;
|
||||
margin-left: 30rpx;
|
||||
}
|
||||
@@ -167,6 +172,7 @@ uni-button:after {
|
||||
/* flex: 1; */
|
||||
width: calc(100% - 170rpx);
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
padding: 5rpx 0;
|
||||
margin-left: 30rpx;
|
||||
display: flex;
|
||||
@@ -184,8 +190,8 @@ uni-button:after {
|
||||
}
|
||||
.filter_input {
|
||||
width: 100%;
|
||||
height: 70rpx;
|
||||
line-height: 70rpx;
|
||||
height: 80rpx;
|
||||
line-height: 80rpx;
|
||||
border: 1px solid #dcdfe6;
|
||||
background-color: #fff;
|
||||
padding: 0 15rpx;
|
||||
@@ -196,6 +202,16 @@ uni-button:after {
|
||||
.filter_input_disabled {
|
||||
background-color: #eee;
|
||||
}
|
||||
.filter_item-1 {
|
||||
border-bottom: 2rpx solid #dcdfe6;
|
||||
}
|
||||
.filter_item-1 .filter_label {
|
||||
text-align: auto;
|
||||
text-align-last: auto;
|
||||
}
|
||||
.filter_item-1 .filter_input, .filter_item-1 .uni-select {
|
||||
border: 0 !important;
|
||||
}
|
||||
|
||||
.grid-wraper {
|
||||
width: 100%;
|
||||
@@ -209,8 +225,10 @@ uni-button:after {
|
||||
table-layout: fixed;
|
||||
min-width: 100%;
|
||||
border-collapse: separate;
|
||||
border-spacing: 0;
|
||||
border: 0;
|
||||
-webkit-border-horizontal-spacing: 0px;
|
||||
-webkit-border-vertical-spacing: 10rpx;
|
||||
padding-bottom: 8rpx;
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
.slide_new table td, .slide_new table th {
|
||||
box-sizing: border-box;
|
||||
@@ -219,13 +237,13 @@ uni-button:after {
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
padding: 0 20rpx;
|
||||
border-bottom: 10rpx solid #f5f5f5;
|
||||
text-align: center;
|
||||
}
|
||||
.slide_new table td:first-child, .slide_new table th:first-child{
|
||||
position: sticky;
|
||||
left: 0;
|
||||
z-index: 101;
|
||||
box-shadow: 3px 0px 3px 0px rgba(160,160,160,0.20);
|
||||
}
|
||||
.slide_new table thead tr th {
|
||||
position: sticky;
|
||||
@@ -246,8 +264,24 @@ uni-button:after {
|
||||
color: #323232;
|
||||
background: #fff;
|
||||
}
|
||||
.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
|
||||
color: #4e6ef2;
|
||||
font-weight: bold;
|
||||
}
|
||||
.slide_new table tbody tr.checked td {
|
||||
background-color: #fef6e4;
|
||||
border-top: 1px solid #D7592F;
|
||||
border-bottom: 1px solid #D7592F;
|
||||
}
|
||||
.slide_new table tbody tr.checked td:first-child {
|
||||
border-left: 1px solid #D7592F;
|
||||
border-top-left-radius: 8rpx;
|
||||
border-bottom-left-radius: 8rpx;
|
||||
}
|
||||
.slide_new table tbody tr.checked td:last-child {
|
||||
border-right: 1px solid #D7592F;
|
||||
border-top-right-radius: 8rpx;
|
||||
border-bottom-right-radius: 8rpx;
|
||||
|
||||
}
|
||||
|
||||
/** 提交栏 **/
|
||||
@@ -268,16 +302,16 @@ uni-button:after {
|
||||
.submit-button {
|
||||
font-size: 30rpx;
|
||||
line-height: 62rpx;
|
||||
color: #ff6a00;
|
||||
color: #D7592F ;
|
||||
text-align: center;
|
||||
letter-spacing: 1rpx;
|
||||
padding: 0 22rpx;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ff6a00;
|
||||
border: 1px solid #D7592F ;
|
||||
margin: 0 40rpx 10rpx 0;
|
||||
border-radius: 30rpx;
|
||||
}
|
||||
.submit-bar_new {
|
||||
.submitbar {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
@@ -287,54 +321,83 @@ uni-button:after {
|
||||
padding: 10rpx 0;
|
||||
box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
|
||||
}
|
||||
.submit-button_new {
|
||||
.btn-submit {
|
||||
padding: 0;
|
||||
font-size: 30rpx;
|
||||
line-height: 62rpx;
|
||||
color: #ff6a00;
|
||||
padding: 0;
|
||||
text-align: center;
|
||||
border-radius: 10rpx;
|
||||
}
|
||||
.btn-default {
|
||||
color: #D7592F ;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ff6a00;
|
||||
border-radius: 30rpx;
|
||||
border: 1px solid #D7592F ;
|
||||
}
|
||||
.btn-disabled, .submit-button[disabled] {
|
||||
background-color: #c9c9c9;
|
||||
border: 1px solid #c9c9c9;
|
||||
.btn-success {
|
||||
color: #fff;
|
||||
border: 1px solid #D7592F ;
|
||||
background-color: #D7592F ;
|
||||
}
|
||||
.btn-info {
|
||||
color: #fff;
|
||||
border: 1px solid #c9c9c9;
|
||||
background-color: #c9c9c9;
|
||||
}
|
||||
.btn-disabled, .submit-button[disabled]:not([type]) {
|
||||
color: #fff;
|
||||
border: 1px solid #c9c9c9;
|
||||
background-color: #c9c9c9;
|
||||
}
|
||||
uni-button[disabled]:not([type]) {
|
||||
color: #fff;
|
||||
border: 1px solid #c9c9c9;
|
||||
background-color: #c9c9c9;
|
||||
}
|
||||
|
||||
/** 下拉框 */
|
||||
.uni-select__selector {
|
||||
z-index: 300 !important;
|
||||
}
|
||||
|
||||
/** 弹窗 */
|
||||
.popshow {
|
||||
transform: translateY(0);
|
||||
}
|
||||
.pophide {
|
||||
transform: translateY(100%);
|
||||
}
|
||||
.msg_wrapper {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
top: auto;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
text-align: center;
|
||||
z-index: 201;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: calc(100% - var(--status-bar-height) - 72rpx);
|
||||
padding: 14rpx;
|
||||
background-color: #f6f6f6;
|
||||
box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
|
||||
border-top-left-radius: 20rpx;
|
||||
border-top-right-radius: 20rpx;
|
||||
z-index: 301;
|
||||
transition: all .3s;
|
||||
}
|
||||
.msg_wrapper_1 {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.msg_box {
|
||||
width: 90%;
|
||||
padding: 20rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 4px;
|
||||
border: 1px solid #ebeef5;
|
||||
box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
|
||||
backface-visibility: hidden;
|
||||
.pop-line {
|
||||
width: 10%;
|
||||
height: 8rpx;
|
||||
margin: 0 auto 14rpx auto;
|
||||
background-color: #d4d4d4;
|
||||
border-radius: 8rpx;
|
||||
}
|
||||
.msg_content {
|
||||
width: 100%;
|
||||
height: calc(100% - 22rpx);
|
||||
margin-bottom: 86rpx;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
.msg_box {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.msg_mask {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
@@ -343,9 +406,8 @@ uni-button:after {
|
||||
height: 100%;
|
||||
opacity: .7;
|
||||
background: #000;
|
||||
z-index: 200;
|
||||
z-index: 300;
|
||||
}
|
||||
|
||||
.msg_btns {
|
||||
width: 100%;
|
||||
max-width: 300px;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
$red = #ff6a00
|
||||
$red = #D7592F
|
||||
$green = #6CBE8B
|
||||
$yellow = #E9B451
|
||||
$blue = #6798ef
|
||||
|
||||
@@ -123,4 +123,11 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
|
||||
}
|
||||
.zd-col-1 {
|
||||
width: 4.16667%
|
||||
}
|
||||
.letter-30 {
|
||||
letter-spacing: 30rpx;
|
||||
text-indent: 30rpx;
|
||||
}
|
||||
.h-50 {
|
||||
height: 50% !important;
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
<view class="header">
|
||||
<span @tap="goBack" class="iconfont icon_back"></span>
|
||||
<span class="page_name">{{title}}</span>
|
||||
<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}"></span>
|
||||
<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show === false}"></span>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
show1: {
|
||||
show: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
|
||||
@@ -129,14 +129,14 @@
|
||||
@import '../common/style/mixin.styl';
|
||||
.search_wraper
|
||||
position relative
|
||||
_wh(100%, 70rpx)
|
||||
_wh(100%, 80rpx)
|
||||
.search_input
|
||||
padding-right: 160rpx;
|
||||
.buttons_wraper
|
||||
position absolute
|
||||
top 0
|
||||
right 10rpx
|
||||
_wh(auto, 70rpx)
|
||||
_wh(auto, 80rpx)
|
||||
_fj(flex-end)
|
||||
.icon_scan_active
|
||||
color $red
|
||||
|
||||
@@ -99,12 +99,12 @@
|
||||
@import '../common/style/mixin.styl';
|
||||
.search_wraper
|
||||
position relative
|
||||
_wh(100%, 70rpx)
|
||||
_wh(100%, 80rpx)
|
||||
.search_input
|
||||
padding-right: 160rpx;
|
||||
.buttons_wraper
|
||||
position absolute
|
||||
top 0
|
||||
right 0
|
||||
_wh(auto, 70rpx)
|
||||
_wh(auto, 80rpx)
|
||||
</style>
|
||||
|
||||
@@ -74,14 +74,14 @@
|
||||
@import '../common/style/mixin.styl';
|
||||
.search_wraper
|
||||
position relative
|
||||
_wh(100%, 70rpx)
|
||||
_wh(100%, 80rpx)
|
||||
.search_input
|
||||
padding-right: 160rpx;
|
||||
.buttons_wraper
|
||||
position absolute
|
||||
top 0
|
||||
right 10rpx
|
||||
_wh(auto, 70rpx)
|
||||
_wh(auto, 80rpx)
|
||||
_fj(flex-end)
|
||||
.icon_scan_active
|
||||
color $red
|
||||
|
||||
32
pages.json
32
pages.json
@@ -254,6 +254,38 @@
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
}
|
||||
,{
|
||||
"path" : "pages/SecondPhase/EmptyVehicleInStore",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "pages/SecondPhase/EmptyBoxInStore",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "pages/SecondPhase/DeliveryUnbind",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
}
|
||||
,{
|
||||
"path" : "pages/SecondPhase/DeliveryUnbindConfirm",
|
||||
"style" :
|
||||
{
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
|
||||
}
|
||||
],
|
||||
"globalStyle": {
|
||||
// "pageOrientation": "landscape",
|
||||
|
||||
@@ -35,8 +35,8 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit-bar">
|
||||
<button class="submit-button" @tap="_rgvStatusQuery">查询</button>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-22 btn-submit btn-success letter-30" @tap="_rgvStatusQuery">查询</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -53,10 +53,10 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit-bar">
|
||||
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_taskConfirm">强制完成</button>
|
||||
<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_againLssued">重新下发</button>
|
||||
<button class="submit-button" @tap="_taskTaskQuery">查询</button>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled2" @tap="_taskConfirm">强制完成</button>
|
||||
<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled1" @tap="_againLssued">重新下发</button>
|
||||
<button class="zd-col-5 btn-submit btn-success letter-30" @tap="_taskTaskQuery">查询</button>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
|
||||
box-shadow 1px 0 2px rgba(0,0,0,.12)
|
||||
.bgred td
|
||||
background-color #ff6a00
|
||||
background-color #D7592F
|
||||
color #ffffff
|
||||
.bgyellow td
|
||||
background-color #E9B451
|
||||
|
||||
@@ -76,44 +76,47 @@
|
||||
</view>
|
||||
<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
|
||||
</view>
|
||||
<view class="zd-row submit-bar_new">
|
||||
<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">满轴送回</button>
|
||||
<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">空轴送回</button>
|
||||
<button class="zd-col-5 submit-button_new" @tap="handleSure">人工呼叫</button>
|
||||
<button class="zd-col-3 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
|
||||
<button class="zd-col-3 submit-button_new" @tap="searchList">查询</button>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('2')">满轴送回</button>
|
||||
<button class="zd-col-5 btn-submit btn-success" :class="{'btn-info': !val1}" :disabled="disabled2" @tap="_feedingVehicleReturn('1')">空轴送回</button>
|
||||
<button class="zd-col-5 btn-submit btn-default" @tap="handleSure">人工呼叫</button>
|
||||
<button class="zd-col-3 btn-submit btn-success" :class="{'btn-info': !pkId}" :disabled="disabled" @tap="toSure">呼叫</button>
|
||||
<button class="zd-col-3 btn-submit btn-default" @tap="searchList">查询</button>
|
||||
</view>
|
||||
<view v-if="active" class="msg_wrapper msg_wrapper_1">
|
||||
<view class="msg_box">
|
||||
<view class="filter_item">
|
||||
<view class="filter_label">起点</view>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val3"
|
||||
@handleChange="handleChange1"
|
||||
/>
|
||||
<view class="msg_wrapper h-50" :class="active ? 'popshow' : 'pophide'">
|
||||
<view class="pop-line"></view>
|
||||
<view class="msg_content">
|
||||
<view class="zd_wrapper zd_wrapper-1">
|
||||
<view class="filter_item filter_item-1">
|
||||
<view class="filter_label">起点</view>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val3"
|
||||
@handleChange="handleChange1"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item filter_item-1">
|
||||
<view class="filter_label">母卷号</view>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val4"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item filter_item-1">
|
||||
<view class="filter_label">终点</view>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val5"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_label">母卷号</view>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val4"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_label">终点</view>
|
||||
<view class="filter_input_wraper">
|
||||
<search-box
|
||||
v-model="val5"
|
||||
/>
|
||||
</view>
|
||||
</view>
|
||||
<view class="msg_btns">
|
||||
<button class="submit-button msg_btn" @tap="cancleModal">取消</button>
|
||||
<button class="submit-button msg_btn" @tap="modalToSure">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
|
||||
<button class="zd-col-11 btn-submit btn-success letter-30" @tap="modalToSure">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="active" class="msg_mask"></view>
|
||||
|
||||
@@ -80,31 +80,40 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit-bar">
|
||||
<button class="submit-button" :class="{'btn-disabled': !index1 || checkArr.length > 0}" :disabled="disabled3" @tap="_disuseConfirm">废箔下卷</button>
|
||||
<button class="submit-button" :class="{'btn-disabled': !index1 || !checkArr.length}" :disabled="disabled1" @tap="_outConfirm">子卷出站</button>
|
||||
<button class="submit-button" @tap="showModal">出站配送</button>
|
||||
<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !index1 || checkArr.length > 0}" :disabled="disabled3" @tap="_disuseConfirm">废箔下卷</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" :class="{'btn-info': !index1 || !checkArr.length}" :disabled="disabled1" @tap="_outConfirm">子卷出站</button>
|
||||
<button class="zd-col-6 btn-submit btn-success" @tap="showModal">出站配送</button>
|
||||
<button class="zd-col-5 btn-submit btn-success" @tap="_queryMaterialInfo">查询</button>
|
||||
</view>
|
||||
<view v-if="active" class="msg_wrapper">
|
||||
<view class="msg_box">
|
||||
<view class="filter_item">
|
||||
<view class="filter_label">区域</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
|
||||
<view class="msg_wrapper h-50" :class="active ? 'popshow' : 'pophide'">
|
||||
<view class="pop-line"></view>
|
||||
<view class="msg_content">
|
||||
<view class="zd_wrapper zd_wrapper-1">
|
||||
<view class="filter_item filter_item-1">
|
||||
<view class="filter_label">区域</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index3" :localdata="options3" @change="selectChange3"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row">
|
||||
<view class="zd-col-19">
|
||||
<view class="filter_item filter_item-1">
|
||||
<view class="filter_label">缓存点位</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-col-4">
|
||||
<button class="btn-submit btn-success" @tap="_conveyPointQuery">查询</button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="filter_item">
|
||||
<view class="filter_label">缓存点位</view>
|
||||
<view class="filter_input_wraper">
|
||||
<uni-data-select v-model="index4" :localdata="options4" @change="selectChange4"></uni-data-select>
|
||||
</view>
|
||||
<view class="filter_search" @tap="_conveyPointQuery">查询</view>
|
||||
</view>
|
||||
<view class="msg_btns">
|
||||
<button class="submit-button msg_btn" @tap="cancleModal">取消</button>
|
||||
<button class="submit-button msg_btn" :class="{'btn-disabled': !index4}" :disabled="disabled2" @tap="_conveyConfirm">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-11 btn-submit btn-default letter-30" @tap="cancleModal">取消</button>
|
||||
<button class="zd-col-11 btn-submit btn-success letter-30" :class="{'btn-info': !index4}" :disabled="disabled2" @tap="_conveyConfirm">确认</button>
|
||||
</view>
|
||||
</view>
|
||||
<view v-if="active" class="msg_mask"></view>
|
||||
|
||||
@@ -75,27 +75,30 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="submit-bar">
|
||||
<view class="zd-row submitbar">
|
||||
<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_saveCheck">保存</button> -->
|
||||
<!-- <button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_confirmCheck">确认</button> -->
|
||||
<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_checkexception">异常</button>
|
||||
<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_checknormal">正常</button>
|
||||
<button class="submit-button" @tap="_checkQueryDtl(checkCode, val1)">查询</button>
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !dataList.length}" :disabled="disabled1" @tap="_checkexception">异常</button>
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" :class="{'btn-info': !dataList.length}" :disabled="disabled1" @tap="_checknormal">正常</button>
|
||||
<button class="zd-col-7 btn-submit btn-success letter-30" @tap="_checkQueryDtl(checkCode, val1)">查询</button>
|
||||
</view>
|
||||
<view v-show="modelShow" class="msg_wrapper">
|
||||
<view class="msg_box">
|
||||
<view class="msg_item">
|
||||
<view class="filter_label">备注</view>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="text" class="msg_input" v-model="val0">
|
||||
<view class="msg_wrapper h-50" :class="modelShow ? 'popshow' : 'pophide'">
|
||||
<view class="pop-line"></view>
|
||||
<view class="msg_content">
|
||||
<view class="zd_wrapper zd_wrapper-1">
|
||||
<view class="filter_item filter_item-1">
|
||||
<view class="filter_label">备注</view>
|
||||
<view class="filter_input_wraper">
|
||||
<input type="text" class="filter_input" v-model="val0">
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="msg_btns">
|
||||
<button class="submit-button" @tap="toSurerk">确定</button>
|
||||
</view>
|
||||
</view>
|
||||
<view class="zd-row submitbar">
|
||||
<button class="zd-col-22 btn-submit btn-success letter-30" @tap="toSurerk">确定</button>
|
||||
</view>
|
||||
</view>
|
||||
<view v-show="modelShow" class="mask"></view>
|
||||
<view v-show="modelShow" class="msg_mask"></view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
@@ -240,86 +243,4 @@
|
||||
// // left 89rpx
|
||||
// // z-index 102
|
||||
// // box-shadow 1px 0 2px rgba(0,0,0,.12)
|
||||
.msg_wrapper
|
||||
position fixed
|
||||
top 0
|
||||
bottom 0
|
||||
left 0
|
||||
right 0
|
||||
text-align center
|
||||
z-index 10000
|
||||
&::after
|
||||
content ""
|
||||
display inline-block
|
||||
height 100%
|
||||
width 0
|
||||
vertical-align middle
|
||||
.msg_box
|
||||
display inline-block
|
||||
width calc(100% - 30rpx)
|
||||
padding 30rpx
|
||||
vertical-align middle
|
||||
background-color #fff
|
||||
border-radius 8rpx
|
||||
border 1px solid #ebeef5
|
||||
font-size 36rpx
|
||||
box-shadow 0 2px 12px 0 rgb(0 0 0 / 10%)
|
||||
text-align left
|
||||
overflow hidden
|
||||
backface-visibility hidden
|
||||
.buttonbox
|
||||
width 100px
|
||||
height 30px
|
||||
margin-top 20px
|
||||
margin 0 auto
|
||||
.mask
|
||||
position fixed
|
||||
top 0
|
||||
left 0
|
||||
width 100%
|
||||
height 100%
|
||||
opacity .6
|
||||
background #000
|
||||
z-index 9999
|
||||
.msg_item
|
||||
display flex
|
||||
justify-content: space-between
|
||||
align-items: center
|
||||
width 100%
|
||||
height 80rpx
|
||||
line-height 80rpx
|
||||
margin 0 auto
|
||||
margin-bottom 14rpx
|
||||
.label_item
|
||||
display inline-block
|
||||
width 180rpx
|
||||
font-size 32rpx
|
||||
line-height inherit
|
||||
color #606266
|
||||
.from_item
|
||||
display inline-block
|
||||
width calc(100% - 200rpx)
|
||||
line-height inherit
|
||||
.msg_input
|
||||
width 100%
|
||||
height 80rpx
|
||||
padding 0 30rpx
|
||||
border-radius 4px
|
||||
border 1px solid #DCDFE6
|
||||
font-size 28rpx
|
||||
line-height 80rpx
|
||||
color #606266
|
||||
.msg_btns
|
||||
width 600rpx
|
||||
height 70rpx
|
||||
line-height 70rpx
|
||||
margin 40rpx auto 0
|
||||
display flex
|
||||
justify-content: center
|
||||
align-items: center
|
||||
.submit-bar
|
||||
justify-content space-around
|
||||
.submit-button
|
||||
margin-left 20rpx
|
||||
margin-right 20rpx
|
||||
</style>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<view class="zd_container">
|
||||
<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
|
||||
<nav-bar title="设置" :inner2="true" @goIn="goIn" :show="false"></nav-bar>
|
||||
<view class="zd_content">
|
||||
<view class="zd_wrapper">
|
||||
<view class="input-wrap">
|
||||
|
||||
BIN
static/image/search_bg.png
Normal file
BIN
static/image/search_bg.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.1 KiB |
@@ -29,65 +29,10 @@ export const handRequest = () => request({
|
||||
})
|
||||
|
||||
// 菜单
|
||||
export const authority1 = () => request({
|
||||
export const authority = () => request({
|
||||
url:'api/pda/authority',
|
||||
data: {}
|
||||
})
|
||||
export const authority = () => {
|
||||
let res = {
|
||||
sonTree: [
|
||||
{menu_id: '1', path: 'RF01', name: '生产管理', sonTree: [
|
||||
{menu_id: '1', name: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'},
|
||||
{menu_id: '2', name: '生箔工序', path: '/pages/ProductManage/SboProcess'},
|
||||
{menu_id: '3', name: '烘烤工序', path: '/pages/ProductManage/BakeProcess'},
|
||||
{menu_id: '4', name: '人工烘烤', path: '/pages/ProductManage/ManmadeBake'}
|
||||
]},
|
||||
{menu_id: '2', path: 'RF02', name: '半成品管理', sonTree: [
|
||||
{menu_id: '1', name: '半成品入库', path: '/pages/WarehouseManage/SemifinishedInStore'},
|
||||
{menu_id: '2', name: '半成品出库', path: '/pages/WarehouseManage/SemifinishedOutStore'},
|
||||
]},
|
||||
{menu_id: '3', path: 'RF03', name: '分切管理', sonTree: [
|
||||
{menu_id: '1', name: '分切上料', path: '/pages/ProductManage/SlittingFeeding'},
|
||||
{menu_id: '2', name: '空轴套管', path: '/pages/ProductManage/ZjCasing'},
|
||||
{menu_id: '3', name: '空轴配送', path: '/pages/ProductManage/ZjDelivery'},
|
||||
{menu_id: '4', name: '空轴进站', path: '/pages/ProductManage/ZjInStore'},
|
||||
{menu_id: '5', name: '子卷出站', path: '/pages/ProductManage/ZjOutStore'},
|
||||
]},
|
||||
{menu_id: '4', path: 'RF04', name: '点位管理', sonTree: [
|
||||
{menu_id: '1', name: '点位管理', path: '/pages/ProductManage/PointManage'},
|
||||
{menu_id: '2', name: '异常出库解锁', path: '/pages/WarehouseManage/ErrorOutUnlock'}
|
||||
]},
|
||||
{menu_id: '5', path: 'RF05', name: '纸管/FRP管管理', sonTree: [
|
||||
{menu_id: '1', name: '空管入库', path: '/pages/ProductManage/EmptyPipeInStore'},
|
||||
{menu_id: '2', name: '空管出库', path: '/pages/ProductManage/EmptyPipeOutStore'},
|
||||
]},
|
||||
{menu_id: '6', path: 'RF06', name: '成品管理', sonTree: [
|
||||
{menu_id: '1', name: '生产入库', path: '/pages/WarehouseManage/InStoreConfirm'},
|
||||
{menu_id: '2', name: '退货入库', path: '/pages/WarehouseManage/ReturngoodsInStore'},
|
||||
{menu_id: '3', name: '报废入库', path: '/pages/WarehouseManage/ScrapInStore'},
|
||||
{menu_id: '4', name: '拆分入库', path: '/pages/WarehouseManage/InStoreSplit'},
|
||||
{menu_id: '5', name: '生产区发货', path: '/pages/WarehouseManage/ProdDelivery'},
|
||||
{menu_id: '6', name: '虚拟区发货', path: '/pages/WarehouseManage/XuniDelivery'},
|
||||
{menu_id: '7', name: '贴标捆扎', path: '/pages/WarehouseManage/LabelBind'}
|
||||
]},
|
||||
{menu_id: '7', path: 'RF07', name: '在库管理', sonTree: [
|
||||
{menu_id: '1', name: '盘点管理', path: '/pages/WarehouseManage/CheckList'},
|
||||
]},
|
||||
{menu_id: '8', path: 'RF08', name: '载具管理', sonTree: [
|
||||
{menu_id: '1', name: '空载具入库', path: '/pages/WarehouseManage/EmptyInStore'},
|
||||
{menu_id: '2', name: '空载具出库', path: '/pages/WarehouseManage/EmptyOutStore'},
|
||||
]},
|
||||
{menu_id: '9', path: 'RF09', name: '打印管理', sonTree: [
|
||||
{menu_id: '1', name: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'},
|
||||
]},
|
||||
{menu_id: '10', path: 'RF10', name: '调度管理', sonTree: [
|
||||
{menu_id: '1', name: '任务管理', path: '/pages/DispatchManage/TaskManage'},
|
||||
{menu_id: '2', name: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'}
|
||||
]}
|
||||
]
|
||||
}
|
||||
return res
|
||||
}
|
||||
|
||||
/**
|
||||
* 空管入库
|
||||
@@ -557,4 +502,62 @@ data: {
|
||||
export const rgvStatusQuery = () => request({
|
||||
url:'api/pda/task/rgvStatusQuery',
|
||||
data: {}
|
||||
})
|
||||
|
||||
/**
|
||||
* 二期空载具入库
|
||||
*/
|
||||
// 1.1空载具入库-【入库按钮】
|
||||
export const twoPdaVehicleIn = (code, type, pcode) => request({
|
||||
url:'api/twoPda/vehicle/vehicleIn',
|
||||
data: {
|
||||
vehicle_code: code,
|
||||
vehicle_type: type,
|
||||
point_code: pcode
|
||||
}
|
||||
})
|
||||
/**
|
||||
* 二期空木箱入库
|
||||
*/
|
||||
// 1.1空木箱入库-【入库按钮】
|
||||
export const twoPdaBoxIn = (code, no, pcode) => request({
|
||||
url:'api/twoPda/vehicle/boxIn',
|
||||
data: {
|
||||
vehicle_code: code,
|
||||
box_no: no,
|
||||
point_code: pcode
|
||||
}
|
||||
})
|
||||
/**
|
||||
* 二期发货区解绑
|
||||
*/
|
||||
// 1.1单据初始化查询
|
||||
export const twoPdaIvtQuery = (no, code) => request({
|
||||
url:'api/twoPda/st/ivtQuery',
|
||||
data: {
|
||||
box_no: no,
|
||||
bill_code: code
|
||||
}
|
||||
})
|
||||
// 1.2【确认】按钮(二级页面)
|
||||
export const twoPdaIvtDtlQuery = (no, code) => request({
|
||||
url:'api/twoPda/st/ivtDtlQuery',
|
||||
data: {
|
||||
box_no: no,
|
||||
bill_code: code
|
||||
}
|
||||
})
|
||||
// 1.3木箱明细(点木箱超链接跳转)
|
||||
export const twoPdaIvtbBoxDtlQuery = (no) => request({
|
||||
url:'api/twoPda/st/ivtbBoxDtlQuery',
|
||||
data: {
|
||||
box_no: no
|
||||
}
|
||||
})
|
||||
// 1.4【出库确认】按钮(二级页面按钮)
|
||||
export const twoPdaOutConfirm = (no) => request({
|
||||
url:'api/twoPda/st/outConfirm',
|
||||
data: {
|
||||
box_no: no
|
||||
}
|
||||
})
|
||||
75
utils/mork2.js
Normal file
75
utils/mork2.js
Normal file
@@ -0,0 +1,75 @@
|
||||
export const authority = () => {
|
||||
let res = {
|
||||
code: '1',
|
||||
result: {
|
||||
sonTree: [
|
||||
{menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [
|
||||
{menu_id: '1', title: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'},
|
||||
{menu_id: '2', title: '生箔工序', path: '/pages/ProductManage/SboProcess'},
|
||||
{menu_id: '3', title: '烘烤工序', path: '/pages/ProductManage/BakeProcess'},
|
||||
{menu_id: '4', title: '人工烘烤', path: '/pages/ProductManage/ManmadeBake'}
|
||||
]},
|
||||
{menu_id: '2', path: 'RF02', title: '半成品管理', sonTree: [
|
||||
{menu_id: '1', title: '半成品入库', path: '/pages/WarehouseManage/SemifinishedInStore'},
|
||||
{menu_id: '2', title: '半成品出库', path: '/pages/WarehouseManage/SemifinishedOutStore'},
|
||||
]},
|
||||
{menu_id: '3', path: 'RF03', title: '分切管理', sonTree: [
|
||||
{menu_id: '1', title: '分切上料', path: '/pages/ProductManage/SlittingFeeding'},
|
||||
{menu_id: '2', title: '空轴套管', path: '/pages/ProductManage/ZjCasing'},
|
||||
{menu_id: '3', title: '空轴配送', path: '/pages/ProductManage/ZjDelivery'},
|
||||
{menu_id: '4', title: '空轴进站', path: '/pages/ProductManage/ZjInStore'},
|
||||
{menu_id: '5', title: '子卷出站', path: '/pages/ProductManage/ZjOutStore'},
|
||||
]},
|
||||
{menu_id: '4', path: 'RF04', title: '点位管理', sonTree: [
|
||||
{menu_id: '1', title: '点位管理', path: '/pages/ProductManage/PointManage'},
|
||||
{menu_id: '2', title: '异常出库解锁', path: '/pages/WarehouseManage/ErrorOutUnlock'}
|
||||
]},
|
||||
{menu_id: '5', path: 'RF05', title: '纸管/FRP管管理', sonTree: [
|
||||
{menu_id: '1', title: '空管入库', path: '/pages/ProductManage/EmptyPipeInStore'},
|
||||
{menu_id: '2', title: '空管出库', path: '/pages/ProductManage/EmptyPipeOutStore'},
|
||||
]},
|
||||
{menu_id: '6', path: 'RF06', title: '成品管理', sonTree: [
|
||||
{menu_id: '1', title: '生产入库', path: '/pages/WarehouseManage/InStoreConfirm'},
|
||||
{menu_id: '2', title: '退货入库', path: '/pages/WarehouseManage/ReturngoodsInStore'},
|
||||
{menu_id: '3', title: '报废入库', path: '/pages/WarehouseManage/ScrapInStore'},
|
||||
{menu_id: '4', title: '拆分入库', path: '/pages/WarehouseManage/InStoreSplit'},
|
||||
{menu_id: '5', title: '生产区发货', path: '/pages/WarehouseManage/ProdDelivery'},
|
||||
{menu_id: '6', title: '虚拟区发货', path: '/pages/WarehouseManage/XuniDelivery'},
|
||||
{menu_id: '7', title: '贴标捆扎', path: '/pages/WarehouseManage/LabelBind'}
|
||||
]},
|
||||
{menu_id: '7', path: 'RF07', title: '在库管理', sonTree: [
|
||||
{menu_id: '1', title: '盘点管理', path: '/pages/WarehouseManage/CheckList'},
|
||||
]},
|
||||
{menu_id: '8', path: 'RF08', title: '载具管理', sonTree: [
|
||||
{menu_id: '1', title: '空载具入库', path: '/pages/WarehouseManage/EmptyInStore'},
|
||||
{menu_id: '2', title: '空载具出库', path: '/pages/WarehouseManage/EmptyOutStore'},
|
||||
]},
|
||||
{menu_id: '9', path: 'RF09', title: '打印管理', sonTree: [
|
||||
{menu_id: '1', title: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'},
|
||||
]},
|
||||
{menu_id: '10', path: 'RF10', title: '调度管理', sonTree: [
|
||||
{menu_id: '1', title: '任务管理', path: '/pages/DispatchManage/TaskManage'},
|
||||
{menu_id: '2', title: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'}
|
||||
]}
|
||||
]
|
||||
}}
|
||||
return res
|
||||
}
|
||||
export const twoPdaIvtQuery = (no, code) => {
|
||||
let res = {
|
||||
data: [{bill_code: '1', bill_status: 'ljdjldj'}, {bill_code: '2'}]
|
||||
}
|
||||
return res
|
||||
}
|
||||
export const twoPdaIvtDtlQuery = (no, code) => {
|
||||
let res = {
|
||||
data: [{package_box_sn: '1', point_code: 'ljdjldj'}, {package_box_sn: '2'}]
|
||||
}
|
||||
return res
|
||||
}
|
||||
export const twoPdaIvtbBoxDtlQuery = (no) => {
|
||||
let res = {
|
||||
data: [{package_box_sn: '1', container_name: 'ljdjldj'}, {package_box_sn: '2'}]
|
||||
}
|
||||
return res
|
||||
}
|
||||
Reference in New Issue
Block a user