chencc 1 år sedan
förälder
incheckning
8a3716817e

+ 2 - 1
src/views/bpm/handleTask/components/bomApprover/detailDialog.vue

@@ -5,8 +5,9 @@
     <div class="iframe_box"  ref="iframeBox">
       <!--   src="http://aiot.zoomwin.com.cn:51001/page-main-data/product/oneProduct?isWt=true&businessId=1895440590572208130" -->
       <!-- {{ location + '/page-main-data/product/oneProduct?isWt=true&businessId=' + businessId }} -->
+   
      <iframe
-     :src="location + '/page-main-data/product/oneProduct?isWt=true&businessId=' + businessId" 
+     :src="location + '/page-main-data/product/oneProduct?isWt=true&isBtn=false&businessId=' + businessId" 
       width="100%"
       height="600"
       frameborder="0"

+ 10 - 0
src/views/bpm/stockManagement/storage.vue

@@ -373,6 +373,12 @@
               {{ row.supplierMark }}
             </template>
           </el-table-column> -->
+          <el-table-column label="序列号" prop="engrave" width="140">
+            <template slot-scope="{ row, $index }">
+              
+              <span > {{ row.productSequence }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="刻码" prop="engrave" width="140">
             <template slot-scope="{ row, $index }">
               <el-input v-if="!row.isPack" :ref="'packing_engrave' + $index" @keyup.native="
@@ -646,11 +652,15 @@ export default {
   watch: {
     packingList: {
       handler(newVal) {
+        console.log(newVal);
+
         this.showPackingList = newVal.slice(
           0,
           this.pageSize * (this.pickingPageNum > 0 ? this.pickingPageNum : 1)
         );
         this.showPackingList.forEach((obj) => {
+          console.log(obj,'666666666');
+
           obj.workOrderId = this.detailProductList[0]?.workOrderId;
           obj.taskId = this.detailProductList[0]?.taskId;
           obj.outsourceBatchNo = this.detailProductList[0]?.batchNo;