Merge branch 'live' into edit

src/main.js

@@ -17,7 +17,7 @@ import globalComponents from './components/globalComponents'
 import App from './App'
 import store from './store'
 import base from './assets/utils/prototype/index'
-require('./mock')
+// require('./mock')
 
 import * as filters from './filters' // global filters
 

src/mock/axios.js

@@ -1,22 +0,0 @@
-
-const header = {}
-window.ajaxTimeout = 20000
-export default async (
-    url = '',
-    data = {},
-    type = 'GET',
-    params = {},
-    headers = header,
-) => {
-    return new Promise((resolve, reject) => {
-        console.log(url)
-        axios
-            .post(`/${url.url||url}`, {})
-            .then((res) => {
-                resolve(res.data)
-            })
-            .catch((err) => {
-                reject(err);
-            });
-    })
-}

src/mock/index.js

@@ -1,37 +0,0 @@
-import Mock from 'mockjs'
-
-import * as process from './modules/process'
-import * as stock from './modules/stock'
-let baseUrl = ""
-let openMock = true
-
-fnCreate(process, openMock)
-fnCreate(stock, openMock)
-/**
- * 创建mock模拟数据
- * @param {*} mod 模块
- * @param {*} isOpen 是否开启?
- */
-function fnCreate(mod, isOpen = true) {
-    if (isOpen) {
-        for (var key in mod) {
-            ((res) => {
-                if (res.isOpen !== false) {
-                    let url = baseUrl
-                    if (!url.endsWith("/")) {
-                        url = url + "/"
-                    }
-                    url = url + res.url
-                    // console.log(url)
-                    // console.log(new RegExp(url))
-                    Mock.mock(new RegExp(url), res.type, (opts) => {
-                        opts['data'] = opts.body ? JSON.parse(opts.body) : null
-                        delete opts.body
-
-                        return res.data
-                    })
-                }
-            })(mod[key]() || {})
-        }
-    }
-}

src/mock/model/http.js

@@ -1,5 +0,0 @@
-export default {
-    code: 0,
-    data: {},
-    mag: "",
-}

src/mock/model/list.js

@@ -1,4 +0,0 @@
-export default {
-    count: 0,
-    list: []
-}

src/mock/modules/process.js

@@ -1,58 +0,0 @@
-import http from "@/mock/model/http"
-import list from "@/mock/model/list"
-import Mock from 'mockjs'
-const Random = Mock.Random
-
-export function oingList() { //我的待办列表
-  let model = JSON.parse(JSON.stringify(http)) 
-  let listModel= JSON.parse(JSON.stringify(list)) 
-  listModel.count = 100
-  listModel.list = []
-
-  for (let i = 0; i < 15; i++) {
-    listModel.list.push(Mock.mock({
-      id: '@increment',//待办编号
-      'title|1': ['备货申请', '采购入库', '咨询确认单审批', '销售确认单审批', '销售出库', '售后退货申请', '售后退货', '采购调拨', '采购盘点'],//流程名称
-      orderNo: '@guid',//单据号
-      'type|1': ['待审核', '待采购反馈', '待发货', '待收货', '待申请售后'],//当前节点
-      timestamp: +Mock.Random.date('T'),//停留时间
-      author: '@cname',//发起人
-      'reviewer|1': ['采购部', '网络部', '信息部', '财务部', '客服部', '项目部', '人事部'],//发起部门
-      addTime: '@datetime', //创建时间
-    }))
-  }
-  model.data = listModel
-
-  return {
-    url: 'process/oingList',
-    type: 'post',
-    data: model
-  }
-}
-
-export function doneList() { //我的已办列表
-  let model = JSON.parse(JSON.stringify(http)) 
-  let listModel= JSON.parse(JSON.stringify(list)) 
-  listModel.count = 100
-  listModel.list = []
-
-  for (let i = 0; i < 15; i++) {
-    listModel.list.push(Mock.mock({
-      id: '@increment',//待办编号
-      'title|1': ['备货申请', '采购入库', '咨询确认单审批', '销售确认单审批', '销售出库', '售后退货申请', '售后退货', '采购调拨', '采购盘点'],//流程名称
-      orderNo: '@guid',//单据号
-      'type|1': ['待审核', '待采购反馈', '待发货', '待收货', '待申请售后'],//当前节点
-      timestamp: +Mock.Random.date('T'),//停留时间
-      author: '@cname',//发起人
-      'reviewer|1': ['采购部', '网络部', '信息部', '财务部', '客服部', '项目部', '人事部'],//发起部门
-      addTime: '@datetime', //创建时间
-    }))
-  }
-  model.data = listModel
-
-  return {
-    url: 'process/doneList',
-    type: 'post',
-    data: model
-  }
-}

src/mock/modules/stock.js

@@ -1,128 +0,0 @@
-import http from "@/mock/model/http"
-import list from "@/mock/model/list"
-import Mock from 'mockjs'
-const Random = Mock.Random
-
-export function stockListAll() {
-  let model = JSON.parse(JSON.stringify(http)) 
-  model.data = []
-
-  for (let i = 0; i < 50; i++) {
-    let father = Mock.mock({
-      id: '@increment',//id
-      name: '@ctitle(5)',//公司名称
-      child: []
-    })
-    for (let j = 0; j < 10; j++) {
-      father.child.push(Mock.mock({
-        id: '@increment',//id
-        name: '@ctitle(5)',//仓库名称
-      }))
-    }
-
-
-
-    model.data.push(father)
-  }
-  return {
-    url: 'stock/stockListAll',
-    type: 'post',
-    data: model
-  }
-}
-
-
-export function statistics() {
-  let model = JSON.parse(JSON.stringify(http)) 
-    model.data= Mock.mock({
-      value1: '@integer(300, 5000)',//当前库存
-      value2: '@integer(300, 5000)',//待入库
-      value3: '@integer(300, 5000)',//待出库
-      value4: '@integer(300, 5000)',//可用库存
-      value5: '@integer(300, 5000)',//在途库存
-    })
-  return {
-    url: 'stock/statistics',
-    type: 'post',
-    data: model
-  }
-}
-
-export function stockLog() {
-  let model = JSON.parse(JSON.stringify(http)) 
-  let listModel= JSON.parse(JSON.stringify(list)) 
-  listModel.count = 100
-  listModel.list = []
-
-  for (let i = 0; i < 15; i++) {
-    listModel.list.push(Mock.mock({
-      id: '@increment',//记录编号
-      author: '@cname',//操作人
-      'reviewer|1': ['采购部', '网络部', '信息部', '财务部', '客服部', '项目部', '人事部'],//操作人部门
-      'type|1': ['待入库', '待出库', '其他入库', '其他出库', '正式入库', '正式出库'],//仓库类型
-      "number|1-100":100,//操作数量
-      'typeo|1': ['采购入库单', '销售出库单', '售后退货', '采购调拨', '采购盘点'],//库存来源
-      addTime: '@datetime', //操作时间
-    }))
-  }
-  model.data = listModel
-  return {
-    url: 'stock/stockLog',
-    type: 'post',
-    data: model
-  }
-}
-
-
-
-//库存预警列表
-export function orderWarnList() {
-  let model = JSON.parse(JSON.stringify(http)) 
-  let listModel= JSON.parse(JSON.stringify(list)) 
-  listModel.count = 100
-  listModel.list = []
-
-  for (let i = 0; i < 15; i++) {
-    listModel.list.push(Mock.mock({
-      orderNo: '@guid',//商品编号
-      'goods|1':  ['恰恰瓜子', '卫龙辣条', 'XX月饼', 'XX潮牌鞋', '可口可乐'],//商品名称
-      'attribute|1': ['红色-X码', '红色-m码', '红色-l码', '蓝色-l码', '蓝色-l码', '蓝色-l码', '整装'],//属性名称
-      'type|1': [ '潮牌', '休闲食品'],//分类
-      'unit|1': [ '件', '双', '袋', '盒', '桶'],//单位
-      "number|1-100":100,//可用库存
-      "warnNumber|1-50":50,//预警库存
-      addTime: '@datetime', //操作时间
-    }))
-  }
-  model.data = listModel
-  return {
-    url: 'stock/orderWarnList',
-    type: 'post',
-    data: model
-  }
-}
-
-
-//仓库商品列表
-export function stockGoodsList() {
-  let model = JSON.parse(JSON.stringify(http)) 
-  let listModel= JSON.parse(JSON.stringify(list)) 
-  listModel.count = 100
-  listModel.list = []
-
-  for (let i = 0; i < 15; i++) {
-    listModel.list.push(Mock.mock({
-      orderNo: '@guid',//商品编号
-      'goods|1':  ['恰恰瓜子', '卫龙辣条', 'XX月饼', 'XX潮牌鞋', '可口可乐'],//商品名称
-      'attribute|1': ['红色-X码', '红色-m码', '红色-l码', '蓝色-l码', '蓝色-l码', '蓝色-l码', '整装'],//属性名称
-      'unit|1': [ '件', '双', '袋', '盒', '桶'],//单位
-      "number|1-100":100,//可用库存
-    }))
-  }
-  model.data = listModel
-  return {
-    url: 'stock/stockGoodsList',
-    type: 'post',
-    data: model
-  }
-}

src/mock/service/process/done/index.js

@@ -1,8 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'process/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'doneList', data, 'post', params),
- 
-}

src/mock/service/process/oing/index.js

@@ -1,9 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'process/'
-export default {
-  // 分页查询
-  list: (data, params) => http(api + 'oingList', data, 'post', params),
-
-}
-

src/mock/service/stock/allot/index.js

@@ -1,10 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
-  goodsList:  (data, params) => http(api + 'stockGoodsList', data, 'post', params),
-  
-}

src/mock/service/stock/allotFlow/index.js

@@ -1,11 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
-  // 获取库存商品
-  goodsList:  (data, params) => http(api + 'stockGoodsList', data, 'post', params),
-  
-}

src/mock/service/stock/dataWeido/index.js

@@ -1,9 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
- 
-}

src/mock/service/stock/newApply/index.js

@@ -1,9 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
- 
-}

src/mock/service/stock/oing/index.js

@@ -1,8 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'process/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'oingList', data, 'post', params),
- 
-}

src/mock/service/stock/productWeido/index.js

@@ -1,8 +0,0 @@
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
- 
-}

src/mock/service/stock/spaceCount/index.js

@@ -1,8 +0,0 @@
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
- 
-}

src/mock/service/stock/stockWarning/index.js

@@ -1,9 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-  // 分页查询
-  list:  (data, params) => http(api + 'orderWarnList', data, 'post', params),
-  listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
- 
-}

src/mock/service/stock/survey/index.js

@@ -1,11 +0,0 @@
-// 账号
-import http from '@/mock/axios'
-const api = 'stock/'
-export default {
-    // 统计
-    statistics: (data, params) => http(api + 'statistics', data, 'post', params),
-    // 全部企业&&仓库
-    listAll: (data, params) => http(api + 'stockListAll', data, 'post', params),
-    // 日志
-    log: (data, params) => http(api + 'stockLog', data, 'post', params),
-}

src/views/process/done/index.vue

@@ -134,7 +134,7 @@
 <script>
 import addEdit from "./addEdit";
 // import asyncRequest from "@/apis/service/process/done";
-import asyncRequest from "@/mock/service/process/done"; //引入mock数据
+// import asyncRequest from "@/mock/service/process/done"; //引入mock数据
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
@@ -235,7 +235,7 @@ export default {
     };
   },
   mounted() {
-    this.searchList();
+    // this.searchList();
   },
   methods: {
     restSearch() {

src/views/process/oing/index.vue

@@ -132,7 +132,7 @@
 <script>
 import addEdit from "./addEdit";
 // import asyncRequest from "@/apis/service/process/oing";
-import asyncRequest from "@/mock/service/process/oing"; //引入mock数据
+// import asyncRequest from "@/mock/service/process/oing"; //引入mock数据
 import statusList from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
@@ -239,7 +239,7 @@ export default {
     };
   },
   mounted() {
-    this.searchList();
+    // this.searchList();
   },
   methods: {
     restSearch() {

src/views/stock/check/components/addEdit.vue

@@ -177,7 +177,7 @@ export default {
     closeModel() {
       console.log("closeModel!!");
     },
-
+    addGoodsRes(e) {},
     //供应商选择
     supplierChange(e) {
       if (e && e.id) {

src/views/stock/check/detail.vue

@@ -57,7 +57,6 @@
           (status == '2' && powers.some((item) => item == '018'))
         "
         v-model="activeNames"
-        @change="handleChange"
       >
         <el-collapse-item
           v-if="