1

src/views/warehouseBusiness/inStock/index.vue

@@ -334,7 +334,8 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1"
+            v-show="scope.row.fItemsStatus !== 4"
+            v-if="scope.row.fBillstatus < 4"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:inStock:remove']"
           >删除
@@ -1963,7 +1964,7 @@
         <el-button :disabled="browseStatus" type="warning" prop="打印" @click="showEditDialog_s"
         >入库单
         </el-button>
-        <el-button @click="discharge" :disabled="browseStatus">卸货 </el-button>
+        <el-button @click="discharge" :disabled="browseStatus">卸货完成</el-button>
         <el-button type="info" :disabled="browseStatus" prop="打印" @click="showEditDialog_sss"
         >作业单
         </el-button>
@@ -2387,9 +2388,7 @@
           </tr>
           <tr v-for="(item, index) in Printinglist" :key="index">
             <td width="250">货物品名:</td>
-            <!-- <td width="200" colspan="">1</td> -->
-            <td width="250">{{ item.fGoodsids }}</td>
-            <!-- <td width="250">白色聚吕</td> -->
+             <td width="200" colspan="">{{ item.fGoodsids }}</td>
             <!-- <td width="200" colspan="2">件数: 161件</td> -->
             <!-- <td width="200"></td> -->
             <td width="200" colspan="4" class="zzss">
@@ -2480,6 +2479,8 @@
             <td width="200" colspan="4" class="zzss">
               {{ item.fGoodsids }}
             </td>
+            <td width="200">1</td>
+            <td width="200">白色聚吕</td>
           </tr>
           <tr>
             <td width="1400" colspan="6">&nbsp;</td>

src/views/warehouseBusiness/outStock/index.vue

@@ -313,6 +313,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-show="scope.row.fItemsStatus !== 4"
             v-if="scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:inStock:remove']"
@@ -1687,7 +1688,7 @@
         <el-button type="warning" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="showEditDialog_s"
         >出库单
         </el-button>
-        <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
+        <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货完成</el-button>
         <el-button type="info" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="printJobSheet"
         >作业单
         </el-button>