snow преди 2 години
родител
ревизия
8d6b9e8b1a
променени са 3 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 0 0
      dist/static/js/0.js
  2. 1 1
      src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue
  3. 5 1
      src/views/sellOut/salesOrder/detail.vue

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
dist/static/js/0.js


+ 1 - 1
src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -81,7 +81,7 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('1') && String(sitem.status) === '12' && !isSupertube">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('1') && String(sitem.status) === '1' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
           </el-collapse>

+ 5 - 1
src/views/sellOut/salesOrder/detail.vue

@@ -168,6 +168,10 @@
                 @refresh="initData()"
               />
             </el-collapse-item>
+
+            <el-collapse-item title="发货工单" name="4">
+              <child-list />
+            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
@@ -210,7 +214,7 @@ import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
 import addForm from "./components/addForm";
 import orderOutTable from "./components/order-out-table";
-
+import ChildList from "./components/child-list.vue"
 import { showColumns } from "./components/ShowDataTableColumns";
 import setPartial from "./setPartial";
 import { xs_order_source_options, xs_order_type_options } from "@/assets/js/statusList";

Някои файлове не бяха показани, защото твърде много файлове са промени