出库部分调整

src/views/warehouseBusiness/inStock/index.vue

@@ -344,7 +344,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 6"
+            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
             @click="handleUpdate(scope.row, true)"
           >审核进度
           </el-button>

src/views/warehouseBusiness/outStock/index.vue

@@ -314,7 +314,7 @@
             type="text"
             icon="el-icon-delete"
             v-show="scope.row.fItemsStatus !== 4"
-            v-if="scope.row.fBillstatus !== 6 && scope.row.fItemsStatus === 1"
+            v-if="scope.row.fBillstatus < 4"
             @click="handleDelete(scope.row)"
             v-hasPermi="['warehouseBusiness:inStock:remove']"
           >删除
@@ -761,19 +761,19 @@
         >
         </el-table-column>
         <el-table-column
-          prop="fWarehouselocids"
+          prop="fMarks"
           header-align="center"
-          width="150px"
           align="center"
-          label="*库区"
+          width="140px"
+          label="*品牌"
         >
         </el-table-column>
         <el-table-column
-          prop="fMarks"
+          prop="fWarehouselocids"
           header-align="center"
+          width="150px"
           align="center"
-          width="140px"
-          label="*品牌"
+          label="*库区"
         >
         </el-table-column>
         <el-table-column
@@ -781,7 +781,7 @@
           header-align="center"
           align="center"
           width="180px"
-          label="*当前库存"
+          label="*结余库存"
         >
         </el-table-column>
         <el-table-column
@@ -789,7 +789,7 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*出库件数"
+          label="*结余件数"
         >
           <template slot-scope="scope">
             <el-input
@@ -797,7 +797,7 @@
               @change="qtyChange(scope.row)"
               v-model="scope.row.fQty"
               :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
-              placeholder="出库件数"
+              placeholder="结余件数"
               show-word-limit
             />
           </template>
@@ -807,14 +807,14 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*出库毛重"
+          label="*结余毛重"
         >
           <template slot-scope="scope">
             <el-input
               :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fGrossweight"
-              placeholder="出库毛重"
+              placeholder="结余毛重"
               show-word-limit
             />
           </template>
@@ -824,35 +824,35 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*出库净重"
+          label="*结余净重"
         >
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fNetweight"
               :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
-              placeholder="出库净重"
-              show-word-limit
-            />
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="fVolumn"
-          header-align="center"
-          width="180px"
-          align="center"
-          label="出库尺码"
-        >
-          <template slot-scope="scope">
-            <el-input
-              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/, "$1$2.$3")'
-              v-model="scope.row.fVolumn"
-              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
-              placeholder="出库尺码"
+              placeholder="结余净重"
               show-word-limit
             />
           </template>
         </el-table-column>
+<!--        <el-table-column-->
+<!--          prop="fVolumn"-->
+<!--          header-align="center"-->
+<!--          width="180px"-->
+<!--          align="center"-->
+<!--          label="出库尺码"-->
+<!--        >-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-input-->
+<!--              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/, "$1$2.$3")'-->
+<!--              v-model="scope.row.fVolumn"-->
+<!--              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"-->
+<!--              placeholder="出库尺码"-->
+<!--              show-word-limit-->
+<!--            />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column
           prop="fPackagespecs"
           header-align="center"