build

dist/static/js/1.js

@@ -1,17 +1,5 @@
 (window["webpackJsonp"] = window["webpackJsonp"] || []).push([[1],{
 
-/***/ "./node_modules/@babel/runtime/helpers/esm/objectDestructuringEmpty.js":
-/*!*****************************************************************************!*\
-  !*** ./node_modules/@babel/runtime/helpers/esm/objectDestructuringEmpty.js ***!
-  \*****************************************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectDestructuringEmpty; });\nfunction _objectDestructuringEmpty(obj) {\n  if (obj == null) throw new TypeError(\"Cannot destructure \" + obj);\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectDestructuringEmpty.js?");
-
-/***/ }),
-
 /***/ "./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js":
 /*!****************************************************************************!*\
   !*** ./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js ***!
@@ -20,7 +8,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) *
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutProperties; });\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ \"./node_modules/core-js/modules/es.symbol.js\");\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./objectWithoutPropertiesLoose.js */ \"./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js\");\n\n\nfunction _objectWithoutProperties(source, excluded) {\n  if (source == null) return {};\n  var target = Object(_objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__[\"default\"])(source, excluded);\n  var key, i;\n  if (Object.getOwnPropertySymbols) {\n    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);\n    for (i = 0; i < sourceSymbolKeys.length; i++) {\n      key = sourceSymbolKeys[i];\n      if (excluded.indexOf(key) >= 0) continue;\n      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;\n      target[key] = source[key];\n    }\n  }\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutProperties; });\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ \"./node_modules/core-js/modules/es.symbol.js\");\n/* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./objectWithoutPropertiesLoose.js */ \"./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js\");\n\n\nfunction _objectWithoutProperties(source, excluded) {\n  if (source == null) return {};\n  var target = Object(_objectWithoutPropertiesLoose_js__WEBPACK_IMPORTED_MODULE_1__[\"default\"])(source, excluded);\n  var key, i;\n\n  if (Object.getOwnPropertySymbols) {\n    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);\n\n    for (i = 0; i < sourceSymbolKeys.length; i++) {\n      key = sourceSymbolKeys[i];\n      if (excluded.indexOf(key) >= 0) continue;\n      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;\n      target[key] = source[key];\n    }\n  }\n\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js?");
 
 /***/ }),
 
@@ -32,7 +20,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) *
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutPropertiesLoose; });\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ \"./node_modules/core-js/modules/es.object.keys.js\");\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);\n\nfunction _objectWithoutPropertiesLoose(source, excluded) {\n  if (source == null) return {};\n  var target = {};\n  var sourceKeys = Object.keys(source);\n  var key, i;\n  for (i = 0; i < sourceKeys.length; i++) {\n    key = sourceKeys[i];\n    if (excluded.indexOf(key) >= 0) continue;\n    target[key] = source[key];\n  }\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return _objectWithoutPropertiesLoose; });\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ \"./node_modules/core-js/modules/es.object.keys.js\");\n/* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);\n\nfunction _objectWithoutPropertiesLoose(source, excluded) {\n  if (source == null) return {};\n  var target = {};\n  var sourceKeys = Object.keys(source);\n  var key, i;\n\n  for (i = 0; i < sourceKeys.length; i++) {\n    key = sourceKeys[i];\n    if (excluded.indexOf(key) >= 0) continue;\n    target[key] = source[key];\n  }\n\n  return target;\n}\n\n//# sourceURL=webpack:///./node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js?");
 
 /***/ }),
 
@@ -95,6 +83,17 @@ eval("\nvar toIndexedObject = __webpack_require__(/*! ../internals/to-indexed-ob
 
 /***/ }),
 
+/***/ "./node_modules/core-js/internals/array-reduce.js":
+/*!********************************************************!*\
+  !*** ./node_modules/core-js/internals/array-reduce.js ***!
+  \********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+eval("var aFunction = __webpack_require__(/*! ../internals/a-function */ \"./node_modules/core-js/internals/a-function.js\");\nvar toObject = __webpack_require__(/*! ../internals/to-object */ \"./node_modules/core-js/internals/to-object.js\");\nvar IndexedObject = __webpack_require__(/*! ../internals/indexed-object */ \"./node_modules/core-js/internals/indexed-object.js\");\nvar toLength = __webpack_require__(/*! ../internals/to-length */ \"./node_modules/core-js/internals/to-length.js\");\n\n// `Array.prototype.{ reduce, reduceRight }` methods implementation\nvar createMethod = function (IS_RIGHT) {\n  return function (that, callbackfn, argumentsLength, memo) {\n    aFunction(callbackfn);\n    var O = toObject(that);\n    var self = IndexedObject(O);\n    var length = toLength(O.length);\n    var index = IS_RIGHT ? length - 1 : 0;\n    var i = IS_RIGHT ? -1 : 1;\n    if (argumentsLength < 2) while (true) {\n      if (index in self) {\n        memo = self[index];\n        index += i;\n        break;\n      }\n      index += i;\n      if (IS_RIGHT ? index < 0 : length <= index) {\n        throw TypeError('Reduce of empty array with no initial value');\n      }\n    }\n    for (;IS_RIGHT ? index >= 0 : length > index; index += i) if (index in self) {\n      memo = callbackfn(memo, self[index], index, O);\n    }\n    return memo;\n  };\n};\n\nmodule.exports = {\n  // `Array.prototype.reduce` method\n  // https://tc39.github.io/ecma262/#sec-array.prototype.reduce\n  left: createMethod(false),\n  // `Array.prototype.reduceRight` method\n  // https://tc39.github.io/ecma262/#sec-array.prototype.reduceright\n  right: createMethod(true)\n};\n\n\n//# sourceURL=webpack:///./node_modules/core-js/internals/array-reduce.js?");
+
+/***/ }),
+
 /***/ "./node_modules/core-js/internals/ieee754.js":
 /*!***************************************************!*\
   !*** ./node_modules/core-js/internals/ieee754.js ***!

src/views/goodStore/active/columns.js

@@ -61,6 +61,16 @@ const listCol = [
     prop: "platform_name",
     label: "平台名称",
   },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
+  },
   {
     prop: "company_name",
     label: "创建人部门",

src/views/goodStore/activeGood/index.vue

@@ -140,7 +140,7 @@
         </template>
 
         <template #is_activity="{ scope }">
-          {{ scope.row.is_activity + '' === "1" ? "是" : "否" }}
+          {{ scope.row.is_activity + "" === "1" ? "是" : "否" }}
         </template>
 
         <template #operation="{ scope }">
@@ -261,7 +261,7 @@ export default {
         {
           prop: "is_activity",
           label: "是否使用结算单价",
-          width: "110",
+          width: "120",
           _slot_: "is_activity",
         },
         {
@@ -303,6 +303,16 @@ export default {
           label: "活动名称",
           width: "120px",
         },
+        {
+          prop: "companyNo",
+          label: "业务公司编号",
+          width: "160",
+        },
+        {
+          prop: "companyName",
+          label: "业务公司名称",
+          "min-width": "135",
+        },
         {
           prop: "",
           label: "操作",
@@ -378,7 +388,7 @@ export default {
      * @param {String} status 0-禁用 1-启用
      */
     async changeStatus(id, status) {
-      await this.$confirm(`确定要改为${status + '' === "1" ? "禁用" : "启用"}？`, {
+      await this.$confirm(`确定要改为${status + "" === "1" ? "禁用" : "启用"}？`, {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -387,7 +397,7 @@ export default {
           this.loading = true;
           const model = {
             id: id,
-            status: status + '' === "1" ? "0" : "1",
+            status: status + "" === "1" ? "0" : "1",
           };
           const res = await asyncRequest.status(model);
           if (res && res.code === 0) {
@@ -439,10 +449,10 @@ export default {
     async searchList() {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
-      
+
       const res = await asyncRequest.list({
         ...model,
-        needRela: true
+        needRela: true,
       });
 
       if (res && res.code === 0 && res.data) {

src/views/goodStore/dealGoodsPool/columns.js

@@ -93,7 +93,7 @@ const listCol = [
     width: "110px",
   },
   {
-    prop: "company",
+    prop: "companyName",
     label: "业务公司名称",
     width: "110px",
   },

src/views/goodStore/supplierGoodsOffline/columns.js

@@ -26,7 +26,16 @@ const columns = [
       label: "下线商品名称",
       minWidth: "215px",
     },
-  
+    {
+      prop: "companyNo",
+      label: "业务公司编号",
+      width: "160",
+    },
+    {
+      prop: "companyName",
+      label: "业务公司名称",
+      "min-width": "135",
+    },
     {
       prop: "creater",
       label: "操作人",

src/views/purchaseIn/recovery/columns.js

@@ -26,7 +26,7 @@ const columns = [
     prop: "can",
     label: "分类",
     _slot_: "can",
-    "width": "180px",
+    width: "180px",
   },
 
   {
@@ -40,6 +40,16 @@ const columns = [
     label: "单位",
     width: "50px",
   },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
+  },
+  {
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
+  },
   {
     prop: "supplierName",
     label: "供应商名称",
@@ -354,15 +364,13 @@ const infoColumns = [
     label: "购买方公司",
     _slot_: "khName",
   },
-
-
 ];
-const is_addrs_options= [
+const is_addrs_options = [
   { value: "0", label: "一地" },
   { value: "1", label: "多地" },
 ];
 
-const options0= [
+const options0 = [
   { id: "0", label: "待发布竞标" },
   { id: "1", label: "招标进行中" },
   { id: "2", label: "招标已结束" },
@@ -387,5 +395,5 @@ export {
   costColumns,
   infoColumns,
   is_addrs_options,
-  options0
+  options0,
 };

src/views/sellOut/sellOutOrder/columns.js

@@ -20,6 +20,11 @@ const columns = [
     label: '采购单编号',
     width: '156'
   },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '70px'
+  },
   {
     prop: 'company_name',
     label: '申请人部门',
@@ -30,11 +35,7 @@ const columns = [
     label: '供应商',
     minWidth: '150px'
   },
-  {
-    prop: 'apply_name',
-    label: '申请人',
-    width: '70px'
-  },
+
   // {
   //   prop: "orderCode",
   //   label: "销售订单编号",
@@ -94,7 +95,16 @@ const columns = [
     label: '客户名称',
     width: '200'
   },
-
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
+  },
   {
     prop: 'contactor',
     label: '联系人',

src/views/sellOut/zixunOrder/columns.js

@@ -605,6 +605,16 @@ const listCol = [
     label: '客户名称',
     'min-width': '135'
   },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
+  },
 
   {
     prop: 'budget_price',

src/views/supplierPurchaseIn/supplierPurchaseDiffOrder/columns.js

@@ -1,39 +1,30 @@
 export default [
   {
-    prop: 'cgdNo',
-    label: '采购单编号',
-    width: '160px'
+    prop: "cgdNo",
+    label: "采购单编号",
+    width: "160px",
   },
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '120px'
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
   },
   {
-    prop: 'order_source',
-    label: '订单来源',
-    _slot_: 'order_source',
-    width: '85px'
-  },
-  {
-    prop: 'company_name',
-    label: '申请人部门',
-    minWidth: '100px'
-  },
-  {
-    prop: 'apply_name',
-    label: '申请人',
-    width: '65px'
+    prop: "order_source",
+    label: "订单来源",
+    _slot_: "order_source",
+    width: "85px",
   },
+
   {
-    prop: 'good_code',
-    label: '商品编码',
-    width: '150px'
+    prop: "good_code",
+    label: "商品编码",
+    width: "150px",
   },
   {
-    prop: 'good_name',
-    label: '商品名称'
+    prop: "good_name",
+    label: "商品名称",
   },
   // {
   //   prop: "class_cat",
@@ -41,28 +32,43 @@ export default [
   // },
 
   {
-    prop: 'good_weight',
-    label: '商品总重量(g)',
-    width: '110px'
+    prop: "good_weight",
+    label: "商品总重量(g)",
+    width: "110px",
+  },
+  {
+    prop: "diff_weight",
+    label: "工差总重量(g)",
+    width: "110px",
+  },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
   },
   {
-    prop: 'diff_weight',
-    label: '工差总重量(g)',
-    width: '110px'
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
   },
 
   {
-    prop: 'addtime',
-    label: '创建时间',
-    width: '140px',
-    sortable: true
+    prop: "apply_name",
+    label: "申请人",
+    width: "65px",
   },
   {
-    prop: '',
-    label: '操作',
-    fixed: 'right',
+    prop: "addtime",
+    label: "创建时间",
+    width: "140px",
+    sortable: true,
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
     _noset_: true,
-    width: '52px',
-    _slot_: 'operation'
-  }
-]
+    width: "52px",
+    _slot_: "operation",
+  },
+];

src/views/supplierPurchaseIn/supplierPurchaseOrder/columns.js

@@ -155,14 +155,24 @@ const columns = [
   },
   {
     prop: 'supplierNo',
-    label: '采购供应商编号',
+    label: '供应商编号',
     width: '145px'
   },
   {
     prop: 'supplier_name',
-    label: '采购供应商名称',
+    label: '供应商名称',
     width: '155px'
   },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
+  },
   // {
   //   prop: "company_name",
   //   label: "供应商负责人部门",

src/views/supplierPurchaseIn/supplierPurchaseReturn/columns.js

@@ -23,7 +23,7 @@ export default [
   // },
   {
     prop: 'order_type',
-    label: '退货来源',
+    label: '商品类型',
     // 1备库 2竞价
     _slot_: 'order_type',
     width: '80px'
@@ -66,6 +66,16 @@ export default [
     label: '退货总金额',
     width: '100'
   },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
+  },
   // {
   //   prop: "post_company",
   //   label: "物流公司",

src/views/supplierPurchaseIn/supplierWsmInOrder/columns.js

@@ -21,16 +21,6 @@ export default [
   //   label: "备库单编号",
   //   width: "155px",
   // },
-  // {
-  //   prop: "supplierNo",
-  //   label: "采购供应商编号",
-  //   width: "145px",
-  // },
-  // {
-  //   prop: "supplier_name",
-  //   label: "采购供应商名称",
-  //   width: "155px",
-  // },
 
   {
     prop: 'spuCode',
@@ -135,15 +125,36 @@ export default [
   //   width: "145px",
   // },
   {
-    prop: 'wsm_supplierNo',
-    label: '仓库公司编号',
-    width: '145px'
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
   },
   {
-    prop: 'wsm_supplier',
-    label: '仓库公司名称',
-    width: '155px'
+    prop: 'companyName',
+    label: '业务公司名称',
+    'min-width': '135'
   },
+  {
+    prop: "supplierNo",
+    label: "供应商编号",
+    width: "145px",
+  },
+  {
+    prop: "supplier_name",
+    label: "供应商名称",
+    width: "155px",
+  },
+
+  // {
+  //   prop: 'wsm_supplierNo',
+  //   label: '仓库公司编号',
+  //   width: '145px'
+  // },
+  // {
+  //   prop: 'wsm_supplier',
+  //   label: '仓库公司名称',
+  //   width: '155px'
+  // },
   {
     prop: 'wsm_code',
     label: '仓库编号',

src/views/supplierSellOut/supplierReturnOrder/columns.js

@@ -32,11 +32,11 @@ export default [
     width: '150'
   },
 
-  {
-    prop: 'customer_code',
-    label: '客户编号',
-    width: '140'
-  },
+  // {
+  //   prop: 'customer_code',
+  //   label: '客户编号',
+  //   width: '140'
+  // },
   {
     prop: 'supplierNo',
     label: '供应商编号',
@@ -47,6 +47,16 @@ export default [
     label: '供应商名称',
     width: '150'
   },
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
+  },
+  {
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
+  },
   // {
   //   prop: "customer_name",
   //   label: "客户名称",

src/views/supplierSellOut/supplierSellAfterApply/columns.js

@@ -1,46 +1,44 @@
 const columns = [
   {
-    prop: 'orderCode',
-    label: '订单编号',
-    width: '160'
-  },
-  {
-    prop: 'returnCode',
-    label: '售后申请单',
-    width: '160'
-  },
-  {
-    prop: 'company_name',
-    label: '申请人部门',
-    minWidth: '150px'
-  },
-  {
-    prop: 'apply_name',
-    label: '申请人'
+    prop: "returnCode",
+    label: "售后申请单",
+    width: "160",
   },
+
   // {
   //   prop: "orderCode",
   //   label: "销售订单编号",
   //   width:"160"
   // },
   {
-    prop: 'outCode',
-    label: '发货申请单编号',
-    width: '160'
+    prop: "outCode",
+    label: "发货申请单编号",
+    width: "160",
+  },
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    width: "160",
+  },
+  {
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "120px",
   },
   {
-    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,15 +57,14 @@ const columns = [
   // },
 
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '120px'
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
   },
   {
-    prop: 'addtime',
-    label: '添加时间',
-    width: 150
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
   },
 
   // {
@@ -85,109 +82,123 @@ const columns = [
   //   _slot_: "post_own",
   // },
   {
-    prop: 'supplierNo',
-    label: '供应商编号',
-    width: '160'
+    prop: "supplierNo",
+    label: "供应商编号",
+    width: "160",
+  },
+  {
+    prop: "supplierName",
+    label: "供应商名称",
+    width: "160",
+  },
+  {
+    prop: "customer_name",
+    label: "客户名称",
+    width: "200",
   },
   {
-    prop: 'supplierName',
-    label: '供应商名称',
-    width: '160'
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
   },
   {
-    prop: 'customer_name',
-    label: '客户名称',
-    width: '200'
+    prop: "apply_name",
+    label: "申请人",
   },
   {
-    prop: '',
-    label: '操作',
-    fixed: 'right',
+    prop: "addtime",
+    label: "添加时间",
+    width: 150,
+  },
+  {
+    prop: "",
+    label: "操作",
+    fixed: "right",
     _noset_: true,
-    _slot_: 'operation',
-    width: 50
-  }
-]
+    _slot_: "operation",
+    width: 50,
+  },
+];
 const sellshowColumns = [
   {
-    prop: 'returnCode',
-    label: '售后申请单号',
-    span: 6
+    prop: "returnCode",
+    label: "售后申请单号",
+    span: 6,
   },
   {
-    prop: 'status',
-    label: '售后申请单状态',
-    _slot_: 'status',
-    span: 6
+    prop: "status",
+    label: "售后申请单状态",
+    _slot_: "status",
+    span: 6,
   },
   {
-    prop: 'outCode',
-    label: '发货申请单编号',
-    span: 6
+    prop: "outCode",
+    label: "发货申请单编号",
+    span: 6,
   },
 
   {
-    prop: 'order_type',
-    label: '订单类别',
-    _slot_: 'order_type',
-    span: 6
+    prop: "order_type",
+    label: "订单类别",
+    _slot_: "order_type",
+    span: 6,
   },
 
   {
-    prop: 'is_receive',
-    label: '期望结果',
-    _slot_: 'is_receive',
-    span: 6
+    prop: "is_receive",
+    label: "期望结果",
+    _slot_: "is_receive",
+    span: 6,
   },
   {
-    prop: 'addtime',
-    label: '创建时间',
-    span: 6
+    prop: "addtime",
+    label: "创建时间",
+    span: 6,
   },
   {
-    prop: 'total_num',
-    label: '发货总数量',
-    span: 4
+    prop: "total_num",
+    label: "发货总数量",
+    span: 4,
   },
   {
-    prop: 'error_num',
-    label: '异常数量',
-    span: 4
+    prop: "error_num",
+    label: "异常数量",
+    span: 4,
   },
 
   {
-    prop: 'apply_name',
-    label: '申请人',
-    span: 4
+    prop: "apply_name",
+    label: "申请人",
+    span: 4,
   },
 
   {
-    prop: 'error_msg',
-    label: '异常原因',
-    span: 6
+    prop: "error_msg",
+    label: "异常原因",
+    span: 6,
   },
   {
-    prop: 'except_code',
-    label: '期望',
-    _slot_: 'except_code',
-    span: 6
+    prop: "except_code",
+    label: "期望",
+    _slot_: "except_code",
+    span: 6,
   },
   {
-    prop: 'loop_total',
-    label: '循环次数',
-    span: 4
+    prop: "loop_total",
+    label: "循环次数",
+    span: 4,
   },
   {
-    prop: 'error_img',
-    label: '异常图片',
-    _slot_: 'error_img',
-    span: 8
+    prop: "error_img",
+    label: "异常图片",
+    _slot_: "error_img",
+    span: 8,
   },
   {
-    prop: 'error_remark',
-    label: '备注',
-    span: 24
-  }
+    prop: "error_remark",
+    label: "备注",
+    span: 24,
+  },
   // {
   //   prop: "sale_price",
   //   label: "销售单价",
@@ -210,6 +221,5 @@ const sellshowColumns = [
   //   prop: "updatetime",
   //   label: "更新时间",
   // },
-
-]
-export { columns, sellshowColumns }
+];
+export { columns, sellshowColumns };

src/views/supplierSellOut/supplierSellOutOrder/columns.js

@@ -25,15 +25,14 @@ const columns = [
     label: '申请人部门',
     minWidth: '150px'
   },
-  {
-    prop: 'wsm_supplier',
-    label: '供应商',
-    minWidth: '150px'
-  },
   {
     prop: 'apply_name',
     label: '申请人',
     width: '70px'
+  }, {
+    prop: 'wsm_supplier',
+    label: '供应商',
+    minWidth: '150px'
   },
   // {
   //   prop: "orderCode",
@@ -116,7 +115,16 @@ const columns = [
     label: '发货时间',
     width: '140'
   },
-
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
+  },
+  {
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
+  },
   {
     prop: 'addtime',
     label: '添加时间',

src/views/supplierSellOut/supplierSellReturn/columns.js

@@ -5,56 +5,67 @@ export default [
   //   width:"160"
   // },
   {
-    prop: 'returnCode',
-    label: '退货单编号',
-    width: '160'
+    prop: "returnCode",
+    label: "退货单编号",
+    width: "160",
   },
   {
-    prop: 'orderCode',
-    label: '销售订单编号',
-    width: '160'
+    prop: "orderCode",
+    label: "销售订单编号",
+    width: "160",
   },
   {
-    prop: 'status',
-    label: '状态',
-    _slot_: 'status',
-    width: '180px'
+    prop: "status",
+    label: "状态",
+    _slot_: "status",
+    width: "180px",
   },
   {
-    prop: 'good_code',
-    label: '商品成本编码',
-    width: '160'
+    prop: "good_code",
+    label: "商品成本编码",
+    width: "160",
   },
   {
-    prop: 'skuCode',
-    label: '上线商品编码',
-    width: '160'
+    prop: "skuCode",
+    label: "上线商品编码",
+    width: "160",
   },
   {
-    prop: 'good_name',
-    label: '商品名称',
-    'min-width': '180'
+    prop: "good_name",
+    label: "商品名称",
+    "min-width": "180",
   },
   {
-    prop: 'num',
-    label: '退货数量',
-    width: '110'
+    prop: "num",
+    label: "退货数量",
+    width: "110",
   },
   {
-    prop: 'total_num',
-    label: '订单总数',
-    width: '110'
+    prop: "total_num",
+    label: "订单总数",
+    width: "110",
   },
   {
-    prop: 'supplierNo',
-    label: '供应商编号',
-    width: '150'
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
   },
   {
-    prop: 'supplierName',
-    label: '供应商名称',
-    width: '150'
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
   },
+  {
+    prop: "supplierNo",
+    label: "供应商编号",
+    width: "150",
+  },
+  {
+    prop: "supplierName",
+    label: "供应商名称",
+    width: "150",
+  },
+
   // {
   //   prop: "error_msg",
   //   label: "退货原因",
@@ -67,31 +78,30 @@ export default [
   //   width: "120"
   // },
   {
-    prop: 'company_name',
-    label: '申请人部门',
-    minWidth: '150px'
+    prop: "company_name",
+    label: "申请人部门",
+    minWidth: "150px",
   },
   {
-    prop: 'apply_name',
-    label: '申请人',
-    width: '70'
+    prop: "apply_name",
+    label: "申请人",
+    width: "70",
   },
   {
-    prop: 'addtime',
-    label: '申请时间',
+    prop: "addtime",
+    label: "申请时间",
     sortable: true,
-    width: 150
+    width: 150,
   },
   {
-    prop: '',
+    prop: "",
     width: 50,
-    label: '操作',
-    fixed: 'right',
+    label: "操作",
+    fixed: "right",
     _noset_: true,
-    _slot_: 'operation'
-  }
-
-]
+    _slot_: "operation",
+  },
+];
 // page	是	string	页码
 // size	是	string	页码数
 // cgdNo	是	string	采购单编号