snow 2 سال پیش
والد
کامیت
fe26fe9836

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/0.js


+ 14 - 13
dist/static/js/1.js

@@ -1,5 +1,17 @@
 (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 ***!
@@ -8,7 +20,7 @@
 /***/ (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\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?");
+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?");
 
 /***/ }),
 
@@ -20,7 +32,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\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?");
+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?");
 
 /***/ }),
 
@@ -83,17 +95,6 @@ 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 ***!

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/chunk-elementUI.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 11 - 11
dist/static/js/chunk-libs.js


+ 11 - 10
src/apis/service/stock/dataWeido/index.js

@@ -1,18 +1,19 @@
 // 物业管理员
-import http from "@/apis/axios";
-const api = "admin/";
+import http from '@/apis/axios'
+const api = 'admin/'
 export default {
   // 添加
-  add: (data, params) => http(api + "add", data, "post", params),
+  add: (data, params) => http(api + 'add', data, 'post', params),
   // 删除
-  delete: (data, params) => http(api + "delete", data, "post", params),
+  delete: (data, params) => http(api + 'delete', data, 'post', params),
   // 分页查询
-  list: (data, params) => http(api + "getstockwsm", data, "post", params),
+  list: (data, params) => http(api + 'getstockwsm', data, 'post', params),
   // 详情
-  detail: (data, params) => http(api + "detail", data, "post", params),
+  detail: (data, params) => http(api + 'detail', data, 'post', params),
   // 更新
-  update: (data, params) => http(api + "update", data, "post", params),
+  update: (data, params) => http(api + 'update', data, 'post', params),
   // 修改状态
-  status: (data, params) => http(api + "accountstatus", data, "post", params),
-};
-   
+  status: (data, params) => http(api + 'accountstatus', data, 'post', params),
+  listChild: (data, params) => http(api + 'getstockwsmchild', data, 'post', params)
+}
+

+ 4 - 4
src/views/interest/handover/index.vue

@@ -249,10 +249,10 @@ export default {
           prop: "hand_name",
           label: "接收人",
         },
-        {
-          prop: "companyNo",
-          label:"业务公司编号"
-        },
+        // {
+        //   prop: "companyNo",
+        //   label:"业务公司编号"
+        // },
         {
           prop: "status",
           label: "状态",

+ 5 - 5
src/views/stock/goodsRepertory/columns.js

@@ -150,11 +150,11 @@ const listCol = [
     label: '供应商负责人',
     width: '95'
   },
-  {
-    prop: 'company_name',
-    label: '创建人部门',
-    minWidth: '150px'
-  },
+  // {
+  //   prop: 'company_name',
+  //   label: '创建人部门',
+  //   minWidth: '150px'
+  // },
   {
     prop: 'creater',
     label: '创建人',

+ 4 - 4
src/views/stock/goodsRepertory/index.vue

@@ -181,8 +181,8 @@
                   <el-option label="业务企业编号" value="5" />
                   <el-option label="平台商品编号" value="6" />
                   <el-option label="创建人" value="7" />
-                  <el-option label="创建人部门" value="8" /> </el-select
-              ></el-input>
+                  <!-- <el-option label="创建人部门" value="8" />  -->
+                </el-select></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">
@@ -310,7 +310,7 @@ export default {
         companyNo: "", //业务企业编号
         // exam_status: "6", //审核状态
         plat_code: "", //平台商品编号
-        company_name: "", //创建人部门
+        // company_name: "", //创建人部门
         creater: "", //
       },
 
@@ -381,7 +381,7 @@ export default {
         companyNo: "", //业务企业编号
         // exam_status: "6", //审核状态
         plat_code: "", //平台商品编号
-        company_name: "", //创建人部门
+        // company_name: "", //创建人部门
         creater: "", //
       };
       this.searchList();

+ 20 - 21
src/views/stock/stockCount/components/dataWeido/index.vue

@@ -2,12 +2,16 @@
   <div class="dataWeido pagePadding" style="padding: 0">
     <div v-if="powers.some((i) => i == '001')">
       <ex-table
+        ref="table"
         v-loading="loading"
         :table="table"
         :data="tableData"
         :columns="columns"
         :page="pageInfo"
         :size="size"
+        row-key="wsm_code"
+        :expand-row-keys="expandKeys"
+        @expand-change="handleExpandChange"
         @page-curr-change="handlePageChange"
         @page-size-change="handleSizeChange"
         @screen-reset="
@@ -25,25 +29,6 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
               <el-col :span="24">
-                <!-- <el-col :span="12" style="width: 240px">
-                  <search-work-company
-                    :value="parmValue.companyNo"
-                    :names="''"
-                    :size="searchSize"
-                    :is-detail="id !== 'add'"
-                    :placeholder="'业务公司'"
-                    @searchChange="supplierChange"
-                  />
-                </el-col> -->
-                <!-- <el-col :span="12" style="width: 300px; padding: 0 0 0 10px">
-                  <search-supplier
-                    :size="searchSize"
-                    :placeholder="'供应商公司'"
-                    :disabled="parmValue.companyNo === ''"
-                    :value="parmValue.supplier_code"
-                    @searchChange="selectSupplier"
-                  />
-                </el-col> -->
                 <el-col :span="12" style="width: 200px; padding-left: 10px">
                   <search-stock
                     :isDetail="true"
@@ -84,6 +69,7 @@
         </template>
         <template #expand="{ scope }">
           <el-table
+            v-loading="scope.row.loading"
             :data="scope.row.child"
             style="width: 100%; paddind: 20px"
             border
@@ -92,7 +78,7 @@
             <el-table-column
               label="商品编码"
               prop="spuCode"
-              width="160"
+              width="170"
             ></el-table-column>
 
             <el-table-column
@@ -204,6 +190,7 @@ export default {
   data() {
     return {
       loading: false,
+      loadingRows: {},
       stock_code: "",
       supplier_code: "",
       parmValue: {
@@ -213,6 +200,7 @@ export default {
         page: 1, // 页码
         size: 15, // 每页显示条数
       },
+      expandKeys:[],
 
       // 表格 - 数据
       tableData: [],
@@ -287,6 +275,16 @@ export default {
       };
       this.searchList();
     },
+    async handleExpandChange(row){
+      if(!row.expand) {
+        row.loading = true
+        const { data } = await asyncRequest.listChild({wsm_code:row.wsm_code})
+        row.loading = false
+        this.expandKeys.push(row.expand)
+        row.child = data;
+        row.expand = true
+      }
+    },
     async searchList() {
       this.loading = true;
       let model = JSON.parse(JSON.stringify(this.parmValue));
@@ -301,7 +299,8 @@ export default {
       });
 
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        const _list = res.data.list;
+        this.tableData = _list.map(item => ({...item,child:[], expand:false, loading:false}))
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();

+ 2 - 2
src/views/stock/stockWarning/index.vue

@@ -88,7 +88,7 @@
                   @searchChange="selectStock"
                 />
               </el-col>
-              <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
+              <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   placeholder="采购人部门"
                   v-model="parmValue.company_name"
@@ -101,7 +101,7 @@
                   class="input"
                 >
                 </el-input>
-              </el-col>
+              </el-col> -->
 
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است