Browse Source

出入库

tong 4 years ago
parent
commit
8d7db01cf3

File diff suppressed because it is too large
+ 313 - 276
src/views/warehouseBusiness/inStock/index.vue


+ 8 - 7
src/views/warehouseBusiness/outStock/index.vue

@@ -274,14 +274,15 @@
       <el-table-column label="出库净重" align="center" prop="fNetweight" />
       <el-table-column
         width="100"
-        label="库状态"
+        label="库状态"
         align="center"
         prop="fItemsStatus"
       >
         <template slot-scope="scope">
-          <span v-if="scope.row.fItemsStatus === 1">未入账</span>
-          <span v-if="scope.row.fItemsStatus === 2">部分入账</span>
-          <span v-if="scope.row.fItemsStatus === 6">全部入账</span>
+          <span v-if="scope.row.fItemsStatus === 1">计划</span>
+          <span v-if="scope.row.fItemsStatus === 2">卸货中</span>
+          <span v-if="scope.row.fItemsStatus === 3">已卸货</span>
+          <span v-if="scope.row.fItemsStatus === 4">已入库</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -1095,8 +1096,8 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.fBillstatus === 40">已出库</span>
-            <span v-if="scope.row.fBillstatus === 20">待出库</span>
-            <span v-if="scope.row.fBillstatus === 30">装货中</span>
+            <span v-if="scope.row.fBillstatus === 20">卸货中</span>
+            <span v-if="scope.row.fBillstatus === 30">已卸货</span>
             <span v-if="scope.row.fBillstatus === 10">计划</span>
           </template>
         </el-table-column>
@@ -2551,7 +2552,7 @@ export default {
         scanStyles: false,
       });
       this.addList();
-      this.editDialogVisible_sss = false;
+      this.openPrintJobSheet = false;
     },
     // 关闭二级弹窗
     closeWindow () {

Some files were not shown because too many files changed in this diff