Merge branch 'company' into v3.0

.gitignore

@@ -14,3 +14,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+.history

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?");
 
 /***/ }),
 
@@ -107,6 +95,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/apis/service/dataCorrection/managerCorrection/index.js

@@ -0,0 +1,9 @@
+import http from '@/apis/axios'
+const api = 'admin/'
+
+export default {
+  list: (data, params) => http(api + 'managerlist', data, 'post', params),
+  detail: (data, params) => http(api + 'managerinfo', data, 'post', params),
+  add: (data, params) => http(api + 'manageradd', data, 'post', params),
+  status: (data, params) => http(api + 'managerstatus', data, 'post', params)
+}

src/apis/service/goodStore/dealGoodsPool/index.js

@@ -6,5 +6,5 @@ export default {
   list: (data, params) => http(api + "zixunlist", data, "post", params),
   // 添加
   online_add: (data, params) => http(api + "gooduponlinezixun", data, "post", params),
-
+  goodupbaseiczx: (data, params) => http(api + "goodupbaseiczx", data, "post", params),
 };

src/views/dataCorrection/customerCorrection/components/correctionForm.vue

@@ -544,8 +544,6 @@ export default {
           }
         };
 
-        console.log(111);
-
         this.loading = true;
         const res = await asyncRequest.create(payload);
         this.loading = false;

src/views/dataCorrection/customerCorrection/detail.vue

@@ -7,24 +7,24 @@
 </template>
 
 <script>
-import CorrectionForm from "./components/correctionForm.vue";
+import CorrectionForm from './components/correctionForm.vue'
 
 export default {
-  name: "",
+  name: '',
   components: {
     CorrectionForm
   },
   computed: {
     mode() {
-      return this.$route.query.mode || "create";
+      return this.$route.query.mode || 'create'
     },
     title() {
       const mapTitle = {
-        update: "销售单客户修改申请详情",
-        create: "新建销售单客户修改申请"
-      };
-      return mapTitle[this.mode];
+        update: '销售单客户修改申请详情',
+        create: '新建销售单客户修改申请'
+      }
+      return mapTitle[this.mode]
     }
   }
-};
+}
 </script>

src/views/dataCorrection/managerCorrection/columns.js

@@ -0,0 +1,55 @@
+const columns = [
+  {
+    prop: 'orderCode',
+    label: '销售单编号',
+    minWidth: '180',
+    _slot_: 'orderCode'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    minWidth: '155'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司名称',
+    minWidth: '155'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '90px'
+  },
+  {
+    label: '项目经理(修改后)',
+    prop: 'manager',
+    minWidth: '185'
+  },
+  {
+    prop: 'updatetime',
+    label: '修改时间',
+    minWidth: '145'
+  },
+
+  {
+    prop: 'apply_name',
+    minWidth: '150px',
+    label: '申请人'
+  },
+  {
+    prop: 'addtime',
+    minWidth: '150px',
+    label: '申请时间'
+  },
+  {
+    prop: '操作',
+    label: '操作',
+    width: '60px',
+    _slot_: 'operation'
+  }
+]
+
+export {
+  columns
+}

src/views/dataCorrection/managerCorrection/components/_columns.js

@@ -0,0 +1,318 @@
+const columns = [
+  { type: 'selection', fixed: 'left', _noset_: true },
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    width: '155px'
+  },
+
+  // {
+  //   prop: "good_code",
+  //   label: "商品编码",
+  //   width:"128"
+  // },
+  {
+    prop: 'good_name',
+    label: '商品名称',
+    _slot_: 'good_name',
+    width: '150'
+  },
+  {
+    prop: 'good_class',
+    label: '商品分类',
+    width: '120'
+  },
+  {
+    prop: 'good_num',
+    label: '商品数量',
+    width: '110'
+  },
+  {
+    prop: 'sale_price',
+    label: '销售单价',
+    width: '110'
+  },
+  {
+    prop: 'total_price',
+    label: '总价',
+    width: '110'
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    width: '120px'
+  },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type',
+    width: '80'
+  },
+
+  // {
+  //   prop: 'cgd_status',
+  //   label: '采购单状态',
+  //   _slot_: 'cgd_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '100px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100px'
+  },
+  {
+    prop: 'manager',
+    label: '项目经理',
+    width: '100px'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户公司编码',
+    width: '155px'
+  },
+  {
+    prop: 'customerName',
+    label: '企业客户名称',
+    width: '125px'
+  },
+  {
+    prop: 'supplierName',
+    label: '销售方公司',
+    width: '125px'
+  },
+  // {
+  //   prop: "company_name",
+  //   label: "订单创建人部门",
+  //   minWidth: "100px",
+  // },
+
+  {
+    prop: 'apply_name',
+    label: '订单创建人',
+    width: '85px'
+  },
+  {
+    prop: 'cgder',
+    label: '供应商负责人',
+    width: '95'
+  },
+  {
+    prop: 'good_creater',
+    label: '商品创建人',
+    width: '85px'
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    width: '145px'
+  }
+]
+
+const ShowDataTableColumns = [
+  {
+    prop: 'orderCode',
+    label: '订单编号',
+    span: 6
+  },
+  {
+    prop: 'status',
+    label: '订单状态',
+    _slot_: 'status',
+    span: 6
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    span: 6
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    span: 6
+  },
+
+  {
+    prop: 'supplierName',
+    label: '销售方公司',
+    _slot_: 'supplierName',
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '购买方公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+
+  {
+    prop: 'platform_name',
+    label: '所属平台',
+    span: 12
+  },
+  {
+    prop: 'apply_name',
+    label: '创建人',
+    span: 6
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'is_active',
+    label: '活动类型',
+    _slot_: 'is_active',
+    span: 12
+  },
+  {
+    prop: 'arrive_time',
+    label: '要求到货时间',
+    span: 6
+  },
+  {
+    prop: 'paytime',
+    label: '承诺付款时间',
+    span: 6
+  },
+
+  {
+    prop: 'good_num',
+    label: '购买数量',
+    span: 4
+  },
+  {
+    prop: 'send_num',
+    label: '已发数量',
+    span: 4
+  },
+  {
+    prop: 'wsend_num',
+    label: '未发数量',
+    span: 4
+  },
+  {
+    prop: 'th_num',
+    label: '退货数量',
+    span: 4
+  },
+
+  {
+    prop: 'sale_price',
+    label: '售价',
+    append: '元',
+    span: 4
+  },
+  {
+    prop: 'total_price',
+    label: '总金额',
+    append: '元',
+    span: 4
+  },
+  {
+    prop: 'returnCode',
+    label: '售后来源单号',
+    span: 6
+  },
+  {
+    prop: 'proof_id',
+    label: '凭证文件',
+    _slot_: 'proof_id',
+    span: 6
+  },
+
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    append: '元',
+    span: 6
+  },
+  {
+    prop: 'send_type',
+    label: '下单方式',
+    _slot_: 'send_type',
+    span: 6
+  },
+
+  {
+    prop: 'useage',
+    label: '订单用途',
+    span: 24
+  },
+
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  },
+
+  {
+    prop: 'platform_order',
+    label: '平台订单号',
+    span: 24
+  },
+  {
+    prop: 'workNo',
+    label: '其他单号',
+    span: 24
+  }
+]
+const statusOptions = [
+  { value: '0', label: '待发货' },
+  { value: '1', label: '待发货完成' },
+  { value: '2', label: '发货已完成' },
+  { value: '3', label: '订单已取消' }
+]
+
+const mianColumns = [
+  {
+    prop: 'orderCode',
+    label: '销售单编号',
+    span: 18,
+    _slot_: 'orderCode'
+  },
+  {
+    label: '项目经理(修改后)',
+    span: 6,
+    prop: 'manager'
+  },
+
+  {
+    label: '业务公司',
+    span: 10,
+    _slot_: 'company'
+  },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    span: 4
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    span: 4,
+    _slot_: 'status'
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  }
+]
+
+export { columns, statusOptions, ShowDataTableColumns, mianColumns }

src/views/dataCorrection/managerCorrection/components/addEdit.vue

@@ -0,0 +1,498 @@
+<template>
+  <el-dialog
+    v-loading="loading"
+    title="销售单详情"
+    :center="true"
+    align="left"
+    top="2vh"
+    width="1080px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
+  >
+    <el-card style="margin-top: -20px">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @selection-change="list => selected = list"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{ }">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="6" style="width: 293px; padding: 0 0 0 0px">
+                <period-date-picker
+                  :type="1"
+                  :width="'135px'"
+                  :size="searchSize"
+                  :start="parmValue.start"
+                  :end="parmValue.end"
+                  @timeReturned="handleTime"
+                />
+              </el-col>
+              <el-col :span="4" style="width: 148px; padding: 0 0 0 8px">
+                <el-select
+                  v-model="parmValue.status"
+                  :size="searchSize"
+                  filterable
+                  clearable
+                  placeholder="订单状态"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="'status' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-switch
+                  v-model="parmValue.use_type"
+                  :active-value="usetypeOtions[1].value"
+                  :inactive-value="usetypeOtions[0].value"
+                  :active-text="usetypeOtions[1].label"
+                  :inactive-text="usetypeOtions[0].label"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
+                >刷新</el-button>
+              </el-col>
+            </el-row>
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="6" style="width: 371px">
+                <search-customer
+                  :value="customerCode"
+                  :size="searchSize"
+                  :names="parmValue.supplierName"
+                  :is-detail="true"
+                  :placeholder="'企业客户'"
+                  @searchChange="customerChange"
+                />
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-select
+                  v-model="parmValue.order_source"
+                  :size="searchSize"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_source_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 150px; padding: 0 0 0 9px">
+                <el-select
+                  v-model="parmValue.order_type"
+                  :size="searchSize"
+                  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" style="width: 66px; float: right">
+                <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">重置</el-button>
+              </el-col>
+              <!-- 暂时注释，下版需要导出 -->
+              <el-col :span="4" style="width: 66px; float: right">
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  :size="searchSize"
+                  class="fr"
+                  @click="submit(selection)"
+                >提交</el-button>
+              </el-col>
+            </el-row>
+
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="6" style="width: 426px">
+                <el-input
+                  v-model="input"
+                  clearable
+                  placeholder="关键字"
+                  maxlength="40"
+                  :size="searchSize"
+                  class="input-with-select"
+                  @blur="searchList"
+                >
+                  <el-select
+                    slot="prepend"
+                    v-model="select"
+                    style="width: 100px"
+                    placeholder="关键字类型"
+                    @change="searchList"
+                  >
+                    <el-option label="订单编号" value="orderCode" />
+                    <el-option label="商品名称" value="good_name" />
+                    <el-option label="创建人" value="apply_name" />
+                    <el-option label="创建人部门" value="company_name" />
+                  </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  />
+                </el-input>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+        <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
+            <span v-if="i !== 0">-</span>
+            <span v-else>_</span>
+            <span>{{ si.spec_name }}[{{ si.spec_value || si.spec_value_name }}]</span>
+          </span>
+        </template>
+
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{
+              (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
+                .label || "---"
+            }}
+          </el-tag>
+        </template>
+
+        <template #cgd_status="{ scope }">
+          <el-tag size="mini">
+            <template v-if="String(scope.row.order_type) === '1'">--</template>
+            <template v-else>
+              {{
+                (
+                  purchaseStatusOptions.find(
+                    ({ value }) => value === scope.row.cgd_status
+                  ) || {}
+                ).label || "---"
+              }}
+            </template>
+          </el-tag>
+        </template>
+
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+                '--'
+            "
+          />
+        </template>
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
+              ).label || '--'
+            "
+          />
+        </template>
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          />
+        </template>
+      </ex-table>
+    </el-card>
+  </el-dialog>
+</template>
+
+<script>
+import asyncRequest from '@/apis/service/dataCorrection/cgMessage'
+import mixinPage from '@/mixins/elPaginationHandle'
+import { mapGetters } from 'vuex'
+import resToken from '@/mixins/resToken'
+
+import { columns } from './_columns'
+import {
+  cg_order_type_options,
+  xs_order_type_options,
+  xs_order_source_options,
+  usetypeOtions
+} from '@/assets/js/statusList'
+
+export default {
+  mixins: [mixinPage, resToken],
+  props: ['showModel'],
+  computed: {
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val
+      if (val) {
+        this.restSearch()
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit('cancel')
+      }
+    }
+  },
+  data() {
+    return {
+      usetypeOtions,
+      showModelThis: this.showModel,
+      select: '1',
+      input: '',
+      timeOBJ: {
+        start: '', // 起始时间
+        end: '' // 结束时间
+      },
+      options: ['创建时间', '最晚入库时间'],
+      sselect: '创建时间',
+      xs_order_source_options,
+      xs_order_type_options,
+      // 状态
+      statusOptions: [
+        { id: '0', label: '待发货' },
+        { id: '1', label: '待发货完成' },
+        { id: '2', label: '发货已完成' },
+        { id: '3', label: '订单已取消' }
+      ],
+      /* 采购单状态 **/
+      purchaseStatusOptions: [
+        { value: '0', label: '待与供应商确认' },
+        { value: '1', label: '待入库' },
+        { value: '2', label: '部分入库' },
+        { value: '3', label: '入库完成' },
+        { value: '4', label: '已取消订单' }
+      ],
+      cg_order_type_options,
+      selected: [],
+
+      loading: false,
+      showModel: false,
+      parmValue: {
+        use_type: '',
+        order_source: '',
+        order_type: '', // 订单来源
+        orderCode: '', // 销售订单code
+        apply_name: '', // 申请人
+        good_name: '', // 产品名称
+        good_code: '', // 产品属性编号
+        status: '', // 状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        supplierNo: '', // 供应商编号
+        customer_code: '', // 客户编号
+        start: '', // 新建起始时间
+        end: '', // 新建结束时间
+        company_name: '', // 创建人部门
+        use_type: '1'
+      },
+      tableData: [],
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ['setcol']
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    }
+  },
+
+  methods: {
+    // 提交
+    async submit() {
+      if (this.selected.length === 0) {
+        this.$message.warning('至少选择一条销售单！')
+        return
+      }
+
+      this.showModelThis = false
+      // 刷新
+      this.$emit('refresh', this.selected)
+    },
+
+    restSearch() {
+      this.select = 'orderCode'
+      this.input = ''
+      this.customerCode = []
+      this.parmValue = {
+        order_type: '',
+        orderCode: '', // 销售订单code
+        apply_name: '', // 申请人
+        good_name: '', // 产品名称
+        good_code: '', // 产品属性编号
+        status: '', // 状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        supplierNo: '', // 供应商编号
+        customer_code: '', // 客户编号
+        start: '', // 新建起始时间
+        end: '', // 新建结束时间
+        company_name: '', // 部门
+        use_type: '1'
+      }
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      }
+      this.searchList()
+    },
+    async handleClick(e) {
+      this.sselect = e
+      this.parmValue.start = e === '创建时间' ? this.timeOBJ.start : ''
+      this.parmValue.end = e === '创建时间' ? this.timeOBJ.end : ''
+      this.parmValue.last_start = e !== '创建时间' ? this.timeOBJ.start : ''
+      this.parmValue.last_end = e !== '创建时间' ? this.timeOBJ.end : ''
+      if (
+        !(
+          (this.timeOBJ.start !== '' && this.timeOBJ.end === '') ||
+          (this.timeOBJ.start === '' && this.timeOBJ.end !== '')
+        )
+      ) {
+        this.parmValue.page = 1
+        this.pageInfo.curr = 1
+        await this.searchList()
+      }
+    },
+
+    async searchList() {
+      if (
+        (this.parmValue.start !== '' && this.parmValue.end === '') ||
+        (this.parmValue.start === '' && this.parmValue.end !== '')
+      ) {
+        this.$message.warning('时间区间不完整！')
+        return
+      }
+      this.loading = true
+      this.parmValue.orderCode = this.select === 'orderCode' ? this.input : ''
+      this.parmValue.good_name = this.select === 'good_name' ? this.input : ''
+      this.parmValue.apply_name =
+        this.select === 'apply_name' ? this.input : ''
+      this.parmValue.company_name =
+        this.select === 'company_name' ? this.input : ''
+
+      const res = await asyncRequest.saleList({
+        ...this.parmValue,
+        needRela: true
+      })
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list
+        this.tableData.forEach(v => {
+          v.good_class = ''
+          if (v.can && v.can.length > 0) {
+            v.can.forEach((x, i) => {
+              v.good_class += i === 0 ? x.name : '_' + x.name
+            })
+          }
+        })
+        this.pageInfo.total = Number(res.data.count)
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.tableData = []
+        this.pageInfo.total = 0
+      }
+      this.loading = false
+    },
+    // 时间
+    async handleTime(e) {
+      if (e.startTime !== '') {
+        this.timeOBJ.start = e.startTime
+      } else {
+        this.timeOBJ.start = ''
+      }
+      if (e.endTime !== '') {
+        this.timeOBJ.end = e.endTime
+      } else {
+        this.timeOBJ.end = ''
+      }
+      await this.handleClick(this.sselect)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/dataCorrection/managerCorrection/components/correctionDetail.vue

@@ -0,0 +1,42 @@
+<template>
+  <show-data-table
+    border
+    style="margin: 0; padding: 0"
+    :sitem="detail"
+    :columns="mianColumns"
+  >
+    <template #orderCode>
+      {{ Object.keys(detail.orderCode).map(key => detail.orderCode[key]).join(" , ") }}
+    </template>
+
+    <template #status>
+      <el-tag
+        size="mini"
+      >{{ (approvalStatusOptions.find(({value}) => value === detail.status) || {}).label || '--' }}</el-tag>
+    </template>
+
+    <template #company>
+      <el-tooltip :content="'业务公司编码 : ' + detail.companyNo" placement="top">
+        <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+      </el-tooltip>
+      {{ detail.companyName }}
+    </template>
+  </show-data-table>
+</template>
+
+<script>
+import { mianColumns } from './_columns'
+export default {
+  props: ['detail'],
+  data() {
+    return {
+      mianColumns,
+      approvalStatusOptions: [
+        { value: '1', label: '待审核' },
+        { value: '2', label: '审核通过' },
+        { value: '3', label: '审核驳回' }
+      ]
+    }
+  }
+}
+</script>

src/views/dataCorrection/managerCorrection/components/correctionForm.vue

@@ -0,0 +1,238 @@
+<template>
+  <el-form ref="ruleForm" v-loading="loading" label-width="100px" :model="ruleForm" :rules="rules">
+    <el-form-item prop="orderCode" style="width: 100%" label="销售订单">
+      <el-button class="fr" type="primary" size="mini" style="margin-bottom: 10px" @click="handlePushOrder">添加</el-button>
+      <ex-table
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :size="'mini'"
+        :no-pagination="true"
+      >
+        <template #good_name="{ scope }">
+          <span>{{ scope.row.good_name }}</span>
+          <span v-for="(si, i) in scope.row.speclist" :key="si.spec_id + i">
+            <span v-if="i !== 0">-</span>
+            <span v-else>_</span>
+            <span>{{ si.spec_name }}[{{ si.spec_value || si.spec_value_name }}]</span>
+          </span>
+        </template>
+
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{
+              (usetypeOtions.find(({value}) => value === scope.row.use_type) || {})
+                .label || "---"
+            }}
+          </el-tag>
+        </template>
+
+        <template #cgd_status="{ scope }">
+          <el-tag size="mini">
+            <template v-if="String(scope.row.order_type) === '1'">--</template>
+            <template v-else>
+              {{
+                (
+                  purchaseStatusOptions.find(
+                    ({ value }) => value === scope.row.cgd_status
+                  ) || {}
+                ).label || "---"
+              }}
+            </template>
+          </el-tag>
+        </template>
+
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.value == scope.row.status) || {}).label ||
+                '--'
+            "
+          />
+        </template>
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
+              ).label || '--'
+            "
+          />
+        </template>
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          />
+        </template>
+
+        <template #action="{scope}">
+          <el-button type="text" size="mini" @click="deleteItem(scope.$index)">删除</el-button>
+        </template>
+      </ex-table>
+    </el-form-item>
+
+    <el-row :gutter="5">
+      <el-col :span="12">
+        <el-form-item label="项目经理" prop="manager">
+          <project-manager
+            size="mini"
+            :is-detail="true"
+            :names="ruleForm.manager"
+            :value="ruleForm.managerid"
+            @searchChange="manageridChange"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="ruleForm.remark" type="textarea" placeholder="备注" />
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-form-item>
+      <div style="display: flex;justify-content: flex-end">
+        <el-button type="primary" size="mini" @click="submit">保存</el-button>
+      </div>
+    </el-form-item>
+    <addEdit
+      :company-no="currentCompany"
+      :show-model="visible"
+      @refresh="handleRefresh"
+      @cancel="visible = false"
+    />
+  </el-form>
+</template>
+
+<script>
+
+import { usetypeOtions, xs_order_source_options, xs_order_type_options } from '@/assets/js/statusList'
+import asyncRequest from '@/apis/service/dataCorrection/managerCorrection'
+import { columns, statusOptions } from './_columns'
+import addEdit from './addEdit.vue'
+import companyHelper from '@/mixins/companyHelper'
+
+export default {
+  name: 'CorrectionForm',
+  components: { addEdit },
+  mixins: [companyHelper],
+  data() {
+    return {
+      loading: false,
+      visible: false,
+      xs_order_type_options,
+      xs_order_source_options,
+      statusOptions,
+      usetypeOtions,
+      ruleForm: {
+        orderCode: [],
+        manager: '',
+        managerid: '',
+        remark: ''
+      },
+      columns: [
+        ...columns.slice(1), {
+          width: '100px',
+          label: '操作',
+          _slot_: 'action',
+          fixed: 'right'
+        }
+      ],
+      rules: {
+        orderCode: [{ type: 'array', required: true, message: '请选择销售单', trigger: 'change' }],
+        manager: [{ required: true, message: '请选择项目经理', trigger: 'change' }],
+        remark: [{ required: true, message: '请输入备注', trigger: 'change' }]
+      },
+      purchaseStatusOptions: [
+        { value: '0', label: '待与供应商确认' },
+        { value: '1', label: '待入库' },
+        { value: '2', label: '部分入库' },
+        { value: '3', label: '入库完成' },
+        { value: '4', label: '已取消订单' }
+      ],
+      tablebtnSize: 'mini',
+      size: 'mini',
+      tableData: [],
+      table: {
+        stripe: true,
+        border: true
+      }
+    }
+  },
+  methods: {
+    onCompanyChange() {
+      this.tableData = []
+      this.ruleForm.orderCode = []
+      this.$refs.ruleForm.validateField('orderCode')
+    },
+    handlePushOrder() {
+      if (!this.currentCompany) {
+        this.$message.warning('请选择一家业务公司')
+        return
+      }
+      this.visible = true
+    },
+    async submit() {
+      if (!this.currentCompany) {
+        this.$message.warning('请选择一家业务公司')
+        return
+      }
+
+      try {
+        await this.$refs.ruleForm.validate()
+        this.loading = true
+        const res = await asyncRequest.add({
+          ...this.ruleForm,
+          managerid: Array.isArray(this.ruleForm.managerid) ? this.ruleForm.managerid[0] : this.ruleForm.managerid,
+          companyNo: this.currentCompany
+        })
+        this.loading = false
+
+        if (res && res.code === 0 && res.data) {
+          this.$router.push('/dataCorrection/managerCorrection')
+        } else if (res && res.code >= 100 && res.code <= 104) {
+          await this.logout()
+        } else {
+          this.$message.warning(res.message)
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    manageridChange(e) {
+      const { id, label } = e
+      this.ruleForm.manager = label
+      this.ruleForm.managerid = id ? [id] : []
+      this.$refs.ruleForm.validateField('managerid')
+    },
+    deleteItem(index) {
+      this.tableData.splice(index, 1)
+      this.ruleForm.orderCode = this.tableData.map(({ orderCode }) => orderCode)
+      this.$refs.ruleForm.validateField('orderCode')
+    },
+    handleRefresh(selected) {
+      const ids = this.tableData.map(({ id }) => id)
+      for (const item of selected) {
+        if (ids.includes(item.id)) {
+          continue
+        }
+        this.tableData.push(item)
+        this.ruleForm.orderCode = this.tableData.map(({ orderCode }) => orderCode)
+        this.$refs.ruleForm.validateField('orderCode')
+      }
+    }
+  }
+}
+</script>

src/views/dataCorrection/managerCorrection/components/waitApproval.vue

@@ -0,0 +1,57 @@
+<template>
+  <el-form ref="ruleForm" label-width="80px" size="mini" :model="ruleForm" :rules="rules">
+    <el-form-item label="状态" prop="status">
+      <el-select v-model="ruleForm.status" style="width:100%">
+        <el-option value="2" label="通过" />
+        <el-option value="3" label="驳回" />
+      </el-select>
+    </el-form-item>
+
+    <el-form-item label="备注" prop="remark">
+      <el-input v-model="ruleForm.remark" placeholder="备注" type="textarea" />
+    </el-form-item>
+
+    <el-form-item>
+      <div class="fr">
+        <el-button type="primary" @click="submit">保 存</el-button>
+      </div>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+export default {
+  name: 'WaitApproval',
+  data() {
+    return {
+      ruleForm: {
+        status: '2',
+        remark: ''
+      }
+    }
+  },
+  computed: {
+    rules() {
+      return {
+        status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+        remark: [
+          {
+            required: this.ruleForm.status === '3',
+            message: '请输入备注',
+            trigger: 'change'
+          }
+        ]
+      }
+    }
+  },
+  methods: {
+    submit() {
+      this.$refs.ruleForm.validate(isValid => {
+        if (!isValid) return
+        const { status, remark } = this.ruleForm
+        this.$emit('confirm', { status, remark })
+      })
+    }
+  }
+}
+</script>

src/views/dataCorrection/managerCorrection/detail.vue

@@ -0,0 +1,92 @@
+<template>
+  <el-tabs v-loading="loading" style="padding:10px">
+    <el-tab-pane :label="title">
+      <correction-form v-if="mode === 'create'" />
+
+      <el-collapse v-else v-model="activeNames">
+        <el-collapse-item title="项目经理修正申请详情" name="1">
+          <correction-detail :detail="detail" />
+        </el-collapse-item>
+        <el-collapse-item name="2" title="待审核" v-if="String(detail.status) === '1' && powers.includes('043')">
+          <wait-approval @confirm="handleConfirm" />
+        </el-collapse-item>
+      </el-collapse>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script>
+import CorrectionForm from './components/correctionForm.vue'
+import CorrectionDetail from './components/correctionDetail.vue'
+import asyncRequest from '@/apis/service/dataCorrection/managerCorrection'
+import WaitApproval from './components/waitApproval.vue'
+export default {
+  name: '',
+  components: {
+    CorrectionDetail,
+    CorrectionForm,
+    WaitApproval
+  },
+  data() {
+    return {
+      detail: null,
+      loading: false,
+      activeNames: ['1', '2']
+    }
+  },
+  computed: {
+    mode() {
+      return this.$route.query.mode || 'create'
+    },
+    title() {
+      const mapTitle = {
+        update: '项目经理修正申请详情',
+        create: '新建项目经理修正申请'
+      }
+      return mapTitle[this.mode]
+    },
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran =
+        btnList.find(i => i.menu_route == "managerCorrectionDetail") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  mounted() {
+    if (this.mode === 'create') return
+    this.initData()
+  },
+  methods: {
+    async handleConfirm(data) {
+      this.loading = true
+      const res = await asyncRequest.status({
+        id: this.$route.query.id,
+        ...data
+      })
+      this.loading = false
+
+      if (res && res.code === 0 && res.data) {
+        this.initData()
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+      }
+    },
+    async initData() {
+      this.loading = true
+      const res = await asyncRequest.detail({ id: this.$route.query.id })
+      this.loading = false
+
+      if (res && res.code === 0 && res.data) {
+        this.detail = res.data
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout()
+      } else {
+        this.$message.warning(res.message)
+      }
+    }
+  }
+}
+</script>

src/views/dataCorrection/managerCorrection/index.vue

@@ -0,0 +1,276 @@
+<template>
+  <div class="pagePadding">
+    <div class="box" v-if="powers.some((i) => i == '001')">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%;">
+            <el-row style="padding-left: 80px">
+              <el-col :span="5" style="width: 230px; float: left;">
+                <el-input
+                  v-model="parmValue.orderCode"
+                  :size="'mini'"
+                  style="width: 100%"
+                  placeholder="订单编号"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="5" style="width: 230px; float: left;margin-left:10px">
+                <el-input
+                  v-model="parmValue.apply_name"
+                  :size="'mini'"
+                  placeholder="申请人"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+
+              <el-col :span="5" style="margin-left: 10px">
+                <el-select
+                  size="mini"
+                  v-model="parmValue.status"
+                  placeholder="状态"
+                  clearable
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="opt in statusOptions"
+                    :key="opt.value"
+                    :label="opt.label"
+                    :value="opt.value"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="primary"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="searchList"
+                >刷新</el-button>
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  type="warning"
+                  :size="searchSize"
+                  style="float: right"
+                  @click="restSearch"
+                >重置</el-button>
+              </el-col>
+
+              <el-col
+                :span="3"
+                class="fr"
+                style="width: 66px; padding: 0 0 0 10px"
+                v-if="powers.some((i) => i == '003')"
+              >
+                <el-button
+                  :size="searchSize"
+                  type="success"
+                  style="float: right"
+                  @click="onCreate"
+                >添加</el-button>
+              </el-col>
+            </el-row>
+          </div>
+        </template>
+
+        <template #status="{scope}">
+          <el-tag
+            :size="'mini'"
+            :type="scope.row.status == '1' ? 'warning' : ''"
+            v-text="
+            (statusOptions.find((i)=> i.value == scope.row.status) || {})
+              .label || '--'
+          "
+          ></el-tag>
+        </template>
+
+        <template #orderCode="{scope}">
+          {{ Object.keys(scope.row.orderCode).map(key => scope.row.orderCode[key]).join(" , ") }}
+        </template>
+
+        <template #before="{scope}">
+          <el-tooltip :content="'客户公司编码 : ' + scope.row.before.customer_code" placement="top">
+            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+          </el-tooltip>
+          {{scope.row.before.customerName}}
+        </template>
+
+        <template #after="{scope}">
+          <el-tooltip :content="'客户公司编码 : ' + scope.row.after.customer_code" placement="top">
+            <i class="el-icon-warning-outline" style="margin-right:2px;cursor:pointer" />
+          </el-tooltip>
+          {{scope.row.after.customerName}}
+        </template>
+        <!--  -->
+        <template #operation="{ scope }">
+          <el-tooltip effect="dark" content="详情" placement="top" v-if="powers.some((i) => i == '007')">
+            <i
+              class="el-icon-view tb-icon"
+              @click="routeGoto('managerCorrectionDetail', {
+                id: scope.row.id,
+                mode: 'update'
+              })"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+
+<script>
+import asyncRequest from "@/apis/service/dataCorrection/managerCorrection";
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import { columns } from "./columns";
+import { mapGetters } from "vuex";
+import companyHelper from "@/mixins/companyHelper";
+
+export default {
+  mixins: [mixinPage, resToken, companyHelper],
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran =
+        btnList.find(i => i.menu_route == "managerCorrection") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      statusOptions: [
+        { value: "1", label: "待审核" },
+        { value: "2", label: "审核通过" },
+        { value: "3", label: "审核驳回" }
+      ],
+      parmValue: {
+        orderCode: "",
+        apply_name:"",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      },
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"]
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0
+      },
+      // 表格 - 列参数
+      columns: columns
+    };
+  },
+  mounted() {
+    this.searchList();
+  },
+  methods: {
+    onCreate(){
+      if(!this.currentCompany){
+        this.$message.warning('请选择一家业务公司');
+        return
+      }
+
+      this.routeGoto('managerCorrectionDetail', {
+        mode:'create'
+      })
+    },
+    async searchList() {
+      this.loading = true;
+      const res = await asyncRequest.list({
+        companyNo: this.currentCompany,
+        ...this.parmValue
+      });
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+    //重置
+    restSearch() {
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        curr: 1,
+        total: 0
+      };
+      this.parmValue = {
+        orderCode: "",
+        apply_name:"",
+        status: "",
+        page: 1, // 页码
+        size: 15 // 每页显示条数
+      };
+      this.searchList();
+    },
+    async handleTime(e) {
+      this.parmValue.start = e.startTime || "";
+      this.parmValue.end = e.endTime || "";
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end !== "") ||
+        (this.parmValue.start === "" && this.parmValue.end === "")
+      ) {
+        this.pageInfo.curr = 1;
+        this.parmValue.page = 1;
+        await this.searchList();
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -83,6 +83,32 @@
                     @searchChange="platform_codesearchChange"
                   />
                 </el-form-item>
+
+                <el-form-item label="对接平台" prop="platform_type">
+                  <el-select
+                    :disabled="!ruleForm.platform_type"
+                    v-model="ruleForm.platform_type"
+                    @change="ruleForm.platform = ''"
+                    disabled
+                    placeholder="对接平台"
+                    style="width:100%"
+                  >
+                    <el-option label="有赞平台" value="1" />
+                    <el-option label="无对接" value="0" />
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label="定价模式" prop="is_fixed">
+                  <el-select v-model="ruleForm.is_fixed" style="width:100%">
+                    <el-option
+                      v-for="p in pricingOptions"
+                      :key="p.value"
+                      :value="p.value"
+                      :label="p.label"
+                    />
+                  </el-select>
+                </el-form-item>
+
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
                     :disabled="false"
@@ -104,7 +130,9 @@
                     v-model="ruleForm.online_remark"
                   />
                 </el-form-item>
-                <el-button v-if="id !== '007'" type="primary" :size="'mini'" @click="submitForm">保 存</el-button>
+
+                <span v-if="isYZPlatform" style="color:red;margin-right:10px">咨询成交商品池不支持对接有赞的平台上线功能</span>
+                <el-button v-if="id !== '007'" type="primary" :size="'mini'" :disabled="isYZPlatform" @click="submitForm">保 存</el-button>
                 <el-button :size="'mini'" @click="showModelThis = false">
                   {{
                   id == "007" ? "关 闭" : "取 消"
@@ -123,13 +151,16 @@ import asyncRequest from "@/apis/service/goodStore/dealGoodsPool";
 import resToken from "@/mixins/resToken";
 export default {
   name: "brand",
-  props: ["showModel", "id", "sitem"],
+  props: ["showModel", "id", "sitem", "isNobleMetal"],
   mixins: [resToken],
   data() {
     return {
       loading: false,
+      isYZPlatform:false,
       showModelThis: this.showModel,
       ruleForm: {
+        platform_type: "",
+        is_fixed: "",
         platform: "", //string	平台id
         online_reason: "", //string	上线原因
         online_remark: "" //string	上线备注
@@ -141,6 +172,20 @@ export default {
       ],
       rulesThis: this.rules,
       rules: {
+        is_fixed: [
+          {
+            required: true,
+            message: "请选择定价模式",
+            trigger: "change"
+          }
+        ],
+        platform_type: [
+          {
+            required: true,
+            message: "请选择对接平台",
+            trigger: "change"
+          }
+        ],
         platform: [
           {
             required: true,
@@ -166,6 +211,11 @@ export default {
     };
   },
   watch: {
+    isFiexed() {
+      if (this.ruleForm.is_fiexed === "0") {
+        this.ruleForm.is_fixed = "";
+      }
+    },
     showModel: function(val) {
       this.showModelThis = val;
       if (val) {
@@ -178,7 +228,35 @@ export default {
       }
     }
   },
+  computed:{
+    isFiexed() {
+      return (
+        !this.isYZPlatform &&
+        this.isNobleMetal &&
+        this.ruleForm.platform_type !== "1"
+      );
+    },
+    pricingOptions() {
+      return [
+        { value: "1", label: "一口价" },
+        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
+      ];
+    }
+  },
   methods: {
+    isFiexed() {
+      return (
+        !this.isYZPlatform &&
+        this.isNobleMetal &&
+        this.ruleForm.platform_type !== "1"
+      );
+    },
+    pricingOptions() {
+      return [
+        { value: "1", label: "一口价" },
+        ...(this.isFiexed ? [{ value: "0", label: "实时金价" }] : [])
+      ];
+    },
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -192,6 +270,8 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
+            platform_type:"",
+            is_fiexed:"",
             platform: "", //string	平台id
             online_reason: "", //string	上线原因
             online_remark: "" //string	上线备注
@@ -200,11 +280,18 @@ export default {
       });
     },
     platform_codesearchChange(e) {
-      const { id, code, label } = e;
+      const { id, code, label, platform_type } = e;
       this.ruleForm.platform = id || "";
+      this.isYZPlatform = platform_type === "1";
+      this.ruleForm.platform_type = platform_type
       this.$refs.ruleForm.validateField("platform");
     },
     async submitForm() {
+      if(this.isYZPlatform){
+        this.$message.warning("咨询成交商品池不支持对接有赞的平台上线功能")
+        return
+      }
+
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {

src/views/goodStore/dealGoodsPool/index.vue

@@ -1,80 +1,38 @@
 <template>
   <div class="dealGoodsPool pagePadding">
-    <ex-table
-      v-loading="loading"
-      v-if=" powers.some((i) => i == '001')"
-      :table="table"
-      :data="tableData"
-      :columns="columns"
-      :page="pageInfo"
-      :size="size"
-      @page-curr-change="handlePageChange"
-      @page-size-change="handleSizeChange"
-      @screen-reset="
+    <ex-table v-loading="loading" v-if="powers.some((i) => i == '001')" :table="table" :data="tableData"
+      :columns="columns" :page="pageInfo" :size="size" @page-curr-change="handlePageChange"
+      @page-size-change="handleSizeChange" @screen-reset="
         pageInfo.curr = 1;
-        parmValue.page = 1;
-        searchList();
-      "
-      @screen-submit="
-        pageInfo.curr = 1;
-        parmValue.page = 1;
-        searchList();
-      "
-      @selection="selection_change"
-    >
+      parmValue.page = 1;
+      searchList();
+      " @screen-submit="
+  pageInfo.curr = 1;
+parmValue.page = 1;
+searchList();
+" @selection="selection_change">
       <template #table-header="{}">
         <div style="width: 100%">
           <el-row style="padding: 0 0 0 80px">
             <el-col :span="6" style="width: 293px">
-              <period-date-picker
-                :type="1"
-                :width="'135px'"
-                :size="searchSize"
-                :start="parmValue.start"
-                :end="parmValue.end"
-                @timeReturned="handleTime"
-              />
+              <period-date-picker :type="1" :width="'135px'" :size="searchSize" :start="parmValue.start"
+                :end="parmValue.end" @timeReturned="handleTime" />
             </el-col>
             <el-col :span="6" style="width: 250px; padding: 0 0 0 10px">
-              <el-input
-                :size="searchSize"
-                style="100%"
-                v-model="parmValue.spuCode"
-                :maxlength="40"
-                clearable
-                placeholder="商品编码"
-                @blur="
+              <el-input :size="searchSize" style="100%" v-model="parmValue.spuCode" :maxlength="40" clearable
+                placeholder="商品编码" @blur="
                   pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              ></el-input>
+                parmValue.page = 1;
+                searchList();
+                "></el-input>
             </el-col>
             <el-col :span="6" style="width: 280px; padding: 0 0 0 10px">
-              <el-input
-                :size="searchSize"
-                style="100%"
-                v-model="parmValue.good_name"
-                :maxlength="40"
-                clearable
-                placeholder="商品名称"
-                @blur="
+              <el-input :size="searchSize" style="100%" v-model="parmValue.good_name" :maxlength="40" clearable
+                placeholder="商品名称" @blur="
                   pageInfo.curr = 1;
-                  parmValue.page = 1;
-                  searchList();
-                "
-              ></el-input>
-            </el-col>
-            <el-col
-              :span="3"
-              class="fr"
-              style="width: 110px; padding: 0 0 0 10px"
-              v-if="powers.some((i) => i == '055') && !isSupertube"
-            >
-              <el-button :size="searchSize" type="warning" style="float: right" @click="add_online">
-                <i class="el-icon-circle-plus-outline"></i>
-                <span>商品上线</span>
-              </el-button>
+                parmValue.page = 1;
+                searchList();
+                "></el-input>
             </el-col>
             <el-col :span="3" class="fr" style="width: 66px; padding: 0 0 0 10px">
               <el-button type="primary" :size="searchSize" @click="searchList">刷新</el-button>
@@ -83,6 +41,20 @@
               <el-button type="warning" :size="searchSize" @click="restSearch">重置</el-button>
             </el-col>
           </el-row>
+
+          <el-row>
+            <el-col :span="3" class="fr" style="width: 260px; padding: 10px 0 0 10px">
+              <el-button :size="searchSize" type="warning" style="float: right" @click="add_online"  v-if="powers.some((i) => i == '055') && !isSupertube">
+                <i class="el-icon-circle-plus-outline"></i>
+                <span>商品上线</span>
+              </el-button>
+
+              <el-button :size="searchSize" type="warning" style="float: right;margin-right:10px" @click="add_cost"  v-if="powers.some((i) => i == '003') && !isSupertube">
+                <i class="el-icon-circle-plus-outline"></i>
+                <span>添加到商品成本</span>
+              </el-button>
+            </el-col>
+          </el-row>
           <!-- <el-row> -->
           <!-- <el-col :span="4" style="width: 518px">
               <el-input
@@ -139,46 +111,23 @@
         ></el-tag>
       </template>-->
       <template #good_type="{ scope }">
-        <el-tag
-          :size="tablebtnSize"
-          :type="scope.row.good_type == '0' ? 'warning' : ''"
-          v-text="
-            (options1.find((item) => item.id == scope.row.good_type) || {})
-              .name || '--'
-          "
-        ></el-tag>
+        <el-tag :size="tablebtnSize" :type="scope.row.good_type == '0' ? 'warning' : ''" v-text="(options1.find((item) => item.id == scope.row.good_type) || {})
+            .name || '--'
+          "></el-tag>
       </template>
 
       <template #operation="{ scope }">
-        <el-tooltip
-          v-if="powers.some((i) => i == '007')"
-          effect="dark"
-          content="详情"
-          placement="top"
-        >
+        <el-tooltip v-if="powers.some((i) => i == '007')" effect="dark" content="详情" placement="top">
           <i class="el-icon-view tb-icon" @click="show_view(scope.row)"></i>
         </el-tooltip>
       </template>
     </ex-table>
     <no-auth v-else></no-auth>
-    <show-goods-data-table-modal
-      :showModel="visible"
-      :type="'3'"
-      :title="row.dtitle"
-      :skuCode="row.skuCode"
-      :spuCode="row.spuCode"
-      :iscgd="false"
-      @cancel="visible = false"
-    />
+    <show-goods-data-table-modal :showModel="visible" :type="'3'" :title="row.dtitle" :skuCode="row.skuCode"
+      :spuCode="row.spuCode" :iscgd="false" @cancel="visible = false" />
 
-    <add-edit
-      :id="''"
-      :sitem="changeList"
-      :show-model="showModel"
-      :is-detail="false"
-      @refresh="showModel = false,searchList()"
-      @cancel="showModel = false"
-    />
+    <add-edit :id="''" :isNobleMetal="isNobleMetal" :sitem="changeList" :show-model="showModel" :is-detail="false"
+      @refresh="showModel = false, searchList()" @cancel="showModel = false" />
   </div>
 </template>
 <script>
@@ -213,6 +162,7 @@ export default {
     return {
       row: {},
       visible: false,
+      isNobleMetal: false,
       select: "1",
       sinput: "",
       //弹窗
@@ -279,6 +229,60 @@ export default {
     this.searchList();
   },
   methods: {
+    add_cost() {
+      if (this.changeList.length === 0) {
+        this.$message.warning("至少选择一个商品！");
+        return;
+      }
+      if (this.changeList.length > 100) {
+        this.$message.warning("商品数量不能超过100！");
+        return;
+      }
+
+      this.$confirm("是否确认将选中商品添加至商品成本").then(async () => {
+        const codes = this.changeList.map(({ spuCode }) => spuCode);
+
+        const { data, code, message } = await asyncRequest.goodupbaseiczx({ codes })
+
+        if (code === 0) {
+          this.$notify.success({
+            title: "已成功添加至商品成本！",
+            message: ""
+          });
+          this.showModelThis = false;
+          // 刷新
+          this.searchList();
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else if (code === 1009) {
+          let resList = JSON.parse(JSON.stringify(data));
+
+          let htmlList = "<ul>";
+          resList.forEach(v => {
+            htmlList += `<li>
+          <img src='${v.good_img}' style='width: 20px; height: 20px'
+                  class='hover'
+                  v-viewer/>
+                  <span>${v.good_name}__</span>`;
+            const { speclist } = v;
+            let str = "<span>";
+            speclist.forEach((a, ai) => {
+              str += `${ai !== 0 ? "--" : ""}${a.spec_name}[${a.spec_value
+                }]`;
+            });
+            htmlList += str + "</span>" + `</li>`;
+          });
+          htmlList += "</ul>";
+          this.$notify({
+            title: "以下商品已上线或已经在审批流程中！",
+            dangerouslyUseHTMLString: true,
+            message: htmlList
+          });
+        } else {
+          this.$message.warning(message);
+        }
+      })
+    },
     //点击商品上线
     add_online() {
       if (this.changeList.length === 0) {
@@ -289,6 +293,43 @@ export default {
         this.$message.warning("商品数量不能超过100！");
         return;
       }
+      const categoryIds = this.changeList.map(
+        ({ cat_info, is_gold_price }) => ({
+          id: String(cat_info[0].id),
+          isGoldPrice: String(is_gold_price)
+        })
+      );
+
+      const nobleMetalIds = categoryIds.filter(
+        ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
+      );
+
+      if (
+        nobleMetalIds.length > 0 &&
+        categoryIds.length !== nobleMetalIds.length
+      ) {
+        const h = this.$createElement;
+
+        this.$message({
+          message: h("p", null, [
+            h("span", null, "勾选商品必须全部为"),
+            h("i", { style: "color: red" }, "开启实时金价贵金属商品"),
+            h("span", null, "或者全部为"),
+            h(
+              "i",
+              { style: "color: red" },
+              "未开启实时金价的贵金属商品和非贵金属商品"
+            )
+          ]),
+          type: "warning",
+          dangerouslyUseHTMLString: true
+        });
+        return;
+      }
+
+      this.isNobleMetal =
+        nobleMetalIds.length > 0 && categoryIds.length === nobleMetalIds.length;
+
       this.showModel = true;
     },
     //选中触发函数
@@ -325,7 +366,6 @@ export default {
       };
       this.searchList();
     },
-
     //供应商选择
     async supplierNosearchChange(e) {
       console.log(e);

src/views/goodStore/goodsCost/columns.js

@@ -71,6 +71,12 @@ const listCol = [
     prop: 'brand_name',
     label: '品牌'
   },
+  {
+    prop: "create_source",
+    label: "来源",
+    _slot_: "create_source",
+    width: '110px'
+  },
   {
     prop: 'is_stock',
     label: '库存类型',

src/views/goodStore/goodsCost/components/addEdit.vue

@@ -171,24 +171,24 @@ export default {
       ],
       rulesThis: this.rules,
       rules: {
-        platform_type: [
+        platform: [
           {
             required: true,
-            message: "请选择对接平台",
+            message: "请选择所属平台",
             trigger: "change"
           }
         ],
-        platform: [
+        is_fixed: [
           {
             required: true,
-            message: "请选择所属平台",
+            message: "请选择定价模式",
             trigger: "change"
           }
         ],
-        is_fixed: [
+        platform_type: [
           {
             required: true,
-            message: "请选择定价模式",
+            message: "请选择对接平台",
             trigger: "change"
           }
         ],
@@ -280,6 +280,7 @@ export default {
           if (!this.loading) {
             this.loading = true;
             const model = JSON.parse(JSON.stringify(this.ruleForm));
+
             // model.platform = model.platform.toString();
             model.codes = [];
             const list = JSON.parse(JSON.stringify(this.sitem));

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -35,7 +35,7 @@
                   v-model="ruleForm.is_stock"
                   filterable
                   clearable
-                  :disabled="type === 'view' || type === 'editBase' || type === 'editCoin' || type === 'edit'"
+                  :disabled="type === 'view' || type === 'editBase' || type === 'editCoin' || type === 'edit' && createSource === '0'"
                   style="width: 100%"
                   @change="stock_change"
                   placeholder="是否库存品"
@@ -54,7 +54,7 @@
               <el-form-item prop="is_combind" label="组合类型" label-width="110px">
                 <el-select
                   style="width:100%"
-                  :disabled="type !== 'add'"
+                  :disabled="type === 'view' || type === 'editBase' || type === 'editCoin' || type === 'edit' && createSource === '0'"
                   v-model="ruleForm.is_combind"
                   placeholder="是否组合商品"
                   @change="groupGoodChange"
@@ -72,7 +72,7 @@
                 <search-supplier
                   :value="ruleForm.supplierNo"
                   :placeholder="'供应商'"
-                  :disabled="type === 'view' || type === 'editCoin'"
+                  :disabled="type === 'view' || type === 'editCoin' || createSource === '1'"
                   :size="'mini'"
                   :names="supplierName"
                   :isDetail="type !== 'add'"
@@ -100,7 +100,7 @@
                 <company-sort
                   :value="ruleForm.cat_id"
                   :placeholder="'商品分类'"
-                  :disabled="type !== 'add'"
+                  :disabled="!(type === 'add' ||  sitem.status === '7')"
                   :size="'mini'"
                   :names="cat_id_name"
                   :isDetail="type !== 'add'"
@@ -250,7 +250,7 @@
                     filterable
                     clearable
                     :disabled="
-                      type === 'view' || type === 'editBase' || type === 'editCoin'
+                      type === 'view' || type === 'editBase' || type === 'editCoin' || createSource === '1'
                     "
                     style="width: 100%"
                     placeholder="启用实时金价"
@@ -1185,6 +1185,7 @@ export default {
   },
   data() {
     return {
+      createSource:"",
       isStockOptions,
       areaInfo: {
         delivery_place: {
@@ -1323,7 +1324,7 @@ export default {
     },
     async number_change(e, key) {
       this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+      this.$refs.ruleForm && this.$refs.ruleForm.validateField(key);
       await this.get_all_fee();
     },
     openEdit(index, sitem) {
@@ -2027,18 +2028,24 @@ export default {
             stock_moq,
             is_support_stock,
             is_combind,
-            combind_list
+            combind_list,
+            create_source
           } = this.sitem;
 
+          this.createSource = create_source
+
           if (this.type !== "add") {
             const { name, area_code } = await this.getArea("delivery_place");
-            this.areaInfo.delivery_place.label = [name];
-            this.areaInfo.delivery_place.code = [area_code];
-            const { name: _name, area_code: _area_code } = await this.getArea(
-              "origin_place"
-            );
-            this.areaInfo.origin_place.label = [_name];
-            this.areaInfo.origin_place.code = [_area_code];
+
+            if(name && area_code){
+              this.areaInfo.delivery_place.label = [name];
+              this.areaInfo.delivery_place.code = [area_code];
+              const { name: _name, area_code: _area_code } = await this.getArea(
+                "origin_place"
+              );
+              this.areaInfo.origin_place.label = [_name];
+              this.areaInfo.origin_place.code = [_area_code];
+            }
           }
 
           this.companyName = companyName;
@@ -2266,6 +2273,7 @@ export default {
     },
     async getArea(prop = "delivery_place") {
       const chunks = this.sitem[prop].split(",");
+      if(chunks.length !== 3) return {nanme:"", area_code:""}
       let { data: province } = await asyncRequest.province();
       province = province.find(
         ({ province_code }) => province_code === chunks[0]

src/views/goodStore/goodsCost/detail.vue

@@ -41,9 +41,9 @@
                       <div style="max-height: 24px; overflow: hidden">
                         <el-image
                           style="height: 24px; width: 24px; margin-right: 5px"
-                          v-for="(img, index) in sitem.good_img.split(',')"
+                          v-for="(img, index) in Array.isArray(sitem.good_img) ? sitem.good_img : sitem.good_img.split(',')"
                           :src="img"
-                          :preview-src-list="sitem.good_img.split(',')"
+                          :preview-src-list="Array.isArray(sitem.good_img) ? sitem.good_img : sitem.good_img.split(',')"
                           :key="index"
                         />
                       </div>
@@ -384,6 +384,7 @@ export default {
     },
     async getArea(prop = "delivery_place") {
       const chunks = this.sitem[prop].split(",");
+      if(chunks.length !== 3) return ""
       let { data: province } = await asyncRequest.province();
       province = province.find(
         ({ province_code }) => province_code === chunks[0]
@@ -434,6 +435,7 @@ export default {
       const { code, message, data } = await asyncRequest.detail({
         spuCode: this.queryId
       });
+
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));

src/views/goodStore/goodsCost/index.vue

@@ -223,6 +223,12 @@
           </el-row>
         </div>
       </template>
+      
+      <template #create_source="{ scope }">
+        <el-tag size="mini" :type="scope.row.create_source === '1' ? 'warning' : ''">
+          {{ scope.row.create_source === "1" ? "咨询成交商品" : "手动创建商品" }}
+        </el-tag>
+      </template>
 
       <template #spuCode="{ scope }">
         <div style="display:flex;align-items:center">
@@ -377,10 +383,10 @@
         </el-tooltip>
         <el-tooltip
           v-if="
-            powers.some((i) => i == '010') &&
+            (powers.some((i) => i == '010') &&
             !(scope.row.status + '' === '7' || scope.row.status + '' === '8') &&
             !isSupertube &&
-            String(scope.row.createrid) !== '0'
+            String(scope.row.createrid) !== '0') && scope.row.create_source !== '1'
           "
           effect="dark"
           content="复制商品"

src/views/serviceParam/supplierBrand/addEdit.vue

@@ -356,7 +356,7 @@ export default {
             res = await asyncRequest.update(model)
           }
           this.loading = false
-          const { code, data, message } = res
+          const { code, message } = res
           if (code === 0) {
             const title = this.type === 'add' ? '添加成功!' : '修改成功!'
             this.$notify.success({

src/views/serviceParam/supplierBrand/index.vue

@@ -199,7 +199,6 @@ export default {
   data() {
     return {
       statusList: statusList,
-      loading: true,
       options1: [
         { id: "0", name: "长期" },
         { id: "1", name: "非长期" },