feat

src/apis/components/search-account.js

@@ -5,6 +5,10 @@ export default {
   list: (data, params) => http(api + 'userCompanyBasicList', {
     ...data,
     level: '2'
+  }, 'post', params),
+  supplier_list: (data, params) => http(api + 'userCompanyBasicList', {
+    ...data,
+    level: '3'
   }, 'post', params)
 }
 

src/apis/service/sellOut/deliveryWorkOrder/index.js

@@ -0,0 +1,9 @@
+// 物业管理员
+import http from '@/apis/axios'
+const api = 'admin/'
+export default {
+  // 分页查询
+  list: (data, params) => http(api + 'child_list', data, 'post', params),
+  detail: (data, params) => http(api + 'child_info', data, 'post', params),
+  express: (data, params) => http(api + 'child_send', data, 'post', params)
+}

src/apis/service/sellOut/sellOutOrder/index.js

@@ -33,5 +33,9 @@ export default {
   // 库管批量发货
   saleoutbatch: (data, params) => http(api + 'saleoutbatch', data, 'post', params),
   // 售后订单
-  createSaleAndCgdByAfter: (data, params) => http(api + 'createSaleAndCgdByAfter', data, 'post', params)
+  createSaleAndCgdByAfter: (data, params) => http(api + 'createSaleAndCgdByAfter', data, 'post', params),
+  // 分单仓库列表
+  wsmList: (data, params) => http(api + 'child_wsm_list', data, 'post', params),
+  // 分单
+  wsmSplit: (data, params) => http(api + 'child_add', data, 'post', params)
 }

src/apis/service/stock/allot/detail.js

@@ -1,25 +1,25 @@
 // 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
+import http from '@/apis/axios'
+const api = 'admin/'
 export default {
   // 新建程
-  add: (data, params) => http(api + "allotcreate", data, "post", params),
+  add: (data, params) => http(api + 'allotcreate', data, 'post', params),
   // 删除
-  delete: (data, params) => http(api + "allotdelect", data, "post", params),
+  delete: (data, params) => http(api + 'allotdelect', data, 'post', params),
   // 详情
-  detail: (data, params) => http(api + "allotinfo", data, "post", params),
+  detail: (data, params) => http(api + 'allotinfo', data, 'post', params),
   // 编辑
-  update: (data, params) => http(api + "allotedit", data, "post", params),
+  update: (data, params) => http(api + 'allotedit', data, 'post', params),
   // 状态
-  status: (data, params) => http(api + "allotstatus", data, "post", params),
+  status: (data, params) => http(api + 'allotstatus', data, 'post', params),
   // 出库方发货
-  allotgetont: (data, params) => http(api + "allotgetont", data, "post", params),
+  allotgetont: (data, params) => http(api + 'allotgetont', data, 'post', params),
   // 异常原因列表
-  resultlist: (data, params) => http(api + "resultlist", data, "post", params),
+  resultlist: (data, params) => http(api + 'resultlist', data, 'post', params),
   // 入库方验货
-  allotgetin: (data, params) => http(api + "allotgetin", data, "post", params),
+  allotgetin: (data, params) => http(api + 'allotgetin', data, 'post', params),
   // 入库方验货审核
-  allotvesio: (data, params) => http(api + "allotvesio", data, "post", params),
+  allotvesio: (data, params) => http(api + 'allotvesio', data, 'post', params),
   // 调拨批次获取
-  allotgood: (data, params) => http(api + "allotgood", data, "post", params),
-};
+  allotgood: (data, params) => http(api + 'allotgood', data, 'post', params)
+}

src/components/globalComponents/search-account/main.vue

@@ -40,7 +40,8 @@ export default {
     'disabled',
     'names',
     'itemid',
-    'filterCompany'
+    'filterCompany',
+    'level'
   ],
   /**
    * 属性集合
@@ -104,6 +105,7 @@ export default {
       this.selectLoading = true
       if (query !== '') {
         this.options = []
+
         const formValue = {
           page: 1,
           nickname: query,
@@ -111,7 +113,10 @@ export default {
           companyNo: this.filterCompany ? this.currentCompany : ''
         }
 
-        const res = await asyncRequest.list(formValue)
+        const level = this.level || '2'
+        const listApi = level === '3' ? asyncRequest.supplier_list : asyncRequest.list
+        const res = await listApi(formValue)
+
         if (res && res.code === 0 && res.data) {
           const { list } = res.data
           this.options = list

src/config/env.company.js

@@ -3,11 +3,14 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    // baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
   webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
+  // 分仓
+  wmUrl: 'http://stockwm.test241.wanyuhengtong.com',
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {
     // 企业id

src/config/env.development.js

@@ -3,11 +3,14 @@ module.exports = {
   title: '采销平台',
   baseUrl: 'http://wx.wxhr.sit.futurelab.tv',
   api: {
-    baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    // baseApi: 'http://stocknew.test241.wanyuhengtong.com/'
+    baseApi: 'http://stockwm.test241.wanyuhengtong.com/'
   },
   webUrl: 'http://project.web.caixiao365.com/#/test-good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
   shareWebUrl: 'http://post.web.caixiao365.com/?prod=1&outCode=',
+  // 分仓
+  wmUrl: 'http://stockwm.test241.wanyuhengtong.com',
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {
     // 企业id

src/views/purchaseIn/purchaseOrder/index.vue

@@ -296,8 +296,8 @@ import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import { columns, statusOptions } from "./columns";
 import { cg_order_type_options, cg_order_source_options } from "@/assets/js/statusList";
-import { mapGetters } from "vuex";
 import companyHelper from "@/mixins/companyHelper";
+import { mapGetters } from "vuex";
 
 export default {
   name: "purchaseOrder",

src/views/sellOut/deliveryWorkOrder/columns.js

@@ -0,0 +1,125 @@
+export default [
+  { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    width: '160'
+  },
+  {
+    prop: 'orderCode',
+    label: '确认单编号',
+    width: '160'
+  },
+  {
+    prop: 'outCode',
+    label: '确认单编号',
+    width: '160'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
+    width: '160'
+  },
+
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '85'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85'
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    width: '70'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
+  },
+  // {
+  //   prop: 'send_status',
+  //   label: '分单状态',
+  //   _slot_: 'send_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '160'
+  },
+  {
+    prop: 'addtime',
+    label: '下单时间',
+    sortable: true,
+    width: 150
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80'
+  },
+  {
+    prop: '',
+    width: 50,
+    label: '操作',
+    fixed: 'right',
+    _noset_: true,
+    _slot_: 'operation'
+  }
+
+]
+// page	是	string	页码
+// size	是	string	页码数
+// cgdNo	是	string	采购单编号
+// returnCode	是	string	退货单编号
+// good_type_code	是	string	商品属性
+// good_name	是	string	商品名称
+// status	是	string	状态

src/views/sellOut/deliveryWorkOrder/components/ShowDataTableColumns.js

@@ -0,0 +1,75 @@
+
+const showColumns = [
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    span: 7
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    span: 5
+  },
+  {
+    prop: 'order_type',
+    label: '订单来源',
+    _slot_: 'order_type',
+    span: 6
+  }, {
+    prop: 'apply_name',
+    label: '创建人',
+    span: 6
+  },
+
+  {
+    prop: 'supplierName',
+    label: '供应商公司',
+    _slot_: 'supplierName',
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customer_code',
+    label: '客户公司',
+    _slot_: 'customer',
+    span: 12
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    span: 6
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'sendtime',
+    label: '发货时间',
+    span: 6
+  },
+  {
+    prop: 'post_name',
+    label: '物流公司',
+    span: 6
+  },
+  {
+    prop: 'post_code',
+    label: '物流编号',
+    span: 6
+  },
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    span: 6
+  }
+]
+
+export { showColumns }

src/views/sellOut/deliveryWorkOrder/components/express.vue

@@ -0,0 +1,183 @@
+<template>
+  <el-form
+    :model="ruleForm"
+    :rules="rules"
+    ref="ruleForm"
+    :size="'mini'"
+    label-width="90px"
+  >
+    <el-row>
+      <el-col :span="12"
+        ><el-form-item label="物流公司" prop="post_name">
+          <search-express
+            :value="ruleForm.post_name"
+            :placeholder="'请输入物流公司'"
+            :names="''"
+            :size="'mini'"
+            :order_source="''"
+            :is-detail="!(status == '2' && ppowers.some((i) => i == '2'))"
+            @searchChange="handleCompany"
+          />
+        </el-form-item>
+        <el-form-item label="物流费用" prop="post_fee">
+          <digital-input
+            :values="ruleForm.post_fee"
+            :placeholder="'物流费用'"
+            :min="0"
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'post_fee')"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="物流单号" prop="post_code">
+          <el-input
+            placeholder="请输入物流单号"
+            maxlength="100"
+            :size="'mini'"
+            v-model="ruleForm.post_code"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="fr"
+            :size="'mini'"
+            @click="submitForm"
+            :loading="loading"
+            >保 存
+          </el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { isAlphanumeric } from "@/utils/validate";
+export default {
+  name: "allotFlow",
+  mixins: [resToken],
+  props: ["id", "sitem"],
+  computed: {
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "allotDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "DBD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    const validateExpressSn = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("物流单号不能为空！"));
+      } else {
+        if (!isAlphanumeric(value)) {
+          callback(new Error("请输入正确的物流单号"));
+        } else {
+          callback();
+        }
+      }
+    };
+    const validate_post_fee = (rule, value, callback) => {
+      const { required } = rule;
+      if (required && value === "") {
+        callback(new Error("不能为空！"));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      status: "",
+      ruleForm: {
+        post_name: [], //发货物流公司
+        post_code: "", //物流单号
+        post_fee: "",
+      },
+      rules: {
+        post_name: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择发货公司",
+            trigger: "change",
+          },
+        ],
+        post_fee: [
+          {
+            required: true,
+            validator: validate_post_fee,
+            trigger: "blur",
+          },
+        ],
+        post_code: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validateExpressSn,
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
+    // 商品保存提交
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          if (this.loading) {
+            return;
+          }
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.outChildCode = this.sitem.outChildCode;
+          model.post_name = model.post_name.toString();
+          
+          let res = await asyncRequest.express({list:[model]});
+          this.loading = false;
+          
+          if (res && res.code === 0) {
+            //
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    handleCompany(e) {
+      console.log(e);
+      this.ruleForm.post_name = e && e.code ? [e.label] : [];
+      this.$refs.ruleForm.validateField("post_name");
+    },
+  },
+};
+</script>

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="sellReturnDetail pagePadding">
+    <div style="width: 100%" v-if="powers.some((i) => i == '007')">
+      <el-tabs v-model="activeTabs">
+        <el-tab-pane label="业务详情" name="1">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="发货工单详情" name="0">
+              <show-data-table
+                style="margin: 0; padding: 0"
+                :sitem="sitem"
+                v-if="status"
+                :columns="showColumns"
+              >
+                <template slot="status">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (statusOptions.find((item) => item.value == sitem.status) || {})
+                        .label || '--'
+                    "
+                  ></el-tag>
+                </template>
+                
+
+                <template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_type_options.find(
+                          (item) => item.id == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                <template slot="supplierName">
+                  <span>{{ sitem.supplierName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+                <template slot="companyName">
+                  <span>{{ sitem.companyName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>业务公司编号:</span
+                        ><span>{{ sitem.companyNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="customer">
+                  <span>{{ sitem.customer_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>客户公司编号:</span
+                        ><span>{{ sitem.customer_code }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+              </show-data-table>
+            </el-collapse-item>
+
+            <el-collapse-item title="待库管发货" name="2" v-if="sitem.status === '1' && !isSupertube">
+              <express-node @refresh="() => initData()" :sitem="sitem" />
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { showColumns } from "./components/ShowDataTableColumns";
+import { xs_order_type_options } from "@/assets/js/statusList";
+import ExpressNode from "./components/express.vue"
+import { mapGetters } from "vuex";
+export default {
+  name: "deliveryWorkOrderDetail",
+  mixins: [mixinPage, resToken],
+  components: { ExpressNode },
+  computed: {
+    ...mapGetters(['isSupertube']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "deliveryWorkOrderDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      activeTabs: "1",
+      showColumns: showColumns,
+      statusOptions: [
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "发货完成" },
+        { value: "3", label: "已收货" },
+        { value: '3', label: '供应商驳回,待供应商负责人审核'},
+        { value: '4', label: '已全部退货'},
+      ],
+      xs_order_type_options,
+      sitem: null, //传给组件
+      activeNames: ["0", "1", "2", "3", "4", "5", "6"],
+      status: "", //存储详情接口状态
+      statusList: [
+        {
+          value: "1",
+          label: "待验货",
+        },
+        {
+          value: "2",
+          label: "待验货审核",
+        },
+        {
+          value: "3",
+          label: "待业务审核",
+        },
+      ],
+      newTime: "",
+      loading: false,
+      is_stock: "",
+      queryId: "",
+    };
+  },
+  mounted() {
+    this.queryId = this.$route.query.id;
+    this.initData();
+  },
+  methods: {
+    async initData() {
+      const { code, data, message } = await asyncRequest.detail({
+        outChildCode: this.queryId,
+      });
+      if (code === 0) {
+        const { is_stock, status } = data;
+        this.is_stock = is_stock;
+        this.status = status;
+        this.sitem = data;
+        this.getNewTime();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+  },
+};
+</script>

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -0,0 +1,599 @@
+<template>
+  <div class="sellReturn pagePadding">
+    <div
+      v-if=" powers.some((i) => i == '001')"
+    >
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @selection="handleSelection"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="24">
+                <!-- 时间区间 -->
+                <el-col :span="6" style="width: 303px; padding: 0 0 0 0px">
+                  <period-date-picker
+                    :type="1"
+                    :width="'135px'"
+                    :size="searchSize"
+                    :start="parmValue.start"
+                    :end="parmValue.end"
+                    @timeReturned="handleTime"
+                  />
+                </el-col>
+              
+              <el-col :span="4" style="width: 150px;margin-left:10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+                <el-col
+                  :span="4"
+                  class="fr"
+                  style="width: 66px; padding: 0 0 0 10px"
+                >
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="searchSize"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
+              </el-col>
+            </el-row>
+
+            <el-row style="margin-top:10px">
+              <el-col :span="4" style="width: 150px;margin-right:10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_source"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_source_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3" style="margin-right:10px">
+                <search-customer
+                  :value="parmValue.customer_code"
+                  :size="'mini'"
+                  :names="companyName"
+                  :placeholder="'企业客户'"
+                  :disabled="false"
+                  :is-detail="true"
+                  @searchChange="customer_code_change"
+                />
+              </el-col>
+
+              <el-col :span="3" style="margin-right:10px">
+                <search-work-company
+                    :value="parmValue.companyNo"
+                    :placeholder="'业务公司'"
+                    :disabled="false"
+                    :size="'mini'"
+                    :is-detail="true"
+                    @searchChange="company_idsearchChange"
+                />            
+              </el-col>
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+
+                <div style="float: right;">
+                  <el-button type="primary" size="mini" @click="handleExport">发货工单导出</el-button>
+               </div>
+            </el-row>
+
+            <el-row>
+              <el-col :span="6" style="width: 400px;margin-top: 10px;">
+                  <el-input
+                    clearable
+                    placeholder="关键字"
+                    v-model="s_input"
+                    maxlength="40"
+                    :size="searchSize"
+                    class="input-with-select"
+                  >
+                    <el-select
+                      v-model="select"
+                      style="width: 150px"
+                      slot="prepend"
+                      placeholder="关键字类型"
+                    >
+                      <el-option label="确认单编号" value="orderCode" />
+                      <el-option label="发货工单编号" value="outChildCode" />
+                      <el-option label="商品成本编号" value="spuCode" />
+                      <el-option label="发货申请编号" value="outCode" />
+                      <el-option label="商品上线编号" value="skuCode" />
+                      <el-option label="申请人" value="apply_name" />
+                    </el-select>
+                    <el-button
+                      slot="append"
+                      icon="el-icon-search"
+                      @click="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                    ></el-button>
+                  </el-input>
+                </el-col>
+            </el-row>
+          </div>
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <!-- <template #send_status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (sendStatusOptions.find((item) => item.value == scope.row.send_status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template> -->
+        
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find(
+                  (item) => item.id == scope.row.order_type
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+              xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((i) => i == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="getRouter('deliveryWorkOrderDetail', scope.row.outChildCode)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+   <script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import columns from "./columns";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { mapGetters } from "vuex";
+import urlConfig from "@/apis/url-config";
+import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
+import companyHelper from "@/mixins/companyHelper"
+
+export default {
+  name: "sellReturn",
+  mixins: [mixinPage, resToken, companyHelper],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "deliveryWorkOrder"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      xs_order_type_options,
+      xs_order_source_options,
+      fileUrl: urlConfig.baseURL,
+      select: "outChildCode", //默认选择下拉框
+      s_input: "", //搜索框内容
+      select_list:[],
+      sitem: null,
+      // 状态
+      statusOptions: [
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "发货完成" },
+        { value: "3", label: "已收货" },
+        { value: '3', label: '供应商驳回,待供应商负责人审核'},
+        { value: '4', label: '已全部退货'},
+      ],
+      loading: false,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      parmValue: {
+        companyNo:"",
+        customer_code:[],
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        company_name: "",
+        good_code:"",
+        skuCode:"",
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        order_type: "",
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: columns,
+    };
+  },
+  mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      const { page, size } = this.parmValue;
+      // this.parmValue.start = start || last_start;
+      // this.parmValue.end = end || last_end;
+      // if(this.parmValue.companyNo.length>0){
+      //     this.customerCode = [this.parmValue.companyNo] ;
+      // }
+
+      this.pageInfo = {
+        size: size,
+        curr: page,
+        total: 0,
+      };
+      //多选条件
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.s_input = this.parmValue.s_input;
+    } else {
+      this.select = "outChildCode";
+      //  this.sselect = "创建时间"
+    }
+    this.searchList();
+  },
+
+  methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
+    customer_code_change(e) {
+      if (e && e.code) {
+        this.parmValue.customer_code = [e.code];
+      } else {
+        this.parmValue.customer_code = [];
+      }
+      this.searchList();
+    },
+    handleExport(){
+      if (!this.loading) {
+        this.loading = true;
+        let httpType = `aplication/zip`;
+  
+        let model = JSON.parse(JSON.stringify(this.parmValue));
+        delete model['s_input']
+
+        axios({
+          method: "post",
+          url: this.fileUrl +  "/admin/child_export",
+          responseType: "blob",
+          data: {
+            ...model,
+            [this.select]: this.s_input,
+            customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
+            supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
+            needRela: true
+          },
+          headers: {
+            Accept: httpType,
+          },
+        })
+          .then((res) => {
+            if (res && res.status == 200 && res.data) {
+              let url = window.URL.createObjectURL(
+                new Blob([res.data], { type: httpType })
+              );
+              let link = document.createElement("a");
+              link.style.display = "none";
+              link.href = url;
+              let excelName = "发货工单.zip";
+              link.setAttribute("download", excelName);
+              document.body.appendChild(link);
+              link.click();
+              link.remove();
+              window.URL.revokeObjectURL(url); //释放掉blob对象
+              this.$message.success(`导出成功！`);
+              setTimeout(() => {
+                this.loading = false;
+              }, 500);
+            } else {
+              this.$message.error(res.data.message);
+              setTimeout(() => {
+                this.loading = false;
+              }, 500);
+            }
+          })
+          .catch((error) => {
+            console.log(error);
+            this.loading = false;
+          });
+      }
+    },
+    handleSelection(order){
+      const { list } = order
+      this.select_list = list;
+    },
+    getRouter(toRouter, queryId) {
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.s_input = this.s_input;
+        let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+
+        this.routeGoto(toRouter, model);
+      } 
+    },
+    restSearch() {
+      this.s_input = ""; //清除输入框内容
+      this.select = "outChildCode"; //清除下拉框选中项
+
+      this.parmValue = {
+        order_type: "",
+        company_name: "", //申请人部门
+        good_code:"",
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+
+    openModal(id, isDetail, sitem) {
+      this.showModel = true;
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = sitem;
+    },
+    async deleteById(id, status) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+            status: status + '' === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.loading = true;
+
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      delete model['s_input']
+
+      const res = await asyncRequest.list({
+        ...model,
+        [this.select]: this.s_input,
+        customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
+        needRela: true
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    //物流公司查询
+    async handleCompany(e) {
+      console.log(e, "要求传快递简称，不传id"); //
+      if (e && e.code) {
+        this.parmValue.postCompany = [e.shortName];
+        this.parmValue.page = 1;
+      }
+      await this.searchList();
+    },
+
+    company_idsearchChange(e) {
+      const { code } = e;
+      this.parmValue.companyNo = code || "";
+      this.searchList()
+    },
+
+    // 时间
+    async handleTime(e) {
+      if (e.startTime !== "") {
+        this.parmValue.start = e.startTime;
+      } else {
+        this.parmValue.start = "";
+      }
+      if (e.endTime !== "") {
+        this.parmValue.end = e.endTime;
+      } else {
+        this.parmValue.end = "";
+      }
+      if (this.parmValue.start !== "" && this.parmValue.end !== "") {
+        this.parmValue.page = 1;
+        await this.searchList();
+      }
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.sellReturn {
+}
+</style>
+   

src/views/sellOut/hawbWorkbench/columns.js

@@ -10,6 +10,12 @@ const showColumns = [
     _slot_: 'status',
     span: 6
   },
+  {
+    prop: 'send_status',
+    label: '发货工单状态',
+    _slot_: 'send_status',
+    span: 6
+  },
   {
     prop: 'orderCode',
     label: '订单编号',
@@ -92,12 +98,12 @@ const showColumns = [
   {
     prop: 'post_code',
     label: '物流编号',
-    span: 12
+    span: 8
   },
   {
     prop: 'addr',
     label: '收货地址',
-    span: 12
+    span: 10
   },
 
   {

src/views/sellOut/hawbWorkbench/index.vue

@@ -1,18 +1,55 @@
 <template>
   <div v-loading="loading" class="hawbWorkbench">
-    <ul class="hawbWorkbench-slider">
-      <h4 style="margin-top:15px;margin-bottom:15px">发货申请单</h4>
-      <li
-        v-for="item in list"
-        :key="item.id"
-        :class="{ active: activeKey === item.outCode}"
-        @click="onActiveKey(item)"
-      >{{ item.outCode }}</li>
-    </ul>
+    <div class="hawbWorkbench-slider">
+      <div style="display:flex;justify-content:space-between;align-items: center;margin-bottom:5px">
+        <h4 style="margin-top:15px;margin-bottom:15px">发货申请单</h4>
+        <el-button
+          type="primary"
+          size="mini"
+          @click="visible=true"
+        >
+          添加搜索条件
+        </el-button>
+      </div>
+
+      <div v-loading="loadings.slider" style="overflow:hidden; height: calc(100% - 100px)">
+        <ul ref="slider" class="hawbWorkbench-slider__scroll">
+          <li
+            v-for="item in list"
+            :key="item.id"
+            :class="{ active: activeKey === item.outCode}"
+            @click="onActiveKey(item)"
+          >
+            {{ item.outCode }}
+          </li>
+        </ul>
+      </div>
+
+      <div style="height:40px;display:flex;align-items:center;justify-content: space-between;font-size:15px">
+        <p>共 {{ pagination.totalPage === '0' || !pagination.totalPage ? '-' : pagination.totalPage }} 页</p>
+        <div style="line-height:40px;display:flex;align-items:center;gap: 5px;">
+          前往
+          <digital-input
+            style="padding:0px;width:60px"
+            :values="pagination.page"
+            :placeholder="'仓库发货数'"
+            :min="1"
+            :max="pagination.totalPage"
+            :position="'right'"
+            :precision="0"
+            :controls="false"
+            :append="''"
+            :size="'mini'"
+            @reschange="page_change($event)"
+          />
+          页
+        </div>
+      </div>
+    </div>
 
     <div class="hawbWorkbench-main">
-      <el-collapse v-model="collapseValues">
-        <el-collapse-item title="发货申请详情" name="1">
+      <el-collapse v-if="this.activeKey" v-model="collapseValues">
+        <el-collapse-item v-loading="loadings.detail" title="发货申请详情" name="1">
           <show-data-table
             v-if="newTime"
             :new-time="newTime"
@@ -22,61 +59,72 @@
             <template slot="order_type">
               <el-tag
                 :size="'mini'"
-                v-text="
-                  (
-                    xs_order_type_options.find(
-                      (item) => item.id == activeItem.order_type
-                    ) || {}
-                  ).label || '--'
-                "
+                v-text="(xs_order_type_options.find((item) => item.id == activeItem.order_type) || {}).label || '--'"
               />
             </template>
-
             <template slot="status">
               <el-tag
                 :size="'mini'"
-                :type="activeItem.status == '0' ? 'warning' : ''"
-                v-text="
-                  (statusOptions.find((item) => item.value == activeItem.status) || {})
-                    .label || '--'
-                "
+                v-text="(statusOptions.find((item) => item.value == activeItem.status) || {}) .label || '--'"
+              />
+            </template>
+            <template slot="send_status">
+              <el-tag
+                :size="'mini'"
+                v-text="(sendStatusOptions.find((item) => item.value == activeItem.send_status) || {}) .label || '--'"
               />
             </template>
-
             <template slot="sale_price">
               <span>{{ displayPrivateField(isDisplayPrivateField('2'), activeItem.sale_price) }}</span>
             </template>
-            <template slot="total_price">
-              <span>
-                {{ displayPrivateField(isDisplayPrivateField('2'), activeItem.sale_price) }}
-              </span>
+            <template slot="totalPage_price">
+              <span>{{ displayPrivateField(isDisplayPrivateField('2'), activeItem.sale_price) }}</span>
             </template>
           </show-data-table>
         </el-collapse-item>
 
-        <el-collapse-item title="待分仓" name="2">
+        <el-collapse-item v-if="activeItem.send_status === '0'" v-loading="loadings.wsmList" title="待分仓" name="2">
           <div style="width:100%">
-            <el-table size="mini">
-              <el-table-column prop="ckbm" label="仓库号码" min-width="120" />
-              <el-table-column prop="ckmc" label="仓库名称" min-width="120" />
-              <el-table-column prop="ywgsbm" label="业务公司编码" min-width="120" />
-              <el-table-column prop="ywgsmc" label="业务公司名称" min-width="120" />
-              <el-table-column prop="ckszgys" label="仓库所在供应商编码" min-width="140" />
-              <el-table-column prop="ckszgys" label="仓库所在供应商名称" min-width="140" />
-              <el-table-column prop="ckfzr" label="仓库负责人" min-width="120" />
-              <el-table-column prop="kykc" label="可用库存" min-width="120" />
-              <el-table-column prop="ckkfs" label="仓库可发数" min-width="120">
-                <el-input placeholder="仓库可发数" />
+            <el-table size="mini" :data="wsmList">
+              <el-table-column prop="wsm_code" label="仓库编码" min-width="120" show-overflow-tooltip />
+              <el-table-column prop="wsm_name" label="仓库名称" min-width="120" show-overflow-tooltip />
+              <el-table-column prop="companyNo" label="业务公司编码" min-width="120" show-overflow-tooltip />
+              <el-table-column prop="companyName" label="业务公司名称" min-width="120" show-overflow-tooltip />
+              <el-table-column prop="supplierNo" label="仓库所在供应商编码" min-width="140" show-overflow-tooltip />
+              <el-table-column prop="supplierName" label="仓库所在供应商名称" min-width="140" show-overflow-tooltip />
+              <el-table-column prop="contactor_name" label="仓库负责人" min-width="120" show-overflow-tooltip />
+              <el-table-column prop="usable_stock" label="可用库存" min-width="120" show-overflow-tooltip />
+              <el-table-column prop="ckkfs" label="仓库发货数" min-width="120" show-overflow-tooltip>
+                <template slot-scope="scope">
+                  <digital-input
+                    :values="wsmList[scope.$index].num"
+                    :placeholder="'仓库发货数'"
+                    :min="0"
+                    :max="100000000000"
+                    :position="'right'"
+                    :precision="0"
+                    :controls="false"
+                    :append="''"
+                    :size="'mini'"
+                    @reschange="num_change($event, scope.$index)"
+                  />
+                </template>
               </el-table-column>
             </el-table>
 
             <div style="width:100;display: flex;justify-content: flex-end;padding-right: 30px;margin: 20px 0px;">
-              <el-button type="primary" size="mini">保存</el-button>
-              <el-button size="mini">取消</el-button>
+              <el-button type="primary" size="mini" :loading="loadings.wsmSplit" @click="onSplitWsm">保存</el-button>
             </div>
           </div>
         </el-collapse-item>
       </el-collapse>
+
+      <div v-else-if="!currentCompany" class="hawb-error">
+        <i class="el-icon-warning" />
+        <p>请选择发货申请单</p>
+      </div>
+
+      <search-modal :visible.sync="visible" @change="handleSearchChange" />
     </div>
   </div>
 </template>
@@ -84,47 +132,151 @@
 <script>
 import asyncRequest from '@/apis/service/sellOut/sellOutOrder'
 import { xs_order_type_options } from '@/assets/js/statusList'
+import companyHelper from '@/mixins/companyHelper'
 import privateField from '@/mixins/privateField'
+import SearchModal from './search-modal.vue'
 import { showColumns } from './columns'
 
 export default {
   name: 'HawbWorkbench',
-  mixins: [privateField],
+  components: {
+    SearchModal
+  },
+  mixins: [privateField, companyHelper],
   data: () => ({
     list: [],
     loading: false,
+    visible: false,
     showColumns,
     activeKey: null,
     newTime: null,
     activeItem: {},
-    collapseValues: ['1', '2'],
+    params: {},
+    wsmList: [],
     xs_order_type_options,
+    collapseValues: ['1', '2'],
     statusOptions: [
       { value: '0', label: '待采购备货' },
       { value: '1', label: '待库管发货' },
       { value: '2', label: '已发货待收货' },
       { value: '3', label: '已收货' },
       { value: '4', label: '已全部退货' }
-    ]
+    ],
+    sendStatusOptions: [
+      { value: '0', label: '未拆单' },
+      { value: '1', label: '已拆单未发货' },
+      { value: '2', label: '部分发货' },
+      { value: '3', label: '全部发货' }
+    ],
+    pagination: {
+      page: 1,
+      size: 30,
+      totalPage: 0
+    },
+    loadings: {
+      slider: false,
+      wsmList: false,
+      wsmSplit: false,
+      detail: false
+    },
+    state: {
+      loading: false,
+      noMore: false
+    }
   }),
-  mounted() {
-    this.onSearch()
-  },
   methods: {
-    async onSearch() {
-      this.loading = true
-      const { data } = await asyncRequest.list({ size: '20' })
-      this.loading = false
-      if (data.list.length > 0) {
-        this.onActiveKey(data.list[0])
-        this.list = data.list
-      }
+    async initData() {
+      const result = await this.onLoad()
+      if (result.length === 0) return
+      this.onActiveKey(result[0])
+    },
+
+    async onLoad() {
+      if (this.state.noMore) return
+      this.loadings.slider = true
+      const { data } = await asyncRequest.list({ ...this.pagination, ...this.params, needRela: true })
+      this.pagination.totalPage = Math.ceil(data.count / this.pagination.size)
+      this.loadings.slider = false
+      this.list = data.list
+      return data.list
     },
-    onActiveKey(activeItem) {
-      this.activeItem = activeItem
-      this.activeKey = activeItem.outCode
+
+    async num_change(e, index) {
+      this.$set(this.wsmList, index, { ...this.wsmList[index], num: Number(e) })
+    },
+
+    handleSearchChange(params) {
+      this.params = params
+      this.resetState()
+      this.initData()
+    },
+
+    async onActiveKey(activeItem) {
+      const { outCode } = activeItem
+      this.activeKey = outCode
+      await this.requsetDetail(outCode)
+      await this.requesetWsmListWithOutCode(outCode)
       this.computeTime()
     },
+
+    onCompanyChange() {
+      this.resetState()
+      this.initData()
+    },
+
+    resetState() {
+      this.pagination.page = 1
+      this.pagination.totalPage = 0
+      this.loadings.wsmList = false
+      this.loadings.wsmSplit = false
+      this.activeItem = {}
+      this.activeKey = ''
+      this.list = []
+    },
+
+    page_change(page) {
+      this.pagination.page = page
+      this.onLoad()
+    },
+
+    async onSplitWsm() {
+      this.loadings.wsmSplit = true
+      const outCode = this.activeKey
+      const list = this.wsmList.map(({ wsm_code, num }) => ({ wsm_code, num }))
+      const { message, code } = await asyncRequest.wsmSplit({ list, outCode })
+      this.loadings.wsmSplit = false
+      switch (code) {
+        case 0:
+          await this.requsetDetail(outCode)
+          await this.requesetWsmListWithOutCode(outCode)
+          break
+        default:
+          this.$message.warning(message)
+          break
+      }
+    },
+
+    async requesetWsmListWithOutCode(outCode) {
+      this.loadings.wsmList = true
+      const { data } = await asyncRequest.wsmList({ outCode })
+      this.loadings.wsmList = false
+      this.wsmList = data.map(item => ({ ...item, num: 0 }))
+    },
+
+    async requsetDetail(outCode) {
+      this.loadings.detail = true
+      const { message, code, data } = await asyncRequest.detail({ outCode })
+      this.loadings.detail = false
+      switch (code) {
+        case 0:
+          this.activeItem = data
+          break
+        default:
+          this.$message.warning(message)
+          break
+      }
+    },
+
     computeTime() {
       this.newTime = new Date().valueOf()
     }
@@ -142,31 +294,64 @@ export default {
 
   &-slider{
     height: 100%;
-    min-width: 220px;
+    min-width: 240px;
     padding: 0px 10px;
-    overflow-y: auto;
     border-right: 1px solid #ccc;
-    @include scrollBar();
 
-    li{
+    &__scroll{
+     overflow-y: auto;
+     height: 100%;
+     @include scrollBar();
+
+     li{
       width: 100%;
       line-height: 25px;
       margin-bottom: 8px;
       border-radius: 5px;
       user-select: none;
       cursor: pointer;
+      text-align: center;
 
       &.active{
         background-color: #f7f7f7;
         color:#6954f0;
       }
+     }
     }
   }
 
   &-main{
     flex: 1;
     box-sizing: border-box;
+    position: relative;
     padding: 10px;
+
+    .hawb-error{
+      top: 50%;
+      left: 50%;
+      display: flex;
+      position: absolute;
+      transform: translate(-50%, -50%);
+      align-items: center;
+      gap: 10px;
+    }
   }
+
+.hawb-more {
+  text-align: center;
+  color: #999;
+  font-size: 14px;
+  line-height: 38px;
+}
+
+.hawb-loading {
+  display: flex;
+  font-size: 14px;
+  justify-content: center;
+  align-items: center;
+  color: #999;
+  gap: 10px;
+  line-height: 38px;
+}
 }
 </style>

src/views/sellOut/hawbWorkbench/search-modal.vue

@@ -0,0 +1,96 @@
+<template>
+  <el-dialog :visible.sync="innerVisible" title="筛选条件汇总" center :close-on-click-modal="false">
+    <el-row>
+      <el-form>
+        <el-col span="8">
+          <el-form-item label="发货申请单状态">
+            <el-select v-model="formData.status" size="mini">
+              <el-option
+                v-for="opt in statusOptions"
+                :key="opt.id"
+                :value="opt.id"
+                :label="opt.label"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col span="8">
+          <el-form-item label="发货工单状态">
+            <el-select v-model="formData.send_status" size="mini">
+              <el-option
+                v-for="opt in sendStatusOptions"
+                :key="opt.value"
+                :value="opt.value"
+                :label="opt.label"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col span="24">
+          <el-form-item>
+            <div style="display:flex;justify-content:flex-end">
+              <el-button size="mini" @click="onReset">重置</el-button>
+              <el-button size="mini" type="primary" @click="onConfirm">确认</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data: () => ({
+    formData: {
+      status: '',
+      send_status: ''
+    },
+    statusOptions: [
+      { id: '0', label: '待发货' },
+      { id: '1', label: '待库管发货' },
+      { id: '2', label: '已发货待收货' },
+      { id: '3', label: '已收货' },
+      { id: '4', label: '已全部退货' }
+    ],
+    sendStatusOptions: [
+      { value: '0', label: '未拆单' },
+      { value: '1', label: '已拆单未发货' },
+      { value: '2', label: '部分发货' },
+      { value: '3', label: '全部发货' }
+    ]
+  }),
+  computed: {
+    innerVisible: {
+      get() {
+        return this.visible
+      },
+      set(newVal) {
+        this.$emit('update:visible', newVal)
+      }
+    }
+  },
+  methods: {
+    onConfirm() {
+      this.$emit('change', this.formData)
+      this.innerVisible = false
+    },
+    onReset() {
+      this.formData = {
+        status: ''
+      }
+
+      this.$emit('change', this.formData)
+      this.innerVisible = false
+    }
+  }
+}
+</script>

src/views/sellOut/sellOutOrder/detail.vue

@@ -121,9 +121,8 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-            <!-- @todo: 库存品只能由角色库管和库管-张凯旋操作；非库存品和采返商品 只能有当前供应商负责人操作  -->
-            <!-- sitem.has_account + '' === '0' && -->
-            <el-collapse-item
+
+            <!-- <el-collapse-item
               title="库管发货"
               name="3"
               v-if="
@@ -143,7 +142,7 @@
                 :sitem="sitem"
                 @refresh="initData"
               />
-            </el-collapse-item>
+            </el-collapse-item> -->
 
             <el-collapse-item
               title="售后申请单结果"

src/views/serviceParam/storeSet/addEdit.vue

@@ -47,11 +47,11 @@
                 />
               </el-form-item>
               </el-col>
-              <!-- <el-col :span="12"
-                ><el-form-item
-                  label="仓库所在公司"
+              <el-col :span="12">
+                <el-form-item
+                  label="仓库所在供应商公司"
                   prop="supplierNo"
-                  label-width="120px"
+                  label-width="150px"
                   style="width: 100%"
                 >
                   <search-supplier
@@ -59,12 +59,12 @@
                     :names="supplier_name"
                     :is-detail="id !== 'add'"
                     :size="'mini'"
-                    :disabled="isDetail"
                     :placeholder="'仓库公司名称'"
+                    :disabled="id !== 'add'"
                     @searchChange="supplierChange"
                   />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
               <el-col :span="12">
                 <el-form-item label="仓库名称" prop="name">
                   <el-input
@@ -102,6 +102,7 @@
                     :is-detail="id !== 'add'"
                     :disabled="isDetail"
                     :size="'mini'"
+                    level="3"
                     :names="accountNames"
                     @searchChange="accountChange"
                   /> </el-form-item></el-col>
@@ -180,7 +181,7 @@
                 <el-form-item
                   label="收发货省/市/区"
                   prop="addrs_code"
-                  label-width="121px"
+                  label-width="130px"
                 >
                   <select-area
                     :is-detail="id !== 'add'"
@@ -328,14 +329,14 @@ export default {
             trigger: 'change'
           }
         ],
-        // supplierNo: [
-        //   {
-        //     type: "array",
-        //     required: true,
-        //     message: "供应商公司",
-        //     trigger: "change",
-        //   },
-        // ],
+        supplierNo: [
+          {
+            // type: 'array',
+            required: true,
+            message: '供应商公司',
+            trigger: 'change'
+          }
+        ],
         addr_code: [
           {
             type: 'array',
@@ -425,6 +426,7 @@ export default {
       } else {
         this.ruleForm.supplierNo = []
       }
+
       this.$refs.ruleForm.validateField('supplierNo')
     },
     // 仓库省市区
@@ -477,7 +479,7 @@ export default {
           contactor_name,
           mobile,
           name,
-          // supplierNo,
+          supplierNo,
           supplier_name,
           wsm_addr,
           wsm_mobile,
@@ -492,7 +494,7 @@ export default {
         this.ruleForm = {
           companyNo: companyNo || this.business_companyNo || '',
           name: name, // 仓库名称
-          // supplierNo: [supplierNo], //供应商编码
+          supplierNo: [supplierNo], // 供应商编码
           wsmtype: wsm_type || '', // 仓库类型 目前随便填
           addr_code: this.getCode(addr_code), // 仓库省市区
           addr: addr, // 仓库详细地址
@@ -576,7 +578,7 @@ export default {
           this.loading = true
           const {
             name,
-            // supplierNo,
+            supplierNo,
             addr_code,
             addr,
             contactor_id,
@@ -589,11 +591,12 @@ export default {
             position,
             wsmtype
           } = JSON.parse(JSON.stringify(this.ruleForm))
+
           const model = {
             id: this.id,
             companyNo,
             name,
-            // supplierNo: this.getId(supplierNo),
+            supplierNo: this.getId(supplierNo),
             addr_code: this.setCode(addr_code),
             addr,
             contactor_id: this.getId(contactor_id),
@@ -606,7 +609,6 @@ export default {
             // wsm_type: "", //目前随便填
             wsmtype
           }
-          console.log(model)
           let res = {}
           if (this.id === 'add') {
             delete model['id']

src/views/supplierSellOut/supplierDeliveryWorkOrder/columns.js

@@ -0,0 +1,125 @@
+export default [
+  { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    width: '160'
+  },
+  {
+    prop: 'orderCode',
+    label: '确认单编号',
+    width: '160'
+  },
+  {
+    prop: 'outCode',
+    label: '确认单编号',
+    width: '160'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
+    width: '160'
+  },
+
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '85'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '85'
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    width: '70'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
+  },
+  // {
+  //   prop: 'send_status',
+  //   label: '分单状态',
+  //   _slot_: 'send_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '160'
+  },
+  {
+    prop: 'addtime',
+    label: '下单时间',
+    sortable: true,
+    width: 150
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80'
+  },
+  {
+    prop: '',
+    width: 50,
+    label: '操作',
+    fixed: 'right',
+    _noset_: true,
+    _slot_: 'operation'
+  }
+
+]
+// page	是	string	页码
+// size	是	string	页码数
+// cgdNo	是	string	采购单编号
+// returnCode	是	string	退货单编号
+// good_type_code	是	string	商品属性
+// good_name	是	string	商品名称
+// status	是	string	状态

src/views/supplierSellOut/supplierDeliveryWorkOrder/components/ShowDataTableColumns.js

@@ -0,0 +1,75 @@
+
+const showColumns = [
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    span: 7
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    span: 5
+  },
+  {
+    prop: 'order_type',
+    label: '订单来源',
+    _slot_: 'order_type',
+    span: 6
+  }, {
+    prop: 'apply_name',
+    label: '创建人',
+    span: 6
+  },
+
+  {
+    prop: 'supplierName',
+    label: '供应商公司',
+    _slot_: 'supplierName',
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customer_code',
+    label: '客户公司',
+    _slot_: 'customer',
+    span: 12
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    span: 6
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'sendtime',
+    label: '发货时间',
+    span: 6
+  },
+  {
+    prop: 'post_name',
+    label: '物流公司',
+    span: 6
+  },
+  {
+    prop: 'post_code',
+    label: '物流编号',
+    span: 6
+  },
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    span: 6
+  }
+]
+
+export { showColumns }

src/views/supplierSellOut/supplierDeliveryWorkOrder/components/express.vue

@@ -0,0 +1,179 @@
+<template>
+  <el-form
+    :model="ruleForm"
+    :rules="rules"
+    ref="ruleForm"
+    :size="'mini'"
+    label-width="90px"
+  >
+    <el-row>
+      <el-col :span="12"
+        ><el-form-item label="物流公司" prop="post_name">
+          <search-express
+            :value="ruleForm.post_name"
+            :placeholder="'请输入物流公司'"
+            :names="''"
+            :size="'mini'"
+            :order_source="''"
+            :is-detail="!(status == '2' && ppowers.some((i) => i == '2'))"
+            @searchChange="handleCompany"
+          />
+        </el-form-item>
+        <el-form-item label="物流费用" prop="post_fee">
+          <digital-input
+            :values="ruleForm.post_fee"
+            :placeholder="'物流费用'"
+            :min="0"
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'post_fee')"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="物流单号" prop="post_code">
+          <el-input
+            placeholder="请输入物流单号"
+            maxlength="100"
+            :size="'mini'"
+            v-model="ruleForm.post_code"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            class="fr"
+            :size="'mini'"
+            @click="submitForm"
+            :loading="loading"
+            >保 存
+          </el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { isAlphanumeric } from "@/utils/validate";
+export default {
+  name: "allotFlow",
+  mixins: [resToken],
+  props: ["id", "sitem"],
+  computed: {
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find((i) => i.menu_route == "allotDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "DBD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    const validateExpressSn = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("物流单号不能为空！"));
+      } else {
+        if (!isAlphanumeric(value)) {
+          callback(new Error("请输入正确的物流单号"));
+        } else {
+          callback();
+        }
+      }
+    };
+    const validate_post_fee = (rule, value, callback) => {
+      const { required } = rule;
+      if (required && value === "") {
+        callback(new Error("不能为空！"));
+      } else {
+        callback();
+      }
+    };
+
+    return {
+      status: "",
+      ruleForm: {
+        post_name: [], //发货物流公司
+        post_code: "", //物流单号
+        post_fee: "",
+      },
+      rules: {
+        post_name: [
+          {
+            type: "array",
+            required: true,
+            message: "请选择发货公司",
+            trigger: "change",
+          },
+        ],
+        post_fee: [
+          {
+            required: true,
+            validator: validate_post_fee,
+            trigger: "blur",
+          },
+        ],
+        post_code: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validateExpressSn,
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    async number_change(e, key) {
+      this.ruleForm[key] = e + "" || "0";
+      this.$refs.ruleForm.validateField(key);
+    },
+    // 商品保存提交
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async (valid) => {
+        if (valid) {
+          if (this.loading) {return;}
+          this.loading = true;
+          const model = JSON.parse(JSON.stringify(this.ruleForm));
+          model.outChildCode = this.sitem.outChildCode;
+          model.post_name = model.post_name.toString();
+          let res = await asyncRequest.express({list:[model]});
+          this.loading = false;
+          
+          if (res && res.code === 0) {
+            this.showModelThis = false;
+            // 刷新
+            this.$emit("refresh");
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    handleCompany(e) {
+      console.log(e);
+      this.ruleForm.post_name = e && e.code ? [e.label] : [];
+      this.$refs.ruleForm.validateField("post_name");
+    },
+  },
+};
+</script>

src/views/supplierSellOut/supplierDeliveryWorkOrder/detail.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="sellReturnDetail pagePadding">
+    <div style="width: 100%" v-if="powers.some((i) => i == '007')">
+      <el-tabs v-model="activeTabs">
+        <el-tab-pane label="业务详情" name="1">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="发货工单详情" name="0">
+              <show-data-table
+                style="margin: 0; padding: 0"
+                :sitem="sitem"
+                v-if="status"
+                :columns="showColumns"
+              >
+                <template slot="status">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (statusOptions.find((item) => item.value == sitem.status) || {})
+                        .label || '--'
+                    "
+                  ></el-tag>
+                </template>
+                
+
+                <template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_type_options.find(
+                          (item) => item.id == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+
+                <template slot="supplierName">
+                  <span>{{ sitem.supplierName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+                <template slot="companyName">
+                  <span>{{ sitem.companyName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>业务公司编号:</span
+                        ><span>{{ sitem.companyNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="customer">
+                  <span>{{ sitem.customer_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>客户公司编号:</span
+                        ><span>{{ sitem.customer_code }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+              </show-data-table>
+            </el-collapse-item>
+
+            <el-collapse-item title="待库管发货" name="2" v-if="sitem.status === '1' && !isSupertube">
+              <express-node @refresh="() => initData()" :sitem="sitem" />
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { showColumns } from "./components/ShowDataTableColumns";
+import { xs_order_type_options } from "@/assets/js/statusList";
+import ExpressNode from "./components/express.vue"
+import { mapGetters } from "vuex";
+export default {
+  name: "deliveryWorkOrderDetail",
+  mixins: [mixinPage, resToken],
+  components: { ExpressNode },
+  computed: {
+    ...mapGetters(['isSupertube']),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "supplierDeliveryWorkOrderDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      activeTabs: "1",
+      showColumns: showColumns,
+      statusOptions: [
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "发货完成" },
+        { value: "3", label: "已收货" },
+        { value: '3', label: '供应商驳回,待供应商负责人审核'},
+        { value: '4', label: '已全部退货'},
+      ],
+      xs_order_type_options,
+      sitem: null, //传给组件
+      activeNames: ["0", "1", "2", "3", "4", "5", "6"],
+      status: "", //存储详情接口状态
+      statusList: [
+        {
+          value: "1",
+          label: "待验货",
+        },
+        {
+          value: "2",
+          label: "待验货审核",
+        },
+        {
+          value: "3",
+          label: "待业务审核",
+        },
+      ],
+      newTime: "",
+      loading: false,
+      is_stock: "",
+      queryId: "",
+    };
+  },
+  mounted() {
+    this.queryId = this.$route.query.id;
+    this.initData();
+  },
+  methods: {
+    async initData() {
+      const { code, data, message } = await asyncRequest.detail({
+        outChildCode: this.queryId,
+      });
+      if (code === 0) {
+        const { is_stock, status } = data;
+        this.is_stock = is_stock;
+        this.status = status;
+        this.sitem = data;
+        this.getNewTime();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+  },
+};
+</script>

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -0,0 +1,599 @@
+<template>
+  <div class="sellReturn pagePadding">
+    <div
+      v-if=" powers.some((i) => i == '001')"
+    >
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @selection="handleSelection"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="24">
+                <!-- 时间区间 -->
+                <el-col :span="6" style="width: 303px; padding: 0 0 0 0px">
+                  <period-date-picker
+                    :type="1"
+                    :width="'135px'"
+                    :size="searchSize"
+                    :start="parmValue.start"
+                    :end="parmValue.end"
+                    @timeReturned="handleTime"
+                  />
+                </el-col>
+              
+              <el-col :span="4" style="width: 150px;margin-left:10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+                <el-col
+                  :span="4"
+                  class="fr"
+                  style="width: 66px; padding: 0 0 0 10px"
+                >
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="searchSize"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
+              </el-col>
+            </el-row>
+
+            <el-row style="margin-top:10px">
+              <el-col :span="4" style="width: 150px;margin-right:10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_source"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_source_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3" style="margin-right:10px">
+                <search-customer
+                  :value="parmValue.customer_code"
+                  :size="'mini'"
+                  :names="companyName"
+                  :placeholder="'企业客户'"
+                  :disabled="false"
+                  :is-detail="true"
+                  @searchChange="customer_code_change"
+                />
+              </el-col>
+
+              <el-col :span="3" style="margin-right:10px">
+                <search-work-company
+                    :value="parmValue.companyNo"
+                    :placeholder="'业务公司'"
+                    :disabled="false"
+                    :size="'mini'"
+                    :is-detail="true"
+                    @searchChange="company_idsearchChange"
+                />            
+              </el-col>
+
+              <el-col :span="4">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 220px"
+                  :value="supplierNo"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :names="''"
+                  :isDetail="false"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+
+                <div style="float: right;">
+                  <el-button type="primary" size="mini" @click="handleExport">发货工单导出</el-button>
+               </div>
+            </el-row>
+
+            <el-row>
+              <el-col :span="6" style="width: 400px;margin-top: 10px;">
+                  <el-input
+                    clearable
+                    placeholder="关键字"
+                    v-model="s_input"
+                    maxlength="40"
+                    :size="searchSize"
+                    class="input-with-select"
+                  >
+                    <el-select
+                      v-model="select"
+                      style="width: 150px"
+                      slot="prepend"
+                      placeholder="关键字类型"
+                    >
+                      <el-option label="确认单编号" value="orderCode" />
+                      <el-option label="发货工单编号" value="outChildCode" />
+                      <el-option label="商品成本编号" value="spuCode" />
+                      <el-option label="发货申请编号" value="outCode" />
+                      <el-option label="商品上线编号" value="skuCode" />
+                      <el-option label="申请人" value="apply_name" />
+                    </el-select>
+                    <el-button
+                      slot="append"
+                      icon="el-icon-search"
+                      @click="
+                        pageInfo.curr = 1;
+                        parmValue.page = 1;
+                        searchList();
+                      "
+                    ></el-button>
+                  </el-input>
+                </el-col>
+            </el-row>
+          </div>
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <!-- <template #send_status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (sendStatusOptions.find((item) => item.value == scope.row.send_status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template> -->
+        
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find(
+                  (item) => item.id == scope.row.order_type
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+              xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((i) => i == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="getRouter('supplierDeliveryWorkOrderDetail', scope.row.outChildCode)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+   <script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import columns from "./columns";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { mapGetters } from "vuex";
+import urlConfig from "@/apis/url-config";
+import { xs_order_type_options ,xs_order_source_options} from "@/assets/js/statusList";
+import companyHelper from "@/mixins/companyHelper"
+
+export default {
+  name: "sellReturn",
+  mixins: [mixinPage, resToken, companyHelper],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "supplierDeliveryWorkOrder"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      xs_order_type_options,
+      xs_order_source_options,
+      fileUrl: urlConfig.baseURL,
+      select: "outChildCode", //默认选择下拉框
+      s_input: "", //搜索框内容
+      select_list:[],
+      sitem: null,
+      // 状态
+      statusOptions: [
+        { value: "1", label: "待库管发货" },
+        { value: "2", label: "发货完成" },
+        { value: "3", label: "已收货" },
+        { value: '3', label: '供应商驳回,待供应商负责人审核'},
+        { value: '4', label: '已全部退货'},
+      ],
+      loading: false,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      parmValue: {
+        companyNo:"",
+        customer_code:[],
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        company_name: "",
+        good_code:"",
+        skuCode:"",
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        order_type: "",
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: columns,
+    };
+  },
+  mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      const { page, size } = this.parmValue;
+      // this.parmValue.start = start || last_start;
+      // this.parmValue.end = end || last_end;
+      // if(this.parmValue.companyNo.length>0){
+      //     this.customerCode = [this.parmValue.companyNo] ;
+      // }
+
+      this.pageInfo = {
+        size: size,
+        curr: page,
+        total: 0,
+      };
+      //多选条件
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.s_input = this.parmValue.s_input;
+    } else {
+      this.select = "outChildCode";
+      //  this.sselect = "创建时间"
+    }
+    this.searchList();
+  },
+
+  methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.supplierNo = code ? [code] : [];
+      this.searchList()
+    },
+    customer_code_change(e) {
+      if (e && e.code) {
+        this.parmValue.customer_code = [e.code];
+      } else {
+        this.parmValue.customer_code = [];
+      }
+      this.searchList();
+    },
+    handleExport(){
+      if (!this.loading) {
+        this.loading = true;
+        let httpType = `aplication/zip`;
+        
+        let model = JSON.parse(JSON.stringify(this.parmValue));
+        delete model['s_input']
+
+        axios({
+          method: "post",
+          url: this.fileUrl +  "/admin/child_export",
+          responseType: "blob",
+          data: {
+            ...model,
+            [this.select]: this.s_input,
+            customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
+            supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
+            needRela: true
+          },
+          headers: {
+            Accept: httpType,
+          },
+        })
+          .then((res) => {
+            if (res && res.status == 200 && res.data) {
+              let url = window.URL.createObjectURL(
+                new Blob([res.data], { type: httpType })
+              );
+              let link = document.createElement("a");
+              link.style.display = "none";
+              link.href = url;
+              let excelName = "发货工单.zip";
+              link.setAttribute("download", excelName);
+              document.body.appendChild(link);
+              link.click();
+              link.remove();
+              window.URL.revokeObjectURL(url); //释放掉blob对象
+              this.$message.success(`导出成功！`);
+              setTimeout(() => {
+                this.loading = false;
+              }, 500);
+            } else {
+              this.$message.error(res.data.message);
+              setTimeout(() => {
+                this.loading = false;
+              }, 500);
+            }
+          })
+          .catch((error) => {
+            console.log(error);
+            this.loading = false;
+          });
+      }
+    },
+    handleSelection(order){
+      const { list } = order
+      this.select_list = list;
+    },
+    getRouter(toRouter, queryId) {
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.s_input = this.s_input;
+        let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+
+        this.routeGoto(toRouter, model);
+      } 
+    },
+    restSearch() {
+      this.s_input = ""; //清除输入框内容
+      this.select = "outChildCode"; //清除下拉框选中项
+
+      this.parmValue = {
+        order_type: "",
+        company_name: "", //申请人部门
+        good_code:"",
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+      };
+      
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0,
+      };
+      this.searchList();
+    },
+
+    openModal(id, isDetail, sitem) {
+      this.showModel = true;
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = sitem;
+    },
+    async deleteById(id, status) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+            status: status + '' === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.loading = true;
+
+      let model = JSON.parse(JSON.stringify(this.parmValue));
+      delete model['s_input']
+
+      const res = await asyncRequest.list({
+        ...model,
+        [this.select]: this.s_input,
+        customer_code: Array.isArray(this.parmValue.customer_code) ? this.parmValue.customer_code[0] : this.parmValue.customer_code,
+        supplierNo: Array.isArray(this.supplierNo) ? this.supplierNo[0] : this.supplierNo,
+        needRela: true
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    //物流公司查询
+    async handleCompany(e) {
+      console.log(e, "要求传快递简称，不传id"); //
+      if (e && e.code) {
+        this.parmValue.postCompany = [e.shortName];
+        this.parmValue.page = 1;
+      }
+      await this.searchList();
+    },
+
+    company_idsearchChange(e) {
+      const { code } = e;
+      this.parmValue.companyNo = code || "";
+      this.searchList()
+    },
+
+    // 时间
+    async handleTime(e) {
+      if (e.startTime !== "") {
+        this.parmValue.start = e.startTime;
+      } else {
+        this.parmValue.start = "";
+      }
+      if (e.endTime !== "") {
+        this.parmValue.end = e.endTime;
+      } else {
+        this.parmValue.end = "";
+      }
+      if (this.parmValue.start !== "" && this.parmValue.end !== "") {
+        this.parmValue.page = 1;
+        await this.searchList();
+      }
+    },
+  },
+};
+</script>
+   <style lang="scss" scoped>
+.sellReturn {
+}
+</style>
+   

src/views/supplierSellOut/supplierSellOutOrder/detail.vue

@@ -121,8 +121,7 @@
                 :spucode="sitem.good_code"
               />
             </el-collapse-item>
-            <!-- @todo: 库存品只能由角色库管和库管-张凯旋操作；非库存品和采返商品 只能有当前供应商负责人操作  -->
-            <el-collapse-item
+            <!-- <el-collapse-item
               title="库管发货"
               name="3"
               v-if="
@@ -142,7 +141,7 @@
                 :sitem="sitem"
                 @refresh="initData"
               />
-            </el-collapse-item>
+            </el-collapse-item> -->
 
             <el-collapse-item
               title="售后申请单结果"