Merge branch 'master' into 测试

src/views/group/order/management/index.vue

@@ -70,21 +70,6 @@
       <DeliveryNote :rowData="rowData" @clickCancel="clickCancel"></DeliveryNote>
     </el-dialog>
 
-    <el-dialog title="删除并退料入库" v-if="openDelete" v-model="openDelete" width="1000px">
-      <div v-loading="loadingDelete">
-        <el-table :data="deleteList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
-          <el-table-column label="BOM品号" prop="bomSpecCode" width="140" />
-          <el-table-column label="BOM品名" prop="bomSpecName" min-width="220" />
-          <el-table-column label="仓库名称" prop="warehouseName" width="100" />
-          <el-table-column label="出库数量" prop="outQuantity" width="100" />
-        </el-table>
-      </div>
-      <template #footer>
-        <el-button @click="openDelete = false" size="large" v-preReClick>取 消</el-button>
-        <el-button type="primary" @click="submitDelete()" size="large" v-preReClick>确认删除</el-button>
-      </template>
-    </el-dialog>
-
     <el-dialog title="产品包装配置" v-if="openShippingPackage" v-model="openShippingPackage" width="80%" :close-on-press-escape="false" :show-close="false">
       <div style="height: calc(100vh - 184px); overflow-y: auto; overflow-x: hidden" v-loading="loadingPackage">
         <el-form :model="formData.data" :rules="rulesShippingPackage" ref="shippingPackage">
@@ -168,6 +153,21 @@
         <el-button @click="openExpressPacking = false">关 闭</el-button>
       </template>
     </el-dialog>
+
+    <el-dialog title="删除并退料入库" v-if="openDelete" v-model="openDelete" width="1000px">
+      <div v-loading="loadingDelete">
+        <el-table :data="deleteList" :row-style="{ height: '35px' }" header-row-class-name="tableHeader">
+          <el-table-column label="BOM品号" prop="bomSpecCode" width="140" />
+          <el-table-column label="BOM品名" prop="bomSpecName" min-width="220" />
+          <el-table-column label="仓库名称" prop="warehouseName" width="100" />
+          <el-table-column label="出库数量" prop="outQuantity" width="100" />
+        </el-table>
+      </div>
+      <template #footer>
+        <el-button @click="openDelete = false" size="large" v-preReClick>取 消</el-button>
+        <el-button type="primary" @click="submitDelete()" size="large" v-preReClick>确认删除</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 

src/views/production/warehouse/outbound/index.vue

@@ -352,6 +352,7 @@ const getList = async (req, status) => {
     sourceList.value.pagination = {
       pageNum: sourceList.value.pagination.pageNum,
       pageSize: sourceList.value.pagination.pageSize,
+      type: "0",
     };
   } else {
     sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
@@ -374,6 +375,7 @@ const getListTwo = async (req, status) => {
     sourceListTwo.value.pagination = {
       pageNum: sourceListTwo.value.pagination.pageNum,
       pageSize: sourceListTwo.value.pagination.pageSize,
+      type: "0",
     };
   } else {
     sourceListTwo.value.pagination = { ...sourceListTwo.value.pagination, ...req };

src/views/production/warehouse/putInStorage/index.vue

@@ -347,6 +347,7 @@ const getList = async (req, status) => {
     sourceList.value.pagination = {
       pageNum: sourceList.value.pagination.pageNum,
       pageSize: sourceList.value.pagination.pageSize,
+      type: "1",
     };
   } else {
     sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
@@ -369,6 +370,7 @@ const getListTwo = async (req, status) => {
     sourceListTwo.value.pagination = {
       pageNum: sourceListTwo.value.pagination.pageNum,
       pageSize: sourceListTwo.value.pagination.pageSize,
+      type: "1",
     };
   } else {
     sourceListTwo.value.pagination = { ...sourceListTwo.value.pagination, ...req };