Skip to content

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

优化需求

parent f78ee80a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 39 deletions
pages/mes/prodReport/components/workunitList.vue
View file @ 19c3091b
......@@ -73,7 +73,6 @@
methods: {
async getList() {
const res = await this.$u.api.getMesWorkunitList(this.tableParams)
console.log(res, 'res')
if (res.code == 200) {
this.tableData=res.rows
}
......
pages/mes/prodReport/index.vue
View file @ 19c3091b
......@@ -15,20 +15,16 @@
<!-- </view>-->
<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" style="width: 1.15rem"
@iconClick="iconClickArrangeCode" placeholder="请输入编排单号" />
</u-form-item>
<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 label="扫码" label-width="50px" name="arrangeCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" style="width: 200px"
@iconClick="iconClickArrangeCode" placeholder="请扫码" />
</u-form-item>
<u-form-item name="allowProduce" label-width="80px" label="当前可加工">
<uni-data-checkbox v-model="tableParams.allowProduce" @change="getTaskList()"
:localdata="allowProduceLocal"></uni-data-checkbox>
</u-form-item>
<u-form-item name="allowProduce">
<u-button @click="getTaskList()" type="primary" size="medium" style="width: 0.5rem">搜索</u-button>
<u-button @click="getTaskList()" type="primary" size="medium" style="width: 50px">搜索</u-button>
</u-form-item>
</u-form>
</view>
......@@ -90,7 +86,7 @@
<u-button type="primary" @click="commonClick('FeedingInspection')">投料校验</u-button>
<u-button type="primary" @click="commonClick('RecoilMaterial')">反冲料登记</u-button>
<u-button type="primary" @click="commonClick('MaterialRequest')">领料申请</u-button>
<u-button type="primary" @click="commonClick('MaterialRequest')">补料申请</u-button>
<u-button type="primary" @click="commonClick('MaterialReturn')">退料申请</u-button>
<u-button type="primary" @click="commonClick('ViewPpicture')">查看图片</u-button>
<!-- <u-button type="primary" @click="commonClick('jobAssignment')">作业分派</u-button> -->
......@@ -539,15 +535,15 @@
cancelText="关闭" :show-confirm-button="false"
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="feedingInspectionVisible" width="100%" height="100%" :content-style="{ height: '87vh' }">
<view style="display: flex; width: 100%;">
<view style="display: flex; width: 100%;height: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" style="width: calc(100% - 510px);">
<view class="list-bar" style="width: calc(100% - 510px);height:90%;">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" show-scrollbar
:style="{ height: this.screenHeight - 200 + 'px'}" @touchmove.stop>
:style="{ height: '100%'}" @touchmove.stop>
<uni-table border stripe :loading="loading" emptyText="未查询到数据" class="mynotable">
<uni-tr>
<uni-th width="100px" align="center">操作</uni-th>
......@@ -565,7 +561,7 @@
</view>
</uni-td>
<uni-td align="center">{{ line.attr3 == 1 ? '校验' : '未校验' }}</uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td>
<uni-td align="center">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode) }}</uni-td>
<uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{ line.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td>
......@@ -581,7 +577,7 @@
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="display: flex;width: 100%;height:100%">
<view style="width: 510px" v-if="recoilMaterialVisible">
<!-- #ifdef APP-PLUS -->
<app-scan ref="appScan" @getCode="recoilMaterialScan" v-if="!recoilMaterialFlag"></app-scan>
......@@ -593,8 +589,8 @@
position: 'absolute',
background: 'black'}"></view>
</view>
<view class="list-bar" style="width: calc(100% - 510px);">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: this.screenHeight - 200 + 'px'}" @touchmove.stop>
<view class="list-bar" style="width: calc(100% - 510px);height:90%;">
<scroll-view scroll-y="true" scroll-x="true" class="scroll-list" :style="{ height: '100%'}" @touchmove.stop>
<uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据" class="mynotable">
<uni-tr>
<!-- <uni-th width="200px" align="center">操作</uni-th> -->
......@@ -640,7 +636,7 @@
</view>
</u-modal>
<u-modal title="领料申请" @confirm="materialRequestSave()" show-cancel-button
<u-modal title="补料申请" @confirm="materialRequestSave()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialRequestVisible" width="1300rpx">
<view class="list-bar">
......@@ -658,7 +654,7 @@
</u-form-item>
</u-col>
<u-col span="4.5">
<u-form-item label="领料原因" prop="pickingReason">
<u-form-item label="补料原因" prop="pickingReason">
<uni-data-select v-model="curTaskInfo.pickingReason" :localdata="reasonList"
@change="pickingCause"></uni-data-select>
</u-form-item>
......@@ -671,7 +667,7 @@
<uni-th width="100px" align="center">操作</uni-th>
<uni-th width="110px" align="center">产品物料编码</uni-th>
<uni-th width="110px" align="center">产品物料名称</uni-th>
<uni-th width="80px" align="center">领取数量</uni-th>
<uni-th width="80px" align="center">补取数量</uni-th>
</uni-tr>
<uni-tr v-for="(line, index) in materialRequestArrays" :key="index">
<uni-td align="center">
......@@ -689,7 +685,7 @@
</view>
</u-modal>
<u-modal title="领料申请数量" @confirm="materialRequestSetting()" show-cancel-button
<u-modal title="补料申请数量" @confirm="materialRequestSetting()" show-cancel-button
:title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }"
v-model="materialRequestFormVisible" width="700rpx">
<view class="">
......@@ -703,7 +699,7 @@
</u-row>
<u-row>
<u-col>
<u-form-item label="领料数量">
<u-form-item label="补料数量">
<u-number-box v-model="materialRequestFormData.applyNum" :long-press="false" :positive-integer="false"
:size="50" :input-width="190"></u-number-box>
</u-form-item>
......@@ -1532,7 +1528,8 @@ export default {
iconClickArrangeCode() {
uni.scanCode({
success: (res) => {
console.log(res, 'res');
// console.log(res, 'res');
this.tableParams.arrangeCode = res.result
this.getTaskList({ arrangeCode: res.result });
},
fail: () => {
......@@ -1540,17 +1537,6 @@ export default {
}
});
},
iconClickWorkorderCode(data) {
uni.scanCode({
success: (res) => {
console.log(res, 'res');
this.getTaskList({ workorderCode: res.result });
},
fail: () => {
this.$u.toast('扫码失败，请重新扫描');
}
});
},
numclik(...arg) {
console.log('99999999', arg);
},
......@@ -1937,8 +1923,14 @@ export default {
})
.then((res) => {
if (res.code === 200) {
let currentIndex = 0
// 过滤可加工数量为0的数据
this.tableData = res.rows.map((item) => {
this.tableData = res.rows.map((item, index) => {
if (item.location) {
currentIndex = index
item['checked'] = true
this.tableSelectData.push(item)
}
return {
...item,
scheduleStartDateStr: item.scheduleStartDate.substring(2, 16),
......@@ -1948,7 +1940,12 @@ export default {
if (this.tableData.length > 0) {
this.curTaskInfo = this.tableData[0];
this.getMaterialUsageRecordList();
} else {
this.$nextTick(()=>{
const dom = this.$refs['zbtable'].$el.children[0].children[0].children[1].children[0].children[0]
const itemHeight = dom.querySelector('.item-tr').offsetHeight
const enableHeight = dom.querySelector('.zb-table-fixed').scrollHeight - dom.offsetHeight
dom.scrollTop = (itemHeight * currentIndex) > enableHeight ? enableHeight : (itemHeight * currentIndex)
})
}
}
}).catch(e=>{
......@@ -2883,7 +2880,7 @@ export default {
display: flex;
margin: 20rpx 0rpx;
/deep/ .uni-data-checklist .checklist-group .checklist-box {
margin-right: 0.15rem;
margin-right: 15px;
}
}
......
static/css/global.scss
View file @ 19c3091b
......@@ -21,6 +21,7 @@
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
// font-size: calc(100vw / 7.5);
}
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