yangg 1 year ago
parent
commit
9712096ed2

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.bd576a5826b936094d00.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.658e2a9bf51023550279.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.f3b78f0d1b48c1ade883.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.3eb214211646e89cc65f.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/1.60c8810d72b40ba02da5.js


BIN
manager-admin/dist/static/js/1.60c8810d72b40ba02da5.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/1.c97159465f9b6588072e.js


BIN
manager-admin/dist/static/js/1.c97159465f9b6588072e.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/11.c6d1edc00d4afd934ec2.js


BIN
manager-admin/dist/static/js/11.c6d1edc00d4afd934ec2.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/11.ea55fb6b2f81c4d220a7.js


BIN
manager-admin/dist/static/js/11.ea55fb6b2f81c4d220a7.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/12.0452c00eefa6c40f3344.js


BIN
manager-admin/dist/static/js/12.0452c00eefa6c40f3344.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/12.6625519ca1be7c7d42cd.js


BIN
manager-admin/dist/static/js/12.6625519ca1be7c7d42cd.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.3eb214211646e89cc65f.js


BIN
manager-admin/dist/static/js/app.658e2a9bf51023550279.js.gz → manager-admin/dist/static/js/app.3eb214211646e89cc65f.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/manifest.f3b78f0d1b48c1ade883.js


+ 1 - 0
manager-admin/src/components/SkuEditor/src/helper.js

@@ -19,6 +19,7 @@ export const defaultParams = [
     // value: 0,
     type: 'String',
     required: true,
+    reg: RegExp.reg,
     batch: true
   },
  /*{

+ 2 - 1
manager-admin/src/views/login/index.vue

@@ -153,9 +153,10 @@ export default {
     dispatchLoginAction(params) {
       this.loading = true
       return new Promise((resolve, reject) => {
+        console.log(this.$store.dispatch);
         this.$store.dispatch('loginAction', params).then((res) => {
           this.loading = false
-          console.log(res);
+          
           if (res && api.adminWS) {
             try {
               const WS = new WebSocket(api.adminWS, res.access_token)

+ 3 - 2
manager-admin/src/views/stock/goodsInventory/goodsInventoryAdd.vue

@@ -487,9 +487,10 @@ export default {
           const { id } = this.goodsInventoryAddForm
           const params = this.MixinClone(this.goodsInventoryAddForm)
           /*  params.inventory_type = params.inventory_type.id */
-          if (params.dept_id) {
+          /* if (params.dept_id) {
+            console.log(this.deptListAll);
             params.dept_name = this.deptListAll.find(dept => dept.id === params.dept_id).name
-          }
+          } */
           if (params.warehouse_id) {
             params.warehouse_name = this.warehouseList.find(ware => ware.id === params.warehouse_id).name
           }

+ 4 - 1
ui-utils/RegExp.js

@@ -47,6 +47,8 @@ let URL = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[
 let TEL = /0\d{2,3}-\d{7,8}/
 //字母和数字
 let code=/^[A-Za-z0-9]+$/
+/* 禁止输入空格 */
+let reg=/^\S*$/
 
 module.exports = {
   mobile: mobile,
@@ -60,5 +62,6 @@ module.exports = {
   userName: userName,
   URL: URL,
   TEL: TEL,
-  code:code
+  code:code,
+  reg:reg
 }

Some files were not shown because too many files changed in this diff