build

src/components/good-online-platform-modal/main.vue

@@ -130,14 +130,12 @@
               :src="scope.row.good_thumb_img"
               style="display: inline-block; width: 100%; height: 100%"
               alt=""
-            />
+            >
           </div>
         </template>
         <template #model="{ scope }">
           <span v-for="(si, sii) in scope.row.specinfo" :key="si.spec_id">
-            <span v-if="sii !== 0">--</span
-            ><span>{{ si.spec_name }}[{{ si.spec_value }}]</span></span
-          >
+            <span v-if="sii !== 0">--</span><span>{{ si.spec_name }}[{{ si.spec_value }}]</span></span>
         </template>
         <template #is_stock="{ scope }">
           <span>{{ scope.row.is_stock + "" === "1" ? "库存品" : "非库存品" }} </span>
@@ -148,19 +146,19 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/search-good-online-modal";
-import asyncYZRequest from "@/apis/service/youzan/othgoodsOnline";
-import resToken from "@/mixins/resToken";
-import mixinPage from "@/mixins/elPaginationHandle";
-import { mapGetters } from "vuex";
-import columns from "./columns";
+import asyncRequest from '@/apis/components/search-good-online-modal'
+import asyncYZRequest from '@/apis/service/youzan/othgoodsOnline'
+import resToken from '@/mixins/resToken'
+import mixinPage from '@/mixins/elPaginationHandle'
+import { mapGetters } from 'vuex'
+import columns from './columns'
 export default {
-  name: "SearchGoodOnlineModal",
+  name: 'SearchGoodOnlineModal',
   mixins: [resToken, mixinPage],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
-  props: ["showModel", "once", "sitem", "active", "platform_type"],
+  props: ['showModel', 'once', 'sitem', 'active', 'platform_type'],
 
   /**
    * 属性集合
@@ -173,31 +171,31 @@ export default {
    */
   data() {
     return {
-      select: "1",
-      sinput: "",
+      select: '1',
+      sinput: '',
       is_stock: [
-        { id: "0", name: "非库存品" },
-        { id: "1", name: "库存品" },
+        { id: '0', name: '非库存品' },
+        { id: '1', name: '库存品' }
       ],
       selectLoading: false,
-      searchName: "",
+      searchName: '',
       supplierCode: [],
       loading: true,
       showModelThis: false,
       parmValue: {
-        platform_code: "",
-        companyNo: "",
-        is_stock: "",
-        exam_status: "",
+        platform_code: '',
+        companyNo: '',
+        is_stock: '',
+        exam_status: '',
         cat_id: [], // 商品属性code
         brandid: [],
-        skucode: "",
-        spucode: "", // 商品编码
-        good_name: "", // 商品名称
-        plat_code: "",
+        skucode: '',
+        spucode: '', // 商品编码
+        good_name: '', // 商品名称
+        plat_code: '',
 
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
       tableData: [],
       passwordModel: false,
@@ -208,162 +206,167 @@ export default {
       // 表格 - 参数
       table: {
         stripe: true,
-        border: true,
+        border: true
         // _defaultHeader_: ["setcol"],
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格 - 列参数
-      columns: columns,
-    };
+      columns: columns
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.restSearch();
+        this.restSearch()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
 
   methods: {
     restSearch() {
-      console.log(this.active);
-      console.log(this.sitem);
-      const { platform_code, company_id, is_stock } = this.sitem;
+      console.log(this.active)
+      console.log(this.sitem)
+      const { platform_code, company_id, is_stock } = this.sitem
 
       this.parmValue = {
-        platform_code: platform_code || "",
-        companyNo: company_id || "", // 业务企业编号
-        is_stock: is_stock || "",
+        platform_code: platform_code || '',
+        companyNo: company_id || '', // 业务企业编号
+        is_stock: is_stock || '',
         cat_id: [], // 商品属性code
         brandid: [],
-        exam_status: this.active ? "3" : "",
-        skucode: "",
-        spucode: "", // 商品编码
-        good_name: "", // 商品名称
-        plat_code: "",
+        exam_status: this.active ? '3' : '',
+        skucode: '',
+        spucode: '', // 商品编码
+        good_name: '', // 商品名称
+        plat_code: '',
         page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
+        size: 15 // 每页显示条数
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
     async goods_class_change(e) {
-      this.parmValue.cat_id = e;
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.parmValue.cat_id = e
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async brandidsearchChange(e) {
-      const { id } = e;
-      this.parmValue.brandid = id ? [id] : [];
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      const { id } = e
+      this.parmValue.brandid = id ? [id] : []
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async platform_codesearchChange(e) {
-      const { id, code, label } = e;
-      this.parmValue.platform_code = id ? [id] : [];
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      const { id, code, label } = e
+      this.parmValue.platform_code = id ? [id] : []
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async company_idsearchChange(e) {
-      const { id, code, label } = e;
-      this.parmValue.company_id = code || "";
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      const { id, code, label } = e
+      this.parmValue.company_id = code || ''
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async searchList() {
-      this.loading = true;
-      const model = JSON.parse(JSON.stringify(this.parmValue));
-      model.cat_id = model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
+      this.loading = true
+      const model = JSON.parse(JSON.stringify(this.parmValue))
+      model.cat_id = model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : ''
       model.brandid =
-        model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
-      model.spucode = this.select === "2" ? this.sinput : ""; // 商品编码
-      model.good_name = this.select === "1" ? this.sinput : ""; // 商品名称
-      model.plat_code = this.select === "3" ? this.sinput : "";
-      model.skucode = this.select === "4" ? this.sinput : "";
+        model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : ''
+      model.spucode = this.select === '2' ? this.sinput : '' // 商品编码
+      model.good_name = this.select === '1' ? this.sinput : '' // 商品名称
+      model.plat_code = this.select === '3' ? this.sinput : ''
+      model.skucode = this.select === '4' ? this.sinput : ''
       // model.platform_code =
       //   model.platform_code.length > 0
       //     ? model.platform_code[model.platform_code.length - 1]
       //     : "";
 
-      const apis = this.platform_type + "" === "1" ? asyncYZRequest : asyncRequest;
+      const apis = this.platform_type + '' === '1' ? asyncYZRequest : asyncRequest
 
-      const res = await apis.list(model);
+      const status = this.platform_type + '' === '1' ? '6' : '3'
+
+      const res = await apis.list({
+        ...model,
+        exam_status: status
+      })
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.map((e) => {
-          e.cat_name = "";
+          e.cat_name = ''
           if (e.cat_info && e.cat_info.length > 0) {
             e.cat_info.forEach((si, sii) => {
-              e.cat_name += `${sii !== 0 ? "_" : ""}${si.name}`;
-            });
+              e.cat_name += `${sii !== 0 ? '_' : ''}${si.name}`
+            })
           }
-          return e;
-        });
+          return e
+        })
 
-        this.pageInfo.total = Number(res.data.count);
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
+      this.loading = false
     },
     async remoteMethod(query) {
-      this.selectLoading = true;
-      if (query !== "") {
-        this.options = [];
+      this.selectLoading = true
+      if (query !== '') {
+        this.options = []
         const formValue = {
           page: 1,
           size: 100,
           name: query,
-          code: "",
-        };
+          code: ''
+        }
 
-        const res = await asyncRequest.supplierList(formValue);
+        const res = await asyncRequest.supplierList(formValue)
         if (res && res.code === 0 && res.data) {
-          const { list } = res.data;
-          this.options = list;
+          const { list } = res.data
+          this.options = list
         } else if (res && res.code >= 100 && res.code <= 104) {
-          await this.logout();
+          await this.logout()
         } else {
-          this.$message.warning(res.message);
+          this.$message.warning(res.message)
         }
       } else {
-        this.options = [];
+        this.options = []
       }
-      this.selectLoading = false;
+      this.selectLoading = false
     },
     async resultList(selection) {
       if (selection && selection.length > 1 && this.once) {
-        this.$message.warning("只能选择一条商品信息！");
-        return;
+        this.$message.warning('只能选择一条商品信息！')
+        return
       }
-      this.showModelThis = false;
-      this.$emit("resultList", selection);
-    },
-  },
-};
+      this.showModelThis = false
+      this.$emit('resultList', selection)
+    }
+  }
+}
 </script>
 
 <style></style>

src/components/show-good-data-modal/ShowDataTableColumns.js

@@ -1,58 +1,57 @@
 export default [
   {
-    prop: "good_name",
-    label: "商品名称",
-    _slot_: "good_name",
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name'
   },
 
   {
-    prop: "speclist",
-    label: "规格",
-    _slot_: "speclist",
+    prop: 'speclist',
+    label: '规格',
+    _slot_: 'speclist'
   },
   {
-    prop: "supplierName",
-    label: "供应商名称",
+    prop: 'supplierName',
+    label: '供应商名称'
   },
   {
-    prop: "company",
-    label: "业务企业名称",
+    prop: 'company',
+    label: '业务企业名称'
   },
   {
-    prop: "good_info_img",
-    _slot_: "good_info_img",
-    label: "详情图",
+    prop: 'good_info_img',
+    _slot_: 'good_info_img',
+    label: '详情图'
   },
   {
-    prop: "online_reason",
-    label: "上线原因",
+    prop: 'online_reason',
+    label: '上线原因'
   },
-    {
-      prop: "skuCode",
-      label: "上线后商品编号",
-      span: 8,
+  {
+    prop: 'skuCode',
+    label: '上线后商品编号',
+    span: 8
   },
   {
-    prop: "spuCode",
-    label: "成本商品编号",
-    span: 8,
+    prop: 'spuCode',
+    label: '成本商品编号',
+    span: 8
   },
 
-
   {
-    prop: "creater",
-    label: "申请人",
-    span: 8,
+    prop: 'creater',
+    label: '申请人',
+    span: 8
   },
   {
-    prop: "platform_name",
-    label: "上线平台",
-    span: 8,
+    prop: 'platform_name',
+    label: '上线平台',
+    span: 8
   },
   {
-    prop: "plat_code",
-    label: "平台商品编码",
-    span: 8,
+    prop: 'plat_code',
+    label: '平台商品编码',
+    span: 8
   },
   // {
   //   prop: "online_time",
@@ -60,26 +59,26 @@ export default [
   //   span: 8,
   // },
   {
-    prop: "cat",
-    label: "分类",
-    span: 8,
+    prop: 'cat',
+    label: '分类',
+    span: 8
   },
-  
+
   {
-    prop: "brand_name",
-    label: "品牌",
-    span: 8,
+    prop: 'brand_name',
+    label: '品牌',
+    span: 8
   },
   {
-    prop: "unit",
-    label: "单位",
-    span: 4,
+    prop: 'unit',
+    label: '单位',
+    span: 4
   },
   {
-    prop: "tax",
-    label: "税点",
+    prop: 'tax',
+    label: '税点',
     append: '%',
-    span: 4,
+    span: 4
   },
 
   // {
@@ -89,49 +88,48 @@ export default [
   //   span: 6,
   // },
   {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
-    span: 8,
+    prop: 'good_type',
+    label: '是否定制',
+    _slot_: 'good_type',
+    span: 8
   },
   {
-    prop: "is_stock",
-    label: "是否库存品",
-    _slot_: "is_stock",
-    span: 6,
+    prop: 'is_stock',
+    label: '是否库存品',
+    _slot_: 'is_stock',
+    span: 6
   },
- 
- 
+
   {
-    prop: "delivery_day",
-    label: "物流时间",
+    prop: 'delivery_day',
+    label: '物流时间',
     append: '天',
-    span: 6,
+    span: 6
   },
   {
-    prop: "lead_time",
-    label: "供货周期",
+    prop: 'lead_time',
+    label: '供货周期',
     append: '天',
-    span: 6,
+    span: 6
   },
   {
-    prop: "sample_day",
-    label: "调样周期",
+    prop: 'sample_day',
+    label: '调样周期',
     append: '天',
-    span: 6,
+    span: 6
   },
-  
+
   {
-    prop: "exclusive",
-    label: "专属类型",
-    _slot_: "exclusive",
-    span: 8,
+    prop: 'exclusive',
+    label: '专属类型',
+    _slot_: 'exclusive',
+    span: 8
   },
   {
-    prop: "weight",
-    label: "商品总克重",
+    prop: 'weight',
+    label: '商品总克重',
     append: 'g',
-    span: 8,
+    span: 8
   },
 
   // {
@@ -165,10 +163,10 @@ export default [
   //   span: 8,
   // },
   {
-    prop: "supply_area",
-    label: "供货区域",
-    _slot_: "supply_area",
-    span: 8,
+    prop: 'supply_area',
+    label: '供货区域',
+    _slot_: 'supply_area',
+    span: 8
   },
   // {
   //   prop: "delivery_place_cn",
@@ -181,8 +179,6 @@ export default [
   //   span: 8,
   // },
 
-
-
   // {
   //   prop: "cert_fee",
   //   label: "证书费(元)",
@@ -236,43 +232,43 @@ export default [
   //   _slot_: "is_step",
   //   span: 8,
   // },
+  // {
+  //   prop: "exam_status",
+  //   label: "状态",
+  //   _slot_: "exam_status",
+  //   span: 8,
+  // },
   {
-    prop: "exam_status",
-    label: "状态",
-    _slot_: "exam_status",
-    span: 8,
-  },
-  {
-    prop: "updatetime",
-    label: "更新时间",
-    span: 8,
+    prop: 'updatetime',
+    label: '更新时间',
+    span: 12
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    span: 8,
+    prop: 'addtime',
+    label: '创建时间',
+    span: 12
   },
 
   {
-    prop: "online_remark",
-    label: "上线备注",
-    span: 24,
+    prop: 'online_remark',
+    label: '上线备注',
+    span: 24
   },
   {
-    prop: "after_sales",
-    label: "售后说明",
-    span: 24,
+    prop: 'after_sales',
+    label: '售后说明',
+    span: 24
   },
   {
-    prop: "good_remark",
-    label: "商品备注",
-    span: 24,
+    prop: 'good_remark',
+    label: '商品备注',
+    span: 24
   },
 
   {
-    prop: "craft_desc",
-    label: "工艺说明",
-    span: 24,
+    prop: 'craft_desc',
+    label: '工艺说明',
+    span: 24
   },
 
   // {
@@ -282,12 +278,11 @@ export default [
   //   span: 24,
   // },
   {
-    prop: "ladderlist",
-    label: "销售起订量",
-    _slot_: "ladderlist",
-    span: 24,
-  },
-
+    prop: 'ladderlist',
+    label: '销售起订量',
+    _slot_: 'ladderlist',
+    span: 24
+  }
 
 ]
 

src/components/show-good-data-modal/columns.js

@@ -1,95 +1,95 @@
 
-//是否定制
+// 是否定制
 const options1 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//专属类型
+// 专属类型
 const options2 = [
-  { id: "0", name: "非泰康" },
-  { id: "1", name: "泰康" },
+  { id: '0', name: '非泰康' },
+  { id: '1', name: '泰康' }
 ]
-//销售权限
+// 销售权限
 const options3 = [
-  { id: "0", name: "无销售权限" },
-  { id: "1", name: "有销售权限" },
+  { id: '0', name: '无销售权限' },
+  { id: '1', name: '有销售权限' }
 ]
 
-//是否库存品
+// 是否库存品
 const options4 = [
-  { id: "0", name: "非库存品" },
-  { id: "1", name: "库存品" },
+  { id: '0', name: '非库存品' },
+  { id: '1', name: '库存品' }
 ]
-//是否启用实时金价
+// 是否启用实时金价
 const options5 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
-//供货区域
+// 供货区域
 const options6 = [
-  { id: "1", name: "全国" },
-  { id: "2", name: "全国除偏远" },
+  { id: '1', name: '全国' },
+  { id: '2', name: '全国除偏远' }
 ]
-//是否启用阶梯
+// 是否启用阶梯
 const options7 = [
-  { id: "0", name: "否" },
-  { id: "1", name: "是" },
+  { id: '0', name: '否' },
+  { id: '1', name: '是' }
 ]
 const options8 = [
-  { id: "0", name: "待提交" },
-  { id: "1", name: "待完善成本" },
-  { id: "2", name: "待产品审核" },
-  { id: "3", name: "待财务定价" },
-  { id: "4", name: "待财务审核定价" },
-  { id: "5", name: "待上线" },
-  { id: "6", name: "上线成功" },
-  { id: "7", name: "审核失败" },
+  { id: '0', name: '待提交' },
+  { id: '1', name: '待完善成本' },
+  { id: '2', name: '待产品审核' },
+  { id: '3', name: '待财务定价' },
+  { id: '4', name: '待财务审核定价' },
+  { id: '5', name: '待上线' },
+  { id: '6', name: '上线成功' },
+  { id: '7', name: '审核失败' }
 ]
 const columns = [
   {
-    prop: "skuCode",
-    label: "编号",
-    fixed: "left",
-    width: "160px",
+    prop: 'skuCode',
+    label: '编号',
+    fixed: 'left',
+    width: '160px'
   },
   {
-    prop: "good_thumb_img",
-    label: "图片",
-    _slot_: "good_thumb_img",
-    width: "45px",
+    prop: 'good_thumb_img',
+    label: '图片',
+    _slot_: 'good_thumb_img',
+    width: '45px'
   },
   {
-    prop: "good_name",
-    label: "名称",
-    "min-width": "160px",
+    prop: 'good_name',
+    label: '名称',
+    'min-width': '160px'
   },
   {
-    prop: "plat_code",
-    label: "平台编号",
-    width: "170px",
+    prop: 'plat_code',
+    label: '平台编号',
+    width: '170px'
   },
   {
-    prop: "platform_name",
-    label: "平台名称",
-    width: "118px",
+    prop: 'platform_name',
+    label: '平台名称',
+    width: '118px'
   },
 
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "118px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '118px'
   },
   {
-    prop: "cat_name",
-    label: "分类",
-    width: "118px",
+    prop: 'cat_name',
+    label: '分类',
+    width: '118px'
   },
   {
-    prop: "good_type",
-    label: "是否定制",
-    _slot_: "good_type",
-    width: "70px",
+    prop: 'good_type',
+    label: '是否定制',
+    _slot_: 'good_type',
+    width: '70px'
   },
   // {
   //   prop: "good_type",
@@ -99,8 +99,8 @@ const columns = [
   // },
 
   {
-    prop: "brand_name",
-    label: "品牌",
+    prop: 'brand_name',
+    label: '品牌'
   },
 
   // {
@@ -114,59 +114,59 @@ const columns = [
   //   width: "110px",
   // },
   {
-    prop: "companyNo",
-    label: "业务公司编号",
-    width: "110px",
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '110px'
   },
   {
-    prop: "company",
-    label: "业务公司名称",
-    width: "110px",
+    prop: 'company',
+    label: '业务公司名称',
+    width: '110px'
   },
 
   {
-    prop: "creater",
-    label: "创建人",
-    width: "70px",
+    prop: 'creater',
+    label: '创建人',
+    width: '70px'
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "140px",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '140px'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    width: "50px",
-    _slot_: "operation",
-  },
+    width: '50px',
+    _slot_: 'operation'
+  }
 ]
 const rules = {
   platform: [
     {
-      type: "array",
+      type: 'array',
       required: true,
-      message: "请选择所属平台",
-      trigger: "change",
-    },
+      message: '请选择所属平台',
+      trigger: 'change'
+    }
   ],
   online_reason: [
     {
       required: true,
-      message: "上线原因不能为空",
-      trigger: "blur",
-    },
+      message: '上线原因不能为空',
+      trigger: 'blur'
+    }
   ],
   online_remark: [
     {
       required: true,
-      message: "上线备注不能为空",
-      trigger: "blur",
-    },
-  ],
+      message: '上线备注不能为空',
+      trigger: 'blur'
+    }
+  ]
 
 }
 
-export { options1, options2, options3, options4, options5, options6, options7, options8, columns, rules }
+export { options1, options2, options3, options4, options5, options6, options7, options8, columns, rules }

src/views/goodStore/active/columns.js

@@ -1,65 +1,65 @@
-//是否定制
+// 是否定制
 const options1 = [
-  { id: "0", name: "是" },
-  { id: "1", name: "否" },
-];
-//专属类型
+  { id: '0', name: '是' },
+  { id: '1', name: '否' }
+]
+// 专属类型
 const options2 = [
-  { id: "0", name: "非泰康" },
-  { id: "1", name: "泰康" },
-];
-//销售权限
+  { id: '0', name: '非泰康' },
+  { id: '1', name: '泰康' }
+]
+// 销售权限
 const options3 = [
-  { id: "0", name: "有销售权限" },
-  { id: "1", name: "无销售权限" },
-];
+  { id: '0', name: '有销售权限' },
+  { id: '1', name: '无销售权限' }
+]
 
-//是否库存品
+// 是否库存品
 const options4 = [
-  { id: "0", name: "库存品" },
-  { id: "1", name: "非库存品" },
-];
-//是否启用实时金价
+  { id: '0', name: '库存品' },
+  { id: '1', name: '非库存品' }
+]
+// 是否启用实时金价
 const options5 = [
-  { id: "0", name: "是" },
-  { id: "1", name: "否" },
-];
-//供货区域
+  { id: '0', name: '是' },
+  { id: '1', name: '否' }
+]
+// 供货区域
 const options6 = [
-  { id: "0", name: "全国" },
-  { id: "1", name: "全国除偏远" },
-];
+  { id: '0', name: '全国' },
+  { id: '1', name: '全国除偏远' }
+]
 const listCol = [
   {
-    prop: "activity_code",
-    label: "活动编码",
-    fixed: "left",
-    width: "155",
+    prop: 'activity_code',
+    label: '活动编码',
+    fixed: 'left',
+    width: '155'
   },
   {
-    prop: "activity_name",
-    label: "活动名称",
+    prop: 'activity_name',
+    label: '活动名称'
   },
   {
-    prop: "status",
-    label: "状态",
-    width: "105",
-    _slot_: "status",
+    prop: 'status',
+    label: '状态',
+    width: '105',
+    _slot_: 'status'
   },
 
   {
-    prop: "atime",
-    label: "活动时间",
-    _slot_: "atime",
-    width: "270",
+    prop: 'atime',
+    label: '活动时间',
+    _slot_: 'atime',
+    width: '270'
   },
   // {
   //   prop: "platform_code",
   //   label: "平台编号",
   // },
   {
-    prop: "platform_name",
-    label: "平台名称",
+    prop: 'platform_name',
+    label: '平台名称'
   },
   {
     prop: 'companyNo',
@@ -72,52 +72,52 @@ const listCol = [
     'min-width': '135'
   },
   {
-    prop: "company_name",
-    label: "创建人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '创建人部门',
+    minWidth: '150px'
   },
   {
-    prop: "creater",
-    label: "创建人",
-    width: "60",
+    prop: 'creater',
+    label: '创建人',
+    width: '60'
   },
   {
-    prop: "addtime",
-    label: "创建时间",
-    width: "142",
+    prop: 'addtime',
+    label: '创建时间',
+    width: '142'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: "50",
-  },
-];
+    _slot_: 'operation',
+    width: '50'
+  }
+]
 const showColumns = [
   {
-    prop: "skuCode",
-    label: "商品编码",
+    prop: 'skuCode',
+    label: '商品编码'
   },
   {
-    prop: "sale_price",
-    label: "非活动价",
-    append: "元",
-    span: 6,
+    prop: 'sale_price',
+    label: '非活动价',
+    append: '元',
+    span: 6
   },
   {
-    prop: "activity_price",
-    label: "活动价",
-    append: "元",
-    span: 6,
+    prop: 'activity_price',
+    label: '活动价',
+    append: '元',
+    span: 6
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    span: 24,
-  },
-];
+    prop: 'good_name',
+    label: '商品名称',
+    span: 24
+  }
+]
 
 export {
   options1,
@@ -127,5 +127,5 @@ export {
   options5,
   options6,
   listCol,
-  showColumns,
-};
+  showColumns
+}

src/views/sellOut/beforeReturnGoodWorkOrder/columns.js

@@ -2,7 +2,7 @@ export default [
   // { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'saleReturnChildCode',
-    label: '退货工单编号',
+    label: '售前退货工单编号',
     width: '160'
   },
   {
@@ -16,6 +16,28 @@ export default [
     _slot_: 'status',
     width: '80px'
   },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100px'
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退回仓库编码',
+    width: '150px'
+  },
+  {
+    prop: 'return_wsm_name',
+    label: '退回仓库名称',
+    width: '150px',
+    _slot_: 'returnWsm'
+  },
+  {
+    prop: 'return_contactor_name',
+    label: '仓库负责人',
+    width: '120px'
+  },
   {
     prop: 'companyNo',
     label: '业务公司编号',
@@ -46,16 +68,6 @@ export default [
     label: '客户名称',
     width: '150px'
   },
-  {
-    prop: 'return_wsm_code',
-    label: '退回仓库编码',
-    width: '150px'
-  },
-  {
-    prop: 'return_wsm_name',
-    label: '退回仓库名称',
-    width: '150px'
-  },
   // {
   //   prop: 'apply_name',
   //   label: '创建人',

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

@@ -1,7 +1,7 @@
 const showColumns = [
   {
     prop: 'returnCode',
-    label: '退货工单号',
+    label: '售前退货工单号',
     span: 8
   },
   {

src/views/sellOut/beforeReturnGoodWorkOrder/detail.vue

@@ -8,7 +8,7 @@
       <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">
+            <el-collapse-item title="售前退货工单详情" name="0">
               <show-data-table
                 style="margin: 0; padding: 0"
                 :sitem="sitem"
@@ -58,10 +58,27 @@
                   <span>{{ sitem.return_wsm_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
+                      <li><h3>退货仓库</h3></li>
                       <li>
-                        <span>退货仓库编码:</span
+                        <span>编码:</span
                         ><span>{{ sitem.return_wsm_code }}</span>
                       </li>
+                      <li>
+                        <span>名称:</span
+                        ><span>{{ sitem.return_wsm_name }}</span>
+                      </li>
+                      <li>
+                        <span>负责人:</span
+                        ><span>{{ sitem.return_contactor_name }}</span>
+                      </li>
+                      <li>
+                        <span>供应商编码:</span
+                        ><span>{{ sitem.return_supplierNo }}</span>
+                      </li>
+                      <li>
+                        <span>供应商名称:</span
+                        ><span>{{ sitem.return_supplierName }}</span>
+                      </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>

src/views/sellOut/beforeReturnGoodWorkOrder/index.vue

@@ -41,15 +41,38 @@
                 </el-col> -->
 
               <el-col :span="4" style="margin-right:10px">
-                <el-input v-model="parmValue.saleReturnChildCode"  placeholder="退货工单编号" size="mini"  clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
+                <el-input v-model="parmValue.saleReturnChildCode"  placeholder="售前退货工单编号" size="mini"  clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
-
+              
               <el-col :span="4">
                 <el-select placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <el-option label="待收货" value="1" />
                   <el-option label="已收货" value="2" />
                 </el-select>
               </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"
@@ -90,6 +113,36 @@
           ></el-tag>
         </template>
 
+        <template #returnWsm="{scope}">
+          <el-popover placement="top" width="360" trigger="hover">
+            <i class="el-icon-warning-outline" slot="reference"></i>
+             <ul>
+               <li><h3>退货仓库</h3></li>
+               <li>
+                 <span>编号:</span
+                 ><span>{{ scope.row.return_wsm_code }}</span>
+               </li>
+               <li>
+                 <span>名称:</span
+                 ><span>{{ scope.row.return_wsm_name}}</span>
+               </li>
+               <li>
+                 <span>负责人:</span
+                 ><span>{{scope.row.return_contactor_name}}</span>
+               </li>
+               <li>
+                 <span>供应商编码:</span
+                 ><span>{{ scope.row.return_supplierNo }}</span>
+               </li>
+               <li>
+                 <span>供应商名称:</span
+                 ><span>{{ scope.row.return_supplierName }}</span>
+               </li>
+             </ul>
+           </el-popover>
+          <span>{{ scope.row.return_wsm_name }}</span>
+        </template>
+
         <template #type="{scope}">
           <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
         </template>
@@ -184,6 +237,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        order_type:"",
         saleReturnChildCode: "",
         status: "",
         page: 1, // 页码

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -61,6 +61,29 @@
                   </el-select>
                 </el-col>
 
+                <el-col :span="4" style="width: 150px; margin-left: 10px">
+                  <el-select
+                    :size="searchSize"
+                    v-model="parmValue.status"
+                    filterable
+                    clearable
+                    placeholder="状态"
+                    style="width: 100%"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-option
+                      v-for="item in statusOptions"
+                      :key="'orderstatus' + item.id"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-col>
+
                 <el-col :span="4" class="fr" style="width: 66px; padding: 0 0 0 10px">
                   <el-button
                     type="warning"
@@ -164,7 +187,7 @@
                 >
               </div>
 
-              <div style="float: right">
+              <div style="float: right" v-if="powers.includes('087')">
                 <el-button type="primary" size="mini" @click="handleExport"
                   >发货工单导出</el-button
                 >
@@ -279,7 +302,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((i) => i == '007')"
+            v-if="powers.some((i) => i == '007') && dpowers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -324,6 +347,14 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    dpowers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "deliveryWorkOrderDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
   },
   data() {
     return {
@@ -348,6 +379,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        status: "",
         has_account: "",
         customer_code: [],
         returnCode: "", //销售退货code

src/views/sellOut/returnGoodWorkOrder/columns.js

@@ -5,12 +5,12 @@ export default [
     label: '售后退货单号',
     width: '160'
   },
-  {
-    prop: 'type',
-    label: '工单退货类型',
-    width: '100',
-    _slot_: 'type'
-  },
+  // {
+  //   prop: 'type',
+  //   label: '工单退货类型',
+  //   width: '100',
+  //   _slot_: 'type'
+  // },
   {
     prop: 'outChildCode',
     label: '发货工单编号',
@@ -27,25 +27,15 @@ export default [
     _slot_: 'status'
   },
   {
-    prop: 'companyNo',
-    label: '业务公司编号',
-    width: '150px'
+    prop: 'return_num',
+    label: '退货数量'
   },
   {
-    prop: 'companyName',
-    label: '业务公司名称',
-    width: '150px'
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100px'
   },
-  // {
-  //   prop: 'customer_code',
-  //   label: '客户公司编码',
-  //   width: '150px'
-  // },
-  // {
-  //   prop: 'customer_name',
-  //   label: '客户公司名称',
-  //   width: '150px'
-  // },
   {
     prop: 'return_wsm_code',
     label: '退货仓库编码',
@@ -54,23 +44,14 @@ export default [
   {
     prop: 'return_wsm_name',
     label: '退货仓库名称',
-    width: '130px'
+    width: '130px',
+    _slot_: 'returnWsm'
   },
   {
     prop: 'return_contactor_name',
     label: '退货仓库负责人',
     width: '110px'
   },
-  {
-    prop: 'return_supplierName',
-    label: '退货仓库供应商名称',
-    width: '130px'
-  },
-  {
-    prop: 'return_supplierNo',
-    label: '退货仓库供应商编码',
-    width: '130px'
-  },
   {
     prop: 'send_wsm_code',
     label: '发货仓库编码',
@@ -79,7 +60,8 @@ export default [
   {
     prop: 'send_wsm_name',
     label: '发货仓库名称',
-    width: '130px'
+    width: '130px',
+    _slot_: 'sendWsm'
   },
   {
     prop: 'send_contactor_name',
@@ -87,55 +69,15 @@ export default [
     width: '110px'
   },
   {
-    prop: 'send_supplierName',
-    label: '发货仓库供应商名称',
-    width: '130px'
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '150px'
   },
   {
-    prop: 'send_supplierNo',
-    label: '发货仓库供应商编码',
-    width: '130px'
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '150px'
   },
-  // {
-  //   prop: 'companyNo',
-  //   label: '业务公司编号',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'companyName',
-  //   label: '业务公司名称',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'customer_code',
-  //   label: '客户编码',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'customerNname',
-  //   label: '客户名称',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'send_num',
-  //   label: '下单数量',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'sale_price',
-  //   label: '销售单价',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'total_price',
-  //   label: '销售合计 ',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'addtime',
-  //   label: '下单时间',
-  //   width: '160'
-  // },
   {
     prop: '',
     width: 50,

src/views/sellOut/returnGoodWorkOrder/detail.vue

@@ -71,20 +71,29 @@
                   <span>{{ sitem.return_wsm_name }}</span>
                   <el-popover placement="top" width="360" trigger="hover">
                     <ul>
+                      <li><h3>退货仓库</h3></li>
                       <li>
-                        <span>退货仓库编号:</span
+                        <span>编号:</span
                         ><span>{{ sitem.return_wsm_code }}</span>
                       </li>
                       <li>
-                        <span>退货仓库供应商编码:</span
+                        <span>名称:</span
+                        ><span>{{ sitem.return_wsm_name}}</span>
+                      </li>
+                      <li>
+                        <span>负责人:</span
+                        ><span>xx</span>
+                      </li>
+                      <li>
+                        <span>供应商编码:</span
                         ><span>{{ sitem.return_supplierNo }}</span>
                       </li>
                       <li>
-                        <span>退货仓库供应商名称:</span
+                        <span>供应商名称:</span
                         ><span>{{ sitem.return_supplierName }}</span>
                       </li>
                     </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    <i class="el-icon-warning-outline fr" slot="reference" />
                   </el-popover>
                 </template>
 
@@ -92,16 +101,25 @@
                   <span>{{ sitem.send_wsm_name }}</span>
                   <el-popover placement="top" width="360" trigger="hover">
                     <ul>
+                      <li><h3>发货仓库</h3></li>
                       <li>
-                        <span>发货仓库编号:</span
+                        <span>编号:</span
                         ><span>{{ sitem.send_wsm_code }}</span>
                       </li>
                       <li>
-                        <span>发货仓库供应商编码:</span
+                        <span>名称:</span
+                        ><span>{{ sitem.send_wsm_name }}</span>
+                      </li>
+                      <li>
+                        <span>负责人:</span
+                        ><span>xx</span>
+                      </li>
+                      <li>
+                        <span>供应商编码:</span
                         ><span>{{ sitem.send_supplierNo }}</span>
                       </li>
                       <li>
-                        <span>发货仓库供应商名称:</span
+                        <span>供应商名称:</span
                         ><span>{{ sitem.send_supplierName }}</span>
                       </li>
                     </ul>

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -32,12 +32,36 @@
                 <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
-              <el-col :span="4">
+              <el-col :span="4" style="margin-right:10px">
                 <el-select placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <el-option label="待收货" value="1" />
                   <el-option label="已收货" value="2" />
                 </el-select>
               </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"
@@ -78,6 +102,70 @@
           ></el-tag>
         </template>
 
+        <template #returnWsm="{scope}">
+          <el-popover placement="top" width="360" trigger="hover">
+             <i class="el-icon-warning-outline" slot="reference"></i>
+             <ul>
+               <li><h3>退货仓库</h3></li>
+               <li>
+                 <span>编号:</span
+                 ><span>{{ scope.row.return_wsm_code }}</span>
+               </li>
+               <li>
+                 <span>名称:</span
+                 ><span>{{ scope.row.return_wsm_name}}</span>
+               </li>
+               <li>
+                 <span>负责人:</span
+                 ><span>{{ scope.row.return_contactor_name}}</span>
+               </li>
+               <li>
+                 <span>供应商编码:</span
+                 ><span>{{ scope.row.return_supplierNo }}</span>
+               </li>
+               <li>
+                 <span>供应商名称:</span
+                 ><span>{{ scope.row.return_supplierName }}</span>
+               </li>
+             </ul>
+           </el-popover>
+           <span>{{ scope.row.return_wsm_name }}</span>
+        </template>
+
+        <template #order_type="{scope}">
+          <el-tag>{{(xs_order_type_options.find(({id}) => id === scope.row.order_type) || {})?.label || '--'}}</el-tag>
+        </template>
+
+        <template #sendWsm="{scope}">
+          <el-popover placement="top" width="360" trigger="hover">
+            <i class="el-icon-warning-outline" slot="reference"></i>
+             <ul>
+               <li><h3>退货仓库</h3></li>
+               <li>
+                 <span>编号:</span
+                 ><span>{{ scope.row.send_wsm_code }}</span>
+               </li>
+               <li>
+                 <span>名称:</span
+                 ><span>{{ scope.row.send_wsm_name}}</span>
+               </li>
+               <li>
+                 <span>负责人:</span
+                 ><span>{{ scope.row.send_contactor_name}}</span>
+               </li>
+               <li>
+                 <span>供应商编码:</span
+                 ><span>{{ scope.row.send_supplierNo }}</span>
+               </li>
+               <li>
+                 <span>供应商名称:</span
+                 ><span>{{ scope.row.send_supplierName }}</span>
+               </li>
+             </ul>
+           </el-popover>
+           <span>{{ scope.row.send_wsm_name }}</span>
+        </template>
+
         <template #type="{scope}">
           <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
         </template>
@@ -138,7 +226,6 @@ import urlConfig from "@/apis/url-config";
 import { mapGetters } from "vuex";
 import columns from "./columns";
 
-
 export default {
   name: "sellReturn",
   mixins: [mixinPage, resToken, companyHelper],
@@ -172,6 +259,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        order_type: "",
         returnCode:"",
         status: "",
         page: 1, // 页码

src/views/sellOut/sellAfterApply/index.vue

@@ -118,19 +118,6 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <!-- <el-col :span="4" >
-                  <el-select style="width:100%;margin-left:10px" placeholder="供应商端开启状态" clearable size="mini"  v-model="parmValue.has_account"  
-                    @change="
-                        pageInfo.curr = 1;
-                        parmValue.page = 1;
-                        searchList();
-                      "
-                  >
-                    <el-option value="0" label="未开通" />
-                    <el-option value="1" label="已开通"/>
-                  </el-select>
-              </el-col> -->
-
               <el-col :span="2" style="width: 65px; float: right">
                 <el-button
                   type="warning"
@@ -356,16 +343,14 @@ export default {
       // 收到货状态
       statusOptions: [
         { id: "1", label: "待业务审核" },
-        { id: "6", label: "业务已驳回" },
         { id: "9", label: "供应商审核" },
         { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
         { id: "10", label: "业务公司修改，待供应商确认" },
         { id: "11", label: "待设置工单" }, //已收到货才有
-        //{ id: "2", label: "待设置仓库" },//节点废除
         { id: "4", label: "待客户退货" }, //已收到货才有
         { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
+        { id: "6", label: "业务已驳回" },
         { id: "8", label: "申请已取消" },
       ],
       loading: false,

src/views/sellOut/sellOutOrder/index.vue

@@ -276,7 +276,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((i) => i == '007')"
+            v-if="powers.some((i) => i == '007') && dpowers.some((i) => i == '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -336,6 +336,13 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    dpowers() {
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "sellOutOrderDetail") ||
+        {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
   },
   data() {
     return {

src/views/sellOut/sellReturn/index.vue

@@ -334,17 +334,13 @@ export default {
       // 状态
       statusOptions: [
         { value: "1", label: "待业务审批" },
-        // {value:"2", label: "带专员审批"}, 该节点废除
-        // {value:"3", label: "带主管审批"}, 该节点废除
-        { value: "4", label: "退货完成" },
-        { value: "5", label: "业务驳回" },
-        // { value: "6", label: "采购驳回" }, 该节点废除
-        // { value: "7", label: "专员审批不通过" }, 该节点废除
         { value: "8", label: "供应商已驳回,待采购审核" },
         { value: "9", label: "待供应商审核" },
         { value: "10", label: "业务公司修改,待供应商确认" },
         { value: "11", label: "待设置工单" },
         { value: "12", label: "待库管收货" },
+        { value: "4", label: "退货完成" },
+        { value: "5", label: "业务驳回" },
         { value: "13", label: "已取消申请" }
       ],
       loading: false,

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -2,7 +2,7 @@ export default [
   // { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'saleReturnChildCode',
-    label: '退货工单编号',
+    label: '售前退货工单编号',
     width: '160'
   },
   {
@@ -16,6 +16,28 @@ export default [
     _slot_: 'status',
     width: '80px'
   },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100px'
+  },
+  {
+    prop: 'return_wsm_code',
+    label: '退回仓库编码',
+    width: '150px'
+  },
+  {
+    prop: 'return_wsm_name',
+    label: '退回仓库名称',
+    width: '150px',
+    _slot_: 'returnWsm'
+  },
+  {
+    prop: 'return_contactor_name',
+    label: '仓库负责人',
+    width: '120px'
+  },
   {
     prop: 'companyNo',
     label: '业务公司编号',
@@ -46,16 +68,6 @@ export default [
     label: '客户名称',
     width: '150px'
   },
-  {
-    prop: 'return_wsm_code',
-    label: '退回仓库编码',
-    width: '150px'
-  },
-  {
-    prop: 'return_wsm_name',
-    label: '退回仓库名称',
-    width: '150px'
-  },
   // {
   //   prop: 'apply_name',
   //   label: '创建人',

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

@@ -1,7 +1,7 @@
 const showColumns = [
   {
     prop: 'returnCode',
-    label: '退货工单号',
+    label: '售前退货工单号',
     span: 8
   },
   {

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/detail.vue

@@ -8,7 +8,7 @@
       <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">
+            <el-collapse-item title="售前退货工单详情" name="0">
               <show-data-table
                 style="margin: 0; padding: 0"
                 :sitem="sitem"
@@ -58,10 +58,27 @@
                   <span>{{ sitem.return_wsm_name }}</span>
                   <el-popover placement="top" width="300" trigger="hover">
                     <ul>
+                      <li><h3>退货仓库</h3></li>
                       <li>
-                        <span>退货仓库编码:</span
+                        <span>编码:</span
                         ><span>{{ sitem.return_wsm_code }}</span>
                       </li>
+                      <li>
+                        <span>名称:</span
+                        ><span>{{ sitem.return_wsm_name }}</span>
+                      </li>
+                      <li>
+                        <span>负责人:</span
+                        ><span>{{ sitem.return_contactor_name }}</span>
+                      </li>
+                      <li>
+                        <span>供应商编码:</span
+                        ><span>{{ sitem.return_supplierNo }}</span>
+                      </li>
+                      <li>
+                        <span>供应商名称:</span
+                        ><span>{{ sitem.return_supplierName }}</span>
+                      </li>
                     </ul>
                     <i class="el-icon-warning-outline fr" slot="reference"></i>
                   </el-popover>
@@ -82,24 +99,30 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管收货" name="1" v-if="sitem && String(sitem.status) === '1' && !isSupertube && ppowers.includes('1')">
+            <el-collapse-item title="待库管收货" name="1" v-if="sitem && ppowers.includes('1') && String(sitem.status) === '1' && !isSupertube">
               <wait-stockman :sitem="sitem" @reload="initData" />
             </el-collapse-item>
-
-            <el-collapse-item title="退货工单标记" name="2">
-              <work-order-mark @reload="initData" />
-            </el-collapse-item>
           </el-collapse>
         </el-tab-pane>
+
+
+        <el-tab-pane label="审批记录" name="2">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'THGD'"
+            :orderCode="sitem.returnCode"
+          />
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-else>
       <no-auth></no-auth>
     </div>
-
     <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
   </div>
 </template>
+
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -28,17 +28,51 @@
           <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="margin-right:10px">
-                <el-input v-model="parmValue.saleReturnChildCode"  placeholder="退货工单号" size="mini"  clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
+                <el-input v-model="parmValue.saleReturnChildCode"  placeholder="售前退货工单编号" size="mini"  clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
-
+              
               <el-col :span="4">
                 <el-select placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <el-option label="待收货" value="1" />
                   <el-option label="已收货" value="2" />
                 </el-select>
               </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"
@@ -79,6 +113,36 @@
           ></el-tag>
         </template>
 
+        <template #returnWsm="{scope}">
+          <el-popover placement="top" width="360" trigger="hover">
+            <i class="el-icon-warning-outline" slot="reference"></i>
+             <ul>
+               <li><h3>退货仓库</h3></li>
+               <li>
+                 <span>编号:</span
+                 ><span>{{ scope.row.return_wsm_code }}</span>
+               </li>
+               <li>
+                 <span>名称:</span
+                 ><span>{{ scope.row.return_wsm_name}}</span>
+               </li>
+               <li>
+                 <span>负责人:</span
+                 ><span>{{scope.row.return_contactor_name}}</span>
+               </li>
+               <li>
+                 <span>供应商编码:</span
+                 ><span>{{ scope.row.return_supplierNo }}</span>
+               </li>
+               <li>
+                 <span>供应商名称:</span
+                 ><span>{{ scope.row.return_supplierName }}</span>
+               </li>
+             </ul>
+           </el-popover>
+          <span>{{ scope.row.return_wsm_name }}</span>
+        </template>
+
         <template #type="{scope}">
           <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
         </template>
@@ -129,6 +193,7 @@
     </div>
   </div>
 </template>
+
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
@@ -173,20 +238,10 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
-        // companyNo:"",
-        // customer_code:[],
-        // returnCode: "", //销售退货code
-        // orderCode: "", //销售订单code
-        // company_name: "",
-        // good_code:"",
-        // skuCode:"",
-        // apply_name: "", //申请人
-        // start: "",
-        // end: "",
-        // status: "", //节点状态
+        status: "", //节点状态
         page: 1, // 页码
         size: 15, // 每页显示条数
-        // order_type: "",
+        order_type: "",
       },
       tableData: [],
       passwordModel: false,

src/views/supplierSellOut/supplierDeliveryWorkOrder/columns.js

@@ -1,5 +1,4 @@
 export default [
-  { type: 'selection', fixed: 'left', _noset_: true },
   {
     prop: 'outChildCode',
     label: '发货工单号',

src/views/supplierSellOut/supplierDeliveryWorkOrder/detail.vue

@@ -74,7 +74,17 @@
               </show-data-table>
             </el-collapse-item>
 
-            <el-collapse-item title="待库管发货" name="2"  v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.order_type"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.good_code"
+              />
+            </el-collapse-item>
+
+            <el-collapse-item title="待库管发货" name="3"  v-if="sitem.status === '1' && !isSupertube && ppowers.includes('1')">
               <express-node @refresh="() => initData()" :sitem="sitem" />
             </el-collapse-item>
           </el-collapse>

src/views/supplierSellOut/supplierDeliveryWorkOrder/index.vue

@@ -63,6 +63,29 @@
                 </el-select>
               </el-col>
 
+              <el-col :span="4" style="width: 150px; margin-left: 10px">
+                  <el-select
+                    :size="searchSize"
+                    v-model="parmValue.status"
+                    filterable
+                    clearable
+                    placeholder="状态"
+                    style="width: 100%"
+                    @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  >
+                    <el-option
+                      v-for="item in statusOptions"
+                      :key="'orderstatus' + item.id"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-col>
+
                 <el-col
                   :span="4"
                   class="fr"
@@ -151,7 +174,7 @@
                 />
               </el-col> -->
 
-                <div style="float: right;">
+                <div style="float: right;" v-if="powers.includes('087')">
                   <el-button type="primary" size="mini" @click="handleExport">发货工单导出</el-button>
                </div>
 
@@ -248,7 +271,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((i) => i == '007')"
+            v-if="powers.some((i) => i == '007') && dpowers.some(i => i === '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -282,13 +305,15 @@ export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
-      const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "supplierDeliveryWorkOrder"
-        ) || {};
+      const tran =  this.$store.getters.btnList.find( (item) => item.menu_route == "supplierDeliveryWorkOrder") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
+    dpowers(){
+      const tran =  this.$store.getters.btnList.find( (item) => item.menu_route == "supplierDeliveryWorkOrderDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
   },
   data() {
     return {
@@ -312,6 +337,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        status: "",
         companyNo:"",
         customer_code:[],
         returnCode: "", //销售退货code

src/views/supplierSellOut/supplierReturnWorkOrder/columns.js

@@ -5,12 +5,12 @@ export default [
     label: '售后退货单号',
     width: '160'
   },
-  {
-    prop: 'type',
-    label: '工单退货类型',
-    width: '100',
-    _slot_: 'type'
-  },
+  // {
+  //   prop: 'type',
+  //   label: '工单退货类型',
+  //   width: '100',
+  //   _slot_: 'type'
+  // },
   {
     prop: 'outChildCode',
     label: '发货工单编号',
@@ -27,25 +27,15 @@ export default [
     _slot_: 'status'
   },
   {
-    prop: 'companyNo',
-    label: '业务公司编号',
-    width: '150px'
+    prop: 'return_num',
+    label: '退货数量'
   },
   {
-    prop: 'companyName',
-    label: '业务公司名称',
-    width: '150px'
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100px'
   },
-  // {
-  //   prop: 'customer_code',
-  //   label: '客户公司编码',
-  //   width: '150px'
-  // },
-  // {
-  //   prop: 'customer_name',
-  //   label: '客户公司名称',
-  //   width: '150px'
-  // },
   {
     prop: 'return_wsm_code',
     label: '退货仓库编码',
@@ -54,23 +44,14 @@ export default [
   {
     prop: 'return_wsm_name',
     label: '退货仓库名称',
-    width: '130px'
+    width: '130px',
+    _slot_: 'returnWsm'
   },
   {
     prop: 'return_contactor_name',
     label: '退货仓库负责人',
     width: '110px'
   },
-  {
-    prop: 'return_supplierName',
-    label: '退货仓库供应商名称',
-    width: '130px'
-  },
-  {
-    prop: 'return_supplierNo',
-    label: '退货仓库供应商编码',
-    width: '130px'
-  },
   {
     prop: 'send_wsm_code',
     label: '发货仓库编码',
@@ -79,7 +60,8 @@ export default [
   {
     prop: 'send_wsm_name',
     label: '发货仓库名称',
-    width: '130px'
+    width: '130px',
+    _slot_: 'sendWsm'
   },
   {
     prop: 'send_contactor_name',
@@ -87,55 +69,15 @@ export default [
     width: '110px'
   },
   {
-    prop: 'send_supplierName',
-    label: '发货仓库供应商名称',
-    width: '130px'
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '150px'
   },
   {
-    prop: 'send_supplierNo',
-    label: '发货仓库供应商编码',
-    width: '130px'
+    prop: 'companyName',
+    label: '业务公司名称',
+    width: '150px'
   },
-  // {
-  //   prop: 'companyNo',
-  //   label: '业务公司编号',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'companyName',
-  //   label: '业务公司名称',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'customer_code',
-  //   label: '客户编码',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'customerNname',
-  //   label: '客户名称',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'send_num',
-  //   label: '下单数量',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'sale_price',
-  //   label: '销售单价',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'total_price',
-  //   label: '销售合计 ',
-  //   width: '160'
-  // },
-  // {
-  //   prop: 'addtime',
-  //   label: '下单时间',
-  //   width: '160'
-  // },
   {
     prop: '',
     width: 50,

src/views/supplierSellOut/supplierReturnWorkOrder/detail.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="sellReturnDetail pagePadding">
     <div style="display:flex;justify-content:flex-end;align-items:center">
-        <el-button type="primary" plain size="mini" @click="() => visible = true">退货工单标记</el-button>
+        <el-button type="primary" plain size="mini" @click="visible = true">退货工单标记</el-button>
     </div>
 
     <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">
@@ -49,13 +50,13 @@
                       <li>
                         <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
                       </li>
-                    </ul>
+                    </ul>f=
                     <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">
+                  <el-popover placement="top" width="360" trigger="hover">
                     <ul>
                       <li>
                         <span>业务公司编号:</span
@@ -70,20 +71,29 @@
                   <span>{{ sitem.return_wsm_name }}</span>
                   <el-popover placement="top" width="360" trigger="hover">
                     <ul>
+                      <li><h3>退货仓库</h3></li>
                       <li>
-                        <span>退货仓库编号:</span
+                        <span>编号:</span
                         ><span>{{ sitem.return_wsm_code }}</span>
                       </li>
                       <li>
-                        <span>退货仓库供应商编码:</span
+                        <span>名称:</span
+                        ><span>{{ sitem.return_wsm_name}}</span>
+                      </li>
+                      <li>
+                        <span>负责人:</span
+                        ><span>xx</span>
+                      </li>
+                      <li>
+                        <span>供应商编码:</span
                         ><span>{{ sitem.return_supplierNo }}</span>
                       </li>
                       <li>
-                        <span>退货仓库供应商名称:</span
+                        <span>供应商名称:</span
                         ><span>{{ sitem.return_supplierName }}</span>
                       </li>
                     </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                    <i class="el-icon-warning-outline fr" slot="reference" />
                   </el-popover>
                 </template>
 
@@ -91,16 +101,25 @@
                   <span>{{ sitem.send_wsm_name }}</span>
                   <el-popover placement="top" width="360" trigger="hover">
                     <ul>
+                      <li><h3>发货仓库</h3></li>
                       <li>
-                        <span>发货仓库编号:</span
+                        <span>编号:</span
                         ><span>{{ sitem.send_wsm_code }}</span>
                       </li>
                       <li>
-                        <span>发货仓库供应商编码:</span
+                        <span>名称:</span
+                        ><span>{{ sitem.send_wsm_name }}</span>
+                      </li>
+                      <li>
+                        <span>负责人:</span
+                        ><span>xx</span>
+                      </li>
+                      <li>
+                        <span>供应商编码:</span
                         ><span>{{ sitem.send_supplierNo }}</span>
                       </li>
                       <li>
-                        <span>发货仓库供应商名称:</span
+                        <span>供应商名称:</span
                         ><span>{{ sitem.send_supplierName }}</span>
                       </li>
                     </ul>
@@ -110,7 +129,7 @@
 
                 <template slot="customer">
                   <span>{{ sitem.customer_name }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
+                  <el-popover placement="top" width="360" trigger="hover">
                     <ul>
                       <li>
                         <span>客户公司编号:</span
@@ -122,8 +141,6 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
-
-            <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
           </el-collapse>
         </el-tab-pane>
       </el-tabs>
@@ -131,8 +148,11 @@
     <div v-else>
       <no-auth></no-auth>
     </div>
+
+    <mark-modal :visible.sync="visible" :sitem="sitem" @reload="() => initData()" />
   </div>
 </template>
+
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -28,17 +28,41 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-
               <el-col :span="4" style="margin-right:10px" >
                 <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
-              <el-col :span="4">
+              <el-col :span="4" style="margin-right:10px">
                 <el-select placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
                   <el-option label="待收货" value="1" />
                   <el-option label="已收货" value="2" />
                 </el-select>
               </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"
@@ -78,22 +102,73 @@
           ></el-tag>
         </template>
 
+        <template #returnWsm="{scope}">
+          <el-popover placement="top" width="360" trigger="hover">
+             <i class="el-icon-warning-outline" slot="reference"></i>
+             <ul>
+               <li><h3>退货仓库</h3></li>
+               <li>
+                 <span>编号:</span
+                 ><span>{{ scope.row.return_wsm_code }}</span>
+               </li>
+               <li>
+                 <span>名称:</span
+                 ><span>{{ scope.row.return_wsm_name}}</span>
+               </li>
+               <li>
+                 <span>负责人:</span
+                 ><span>{{ scope.row.return_contactor_name}}</span>
+               </li>
+               <li>
+                 <span>供应商编码:</span
+                 ><span>{{ scope.row.return_supplierNo }}</span>
+               </li>
+               <li>
+                 <span>供应商名称:</span
+                 ><span>{{ scope.row.return_supplierName }}</span>
+               </li>
+             </ul>
+           </el-popover>
+           <span>{{ scope.row.return_wsm_name }}</span>
+        </template>
+
+        <template #order_type="{scope}">
+          <el-tag>{{(xs_order_type_options.find(({id}) => id === scope.row.order_type) || {})?.label || '--'}}</el-tag>
+        </template>
+
+        <template #sendWsm="{scope}">
+          <el-popover placement="top" width="360" trigger="hover">
+            <i class="el-icon-warning-outline" slot="reference"></i>
+             <ul>
+               <li><h3>退货仓库</h3></li>
+               <li>
+                 <span>编号:</span
+                 ><span>{{ scope.row.send_wsm_code }}</span>
+               </li>
+               <li>
+                 <span>名称:</span
+                 ><span>{{ scope.row.send_wsm_name}}</span>
+               </li>
+               <li>
+                 <span>负责人:</span
+                 ><span>{{ scope.row.send_contactor_name}}</span>
+               </li>
+               <li>
+                 <span>供应商编码:</span
+                 ><span>{{ scope.row.send_supplierNo }}</span>
+               </li>
+               <li>
+                 <span>供应商名称:</span
+                 ><span>{{ scope.row.send_supplierName }}</span>
+               </li>
+             </ul>
+           </el-popover>
+           <span>{{ scope.row.send_wsm_name }}</span>
+        </template>
+
         <template #type="{scope}">
           <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</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
@@ -128,6 +203,7 @@
     </div>
   </div>
 </template>
+
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -232,17 +232,15 @@ export default {
       // 收到货状态
       statusOptions: [
         { id: "1", label: "待业务审核" },
-        { id: "6", label: "业务已驳回" },
         { id: "9", label: "供应商审核" },
         { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
         { id: "10", label: "业务公司修改，待供应商确认" },
         { id: "11", label: "待设置工单" }, //已收到货才有
-        //{ id: "2", label: "待设置仓库" },//节点废除
         { id: "4", label: "待客户退货" }, //已收到货才有
         { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" }
+        { id: "6", label: "业务已驳回" },
+        { id: "8", label: "申请已取消" },
       ],
       orderCode: "",
       return_code: "",

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -275,17 +275,15 @@ export default {
       // 收到货状态
       statusOptions: [
         { id: "1", label: "待业务审核" },
-        { id: "6", label: "业务已驳回" },
         { id: "9", label: "供应商审核" },
         { id: "2", label: "供应商驳回,待采购审核" }, //  id: "2", label: "供应商驳回,待供应商负责人审核" },
         { id: "10", label: "业务公司修改，待供应商确认" },
         { id: "11", label: "待设置工单" }, //已收到货才有
-        //{ id: "2", label: "待设置仓库" },//节点废除
         { id: "4", label: "待客户退货" }, //已收到货才有
         { id: "12", label: "待库管收货" }, //已收到货才有
         { id: "5", label: "售后已完成" },
-        //{ id: "7", label: "采购已驳回" },//节点废除
-        { id: "8", label: "申请已取消" }
+        { id: "6", label: "业务已驳回" },
+        { id: "8", label: "申请已取消" },
       ],
       loading: false,
       showModel: false,

src/views/supplierSellOut/supplierSellOutOrder/index.vue

@@ -231,7 +231,7 @@
 
         <template #operation="{ scope }">
           <el-tooltip
-            v-if="powers.some((i) => i == '007')"
+            v-if="powers.some((i) => i == '007') && dpowers.some(i => i === '007')"
             effect="dark"
             content="详情"
             placement="top"
@@ -292,6 +292,13 @@ export default {
       const { action } = tran ?? {};
       return action ?? [];
     },
+    dpowers() {
+      const tran =
+        this.$store.getters.btnList.find((item) => item.menu_route == "supplierSellOutOrdeDetail") ||
+        {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
   },
   data() {
     return {

src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -202,18 +202,15 @@ export default {
       sitem: null,
       // 状态
       statusOptions: [
-      { value: "1", label: "待业务审批" },
-        // {value:"2", label: "带专员审批"}, 该节点废除
-        // {value:"3", label: "带主管审批"}, 该节点废除
+        { value: "1", label: "待业务审批" },
+        { value: "8", label: "供应商已驳回,待采购审核" },
+        { value: "9", label: "待供应商审核" },
+        { value: "10", label: "业务公司修改,待供应商确认" },
+        { value: "11", label: "待设置工单" },
+        { value: "12", label: "待库管收货" },
         { value: "4", label: "退货完成" },
         { value: "5", label: "业务驳回" },
-        // { value: "6", label: "采购驳回" }, 该节点废除
-        // { value: "7", label: "专员审批不通过" }, 该节点废除
-        { value: '8', label:'供应商已驳回,待采购审核'},
-        { value: '9', label:'待供应商审核'},
-        { value: '10', label:'业务公司修改,待供应商确认'},
-        { value: '11', label:'待设置工单'},
-        { value: '12', label:'待库管发货'}
+        { value: "13", label: "已取消申请" }
       ],
       loading: false,
       showModel: false,

src/views/system/operationAccount/index.vue

@@ -287,14 +287,14 @@ export default {
           sortable: true,
           // width: "140px",
         },
-        {
-          prop: "",
-          label: "操作",
-          fixed: "right",
-          _noset_: true,
-          width: "60px",
-          _slot_: "operation",
-        },
+        // {
+        //   prop: "",
+        //   label: "操作",
+        //   fixed: "right",
+        //   _noset_: true,
+        //   width: "60px",
+        //   _slot_: "operation",
+        // },
       ],
     };
   },