| pages/scgl/scbg.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/scgl/scbg2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/sjjy.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/sjjy1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/sjjy2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/wgjy.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/wgjy1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/wgjy2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/xjjy.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/xjjy1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/zlgl/xjjy2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
pages/scgl/scbg.vue
@@ -34,7 +34,7 @@ </view> <u-alert :title="alertTitle" type="info"></u-alert> <u-alert :title="'工单数量（'+total+'）'" type="info"></u-alert> <!-- 折叠面板 --> @@ -44,26 +44,26 @@ <u-collapse style="max-height: 62vh;overflow: auto;"> <!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' --> <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> --> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="item in collapseArr" :key="item.ordercode"> <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="(item,index) in collapseArr" :key="item.ordercode+index"> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff" @click="progressClick(item.ordercode)"> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"> <!-- @click="progressClick(item.ordercode)" --> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(item.ordergoodqty)}} @@ -76,55 +76,55 @@ --> <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> </view> </view> </view> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> </u-collapse-item> <!-- </scroll-view> --> </u-collapse-item> </scroll-view> </u-collapse> @@ -241,11 +241,8 @@ uni.$off('scancodedate') // 每次进来先 移除全局自定义事件监听器 uni.$on('scancodedate', function(content) { console.log("扫描到的内容为:", content) // _this.getCheckScanDeviceQrCodeData(content) _this.getCheckScanDeviceQrCodeData(content) }) console.log(option, 8) }, onPullDownRefresh() { @@ -315,7 +312,7 @@ ], //已选中的产品标签 order: '', //单号 placeholder2: '生产订单', total: 10, total: 0, currentpage: 1, //第几页 pageSize: 10, //每页显示多少条 @@ -360,7 +357,7 @@ uni.navigateTo({ url: './scbg2?orderstep=' + orderstep url: './scbg2?orderstep=' + orderstep + '¤tpage=' + this.currentpage }) }, @@ -386,20 +383,20 @@ let ordertype = '' // SO：销售订单 MO：生产订单 PO：生产工单 switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入工单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入工单信息' ordertype = 'PO' break case '生产订单': // this.alertTitle = '生产订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入生产订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入生产订单信息' ordertype = 'MO' break case '销售订单': // this.alertTitle = '销售订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入销售订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入销售订单信息' ordertype = 'SO' break } @@ -424,8 +421,8 @@ this.collapseArr = res.data this.collapseArrAll = res.data this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ 1] // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ // 1] }, loadMore() { @@ -434,22 +431,25 @@ //输入框回车确认事件 confirmInputBoxValue(val) { this.collapseArr = this.collapseArrAll.filter((p) => { return p.ordercode.indexOf(val) !== -1 }) this.order = val this.currentpage = 1 this.getProductOrderSearch(1) // this.collapseArr = this.collapseArrAll.filter((p) => { // return p.ordercode.indexOf(val) !== -1 // }) switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '生产订单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '销售订单': this.alertTitle = '工单数量（共' + this.total + '个）' break } // switch (this.radiovalue) { // case '生产工单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '生产订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '销售订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // }
@@ -3,15 +3,15 @@ <page-nav title="生产报工"></page-nav> <view v-show="topContent.length===0"> <!-- <view v-show="topContent.length===0"> <div class="sacnBody"> <div class="scanImg" @click="topScanClick"></div> <div class="scanText">请扫描任务条码</div> </div> </view> </view> --> <view v-show="topContent.length!==0"> <view class="mainContent" :style="{maxHeight:'1260rpx',overflow: 'scroll'}"> <view class="mainContent" :style="{maxHeight:'72vh',overflow: 'scroll'}"> <!-- 报工信息 --> <u-gap height="5" bgColor="#eff0f1"></u-gap> @@ -320,6 +320,7 @@ onLoad(option) { if (option.orderstep) { this.fromType = '1' this.currentpage = option.currentpage this.getMesOrderStepStart(option.orderstep) } else { this.fromType = '2' @@ -428,6 +429,8 @@ userSheetShow: false, fromType: '1', //来源于哪里 是页面1还是2 currentpage: 1, } }, created() { @@ -739,7 +742,7 @@ let pages = getCurrentPages(); // 页面集合 let beforePage = pages[pages.length - 2]; //上一个页面 // beforePage.$vm.getProductionScheduleKanban() beforePage.$vm.getProductOrderSearch() beforePage.$vm.getProductOrderSearch(this.currentpage) uni.navigateBack() } pages/zlgl/sjjy.vue
@@ -1,6 +1,6 @@ <template> <view> <page-nav title="首检检验"></page-nav> <page-nav title="首件检验"></page-nav> <view class="flex_center" style="margin: 20rpx;"> @@ -34,34 +34,36 @@ </view> <u-alert :title="alertTitle" type="info"></u-alert> <u-alert :title="'工单数量（'+total+'）'" type="info"></u-alert> <!-- 折叠面板 --> <!-- <u-collapse @change="change" @close="close" @open="open"> --> <!-- @change="collapseChange" --> <u-collapse style="max-height: 62vh;overflow: auto;"> <!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' --> <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> --> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="item in collapseArr" :key="item.ordercode"> <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="(item,index) in collapseArr" :key="item.ordercode+index"> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff" @click="progressClick(item.ordercode)"> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"> <!-- @click="progressClick(item.ordercode)" --> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(item.ordergoodqty)}} @@ -74,61 +76,65 @@ --> <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> </view> </view> </view> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> </u-collapse-item> <!-- </scroll-view> --> </u-collapse-item> </scroll-view> </u-collapse> <view class="uni-pagination-box"> <uni-pagination show-icon :page-size="pageSize" :current="currentpage" :total="total" @change="pageChange" /> </view> <!-- 弹出层 --> <!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' --> @@ -212,6 +218,10 @@ <view @click="scan2"> <drag-ball :x='300' :y="600"></drag-ball> </view> <scan-code></scan-code> </view> </template> @@ -220,7 +230,12 @@ import { ProductOrderSearch } from '../../config/api.js'; import scanCode from '@/components/scan-code/scan-code.vue' export default { components: { scanCode }, onLoad(option) { const _this = this uni.$off('scancodedate') // 每次进来先 移除全局自定义事件监听器 @@ -228,9 +243,6 @@ console.log("扫描到的内容为:", content) _this.getCheckScanDeviceQrCodeData(content) }) console.log(option, 8) }, onPullDownRefresh() { @@ -300,7 +312,7 @@ ], //已选中的产品标签 order: '', //单号 placeholder2: '生产订单', total: 10, total: 0, currentpage: 1, //第几页 pageSize: 10, //每页显示多少条 @@ -334,11 +346,6 @@ init() { uni.stopPullDownRefresh(); }, // 页数改变时 分页触发 pageChange(e) { this.currentpage = e.current this.getProductOrderSearch(e.current) }, gotoPage(p1, p2) { let orderstep = null @@ -350,7 +357,7 @@ uni.navigateTo({ url: './sjjy1?orderstep=' + orderstep url: './sjjy1?orderstep=' + orderstep + '¤tpage=' + this.currentpage }) }, @@ -365,25 +372,31 @@ }) }, // 页数改变时 分页触发 pageChange(e) { this.currentpage = e.current this.getProductOrderSearch(e.current) }, // 接口获取 async getProductOrderSearch(current) { let ordertype = '' // SO：销售订单 MO：生产订单 PO：生产工单 switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入工单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入工单信息' ordertype = 'PO' break case '生产订单': // this.alertTitle = '生产订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入生产订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入生产订单信息' ordertype = 'MO' break case '销售订单': // this.alertTitle = '销售订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入销售订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入销售订单信息' ordertype = 'SO' break } @@ -395,17 +408,21 @@ ordercode: this.order, Ratetime: '', // Ratetime: this.calendarRange, page: current, rows: this.pageSize, prop: 'lm_date', sortorder: 'desc' } const res = await ProductOrderSearch(data) this.total = res.count this.collapseArr = res.data this.collapseArrAll = res.data this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ 1] // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ // 1] }, loadMore() { @@ -414,21 +431,27 @@ //输入框回车确认事件 confirmInputBoxValue(val) { this.collapseArr = this.collapseArrAll.filter((p) => { return p.ordercode.indexOf(val) !== -1 }) this.order = val this.currentpage = 1 this.getProductOrderSearch(1) // this.collapseArr = this.collapseArrAll.filter((p) => { // return p.ordercode.indexOf(val) !== -1 // }) switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '生产订单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '销售订单': this.alertTitle = '工单数量（共' + this.total + '个）' break } // switch (this.radiovalue) { // case '生产工单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '生产订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '销售订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // } // this.alertTitle = this.alertTitle.split('/')[0] + this.collapseArr.length + this.alertTitle.split('/')[ // 1] @@ -680,7 +703,6 @@ ::v-deep .u-cell__body { padding-bottom: 40rpx; } .uni-pagination-box { height: 4vh; pages/zlgl/sjjy1.vue
@@ -2,15 +2,15 @@ <view> <page-nav title="首检检验"></page-nav> <view v-if="processArr.length===0"> <!-- <view v-if="processArr.length===0"> <div class="sacnBody"> <div class="scanImg" @click="topScanClick"></div> <div class="scanText">扫描工序任务码</div> </div> </view> </view> --> <view v-if="processArr.length!==0" class="mainContent" style="height: 1340rpx;overflow: auto"> <view v-if="processArr.length!==0" class="mainContent" style="height: 72vh;overflow: auto"> <view> <u-gap height="10" bgColor="#eff0f1"></u-gap> <view class="head" style="height: 386rpx;overflow: auto;"> pages/zlgl/sjjy2.vue
@@ -3,7 +3,7 @@ <page-nav title="首检检验"></page-nav> <view class="mainContent"> <view class="mainContent" style="height: 72vh;overflow: auto"> <view> <u-gap height="10" bgColor="#eff0f1"></u-gap> <view class="head"> pages/zlgl/wgjy.vue
@@ -34,34 +34,36 @@ </view> <u-alert :title="alertTitle" type="info"></u-alert> <u-alert :title="'工单数量（'+total+'）'" type="info"></u-alert> <!-- 折叠面板 --> <!-- <u-collapse @change="change" @close="close" @open="open"> --> <!-- @change="collapseChange" --> <u-collapse style="max-height: 62vh;overflow: auto;"> <!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' --> <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> --> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="item in collapseArr" :key="item.ordercode"> <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="(item,index) in collapseArr" :key="item.ordercode+index"> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff" @click="progressClick(item.ordercode)"> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"> <!-- @click="progressClick(item.ordercode)" --> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(item.ordergoodqty)}} @@ -74,61 +76,65 @@ --> <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> </view> </view> </view> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> </u-collapse-item> <!-- </scroll-view> --> </u-collapse-item> </scroll-view> </u-collapse> <view class="uni-pagination-box"> <uni-pagination show-icon :page-size="pageSize" :current="currentpage" :total="total" @change="pageChange" /> </view> <!-- 弹出层 --> <!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' --> @@ -212,6 +218,10 @@ <view @click="scan2"> <drag-ball :x='300' :y="600"></drag-ball> </view> <scan-code></scan-code> </view> </template> @@ -220,7 +230,12 @@ import { ProductOrderSearch } from '../../config/api.js'; import scanCode from '@/components/scan-code/scan-code.vue' export default { components: { scanCode }, onLoad(option) { const _this = this uni.$off('scancodedate') // 每次进来先 移除全局自定义事件监听器 @@ -228,9 +243,6 @@ console.log("扫描到的内容为:", content) _this.getCheckScanDeviceQrCodeData(content) }) console.log(option, 8) }, onPullDownRefresh() { @@ -300,7 +312,7 @@ ], //已选中的产品标签 order: '', //单号 placeholder2: '生产订单', total: 10, total: 0, currentpage: 1, //第几页 pageSize: 10, //每页显示多少条 @@ -334,11 +346,6 @@ init() { uni.stopPullDownRefresh(); }, // 页数改变时 分页触发 pageChange(e) { this.currentpage = e.current this.getProductOrderSearch(e.current) }, gotoPage(p1, p2) { let orderstep = null @@ -350,7 +357,7 @@ uni.navigateTo({ url: './wgjy1?orderstep=' + orderstep url: './wgjy1?orderstep=' + orderstep + '¤tpage=' + this.currentpage }) }, @@ -365,25 +372,31 @@ }) }, // 页数改变时 分页触发 pageChange(e) { this.currentpage = e.current this.getProductOrderSearch(e.current) }, // 接口获取 async getProductOrderSearch(current) { let ordertype = '' // SO：销售订单 MO：生产订单 PO：生产工单 switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入工单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入工单信息' ordertype = 'PO' break case '生产订单': // this.alertTitle = '生产订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入生产订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入生产订单信息' ordertype = 'MO' break case '销售订单': // this.alertTitle = '销售订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入销售订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入销售订单信息' ordertype = 'SO' break } @@ -395,17 +408,21 @@ ordercode: this.order, Ratetime: '', // Ratetime: this.calendarRange, page: current, rows: this.pageSize, prop: 'lm_date', sortorder: 'desc' } const res = await ProductOrderSearch(data) this.total = res.count this.collapseArr = res.data this.collapseArrAll = res.data this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ 1] // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ // 1] }, loadMore() { @@ -414,21 +431,27 @@ //输入框回车确认事件 confirmInputBoxValue(val) { this.collapseArr = this.collapseArrAll.filter((p) => { return p.ordercode.indexOf(val) !== -1 }) this.order = val this.currentpage = 1 this.getProductOrderSearch(1) // this.collapseArr = this.collapseArrAll.filter((p) => { // return p.ordercode.indexOf(val) !== -1 // }) switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '生产订单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '销售订单': this.alertTitle = '工单数量（共' + this.total + '个）' break } // switch (this.radiovalue) { // case '生产工单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '生产订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '销售订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // } // this.alertTitle = this.alertTitle.split('/')[0] + this.collapseArr.length + this.alertTitle.split('/')[ // 1] @@ -680,7 +703,6 @@ ::v-deep .u-cell__body { padding-bottom: 40rpx; } .uni-pagination-box { height: 4vh; pages/zlgl/wgjy1.vue
@@ -2,15 +2,15 @@ <view> <page-nav title="完工检验"></page-nav> <view v-if="processArr.length===0"> <!-- <view v-if="processArr.length===0"> <div class="sacnBody"> <div class="scanImg" @click="topScanClick"></div> <div class="scanText">扫描工序任务码</div> </div> </view> </view> --> <view v-if="processArr.length!==0" class="mainContent" style="height: 1340rpx;overflow: auto"> <view v-if="processArr.length!==0" class="mainContent" style="height: 72vh;overflow: auto"> <view> <u-gap height="10" bgColor="#eff0f1"></u-gap> <view class="head" style="height: 386rpx;overflow: auto;"> pages/zlgl/wgjy2.vue
@@ -3,7 +3,7 @@ <page-nav title="完工检验"></page-nav> <view class="mainContent"> <view class="mainContent" style="height: 72vh;overflow: auto"> <view> <u-gap height="10" bgColor="#eff0f1"></u-gap> <view class="head"> pages/zlgl/xjjy.vue
@@ -34,34 +34,36 @@ </view> <u-alert :title="alertTitle" type="info"></u-alert> <u-alert :title="'工单数量（'+total+'）'" type="info"></u-alert> <!-- 折叠面板 --> <!-- <u-collapse @change="change" @close="close" @open="open"> --> <!-- @change="collapseChange" --> <u-collapse style="max-height: 62vh;overflow: auto;"> <!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' --> <!-- <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> --> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="item in collapseArr" :key="item.ordercode"> <scroll-view scroll-y :style="{height: 590 + 'px'}" @scrolltolower="loadMore"> <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode' v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0' v-for="(item,index) in collapseArr" :key="item.ordercode+index"> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;"> {{item.partname}} {{item.partspec}} </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff" @click="progressClick(item.ordercode)"> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 26%;left: 44%;top:16px;"> --> <view style="position: absolute;width: 120px;left: 44%;top:16px;color:#0659ff"> <!-- @click="progressClick(item.ordercode)" --> <!-- {{item.partname}}{{item.partspec}} --> <u-line-progress :percentage="parseFloat((item.ordergoodqty*100/item.orderqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <!-- <view style="position: absolute;width: 100px;right: 33px; top:13px; "> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(item.ordergoodqty)}} @@ -74,61 +76,65 @@ --> <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} <view v-if="radiovalue==='生产工单'" style="margin:0 0 5px"> <view class="flex_column"> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品编码：</view> <view class="contentFont" style="font-size: 14px;">{{item.partcode}}</view> </view> </view> </view> </view> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品名称：</view> <view class="contentFont" style="font-size: 14px;">{{item.partname}}</view> </view> <view style="display:flex"> <view class="titleFont" style="font-size: 14px;">产品规格：</view> <view class="contentFont" style="font-size: 14px;">{{item.partspec?item.partspec:'/'}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> <!-- {{item.children}} --> <!-- <u--text class="u-collapse-content"> --> <u-steps :current="-1" inactiveColor='#0659FF' direction="column"> <view v-for="(it,ind) in item.children" :key="item.ordercode+it.name+ind" @click="gotoPage(item.ordercode,it.code)" style="display: flex;align-items: center;"> <!-- <u-steps-item :title="it.code+'/'+it.name+it.spec"></u-steps-item> --> <u-steps-item :title="it.code+'/'+it.name"></u-steps-item> <view class="" style="width: 100px;"> <u-line-progress :percentage="parseFloat((it.goodqty*100/it.planqty).toFixed(2))" inactiveColor="#d1d6f5" height="10" activeColor="#0659ff"></u-line-progress> </view> <view style="width: 30%;text-align: right;"> <view class="" style="display: flex;justify-content: flex-end;"> <view style="color: #0659ff;"> {{parseFloat(it.goodqty)}} </view> <view> /{{ parseFloat(it.planqty)}} </view> </view> </view> </view> </u-steps> <!-- </u--text> --> </u-collapse-item> <!-- </scroll-view> --> </u-collapse-item> </scroll-view> </u-collapse> <view class="uni-pagination-box"> <uni-pagination show-icon :page-size="pageSize" :current="currentpage" :total="total" @change="pageChange" /> </view> <!-- 弹出层 --> <!-- closeIconPos='top-left' closeOnClickOverlay closeable='true' --> @@ -212,6 +218,10 @@ <view @click="scan2"> <drag-ball :x='300' :y="600"></drag-ball> </view> <scan-code></scan-code> </view> </template> @@ -220,7 +230,12 @@ import { ProductOrderSearch } from '../../config/api.js'; import scanCode from '@/components/scan-code/scan-code.vue' export default { components: { scanCode }, onLoad(option) { const _this = this uni.$off('scancodedate') // 每次进来先 移除全局自定义事件监听器 @@ -228,9 +243,6 @@ console.log("扫描到的内容为:", content) _this.getCheckScanDeviceQrCodeData(content) }) console.log(option, 8) }, onPullDownRefresh() { @@ -300,7 +312,7 @@ ], //已选中的产品标签 order: '', //单号 placeholder2: '生产订单', total: 10, total: 0, currentpage: 1, //第几页 pageSize: 10, //每页显示多少条 @@ -334,11 +346,6 @@ init() { uni.stopPullDownRefresh(); }, // 页数改变时 分页触发 pageChange(e) { this.currentpage = e.current this.getProductOrderSearch(e.current) }, gotoPage(p1, p2) { let orderstep = null @@ -365,25 +372,31 @@ }) }, // 页数改变时 分页触发 pageChange(e) { this.currentpage = e.current this.getProductOrderSearch(e.current) }, // 接口获取 async getProductOrderSearch(current) { let ordertype = '' // SO：销售订单 MO：生产订单 PO：生产工单 switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入工单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入工单信息' ordertype = 'PO' break case '生产订单': // this.alertTitle = '生产订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入生产订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入生产订单信息' ordertype = 'MO' break case '销售订单': // this.alertTitle = '销售订单数量（共/个）' this.alertTitle = '工单数量（共/个）' this.placeholder = '请输入销售订单信息' // this.alertTitle = '工单数量（共/个）' // this.placeholder = '请输入销售订单信息' ordertype = 'SO' break } @@ -395,17 +408,21 @@ ordercode: this.order, Ratetime: '', // Ratetime: this.calendarRange, page: current, rows: this.pageSize, prop: 'lm_date', sortorder: 'desc' } const res = await ProductOrderSearch(data) this.total = res.count this.collapseArr = res.data this.collapseArrAll = res.data this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ 1] // this.alertTitle = this.alertTitle.split('/')[0] + this.total + this.alertTitle.split('/')[ // 1] }, loadMore() { @@ -414,21 +431,27 @@ //输入框回车确认事件 confirmInputBoxValue(val) { this.collapseArr = this.collapseArrAll.filter((p) => { return p.ordercode.indexOf(val) !== -1 }) this.order = val this.currentpage = 1 this.getProductOrderSearch(1) // this.collapseArr = this.collapseArrAll.filter((p) => { // return p.ordercode.indexOf(val) !== -1 // }) switch (this.radiovalue) { case '生产工单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '生产订单': this.alertTitle = '工单数量（共' + this.total + '个）' break case '销售订单': this.alertTitle = '工单数量（共' + this.total + '个）' break } // switch (this.radiovalue) { // case '生产工单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '生产订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // case '销售订单': // this.alertTitle = '工单数量（共' + this.total + '个）' // break // } // this.alertTitle = this.alertTitle.split('/')[0] + this.collapseArr.length + this.alertTitle.split('/')[ // 1] @@ -680,7 +703,6 @@ ::v-deep .u-cell__body { padding-bottom: 40rpx; } .uni-pagination-box { height: 4vh; pages/zlgl/xjjy1.vue
@@ -2,15 +2,15 @@ <view> <page-nav title="巡检检验"></page-nav> <view v-if="processArr.length===0"> <!-- <view v-if="processArr.length===0"> <div class="sacnBody"> <div class="scanImg" @click="topScanClick"></div> <div class="scanText">扫描工序任务码</div> </div> </view> </view> --> <view v-if="processArr.length!==0" class="mainContent" style="height: 1340rpx;overflow: auto"> <view v-if="processArr.length!==0" class="mainContent" style="height: 72vh;overflow: auto"> <view> <u-gap height="10" bgColor="#eff0f1"></u-gap> <view class="head" style="height: 386rpx;overflow: auto;"> pages/zlgl/xjjy2.vue
@@ -3,7 +3,7 @@ <page-nav title="巡检检验"></page-nav> <view class="mainContent"> <view class="mainContent" style="height: 72vh;overflow: auto"> <view> <u-gap height="10" bgColor="#eff0f1"></u-gap> <view class="head">
