build

src/views/goodStore/goodsOnline/components/compiance-modal.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="设置是否合规" :visible.sync="innerVisible" width="500px">
+  <el-dialog title="设置是否合规" :visible.sync="innerVisible" width="500px" :close-on-click-modal="false">
     <el-form
       ref="formRef"
       :rules="rules"

src/views/sellOut/salesOrder/components/child-list.vue

@@ -10,10 +10,25 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="42"> </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="outChildCode"
+        label="发货工单编号"
+        width="160"
+      />
+
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货单号"
+        label="发货单编号"
+        width="160"
+      />
+
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="orderCode"
+        label="确认单编号"
         width="160"
       />
 
@@ -32,121 +47,17 @@
 
       <el-table-column
         show-overflow-tooltip
-        prop="send_num"
-        label="发货数量"
+        prop="num"
+        label="总数量"
         width="80"
       />
-      <el-table-column show-overflow-tooltip prop="contactor" label="联系人" width="80" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="联系电话" width="110" />
-      <el-table-column show-overflow-tooltip prop="addr" label="收货地址" min-width="170">
-        <template slot-scope="scope">
-          {{ scope.row.addr_info }}{{ scope.row.addr }}
-        </template>
-      </el-table-column>
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_name"
-        label="物流公司"
-        width="160"
-      />
-      <el-table-column
-        show-overflow-tooltip
-        prop="post_code"
-        label="物流单号"
-        width="160"
-      />
-      <el-table-column
-        show-overflow-tooltip
-        prop="sendtime"
-        label="发货时间"
-        width="145"
-      />
-      <el-table-column fixed="right" width="150">
-        <template slot="header" slot-scope="scope">
-          <span v-if="addr_res + '' === '0'">操作</span>
-          <el-tooltip
-            style="margin: 3px 0 0 8px"
-            effect="dark"
-            class="fr"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
-            content="添加"
-            placement="top"
-          >
-            <i
-              class="el-icon-circle-plus-outline tb-icon"
-              style="color: #6954f0; magin: 0 0 0 10px"
-              @click="openHouseModal()"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            class="fr"
-            style="margin: 3px 0 0 8px"
-            effect="dark"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
-            content="导入收货地址"
-            placement="top"
-          >
-            <i
-              class="el-icon-upload2 tb-icon"
-              style="color: #6954f0"
-              @click="addrmodel = true"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            class="fr"
-            style="margin: 3px 0 0 8px"
-            effect="dark"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
-            content="下载收货地址模板"
-            placement="top"
-          >
-            <a class="downloadAddr" href="./static/收货地址模板.xlsx">
-              <i class="el-icon-download tb-icon" style="color: #6954f0; margin: 0"></i>
-            </a>
-          </el-tooltip>
 
-          <el-tooltip
-            style="margin: 3px 0 0 0"
-            effect="dark"
-            content="退货"
-            class="fr"
-            v-if="addr_res + '' !== '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-delete tb-icon"
-              style="color: #6954f0; magin: 0 0 0 10px"
-              @click="openModal(0)"
-            ></i>
-          </el-tooltip>
-          <el-tooltip
-            effect="dark"
-            content="批量退货"
-            style="margin: 3px 0 0 8px"
-            v-if="batch_num + '' !== '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-date tb-icon"
-              style="color: #6954f0"
-              @click="openModal()"
-            ></i>
-          </el-tooltip>
-          <!-- <el-tooltip
-            effect="dark"
-            content="全部退货"
-            style="margin: 3px 0 0 8px"
-            v-if="status + '' === '0' && powers.some((i) => i == '051')"
-            placement="top"
-          >
-            <i
-              class="el-icon-refresh-left tb-icon"
-              style="color: #6954f0"
-              @click="openAllModal()"
-            ></i>
-          </el-tooltip> -->
-        </template>
+      <el-table-column show-overflow-tooltip prop="wsm_name" label="仓库名称" min-width="160" />
+      <el-table-column show-overflow-tooltip prop="wsm_code" label="仓库编号" min-width="160" />
+      <el-table-column show-overflow-tooltip prop="addtime" label="下单时间" width="140" />
+      <el-table-column show-overflow-tooltip prop="apply_name" label="申请人" width="110" />
 
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-tooltip
             effect="dark"
@@ -156,20 +67,9 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="routeGoto('sellOutOrderDetail', { id: scope.row.outCode })"
+              @click="routeGoto('deliveryWorkOrderDetail', { id: scope.row.outChildCode })"
             ></i>
           </el-tooltip>
-          <!-- <el-tooltip
-            effect="dark"
-            content="退货"
-            v-if="
-              (scope.row.status == '0' || scope.row.status == '1') &&
-              powers.some((i) => i == '051')
-            "
-            placement="top"
-          >
-            <i class="el-icon-delete tb-icon" @click="openModal(scope.row)"></i>
-          </el-tooltip> -->
         </template>
       </el-table-column>
     </el-table>
@@ -211,15 +111,6 @@
       @cancel="returnModel = false"
     />
 
-    <!-- <add-edit
-      :id="modelId"
-      :sitem="s_sitem"
-      :show-model="showModel"
-      :is-detail="isDetail"
-      @refresh="searchList"
-      @cancel="showModel = false"
-    /> -->
-
     <add-return-all-model
       :id="returnAllId"
       :sitem="returnAllSitem"
@@ -274,9 +165,8 @@ export default {
       addrmodel: false,
       // 状态
       statusOptions: [
-        { id: "0", label: "待公司采购" },
-        { id: "1", label: "待库管发货" },
-        { id: "2", label: "已发货待收货" },
+        { id: "1", label: "待发货" },
+        { id: "2", label: "发货完成" },
         { id: "3", label: "已收货" },
         { id: "4", label: "已全部退货" },
       ],
@@ -298,23 +188,7 @@ export default {
       returnAllId: "",
       returnAllSitem: null,
       returnAllShowModel: false,
-      parmValue: {
-        order_type: "",
-        orderCode: "",
-        apply_name: "", //申请人名称
-        cgdNo: "",
-        start: "",
-        end: "",
-        // supplierNo: "",
-        companyNo: "",
-        good_code: "",
-        good_name: "",
-        outCode: "",
-        status: "",
-        company_name: "", //申请人部门
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      },
+      parmValue: {},
       pageInfo: {
         size: 15,
         curr: 1,
@@ -324,8 +198,14 @@ export default {
       resModel: null,
     };
   },
-  mounted() {
-    this.initForm();
+  watch:{
+    sitem:{
+      handler(){
+        if(!this.sitem) return
+        this.initForm();
+      },
+      immediate:true
+    }
   },
   methods: {
     handleSelectionChange(val) {
@@ -349,40 +229,15 @@ export default {
     async resetForm() {
       // 重置
       await this.$nextTick(async () => {
-        this.wsend_num = true;
-        const { orderCode, status, good_num, addr_sum } = this.sitem;
-        this.status = status;
-        this.orderCode = orderCode || "";
-        this.addr_res = parseInt(good_num) - parseInt(addr_sum);
-        if (this.addr_res < 0) {
-          this.addr_res = "0";
-        }
-        // console.log(this.status);
         await this.searchList();
-        // this.tableData = JSON.parse(JSON.stringify(addrs));
       });
     },
     // 列表搜索
     async searchList() {
-      this.parmValue.orderCode = this.orderCode;
-      const { code, data, message } = await asyncRequest.orderOut(this.parmValue);
+      const { code, data } = await asyncRequest.child_list({orderCode: this.sitem.orderCode});
       if (code === 0) {
-        const { list, count } = data;
+        const { list } = data;
         this.tableData = list;
-        this.pageInfo.total = Number(count);
-        this.batch_num = 0;
-        this.tableData.forEach((v) => {
-          v.good_class = "";
-          if (v.can && v.can.length > 0) {
-            v.can.forEach((x, i) => {
-              v.good_class += i === 0 ? x.name : "/" + x.name;
-            });
-          }
-          if (v.status + "" === "0" || v.status + "" === "1") {
-            this.batch_num += parseInt(v.send_num + "");
-          }
-        });
-        console.log(this.batch_num);
       } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
@@ -391,184 +246,6 @@ export default {
       }
       this.loading = false;
     },
-    async addrRefresh(e) {
-      if (!this.loading) {
-        this.loading = true;
-        const { arrive_time, orderCode, wsend_num } = this.sitem;
-        const { list } = e;
-    
-        let t_num = 0,
-          add_num = 0;
-        let model = {
-          arrtime: arrive_time,
-          orderCode: orderCode,
-          addrlist: [],
-        };
-        list.forEach((a) => {
-          add_num += a.receipt_quantity * 1;
-          let item = {
-            contactor: a.contactor,
-            mobile: a.mobile,
-            addr: a.addr,
-            addr_code: a.addr_code,
-            receipt_quantity: a.receipt_quantity,
-          };
-          model.addrlist.push(item);
-        });
-        if (wsend_num * 1 < t_num + add_num) {
-          this.$message.warning("导入地址总数量不能大于未发货总数量！");
-          this.loading = false;
-          return;
-        }
-        const { code, message } = await asyncRequest.saleaddr(model);
-        if (code === 0) {
-          this.$notify.success({
-            title: "地址导入成功！",
-            message: "",
-          });
-          this.showModelThis = false;
-          this.addrmodel = false;
-          this.loading = false;
-          // 刷新
-          this.$emit("refresh");
-        } else if (code >= 100 && code <= 104) {
-          await this.logout();
-        } else {
-          this.$message.warning(message);
-        }
-      }
-
-      // this.tableData = [];
-      // this.tableData.push(...list);
-    },
-    editRow(index) {
-      let findex = this.stockForm.good_stock.findIndex((v) => v.edit === true);
-      if (findex !== -1) {
-        this.$message.warning("当前已有发货仓库信息在编辑，请保存后再试！");
-        return;
-      } else {
-        this.stockForm.good_stock[index].edit = true;
-      }
-    },
-
-    openHouseModal() {
-      this.modelId = "add";
-      this.modelItem = this.sitem;
-      this.modelShowModel = true;
-    },
-    openModal(e) {
-      if (e === 0) {
-        this.resModel = {
-          good_num: this.addr_res + "",
-          orderCode: this.orderCode,
-          return_type: "1",
-          remark: "", //退货备注
-          errorCode: "", //退货原因
-          thnum: this.addr_res + "",
-          returnT: this.addr_res + "",
-          returnAddr: [],
-        };
-        this.returnItem = this.resModel;
-        this.returnModel = true;
-        //  scope.row.outCode
-      } else {
-        let tol = 0,
-          send_num = 0;
-        this.multipleSelection.forEach((s) => {
-          console.log(parseInt(s.send_num + ""));
-          if (!(s.status + "" === "0" || s.status + "" === "1")) {
-            tol += parseInt(s.send_num + "");
-          } else {
-            send_num += parseInt(s.send_num + "");
-          }
-        });
-        console.log(tol, send_num);
-        if (this.multipleSelection.length == 0) {
-          this.$message.warning("请选择发货单！");
-        } else if (tol !== 0) {
-          this.$message.warning("不能已发货的发货单！");
-        } else {
-          // const { addrid, send_num, outCode } = e;
-          this.resModel = {
-            good_num: send_num + "",
-            orderCode: this.orderCode,
-            return_type: "2",
-            remark: "", //退货备注
-            errorCode: "", //退货原因
-            thnum: send_num + "",
-            returnT: send_num + "",
-            returnAddr: JSON.parse(JSON.stringify(this.multipleSelection)),
-          };
-          this.returnItem = this.resModel;
-          this.returnModel = true;
-        }
-      }
-
-      console.log(addModel);
-    },
-    async restSearch() {
-      this.parmValue = {
-        order_type: "",
-        orderCode: "",
-        apply_name: "", //申请人名称
-        cgdNo: "",
-        start: "",
-        end: "",
-        // supplierNo: "",
-        companyNo: "",
-        good_code: "",
-        good_name: "",
-        outCode: "",
-        status: "",
-        company_name: "", //申请人部门
-        page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
-      // 表格 - 分页
-      this.pageInfo = {
-        size: 15,
-        curr: 1,
-        total: 0,
-      };
-      await this.searchList();
-    },
-    async page_size_change(e) {
-      this.parmValue.size = e;
-      this.pageInfo.size = e;
-      this.parmValue.page = 1;
-      this.pageInfo.curr = 1;
-      await this.searchList();
-    },
-    async page_curr_change(e) {
-      this.parmValue.page = e;
-      this.pageInfo.curr = e;
-      await this.searchList();
-    },
-    async openAllModal() {
-      const { good_num } = this.sitem;
-      this.returnAllId = this.orderCode;
-      this.returnAllSitem = {
-        orderCode: this.orderCode,
-        remark: "", //退货备注
-        errorCode: "", //退货原因
-        thnum: good_num + "",
-        returnT: good_num + "",
-      };
-      this.returnAllShowModel = true;
-
-      // await this.$confirm("确定要全部退货？", {
-      //   confirmButtonText: "确定",
-      //   cancelButtonText: "取消",
-      //   type: "warning",
-      // })
-      //   .then(async () => {
-      //     console.log("1111111111");
-      //   })
-      //   .catch(() => {
-      //     console.log("取消");
-      //   });
-      //
-    },
   },
 };
 </script>

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -13,22 +13,7 @@
       <el-table-column
         show-overflow-tooltip
         prop="outCode"
-        label="发货工单号"
-        width="160"
-      />
-
-      <el-table-column
-        show-overflow-tooltip
-        prop="outCode"
-        label="发货单编号"
-        width="160"
-      />
-
-
-      <el-table-column
-        show-overflow-tooltip
-        prop="outCode"
-        label="确认单编号"
+        label="发货单号"
         width="160"
       />
 
@@ -48,17 +33,145 @@
       <el-table-column
         show-overflow-tooltip
         prop="send_num"
-        label="总数量"
+        label="发货数量"
         width="80"
       />
+      <el-table-column show-overflow-tooltip prop="contactor" label="联系人" width="80" />
+      <el-table-column show-overflow-tooltip prop="mobile" label="联系电话" width="110" />
+      <el-table-column show-overflow-tooltip prop="addr" label="收货地址" min-width="170">
+        <template slot-scope="scope">
+          {{ scope.row.addr_info }}{{ scope.row.addr }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_name"
+        label="物流公司"
+        width="160"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="post_code"
+        label="物流单号"
+        width="160"
+      />
+      <el-table-column
+        show-overflow-tooltip
+        prop="sendtime"
+        label="发货时间"
+        width="145"
+      />
+      <el-table-column fixed="right" width="150">
+        <template slot="header" slot-scope="scope">
+          <span v-if="addr_res + '' === '0'">操作</span>
+          <el-tooltip
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            class="fr"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
+            content="添加"
+            placement="top"
+          >
+            <i
+              class="el-icon-circle-plus-outline tb-icon"
+              style="color: #6954f0; magin: 0 0 0 10px"
+              @click="openHouseModal()"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            class="fr"
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
+            content="导入收货地址"
+            placement="top"
+          >
+            <i
+              class="el-icon-upload2 tb-icon"
+              style="color: #6954f0"
+              @click="addrmodel = true"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            class="fr"
+            style="margin: 3px 0 0 8px"
+            effect="dark"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '048')"
+            content="下载收货地址模板"
+            placement="top"
+          >
+            <a class="downloadAddr" href="./static/收货地址模板.xlsx">
+              <i class="el-icon-download tb-icon" style="color: #6954f0; margin: 0"></i>
+            </a>
+          </el-tooltip>
 
-      <el-table-column show-overflow-tooltip prop="contactor" label="仓库名称" width="80" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="仓库编号" width="110" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="商品成本编码" width="110" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="商品上线编码" width="110" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="下单时间" width="110" />
-      <el-table-column show-overflow-tooltip prop="mobile" label="申请人" width="110" />
-      
+          <el-tooltip
+            style="margin: 3px 0 0 0"
+            effect="dark"
+            content="退货"
+            class="fr"
+            v-if="addr_res + '' !== '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-delete tb-icon"
+              style="color: #6954f0; magin: 0 0 0 10px"
+              @click="openModal(0)"
+            ></i>
+          </el-tooltip>
+          <el-tooltip
+            effect="dark"
+            content="批量退货"
+            style="margin: 3px 0 0 8px"
+            v-if="batch_num + '' !== '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-date tb-icon"
+              style="color: #6954f0"
+              @click="openModal()"
+            ></i>
+          </el-tooltip>
+          <!-- <el-tooltip
+            effect="dark"
+            content="全部退货"
+            style="margin: 3px 0 0 8px"
+            v-if="status + '' === '0' && powers.some((i) => i == '051')"
+            placement="top"
+          >
+            <i
+              class="el-icon-refresh-left tb-icon"
+              style="color: #6954f0"
+              @click="openAllModal()"
+            ></i>
+          </el-tooltip> -->
+        </template>
+
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            content="查看"
+            placement="top"
+            v-if="powers.some((i) => i == '007')"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('sellOutOrderDetail', { id: scope.row.outCode })"
+            ></i>
+          </el-tooltip>
+          <!-- <el-tooltip
+            effect="dark"
+            content="退货"
+            v-if="
+              (scope.row.status == '0' || scope.row.status == '1') &&
+              powers.some((i) => i == '051')
+            "
+            placement="top"
+          >
+            <i class="el-icon-delete tb-icon" @click="openModal(scope.row)"></i>
+          </el-tooltip> -->
+        </template>
+      </el-table-column>
     </el-table>
     <div
       v-if="tableData && tableData.length > 0"
@@ -98,6 +211,15 @@
       @cancel="returnModel = false"
     />
 
+    <!-- <add-edit
+      :id="modelId"
+      :sitem="s_sitem"
+      :show-model="showModel"
+      :is-detail="isDetail"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    /> -->
+
     <add-return-all-model
       :id="returnAllId"
       :sitem="returnAllSitem"

src/views/sellOut/salesOrder/detail.vue

@@ -159,7 +159,8 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-            <el-collapse-item title="发货单" name="3">
+            <!-- TODO:修改 -->
+            <!-- <el-collapse-item title="发货单" name="3">
               <order-out-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -167,11 +168,12 @@
                 :id="queryId"
                 @refresh="initData()"
               />
-            </el-collapse-item>
+            </el-collapse-item> -->
 
             <el-collapse-item title="发货工单" name="4">
-              <child-list />
+              <child-list :sitem="sitem"  />
             </el-collapse-item>
+
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2" v-if="queryType !== 'add'">
@@ -225,6 +227,7 @@ export default {
     addForm,
     orderOutTable,
     setPartial,
+    ChildList
   },
   computed: {
     powers() {

src/views/sellOut/sellOutOrder/components/child-list.vue

@@ -0,0 +1,216 @@
+<template>
+  <div class="outOrderTable">
+    <el-table
+      ref="addrForm"
+      :data="tableData"
+      border
+      :size="'mini'"
+      style="width: 100%"
+      row-key="key"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="42"> </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="outChildCode"
+        label="发货工单编号"
+        width="160"
+      />
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="outCode"
+        label="发货单编号"
+        width="160"
+      />
+
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="orderCode"
+        label="确认单编号"
+        width="160"
+      />
+
+      <el-table-column show-overflow-tooltip prop="send_status" label="状态" width="105">
+        <template slot-scope="scope">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
+            "
+          ></el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        show-overflow-tooltip
+        prop="num"
+        label="总数量"
+        width="80"
+      />
+
+      <el-table-column show-overflow-tooltip prop="wsm_name" label="仓库名称" min-width="160" />
+      <el-table-column show-overflow-tooltip prop="wsm_code" label="仓库编号" min-width="160" />
+      <el-table-column show-overflow-tooltip prop="addtime" label="下单时间" width="140" />
+      <el-table-column show-overflow-tooltip prop="apply_name" label="申请人" width="110" />
+
+      <el-table-column label="操作">
+        <template slot-scope="scope">
+          <el-tooltip
+            effect="dark"
+            content="查看"
+            placement="top"
+            v-if="powers.some((i) => i == '007')"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('deliveryWorkOrderDetail', { id: scope.row.outChildCode })"
+            ></i>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div
+      v-if="tableData && tableData.length > 0"
+      class="Pagination"
+      style="text-align: right; margin-top: 10px"
+    >
+      <el-pagination
+        :current-page="parmValue.page"
+        :page-size="parmValue.size"
+        :size="'mini'"
+        layout="total,  prev, pager, next, jumper"
+        :total="pageInfo.total"
+        @size-change="page_size_change"
+        @current-change="page_curr_change"
+      />
+    </div>
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/salesOrder/detail";
+import { mapGetters } from "vuex";
+
+export default {
+  name: "salesOrderDetail",
+  mixins: [mixinPage, resToken],
+  props: ["newTime", "id", "sitem"],
+  watch: {
+    newTime: function (val) {
+      if (val) {
+        this.initForm();
+      }
+    },
+  },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "salesOrderDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+
+  data() {
+    return {
+      orderCode: "",
+      outCode: "",
+      addr_res: 0,
+      batch_num: 0,
+      addrmodel: false,
+      // 状态
+      statusOptions: [
+        { id: "1", label: "待发货" },
+        { id: "2", label: "发货完成" },
+        { id: "3", label: "已收货" },
+        { id: "4", label: "已全部退货" },
+      ],
+      showGoodsModel: false,
+      stock_code: "",
+      tableData: [],
+      loading: false,
+      queryId: "",
+      status: "",
+      showModel: null,
+      modelId: "",
+      modelItem: null,
+      s_sitem: null,
+      returnId: "",
+      returnItem: null,
+      returnModel: false,
+      wsend_num: "",
+      orderCode: "",
+      returnAllId: "",
+      returnAllSitem: null,
+      returnAllShowModel: false,
+      parmValue: {},
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      multipleSelection: [],
+      resModel: null,
+    };
+  },
+  watch:{
+    sitem:{
+      handler(){
+        if(!this.sitem) return
+        this.initForm();
+      },
+      immediate:true
+    }
+  },
+  methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    closeModel() {
+      this.modelId = "";
+      this.modelShowModel = false;
+    },
+    refresh() {
+      this.$emit("refresh");
+      this.modelId = "";
+      this.modelShowModel = false;
+    },
+    async initForm() {
+      this.status = "";
+      this.queryId = this.$route.query.id;
+      // this.rulesThis = this.rules;
+      this.resetForm();
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(async () => {
+        await this.searchList();
+      });
+    },
+    // 列表搜索
+    async searchList() {
+      const { code, data } = await asyncRequest.child_list({outCode: this.sitem.outCode});
+      if (code === 0) {
+        const { list } = data;
+        this.tableData = list;
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>

src/views/sellOut/sellOutOrder/detail.vue

@@ -112,6 +112,11 @@
                 </template> -->
               </show-data-table>
             </el-collapse-item>
+
+            <el-collapse-item title="发货工单" name="3">
+              <child-list :sitem="sitem" />
+            </el-collapse-item>
+
             <el-collapse-item title="商品信息" name="2">
               <show-goods-data-table
                 :newTime="newTime"
@@ -435,6 +440,7 @@ import wantDeliver from "./components/want-deliver";
 import addEditForm from "./components/addEditForm"; //发货单详情
 import addEditA from "./components/addEditA";
 import privateField from "@/mixins/privateField";
+import ChildList from "./components/child-list.vue"
 
 export default {
   name: "sellOutOrderDetail",
@@ -444,6 +450,7 @@ export default {
     addEditA,
     wantDeliver,
     returnExpress,
+    ChildList
   },
   computed: {
     ...mapGetters(["private_field", "isSupertube"]),

src/views/sellOut/sellReturn/detail.vue

@@ -260,7 +260,7 @@ export default {
         { value: '9', label:'待供应商审核'},
         { value: '10', label:'业务公司修改,待供应商确认'},
         { value: '11', label:'待设置工单'},
-        { value: '12', label:'待库管发货'}
+        { value: '12', label:'待库管收货'}
       ],
       xs_order_type_options,
       sitem: null, //传给组件

src/views/sellOut/sellReturn/index.vue

@@ -338,7 +338,7 @@ export default {
         { value: "9", label: "待供应商审核" },
         { value: "10", label: "业务公司修改,待供应商确认" },
         { value: "11", label: "待设置工单" },
-        { value: "12", label: "待库管发货" },
+        { value: "12", label: "待库管收货" },
       ],
       loading: false,
       showModel: false,