build

src/layout/components/Navbar.vue

@@ -22,17 +22,6 @@
         />
       </el-tooltip>
 
-      <el-tooltip placement="left" :content="switchAccountModeText">
-        <el-button
-          v-if="isSupertube"
-          size="large"
-          style="position:fixed; bottom: 160px; right: 60px"
-          circle
-          icon="el-icon-sort"
-          @click="onSwitchCompanyMode"
-        />
-      </el-tooltip>
-
       <div class="right-menu-item">
         <company-select ref="companySelect" select-all global placeholder="请选择供应商" />
       </div>

src/views/sellOut/sellAfterApply/columns.js

@@ -65,12 +65,12 @@ const columns = [
     _slot_: 'status',
     width: '120px'
   },
-  {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '90px'
-  },
+  // {
+  //   prop: 'order_source',
+  //   label: '订单来源',
+  //   _slot_: 'order_source',
+  //   width: '90px'
+  // },
   {
     prop: 'order_type',
     label: '商品来源',
@@ -144,7 +144,7 @@ const sellshowColumns = [
 
   {
     prop: 'is_receive',
-    label: '收货情售后期望结果',
+    label: '售后期望结果',
     _slot_: 'is_receive',
     span: 6
   },

src/views/sellOut/sellAfterApply/detail.vue

@@ -39,9 +39,9 @@
                 <template slot="is_receive">
                   <el-tag :size="'mini'" :type="''">{{
                     sitem.is_receive + '' === "1"
-                      ? "已收到货"
+                      ? "销售订单退货，采购订单也退货"
                       : sitem.is_receive + '' === "0"
-                      ? "未收到"
+                      ? "采购订单不退货(货物已丢失，由业务公司承担)"
                       : "--"
                   }}</el-tag>
                 </template>

src/views/standingBook/components/detail12/columns.js

@@ -1,79 +1,78 @@
 const columns = [
   {
-    prop: "returnCode",
-    label: "售后申请单号",
+    prop: 'returnCode',
+    label: '售后申请单号',
     span: 6
   },
   {
-    prop: "status",
-    label: "售后申请单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后申请单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "outCode",
-    label: "发货申请单编号",
+    prop: 'outCode',
+    label: '发货申请单编号',
     span: 6
   },
 
   {
-    prop: "order_type",
-    label: "订单类别",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '订单类别',
+    _slot_: 'order_type',
     span: 6
   },
 
   {
-    prop: "is_receive",
-    label: "收货情况",
-    _slot_: "is_receive",
+    prop: 'is_receive',
+    label: '售后期望结果',
+    _slot_: 'is_receive',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "total_num",
-    label: "发货总数量",
+    prop: 'total_num',
+    label: '发货总数量',
     span: 4
   },
   {
-    prop: "error_num",
-    label: "异常数量",
+    prop: 'error_num',
+    label: '异常数量',
     span: 4
   },
 
-
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 4
   },
 
   {
-    prop: "error_msg",
-    label: "异常原因",
+    prop: 'error_msg',
+    label: '异常原因',
     span: 6
   },
   {
-    prop: "except_code",
-    label: "期望",
-    _slot_: "except_code",
+    prop: 'except_code',
+    label: '期望',
+    _slot_: 'except_code',
     span: 6
   },
   {
-    prop: "error_img",
-    label: "异常图片",
-    _slot_: "error_img",
+    prop: 'error_img',
+    label: '异常图片',
+    _slot_: 'error_img',
     span: 12
   },
   {
-    prop: "error_remark",
-    label: "备注",
+    prop: 'error_remark',
+    label: '备注',
     span: 24
-  },
+  }
   // {
   //   prop: "sale_price",
   //   label: "销售单价",
@@ -97,28 +96,26 @@ const columns = [
   //   label: "更新时间",
   // },
 
-
-
 ]
 const listColumns = [
   {
-    prop: "returnCode",
-    label: "售后申请单",
-    width: "160"
+    prop: 'returnCode',
+    label: '售后申请单',
+    width: '160'
   },
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "160"
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '160'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人'
   },
   // {
   //   prop: "orderCode",
@@ -126,23 +123,23 @@ const listColumns = [
   //   width:"160"
   // },
   {
-    prop: "outCode",
-    label: "发货申请单编号",
-    width: "160"
+    prop: 'outCode',
+    label: '发货申请单编号',
+    width: '160'
   },
   {
-    prop: "total_num",
-    label: "出库总数",
+    prop: 'total_num',
+    label: '出库总数'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "140"
+    prop: 'good_code',
+    label: '商品编码',
+    width: '140'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   // {
   //     prop:"error_num",
@@ -161,18 +158,17 @@ const listColumns = [
   // },
 
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "addtime",
-    label: "添加时间",
-    width: 150,
+    prop: 'addtime',
+    label: '添加时间',
+    width: 150
   },
 
-
   // {
   //   prop:"post_company",
   //   label:"快递名称",
@@ -194,26 +190,26 @@ const listColumns = [
   //   width:"150"
   // },
   {
-    prop: "customer_name",
-    label: "客户名称",
-    width: "200"
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '200'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: 50,
-  },
+    _slot_: 'operation',
+    width: 50
+  }
 ]
 const statusOptions = [
-  { value: "1", label: "待采购反馈" },
-  { value: "2", label: "已生成采购单" },
+  { value: '1', label: '待采购反馈' },
+  { value: '2', label: '已生成采购单' },
   {
-    value: "4",
-    label: "已取消采购",
-  },
-];
+    value: '4',
+    label: '已取消采购'
+  }
+]
 
-export { columns, statusOptions, listColumns}
+export { columns, statusOptions, listColumns }

src/views/standingBook/components/detail12/main.vue

@@ -33,9 +33,9 @@
         <template slot="is_receive">
           <el-tag :size="'mini'" :type="''">{{
             sitem.is_receive + '' === "1"
-              ? "已收到货"
+              ? "销售订单退货，采购订单也退货"
               : sitem.is_receive + '' === "0"
-              ? "未收到"
+              ? "销售订单退货，采购订单不退货(货物已丢失，由业务公司承担)"
               : "--"
           }}</el-tag>
         </template>

src/views/supplierPurchaseIn/supplierPurchaseOrder/index.vue

@@ -484,20 +484,20 @@ export default {
         this.$message.warning("只能选择待与供应商确认的采购单！");
         return;
       }
-      if (iss) {
-        let htmlList = "<ul>";
-        errorList.forEach((v) => {
-          console.log(v);
-          htmlList += `<li>${v}</li>`;
-        });
-        htmlList += "</ul>";
-        this.$notify({
-          title: "以下采购单对应的供应商账号已开启，不允许在本系统操作！",
-          dangerouslyUseHTMLString: true,
-          message: htmlList,
-        });
-        return;
-      }
+      // if (iss) {
+      //   let htmlList = "<ul>";
+      //   errorList.forEach((v) => {
+      //     console.log(v);
+      //     htmlList += `<li>${v}</li>`;
+      //   });
+      //   htmlList += "</ul>";
+      //   this.$notify({
+      //     title: "以下采购单对应的供应商账号已开启，不允许在本系统操作！",
+      //     dangerouslyUseHTMLString: true,
+      //     message: htmlList,
+      //   });
+      //   return;
+      // }
       await this.$confirm(`确定批量确认？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -1,22 +1,22 @@
 const columns = [
   {
-    prop: "orderCode",
-    label: "订单编号",
-    width: "160"
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '160'
   },
   {
-    prop: "returnCode",
-    label: "售后申请单",
-    width: "160"
+    prop: 'returnCode',
+    label: '售后申请单',
+    width: '160'
   },
   {
-    prop: "company_name",
-    label: "申请人部门",
-    minWidth: "150px",
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
   },
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人'
   },
   // {
   //   prop: "orderCode",
@@ -24,23 +24,23 @@ const columns = [
   //   width:"160"
   // },
   {
-    prop: "outCode",
-    label: "发货申请单编号",
-    width: "160"
+    prop: 'outCode',
+    label: '发货申请单编号',
+    width: '160'
   },
   {
-    prop: "total_num",
-    label: "出库总数",
+    prop: 'total_num',
+    label: '出库总数'
   },
   {
-    prop: "good_code",
-    label: "商品编码",
-    width: "140"
+    prop: 'good_code',
+    label: '商品编码',
+    width: '140'
   },
   {
-    prop: "good_name",
-    label: "商品名称",
-    width: "150"
+    prop: 'good_name',
+    label: '商品名称',
+    width: '150'
   },
   // {
   //     prop:"error_num",
@@ -59,18 +59,17 @@ const columns = [
   // },
 
   {
-    prop: "status",
-    label: "状态",
-    _slot_: "status",
-    width: "120px",
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '120px'
   },
   {
-    prop: "addtime",
-    label: "添加时间",
-    width: 150,
+    prop: 'addtime',
+    label: '添加时间',
+    width: 150
   },
 
-
   // {
   //   prop:"post_company",
   //   label:"快递名称",
@@ -92,95 +91,94 @@ const columns = [
   //   width:"150"
   // },
   {
-    prop: "customer_name",
-    label: "客户名称",
-    width: "200"
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '200'
   },
   {
-    prop: "",
-    label: "操作",
-    fixed: "right",
+    prop: '',
+    label: '操作',
+    fixed: 'right',
     _noset_: true,
-    _slot_: "operation",
-    width: 50,
-  },
+    _slot_: 'operation',
+    width: 50
+  }
 ]
 const sellshowColumns = [
   {
-    prop: "returnCode",
-    label: "售后申请单号",
+    prop: 'returnCode',
+    label: '售后申请单号',
     span: 6
   },
   {
-    prop: "status",
-    label: "售后申请单状态",
-    _slot_: "status",
+    prop: 'status',
+    label: '售后申请单状态',
+    _slot_: 'status',
     span: 6
   },
   {
-    prop: "outCode",
-    label: "发货申请单编号",
+    prop: 'outCode',
+    label: '发货申请单编号',
     span: 6
   },
 
   {
-    prop: "order_type",
-    label: "订单类别",
-    _slot_: "order_type",
+    prop: 'order_type',
+    label: '订单类别',
+    _slot_: 'order_type',
     span: 6
   },
 
   {
-    prop: "is_receive",
-    label: "收货情况",
-    _slot_: "is_receive",
+    prop: 'is_receive',
+    label: '售后期望结果',
+    _slot_: 'is_receive',
     span: 6
   },
   {
-    prop: "addtime",
-    label: "创建时间",
+    prop: 'addtime',
+    label: '创建时间',
     span: 6
   },
   {
-    prop: "total_num",
-    label: "发货总数量",
+    prop: 'total_num',
+    label: '发货总数量',
     span: 4
   },
   {
-    prop: "error_num",
-    label: "异常数量",
+    prop: 'error_num',
+    label: '异常数量',
     span: 4
   },
 
-
   {
-    prop: "apply_name",
-    label: "申请人",
+    prop: 'apply_name',
+    label: '申请人',
     span: 4
   },
 
   {
-    prop: "error_msg",
-    label: "异常原因",
+    prop: 'error_msg',
+    label: '异常原因',
     span: 6
   },
   {
-    prop: "except_code",
-    label: "期望",
-    _slot_: "except_code",
+    prop: 'except_code',
+    label: '期望',
+    _slot_: 'except_code',
     span: 6
   },
   {
-    prop: "error_img",
-    label: "异常图片",
-    _slot_: "error_img",
+    prop: 'error_img',
+    label: '异常图片',
+    _slot_: 'error_img',
     span: 12
   },
   {
-    prop: "error_remark",
-    label: "备注",
+    prop: 'error_remark',
+    label: '备注',
     span: 24
-  },
+  }
   // {
   //   prop: "sale_price",
   //   label: "销售单价",
@@ -204,7 +202,5 @@ const sellshowColumns = [
   //   label: "更新时间",
   // },
 
-
-
 ]
-export { columns, sellshowColumns }
+export { columns, sellshowColumns }

src/views/supplierSellOut/supplierSellAfterApply/detail.vue

@@ -39,7 +39,7 @@
                 <template slot="is_receive">
                   <el-tag :size="'mini'" :type="''">{{
                     sitem.is_receive + '' === "1"
-                      ? "已收到货"
+                      ? "销售订单退货，采购订单也退货"
                       : sitem.is_receive + '' === "0"
                       ? "未收到"
                       : "--"