Commit e098ce22 authored by 沈翠玲's avatar 沈翠玲

首页两个编排扫码和工单扫码合并名称改为扫码,扫码后定位到指定的位置并且打上勾,搜索也是定位勾选

parent 9e5d9004
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<u-form :model="tableParams" labelAlign="right" class="tableForm"> <u-form :model="tableParams" labelAlign="right" class="tableForm">
<u-form-item label="扫码" label-width="50px" name="arrangeCode"> <u-form-item label="扫码" label-width="50px" name="arrangeCode">
<uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" style="width: 200px" <uni-easyinput type="text" suffixIcon="scan" v-model="tableParams.arrangeCode" style="width: 200px"
@iconClick="iconClickArrangeCode" placeholder="请扫码" /> @iconClick="iconClickArrangeCode" placeholder="请输入工单编号或编排单号" />
</u-form-item> </u-form-item>
<u-form-item name="allowProduce" label-width="80px" label="当前可加工"> <u-form-item name="allowProduce" label-width="80px" label="当前可加工">
<uni-data-checkbox v-model="tableParams.allowProduce" @change="getTaskList()" <uni-data-checkbox v-model="tableParams.allowProduce" @change="getTaskList()"
...@@ -561,7 +561,7 @@ ...@@ -561,7 +561,7 @@
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.attr3 == 1 ? '校验' : '未校验' }}</uni-td> <uni-td align="center">{{ line.attr3 == 1 ? '校验' : '未校验' }}</uni-td>
<uni-td align="center">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode) }}</uni-td> <uni-td align="center">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td>
<uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</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.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.batchCode }}</uni-td> <uni-td align="center">{{ line.batchCode }}</uni-td>
...@@ -615,7 +615,7 @@ ...@@ -615,7 +615,7 @@
</uni-td> --> </uni-td> -->
<uni-td align="center">{{ line.sapItemCode }}</uni-td> <uni-td align="center">{{ line.sapItemCode.substring(line.sapItemCode.length - 8, line.sapItemCode.length) }}</uni-td>
<uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td> <uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center"> <uni-td align="center">
<view class="uni-group"> <view class="uni-group">
...@@ -676,7 +676,7 @@ ...@@ -676,7 +676,7 @@
@click="materialRequestFormShow(line)">补料</button> @click="materialRequestFormShow(line)">补料</button>
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td> <uni-td align="center">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td>
<uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td> <uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</uni-td>
<uni-td align="center">{{ line.applyNum }}</uni-td> <uni-td align="center">{{ line.applyNum }}</uni-td>
</uni-tr> </uni-tr>
...@@ -754,7 +754,7 @@ ...@@ -754,7 +754,7 @@
@click="materialReturnFormShow(line)">退料</button> @click="materialReturnFormShow(line)">退料</button>
</view> </view>
</uni-td> </uni-td>
<uni-td align="center">{{ line.itemCode }}</uni-td> <uni-td align="center">{{ line.itemCode.substring(line.itemCode.length - 8, line.itemCode.length) }}</uni-td>
<uni-td align="center">{{ line.itemName }}({{ line.specification }})/{{ line.unitOfMeasure }}</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.quantityIssued }}</uni-td>
<uni-td align="center">{{ line.applyNum }}</uni-td> <uni-td align="center">{{ line.applyNum }}</uni-td>
...@@ -1954,10 +1954,22 @@ export default { ...@@ -1954,10 +1954,22 @@ export default {
this.curTaskInfo = this.tableData[0]; this.curTaskInfo = this.tableData[0];
this.getMaterialUsageRecordList(); this.getMaterialUsageRecordList();
this.$nextTick(()=>{ this.$nextTick(()=>{
const dom = this.$refs['zbtable'].$el.children[0].children[0].children[1].children[0].children[0] const query = uni.createSelectorQuery().in(this)
const itemHeight = dom.querySelector('.item-tr').offsetHeight query
const enableHeight = dom.querySelector('.zb-table-fixed').scrollHeight - dom.offsetHeight .select('#tableBody')
dom.scrollTop = (itemHeight * currentIndex) > enableHeight ? enableHeight : (itemHeight * currentIndex) .boundingClientRect((data1) => {
// query
// .select('#tableBody .item-tr')
// .boundingClientRect((data) => {
const height = 80.8
const currentIndexPlus = currentIndex + 1
console.log(data1.height, (height * currentIndexPlus), 'data1')
const scrollTop = ((height * currentIndexPlus) > data1.height) ? (height * currentIndexPlus) : 0
console.log('scrollTop', scrollTop)
this.$refs['zbtable'].bodyScrollTop = scrollTop
// }).exec()
})
.exec()
}) })
} }
} }
......
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