Skip to content

M
mes-pad
Commit 30cda62f authored by 沈翠玲's avatar 沈翠玲
Browse files
Options

样式适配小的平板

parent 55ca5aac
Show whitespace changes
Inline Side-by-side
Showing with 158 additions and 107 deletions
App.vue
View file @ 30cda62f
......@@ -31,6 +31,7 @@ export default {
<style lang="scss">
/*每个页面公共css */
@import '@/uview-ui/index.scss';
@import '@/static/css/global.scss';
/deep/ .uni-select__selector-scroll {
max-height: 120px !important;
}
......
common/checkappupdate.js
View file @ 30cda62f
......@@ -11,12 +11,17 @@ function check(param = {}) {
plus.runtime.getProperty(plus.runtime.appid, (widgetInfo) => {
let platform = plus.os.name.toLocaleLowerCase()
try {
param.func().then(result => {
console.log(widgetInfo.version)
uni.request({
url: config.baseUrl + '/md/appconfig/getVersion',
success: (result) => {
result = result.data
console.log('result', result)
let data = result.data ? result.data[0] : null;
console.log(widgetInfo.version, data.version)
if (widgetInfo.version === data.version) {
return;
}
if (result.code == 200) {
// android进行如下操作
uni.showModal({
......@@ -92,6 +97,7 @@ function check(param = {}) {
}
})
}
}
})
} catch (e) {
console.log('eee',e)
......
pages/mes/prodReport/index.vue
View file @ 30cda62f
......@@ -16,11 +16,11 @@
<view>
<u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="编排单号" label-width="70px" name="arrangeCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode"
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" style="width: 1.15rem"
@iconClick="iconClickArrangeCode" placeholder="请输入编排单号" />
</u-form-item>
<u-form-item label="生产工单编号" label-width="100px" name="workorderCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.workorderCode"
<u-form-item label="生产工单编号" label-width="95px" name="workorderCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.workorderCode" style="width: 1.15rem"
@iconClick="iconClickWorkorderCode" placeholder="请输入生产工单编号" />
</u-form-item>
<u-form-item name="allowProduce" label-width="80px" label="当前可加工">
......@@ -28,7 +28,7 @@
:localdata="allowProduceLocal"></uni-data-checkbox>
</u-form-item>
<u-form-item name="allowProduce">
<u-button @click="getTaskList()" type="primary" size="medium">搜索</u-button>
<u-button @click="getTaskList()" type="primary" size="medium" style="width: 0.5rem">搜索</u-button>
</u-form-item>
</u-form>
</view>
......@@ -76,7 +76,7 @@
<!-- </view>-->
<!-- </view> -->
</view>
<scroll-view class="prod-body-right" scroll-y>
<scroll-view class="prod-body-right" scroll-y >
<view style="text-align: center; line-height: 80rpx; font-size: 28rpx; font-weight: 600">
{{ this.vuex_workunit == null ? '请选择工作单元' : this.vuex_workunit.workunitName }}
</view>
......@@ -528,17 +528,17 @@
<u-modal title="投料校验" @cancel="$refs.appScan.closed(), (feedingInspectionVisible = false)" show-cancel-button
cancelText="关闭" :show-confirm-button="false"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="feedingInspectionVisible" width="100%" :content-style="{ height: '87vh' }">
<view style="display: flex">
<view style="width: 520px" v-if="feedingInspectionVisible">
v-model="feedingInspectionVisible" width="100%" height="100%" :content-style="{ height: '87vh' }">
<view style="display: flex; width: 100%;">
<view style="width: 510px" v-if="feedingInspectionVisible">
<!-- #ifdef APP-PLUS -->
<app-scan ref="appScan" @getCode="feedingInspectionScan"></app-scan>
<!-- #endif -->
</view>
<view class="list-bar">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list"
:style="{ height: this.screenHeight - 280 + 'px' }">
<uni-table border stripe :loading="loading" emptyText="未查询到数据">
<view class="list-bar" style="width: calc(100% - 510px);">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" show-scrollbar
:style="{ height: this.screenHeight - 280 + 'px'}" @touchmove.stop>
<uni-table border stripe :loading="loading" emptyText="未查询到数据" class="mynotable">
<uni-tr>
<uni-th width="100px" align="center">操作</uni-th>
<uni-th width="65px" align="center">状态</uni-th>
......@@ -567,11 +567,11 @@
</u-modal>
<u-modal title="反冲料登记" @cancel="$refs.appScan.closed(), (recoilMaterialVisible = false)" show-cancel-button
cancelText="关闭" :show-confirm-button="false"
cancelText="关闭" :show-confirm-button="false" height="100%"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="recoilMaterialVisible" width="100%" :content-style="{ height: '87vh' }">
<view style="display: flex">
<view style="width: 520px" v-if="recoilMaterialVisible">
<view style="width: 510px" v-if="recoilMaterialVisible">
<!-- #ifdef APP-PLUS -->
<app-scan ref="appScan" @getCode="recoilMaterialScan" v-if="!recoilMaterialFlag"></app-scan>
<!-- #endif -->
......@@ -582,9 +582,9 @@
position: 'absolute',
background: 'black'}"></view>
</view>
<view class="list-bar">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
<view class="list-bar" style="width: calc(100% - 510px);">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px'}" @touchmove.stop>
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据" class="mynotable">
<uni-tr>
<!-- <uni-th width="200px" align="center">操作</uni-th> -->
<uni-th width="110px" align="center">产品物料编码</uni-th>
......@@ -2846,6 +2846,9 @@ export default {
.tableForm {
display: flex;
margin: 20rpx 0rpx;
/deep/ .uni-data-checklist .checklist-group .checklist-box {
margin-right: 0.15rem;
}
}
.task_card {
......@@ -2952,13 +2955,19 @@ export default {
width: 300rpx;
padding: 10rpx;
overflow: auto;
.u-btn {
height: 100rpx;
line-height: 100rpx;
margin: 20rpx 10rpx;
font-size: 40rpx;
}
/deep/ .uni-scroll-view{
-ms-overflow-style: none; /* IE 10+ */
scrollbar-width: none; /* Firefox */
&::-webkit-scrollbar {
display: none; /* 对于 Chrome, Safari 和 Opera 隐藏滚动条 */
}
}
}
.times {
......@@ -2966,4 +2975,13 @@ export default {
height: 360rpx;
}
}
</style>
<style lang="scss">
.mynotable {
width: 100% !important;
/deep/ .uni-table {
min-width: 100% !important;
}
}
</style>
\ No newline at end of file
static/css/global.scss 0 → 100644
View file @ 30cda62f
::v-deep ::-webkit-scrollbar {
// 滚动条整体样式
display: block;
width: 10rpx !important;
height: 10rpx !important;
-webkit-appearance: auto !important;
background: transparent;
overflow: auto !important;
}
::v-deep ::-webkit-scrollbar-thumb {
// 滚动条里面小方块
border-radius: 10rpx !important;
box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0.2) !important;
background-color: #E2E2E2 !important;
}
::v-deep ::-webkit-scrollbar-track {
// 滚动条
border-radius: 10rpx !important;
box-shadow: inset 0 0 5rpx rgba(0, 0, 0, 0) !important;
background-color: transparent !important;
}
html {
font-size: calc(100vw / 7.5);
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment