|
|
@@ -1,148 +1,146 @@
|
|
|
<template>
|
|
|
<view v-if="isMaskShow" class="mask">
|
|
|
- <view class="uni-column" style="height: 100%; background-color: #f5f5f5;">
|
|
|
- <view class="box-bg uni-row">
|
|
|
- <view class="input-view uni-row">
|
|
|
- <uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
|
|
|
- <input class="nav-bar-input" type="text" v-model="keywords" placeholder="请输入批次号/箱号" />
|
|
|
- </view>
|
|
|
- <view class="search" @click="handleSearch">
|
|
|
- 搜索
|
|
|
- </view>
|
|
|
+ </view>
|
|
|
+ <view class="uni-column" style="height: 100%; background-color: #f5f5f5;">
|
|
|
+ <view class="box-bg uni-row">
|
|
|
+ <view class="input-view uni-row">
|
|
|
+ <uni-icons class="input-uni-icon" type="search" size="18" color="#999" />
|
|
|
+ <input class="nav-bar-input" type="text" v-model="keywords" placeholder="请输入批次号/箱号" />
|
|
|
</view>
|
|
|
- <view class="list-title uni-row">
|
|
|
- <text class="label">是否正常批次</text>
|
|
|
- <text>{{ normalStatus ? '是' : '否' }}</text>
|
|
|
- <switch class="switch" :checked="normalStatus" @change="switchChange" color="rgba(103, 195, 55, 1.0)" />
|
|
|
+ <view class="search" @click="handleSearch">
|
|
|
+ 搜索
|
|
|
</view>
|
|
|
- <view class="scroll-container" style="padding-bottom: 150rpx;">
|
|
|
- <view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
|
|
|
- <text>暂无批次</text>
|
|
|
- </view>
|
|
|
- <!-- 批次列表 -->
|
|
|
- <view v-else v-for="(item, index) in listData" :key="index" class="list-item"
|
|
|
- @click="checkStatus(item)">
|
|
|
- <!-- @click="handleToreportingForWork(item)" -->
|
|
|
- <view class="title-container uni-row" style="justify-content: flex-start;">
|
|
|
- <view class="title uni-row">
|
|
|
- <text class="label">批次号:</text>
|
|
|
- <text class="label code">{{ item['lotCode'] }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="list-title uni-row">
|
|
|
+ <text class="label">是否正常批次</text>
|
|
|
+ <text>{{ normalStatus ? '是' : '否' }}</text>
|
|
|
+ <switch class="switch" :checked="normalStatus" @change="switchChange" color="rgba(103, 195, 55, 1.0)" />
|
|
|
+ </view>
|
|
|
+ <view class="scroll-container" style="padding-bottom: 150rpx;">
|
|
|
+ <view v-if="listData.length == 0" style="color: #999;margin: 50% auto;">
|
|
|
+ <text>暂无批次</text>
|
|
|
+ </view>
|
|
|
+ <!-- 批次列表 -->
|
|
|
+ <view v-else v-for="(item, index) in listData" :key="index" class="list-item" @click="checkStatus(item)">
|
|
|
+ <!-- @click="handleToreportingForWork(item)" -->
|
|
|
+ <view class="title-container uni-row" style="justify-content: flex-start;">
|
|
|
+ <view class="title uni-row">
|
|
|
+ <text class="label">批次号:</text>
|
|
|
+ <text class="label code">{{ item['lotCode'] }}</text>
|
|
|
+ </view>
|
|
|
+ <view class=" uni-row" style="margin-left: 16rpx;">
|
|
|
+ <view v-if="item['status'] == 1" class="tag"><text class="label">进行中</text></view>
|
|
|
+ <view v-else-if="item['status'] == 3" class="tag turnover "><text class="label">待领取</text>
|
|
|
</view>
|
|
|
- <view class=" uni-row" style="margin-left: 16rpx;">
|
|
|
- <view v-if="item['status'] == 1" class="tag"><text class="label">进行中</text></view>
|
|
|
- <view v-else-if="item['status'] == 3" class="tag turnover "><text class="label">待领取</text>
|
|
|
- </view>
|
|
|
- <view v-else-if="item['status'] == 2" class="tag turnover "><text class="label">待周转</text>
|
|
|
- </view>
|
|
|
- <view v-else-if="item['status'] == 0" class="tag finished "><text class="label">未开始</text>
|
|
|
- </view>
|
|
|
- <view v-else-if="item['status'] == 4" type="default finished" class="tag finished"><text
|
|
|
- class="label">已完成</text></view>
|
|
|
+ <view v-else-if="item['status'] == 2" class="tag turnover "><text class="label">待周转</text>
|
|
|
</view>
|
|
|
+ <view v-else-if="item['status'] == 0" class="tag finished "><text class="label">未开始</text>
|
|
|
+ </view>
|
|
|
+ <view v-else-if="item['status'] == 4" type="default finished" class="tag finished"><text
|
|
|
+ class="label">已完成</text></view>
|
|
|
</view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">产品描述</text>
|
|
|
- <text class="label right">{{ curPlan['productDescription'] }}</text>
|
|
|
- </view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">材质</text>
|
|
|
- <text
|
|
|
- class="label right">{{ item['furnaceNoInfo'] ? item['furnaceNoInfo'].firstTechnicalRequirement + ";" + item['furnaceNoInfo'].secondTechnicalRequirement : '-' }}</text>
|
|
|
- </view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">原材料厂家</text>
|
|
|
- <text
|
|
|
- class="label right">{{ item['furnaceNoInfo'] ? item['furnaceNoInfo'].factory : '-' }}</text>
|
|
|
- </view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">箱号</text>
|
|
|
- <text class="label right">{{ item['carrierName'] ? item['carrierName'] : '-' }}</text>
|
|
|
- </view>
|
|
|
- <!-- <view class="item-info uni-row">
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">产品描述</text>
|
|
|
+ <text class="label right">{{ curPlan['productDescription'] }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">材质</text>
|
|
|
+ <text
|
|
|
+ class="label right">{{ item['furnaceNoInfo'] ? item['furnaceNoInfo'].firstTechnicalRequirement + ";" + item['furnaceNoInfo'].secondTechnicalRequirement : '-' }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">原材料厂家</text>
|
|
|
+ <text class="label right">{{ item['furnaceNoInfo'] ? item['furnaceNoInfo'].factory : '-' }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">箱号</text>
|
|
|
+ <text class="label right">{{ item['carrierName'] ? item['carrierName'] : '-' }}</text>
|
|
|
+ </view>
|
|
|
+ <!-- <view class="item-info uni-row">
|
|
|
<text class="label">总工时</text>
|
|
|
<text class="label right">{{ item['totalWorkingHours']}}</text>
|
|
|
</view> -->
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">投入数</text>
|
|
|
- <text
|
|
|
- class="label right">{{item.prevProcess == null ? item['productionQuantity'] : item['processQualifiedNum']}}</text>
|
|
|
- </view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">上道工序</text>
|
|
|
- <text class="label right">{{ item.prevProcess ? item['prevProcess'].processAlias : '-'}}</text>
|
|
|
- </view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">当前工序</text>
|
|
|
- <!-- <text
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">投入数</text>
|
|
|
+ <text
|
|
|
+ class="label right">{{item.prevProcess == null ? item['productionQuantity'] : item['processQualifiedNum']}}</text>
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">上道工序</text>
|
|
|
+ <text class="label right">{{ item.prevProcess ? item['prevProcess'].processAlias : '-'}}</text>
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">当前工序</text>
|
|
|
+ <!-- <text
|
|
|
class="label right">{{ item.currentProcess ? item.prevProcess && item['currentProcess'].processAlias == item['prevProcess'].processAlias ? '-' : item['currentProcess'].processAlias : '-'}}</text> -->
|
|
|
- <text
|
|
|
- class="label right">{{ item.currentProcess ?item['currentProcess'].processAlias : '-'}}</text>
|
|
|
- </view>
|
|
|
- <view class="item-info uni-row">
|
|
|
- <text class="label">下道工序</text>
|
|
|
- <view class="label right uni-row">
|
|
|
- {{ item.nextProcess ? item['nextProcess'].processAlias : '-' }}
|
|
|
- (<view style="color: #1684fc;" @click.stop="handleClickProcessList(item)"> 工艺列表
|
|
|
- </view>)
|
|
|
- </view>
|
|
|
+ <text class="label right">{{ item.currentProcess ?item['currentProcess'].processAlias : '-'}}</text>
|
|
|
+ </view>
|
|
|
+ <view class="item-info uni-row">
|
|
|
+ <text class="label">下道工序</text>
|
|
|
+ <view class="label right uni-row">
|
|
|
+ {{ item.nextProcess ? item['nextProcess'].processAlias : '-' }}
|
|
|
+ (<view style="color: #1684fc;" @click.stop="handleClickProcessList(item)"> 工艺列表
|
|
|
+ </view>)
|
|
|
</view>
|
|
|
- <!-- <view class="item-info uni-row">
|
|
|
+ </view>
|
|
|
+ <!-- <view class="item-info uni-row">
|
|
|
<text class="label">设备</text>
|
|
|
<text class="label right">{{ curPlan['equipmentName'] }}</text>
|
|
|
</view> -->
|
|
|
- <view v-if="notPreProcess" class="item-info uni-row">
|
|
|
- <text class="label">所在区域</text>
|
|
|
- <text class="label right">{{ item['place'] ? item['place'] : '-' }}</text>
|
|
|
+ <view v-if="notPreProcess" class="item-info uni-row">
|
|
|
+ <text class="label">所在区域</text>
|
|
|
+ <text class="label right">{{ item['place'] ? item['place'] : '-' }}</text>
|
|
|
+ </view>
|
|
|
+ <view class="status-btn uni-row">
|
|
|
+ <view v-if="item.dayworkItemList[0].status < 3" class=" uni-row">
|
|
|
+ <button class="reporting-tag" size="mini"
|
|
|
+ @click.stop="handleToreportingForWork(item)">开始报工</button>
|
|
|
+ <!-- <button class="reporting-tag" size="mini" @click="handleToreportingForWork">去报工</button> -->
|
|
|
</view>
|
|
|
- <view class="status-btn uni-row">
|
|
|
- <view v-if="item.dayworkItemList[0].status < 3" class=" uni-row">
|
|
|
- <button class="reporting-tag" size="mini"
|
|
|
- @click.stop="handleToreportingForWork(item)">开始报工</button>
|
|
|
- <!-- <button class="reporting-tag" size="mini" @click="handleToreportingForWork">去报工</button> -->
|
|
|
- </view>
|
|
|
- <view v-if="item['status'] == 2 && !item['hasFinishOutsource']" class=" uni-row">
|
|
|
- <button class="turnover-tag" size="mini"
|
|
|
- @click.stop="handleShowTurnoverApplication(item)">周转申请</button>
|
|
|
- <!-- <button class="reporting-tag" size="mini" @click="handleToreportingForWork">去报工</button> -->
|
|
|
- </view>
|
|
|
- <view v-else-if="item['status'] == 3" class=" uni-row">
|
|
|
- <button class="turnover-tag" size="mini" @click.stop="handleCancelTurnover(item)"
|
|
|
- style="background-color: rgba(255, 85, 85, 1);">取消周转</button>
|
|
|
- </view>
|
|
|
+ <view v-if="item['status'] == 2 && !item['hasFinishOutsource']" class=" uni-row">
|
|
|
+ <button class="turnover-tag" size="mini"
|
|
|
+ @click.stop="handleShowTurnoverApplication(item)">周转申请</button>
|
|
|
+ <!-- <button class="reporting-tag" size="mini" @click="handleToreportingForWork">去报工</button> -->
|
|
|
+ </view>
|
|
|
+ <view v-else-if="item['status'] == 3" class=" uni-row">
|
|
|
+ <button class="turnover-tag" size="mini" @click.stop="handleCancelTurnover(item)"
|
|
|
+ style="background-color: rgba(255, 85, 85, 1);">取消周转</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <!-- 抽屉 -->
|
|
|
- <uni-drawer ref="showRight" mode="right" :mask-click="true">
|
|
|
- <view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
|
|
|
- <view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
|
|
|
- 仅显示当前工序后面工艺
|
|
|
+ </view>
|
|
|
+ <!-- 抽屉 -->
|
|
|
+ <uni-drawer ref="showRight" mode="right" :mask-click="true">
|
|
|
+ <view style="text-align: center; font-size: 48rpx; padding: 48rpx 0 24rpx 0;">工艺列表</view>
|
|
|
+ <view style="font-size: 24rpx;text-align: center;color: red; margin-bottom: 16rpx;">
|
|
|
+ 仅显示当前工序后面工艺
|
|
|
+ </view>
|
|
|
+ <scroll-view scroll-y="true" style="height: 80%;" @touchmove.stop>
|
|
|
+ <view v-for="(item,index) in curProcessAfte" :key="index"
|
|
|
+ style="padding: 8rpx 5% 8rpx 14%; border-top: 1px solid #cccccc">
|
|
|
+ <text>{{ index + 1 }}.{{item.processAlias}}</text>
|
|
|
</view>
|
|
|
- <scroll-view scroll-y="true" style="height: 80%;" @touchmove.stop>
|
|
|
- <view v-for="(item,index) in curProcessAfte" :key="index"
|
|
|
- style="padding: 8rpx 5% 8rpx 14%; border-top: 1px solid #cccccc">
|
|
|
- <text>{{ index + 1 }}.{{item.processAlias}}</text>
|
|
|
- </view>
|
|
|
- </scroll-view>
|
|
|
- <view><button v-if="!editStatus" class="start-batch-btn" style="margin-bottom: 10rpx;" type="primary"
|
|
|
- @click="handleOpenDrawing">查看本工序图纸</button></view>
|
|
|
- </uni-drawer>
|
|
|
- <!-- <view v-if="bottomStatus" class="bottom uni-row">
|
|
|
+ </scroll-view>
|
|
|
+ <view><button v-if="!editStatus" class="start-batch-btn" style="margin-bottom: 10rpx;" type="primary"
|
|
|
+ @click="handleOpenDrawing">查看本工序图纸</button></view>
|
|
|
+ </uni-drawer>
|
|
|
+ <!-- <view v-if="bottomStatus" class="bottom uni-row">
|
|
|
<button class="start-batch-btn" type="primary" @click="handleStartNewBatch">开始新批次</button>
|
|
|
</view>
|
|
|
<view v-if="!bottomStatus" class="bottom uni-row">
|
|
|
<button class="start-batch-btn" type="primary" @click="handleScanCode">扫一扫开始新批次</button>
|
|
|
</view> -->
|
|
|
- <view class="bottom uni-row">
|
|
|
- <button class="start-batch-btn" style="margin-right: 10rpx;" type="primary"
|
|
|
- @click="handleScanCode">扫码开始批次</button>
|
|
|
- </view>
|
|
|
- <dialog-outsourceLot ref="lotDialog" @submit="handleDoIt" />
|
|
|
- <dialog-turnoverInnerApplication ref="turnoverApplicationDialog" @reflushDaywork="handleDoTurnoverAfter" />
|
|
|
- <dialog-selectProduction ref="selectProduction"></dialog-selectProduction>
|
|
|
- <dialog-selectEquipment ref='selectEquipment'
|
|
|
- @handleAddDayWorkItem='handleAddEquipment'></dialog-selectEquipment>
|
|
|
+ <view class="bottom uni-row">
|
|
|
+ <button class="start-batch-btn" style="margin-right: 10rpx;" type="primary"
|
|
|
+ @click="handleScanCode">扫码开始批次</button>
|
|
|
</view>
|
|
|
+ <dialog-outsourceLot ref="lotDialog" @submit="handleDoIt" />
|
|
|
+ <dialog-turnoverInnerApplication ref="turnoverApplicationDialog" @reflushDaywork="handleDoTurnoverAfter" />
|
|
|
+ <dialog-selectProduction ref="selectProduction"></dialog-selectProduction>
|
|
|
+ <dialog-selectEquipment ref='selectEquipment'
|
|
|
+ @handleAddDayWorkItem='handleAddEquipment'></dialog-selectEquipment>
|
|
|
+ </view>
|
|
|
|
|
|
</template>
|
|
|
|
