Merge branch 'master' of yb/eccs into master

eccs-admin/src/main/resources/application-prod.yml

@@ -8,13 +8,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 120.78.152.8
+    host: 8.135.102.238
     # 端口，默认为6379
-    port: 7379
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: Abc-123#*.-
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: tuser
-        password: Qq!123
+        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs_cw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: eccs_cw
+        password: 2KYkenCFH8
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: tuser
-        password: Qq!123
+        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs_cw?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: eccs_cw
+        password: 2KYkenCFH8
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -97,7 +97,7 @@ swagger:
   # 是否开启swagger
   enabled: false
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /prod-api
 
 # 日志配置
 logging:
@@ -105,4 +105,4 @@ logging:
     com.emato: info
     org.springframework: warn
   file:
-    path: /data/eccs/logs
+    path: /data/project/logs

eccs-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ cadmin:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: ~/uploadFile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: test
+    active: prod
   # 文件上传
   servlet:
      multipart:

eccs-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/data/eccs/logs" />
+	<property name="log.path" value="/app/project/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -11,14 +11,36 @@
 			<pattern>${log.pattern}</pattern>
 		</encoder>
 	</appender>
+
+    <appender name="file_debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/eccs-sys-debug.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/eccs-sys-debug.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>DEBUG</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
 	
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
+	    <file>${log.path}/eccs-sys-info.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<fileNamePattern>${log.path}/eccs-sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
 		</rollingPolicy>
@@ -36,11 +58,11 @@
 	</appender>
 	
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
+	    <file>${log.path}/eccs-sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/eccs-sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
         </rollingPolicy>
@@ -59,10 +81,10 @@
 
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
+		<file>${log.path}/eccs-sys-user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/eccs-sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>
@@ -74,15 +96,16 @@
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.emato" level="info" />
 	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+	<logger name="org.springframework" level="info" />
 
-	<root level="info">
+	<root level="debug">
 		<appender-ref ref="console" />
 	</root>
 	
 	<!--系统操作日志-->
-    <root level="info">
+    <root level="debug">
         <appender-ref ref="file_info" />
+        <appender-ref ref="file_debug" />
         <appender-ref ref="file_error" />
     </root>
 	

eccs-biz/src/main/resources/kmall-config.yml

@@ -6,17 +6,17 @@ kmall:
 #  queryAllShopInveMngUrl: http://127.0.0.1:8080/ktoeccs/queryAllStoreProductInfo
 #  # 发送请求
 #  requestToKmall: http://127.0.0.1:8080/ktoeccs/sendToEccs
-  # 测试环境地址
-  # 查询所有库存接口
-  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
-  # 查询门店库存接口
-  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
-  # 发送请求
-  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
-#   生产环境地址
-#  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+#  # 测试环境地址
+#  # 查询所有库存接口
+#  queryAllInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllGoodsInfo
 #  # 查询门店库存接口
-#  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+#  queryAllShopInveMngUrl: http://183.62.225.124:8080/ktoeccs/queryAllStoreProductInfo
 #  # 发送请求
-#  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
+#  requestToKmall: http://183.62.225.124:8080/ktoeccs/sendToEccs
+#   生产环境地址
+  queryAllInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllGoodsInfo
+  # 查询门店库存接口
+  queryAllShopInveMngUrl: http://8.135.102.238:8080/ktoeccs/queryAllStoreProductInfo
+  # 发送请求
+  requestToKmall: http://8.135.102.238:8080/ktoeccs/sendToEccs
 

eccs-system/src/main/java/com/emato/system/service/impl/SysDeptServiceImpl.java

@@ -185,6 +185,8 @@ public class SysDeptServiceImpl implements ISysDeptService
         {
             throw new CustomException("部门停用，不允许新增");
         }
+        //TODO 后面动态添加 cw，sys_dept   字段merch_sn  写死 mhbs764449385500180480
+        dept.setMerchSn("mhbs764449385500180480");
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }

eccs-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="merchSn != null and merchSn != ''">merch_sn,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="merchSn != null and merchSn != ''">#{merchSn},</if>
  			sysdate()
  		)
 	</insert>

eccs-ui/src/api/mall/mallinvemng.js

@@ -53,17 +53,16 @@ export function exportMallinvemng(query) {
 }
 
 // 拉取kmall的所有商品数据
-export function pullKmallInvemng(query,loading,_this) {
+export function pullKmallInvemng(query,_this) {
   return request({
     url: '/biz/mallinvemng/pullKmallInveMng',
     method: 'POST',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/mall/mallshopmng.js

@@ -52,19 +52,17 @@ export function exportMallshopmng(query) {
   })
 }
 
-pullKmallStoreInvemng
 // 拉取kmall的所有商品数据
-export function pullKmallStoreInvemng(query,loading,_this) {
+export function pullKmallStoreInvemng(query, _this) {
   return request({
     url: '/biz/mallshopmng/pullKmallStoreInveMng',
     method: 'POST',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/adjustmentorder.js

@@ -69,16 +69,15 @@ export function pullAdjustmentorder(query,loading,_this) {
 }
 
 // 拉取结转明细
-export function pullAdjustmentorderDetail(adjustmentOrderSn,loading,_this) {
+export function pullAdjustmentorderDetail(adjustmentOrderSn,_this) {
   return request({
     url: '/biz/adjustmentorder/pullAdjustmentorderDetail/' + adjustmentOrderSn,
     method: 'post',
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/invemng.js

@@ -53,17 +53,16 @@ export function exportInvemng(query) {
 }
 
 // 导出库存管理，wms入库回传时，增加库存数
-export function pullInvemng(query,loading,_this) {
+export function pullInvemng(query,_this) {
   return request({
     url: '/biz/invemng/pullInveMng',
     method: 'post',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/invereceiptgoods.js

@@ -53,17 +53,16 @@ export function exportInvereceiptgoods(query) {
 }
 
 // 导出库存管理，wms入库回传时，增加库存数
-export function pullInveReceiptGoods(query,loading,_this) {
+export function pullInveReceiptGoods(query,_this) {
   return request({
     url: '/biz/invereceiptgoods/pullReceiptGoods',
     method: 'post',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/shopin.js

@@ -53,17 +53,16 @@ export function exportShopin(query) {
 }
 
 // 拉取门店进货记录
-export function pullShopInRecord(query,loading,_this) {
+export function pullShopInRecord(query,_this) {
   return request({
     url: '/biz/shopin/pullShopInRecord',
     method: 'post',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 

eccs-ui/src/api/warehouse/shopinve.js

@@ -53,17 +53,16 @@ export function exportShopinve(query) {
 }
 
 // 拉取库存
-export function pullStoreInvemng(query,loading,_this) {
+export function pullStoreInvemng(query,_this) {
   return request({
     url: '/biz/shopinve/pullStoreInveMng',
     method: 'post',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 }

eccs-ui/src/api/warehouse/shopmoverecord.js

@@ -53,18 +53,16 @@ export function exportShopmoverecord(query) {
 }
 
 // 拉取门店转移记录
-export function pullShopMoveRecord(query,loading,_this) {
+export function pullShopMoveRecord(query,_this) {
   return request({
     url: '/biz/shopmoverecord/pullShopMoveRecord',
     method: 'post',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
-
   })
 }

eccs-ui/src/api/warehouse/shopout.js

@@ -52,17 +52,16 @@ export function exportShopout(query) {
   })
 }
 // 拉取门店出场记录
-export function pullShopOutRecord(query,loading,_this) {
+export function pullShopOutRecord(query,_this) {
   return request({
     url: '/biz/shopout/pullShopOutRecord',
     method: 'post',
     params: query,
-    timeout: 3600 * 1000
+    timeout: 3600 * 1000,
+    loading: document.body
   }).then(function (response) {
-    loading.close();
     _this.$alert("拉取成功...");
   }).catch(function () {
-    loading.close();
     _this.$alert("拉取异常...");
   })
 

eccs-ui/src/main.js

@@ -35,6 +35,14 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 
+Vue.prototype.fullLoading = function (msg) {
+  this.$loading({ lock: true, text: msg || "加载中...", spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' });
+}
+
+Vue.prototype.tabLoading = function (target, msg) {
+  this.$loading({ lock: true, target: target || document.body, text: msg || "加载中...", spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' });
+}
+
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
 }
@@ -46,7 +54,7 @@ Vue.prototype.msgError = function (msg) {
 Vue.prototype.msgInfo = function (msg) {
   this.$message.info(msg);
 }
-
+export let a = { lock: true, text:  "加载中...", spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }
 // 全局组件挂载
 Vue.component('Pagination', Pagination)
 Vue.component('RightToolbar', RightToolbar)

eccs-ui/src/utils/request.js

@@ -1,16 +1,19 @@
 import axios from 'axios'
-import { Notification, MessageBox, Message } from 'element-ui'
+import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+
+let loadingInstance = undefined;
+
 // 创建axios实例
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   baseURL: process.env.VUE_APP_BASE_API,
   // 超时
-  timeout: 36000 * 1000
+  timeout: 10000
 })
 // request拦截器
 service.interceptors.request.use(config => {
@@ -41,6 +44,12 @@ service.interceptors.request.use(config => {
     config.params = {};
     config.url = url;
   }
+  if (config["loading"]) {
+    if (loadingInstance) {
+      loadingInstance.close();
+    }
+    loadingInstance = Loading.service({ lock: true, target: config["loading"], text: "处理中...", spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' })
+  }
   return config
 }, error => {
     console.log(error)
@@ -49,6 +58,9 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
+    if (loadingInstance) {
+      loadingInstance.close();
+    }
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息
@@ -80,6 +92,9 @@ service.interceptors.response.use(res => {
     }
   },
   error => {
+    if (loadingInstance) {
+      loadingInstance.close();
+    }
     console.log('err' + error)
     let { message } = error;
     if (message == "Network Error") {

eccs-ui/src/views/mall/mallinvemng/index.vue

@@ -418,13 +418,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(()=> {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullKmallInvemng(queryParams,loading,_this);
+        return pullKmallInvemng(queryParams,_this);
 
       })
 

eccs-ui/src/views/mall/mallshopinvemng/index.vue

@@ -454,21 +454,13 @@ export default {
     /** 拉取按钮操作 */
     handlePull() {
       const queryParams = this.queryParams;
-      const _this=this
-      // 添加遮罩
-
+      const _this = this
       this.$confirm('是否确认拉取电商门店所有库存?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullKmallStoreInvemng(queryParams,loading,_this);
+      }).then(() => {
+        return pullKmallStoreInvemng(queryParams, _this);
       })
     }
   }

eccs-ui/src/views/warehouse/adjustmentorder/index.vue

@@ -415,14 +415,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullAdjustmentorderDetail(adjustmentOrderSns,loading,_this);
-      }).then(function(){
+        return pullAdjustmentorderDetail(adjustmentOrderSns,_this);
+        }).then(function(){
         _this.handleQuery();
       })
     }

eccs-ui/src/views/warehouse/invemng/index.vue

@@ -473,13 +473,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullInvemng(queryParams,loading,_this);
+        return pullInvemng(queryParams,_this);
       }).then(function(){
         _this.handleQuery();
       })

eccs-ui/src/views/warehouse/invereceiptgoods/index.vue

@@ -373,14 +373,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullInveReceiptGoods(queryParams,loading,_this);
-      }).then(function(){
+        return pullInveReceiptGoods(queryParams,_this);
+        }).then(function(){
         _this.handleQuery();
       })
     }

eccs-ui/src/views/warehouse/shopin/index.vue

@@ -429,14 +429,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullShopInRecord(queryParams,loading,_this);
-      }).then(function(){
+        return pullShopInRecord(queryParams,_this);
+        }).then(function(){
         _this.handleQuery();
       })
     }

eccs-ui/src/views/warehouse/shopinve/index.vue

@@ -515,13 +515,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullStoreInvemng(queryParams,loading,_this);
+        return pullStoreInvemng(queryParams,_this);
       }).then(function(){
         _this.handleQuery();
       })

eccs-ui/src/views/warehouse/shopmoverecord/index.vue

@@ -426,14 +426,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullShopMoveRecord(queryParams,loading,_this);
-      }).then(function(){
+        return pullShopMoveRecord(queryParams,_this);
+       }).then(function(){
         _this.handleQuery();
       })
     }

eccs-ui/src/views/warehouse/shopout/index.vue

@@ -415,14 +415,8 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(function() {
-        const loading = _this.$loading({
-          lock: true,
-          text: 'Loading',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        return pullShopOutRecord(queryParams,loading,_this);
-      }).then(function(){
+        return pullShopOutRecord(queryParams,_this);
+        }).then(function(){
         _this.handleQuery();
       })
     }