|
|
@@ -114,7 +114,6 @@
|
|
|
></packingTgBom>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
<!-- 单独报工 -->
|
|
|
<div
|
|
|
v-else-if="
|
|
|
@@ -122,73 +121,73 @@
|
|
|
(item.currentTaskDiagram.type == 5 && item.singleReport == 1)
|
|
|
"
|
|
|
>
|
|
|
- <div v-if="item.toWarehouseList && item.toWarehouseList.length > 0">
|
|
|
- <div class="item">
|
|
|
- <div>
|
|
|
- <div class="text">仓库</div>
|
|
|
- <div class="select-type">
|
|
|
- <el-select
|
|
|
- v-model="warehouseId"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择仓库"
|
|
|
- size="mini"
|
|
|
- class="content_num"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in warehouseList"
|
|
|
- :key="item.id"
|
|
|
- :value="item.id"
|
|
|
- :label="item.name"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <!-- <div v-if="item.toWarehouseList && item.toWarehouseList.length > 0"> -->
|
|
|
+ <div class="item">
|
|
|
+ <div>
|
|
|
+ <div class="text">仓库</div>
|
|
|
+ <div class="select-type">
|
|
|
+ <el-select
|
|
|
+ v-model="warehouseId"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="请选择仓库"
|
|
|
+ size="mini"
|
|
|
+ class="content_num"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in warehouseList"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</div>
|
|
|
+ </div>
|
|
|
|
|
|
- <div>
|
|
|
- <div class="text">入库规格</div>
|
|
|
- <div class="select-type">
|
|
|
- <el-select
|
|
|
- v-model="inWarehouseSpecType"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择入库规格"
|
|
|
- size="mini"
|
|
|
- class="content_num select-warehousing"
|
|
|
- disabled
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in WarehouseSpecTypeList"
|
|
|
- :key="item.value"
|
|
|
- :label="item.text"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </div>
|
|
|
+ <div>
|
|
|
+ <div class="text">入库规格</div>
|
|
|
+ <div class="select-type">
|
|
|
+ <el-select
|
|
|
+ v-model="inWarehouseSpecType"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="请选择入库规格"
|
|
|
+ size="mini"
|
|
|
+ class="content_num select-warehousing"
|
|
|
+ disabled
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in WarehouseSpecTypeList"
|
|
|
+ :key="item.value"
|
|
|
+ :label="item.text"
|
|
|
+ :value="item.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ </div>
|
|
|
|
|
|
- <!-- <div v-for="(it, idx) in item.toWarehouseList" :key="idx"> -->
|
|
|
- <!-- <packingTgBom
|
|
|
+ <!-- <div v-for="(it, idx) in item.toWarehouseList" :key="idx"> -->
|
|
|
+ <!-- <packingTgBom
|
|
|
:list="it.extInfo.pickOutInList"
|
|
|
:singleReport="item.singleReport"
|
|
|
:item="item"
|
|
|
:equipmentList="item.equipmentList"
|
|
|
:isWarehousing="true"
|
|
|
></packingTgBom> -->
|
|
|
- <!-- </div> -->
|
|
|
- <batchSemiProductJobBom
|
|
|
- :list="item.semiProductList"
|
|
|
- :item="item"
|
|
|
- :singleReport="item.singleReport"
|
|
|
- :storeType="storeType"
|
|
|
- :equipmentList="item.equipmentList"
|
|
|
- :isChoose="isChoose"
|
|
|
- :isEngrave="isEngrave"
|
|
|
- :isDisposal="isDisposal"
|
|
|
- >
|
|
|
- </batchSemiProductJobBom>
|
|
|
- </div>
|
|
|
+ <!-- </div> -->
|
|
|
+ <batchSemiProductJobBom
|
|
|
+ :list="item.semiProductList"
|
|
|
+ :item="item"
|
|
|
+ :singleReport="item.singleReport"
|
|
|
+ :storeType="storeType"
|
|
|
+ :equipmentList="item.equipmentList"
|
|
|
+ :isChoose="isChoose"
|
|
|
+ :isEngrave="isEngrave"
|
|
|
+ :isDisposal="isDisposal"
|
|
|
+ >
|
|
|
+ </batchSemiProductJobBom>
|
|
|
+ <!-- </div> -->
|
|
|
</div>
|
|
|
|
|
|
<!-- {{ item.currentTaskDiagram.type }} {{ item.singleReport }}
|
|
|
@@ -292,15 +291,15 @@
|
|
|
</div> -->
|
|
|
|
|
|
<!-- 批量报工 -->
|
|
|
- <div
|
|
|
+ <!-- <div
|
|
|
class="list_box"
|
|
|
v-for="(d, index) in item.toWarehouseList"
|
|
|
:key="index"
|
|
|
- >
|
|
|
- <div class="time" style="margin-bottom: 10rpx"
|
|
|
+ > -->
|
|
|
+ <!-- <div class="time" style="margin-bottom: 10rpx"
|
|
|
>打包时间: {{ d.createTime }}</div
|
|
|
- >
|
|
|
- <!-- <packagingGroupingTwx
|
|
|
+ > -->
|
|
|
+ <!-- <packagingGroupingTwx
|
|
|
ref="packagingGroupingRef"
|
|
|
:objData="d.extInfo"
|
|
|
:workOrderId="item.workOrderId"
|
|
|
@@ -308,22 +307,22 @@
|
|
|
>
|
|
|
</packagingGroupingTwx> -->
|
|
|
|
|
|
- <!-- :list="objData.product" :item="objData" :isDetails="true"
|
|
|
+ <!-- :list="objData.product" :item="objData" :isDetails="true"
|
|
|
:singleReport="objData.singleReport"
|
|
|
:equipmentList="objData.equipmentList" -->
|
|
|
|
|
|
- <batchSemiProductJobBom
|
|
|
- :list="item.product"
|
|
|
- :item="item"
|
|
|
- :singleReport="item.singleReport"
|
|
|
- :storeType="storeType"
|
|
|
- :equipmentList="item.equipmentList"
|
|
|
- :isChoose="isChoose"
|
|
|
- :isEngrave="isEngrave"
|
|
|
- :isDisposal="isDisposal"
|
|
|
- >
|
|
|
- </batchSemiProductJobBom>
|
|
|
- </div>
|
|
|
+ <batchSemiProductJobBom
|
|
|
+ :list="item.product"
|
|
|
+ :item="item"
|
|
|
+ :singleReport="item.singleReport"
|
|
|
+ :storeType="storeType"
|
|
|
+ :equipmentList="item.equipmentList"
|
|
|
+ :isChoose="isChoose"
|
|
|
+ :isEngrave="isEngrave"
|
|
|
+ :isDisposal="isDisposal"
|
|
|
+ >
|
|
|
+ </batchSemiProductJobBom>
|
|
|
+ <!-- </div> -->
|
|
|
</div>
|
|
|
|
|
|
<div v-if="clientEnvironmentId == 2">
|