Merge branch 'master' into test

src/views/bpm/handleTask/components/financialManage/payableManage/components/detailDialog.vue

@@ -124,6 +124,8 @@
     getFinPayableInfoAPI
   } from '@/api/bpm/components/financialManage/payableManage';
   import { getTreeByPid } from '@/api/classifyManage';
+  import { payAndReceiveEnum } from '@/enum/dict';
+  imp
   // import fileMain from '@/components/addDoc/index.vue';
 
   export default {

src/views/bpm/outgoingManagement/add.vue

@@ -405,6 +405,8 @@
                   label="重量单位"
                   prop="weightUnit"
                 ></el-table-column>
+                <el-table-column label="锁定数量" prop="lockQuantity" width="200">
+                </el-table-column>
                 <el-table-column
                 label="库存"
                 prop="stockNum"

src/views/bpm/outgoingManagement/details.vue

@@ -252,6 +252,8 @@
                 </template>
               </template>
             </el-table-column>
+            <el-table-column label="锁定数量" prop="lockQuantity" width="200">
+            </el-table-column>
             <el-table-column
               label="库存"
               prop="stockNum"

src/views/bpm/outgoingManagement/outbound.vue

@@ -273,6 +273,8 @@
               </el-table-column>
               <el-table-column label="颜色" prop="colorKey" width="200">
               </el-table-column>
+              <el-table-column label="锁定数量" prop="lockQuantity" width="200">
+              </el-table-column>
               <el-table-column
                 label="库存"
                 prop="stockNum"

src/views/bpm/outgoingManagement/outboundXTBG.vue

@@ -274,6 +274,8 @@
               </el-table-column>
               <el-table-column label="颜色" prop="colorKey" width="200">
               </el-table-column>
+              <el-table-column label="锁定数量" prop="lockQuantity" width="200">
+              </el-table-column>
               <el-table-column
                 label="库存"
                 prop="stockNum"