yangg 1 жил өмнө
parent
commit
698501a43c
27 өөрчлөгдсөн 7 нэмэгдсэн , 7 устгасан
  1. BIN
      manager-admin/dist.7z
  2. 1 1
      manager-admin/dist/index.html
  3. 0 0
      manager-admin/dist/static/js/26.3780de35be8fea35c153.js
  4. BIN
      manager-admin/dist/static/js/26.3780de35be8fea35c153.js.gz
  5. 0 0
      manager-admin/dist/static/js/26.7278ea1f6b2a1a98c2e2.js
  6. BIN
      manager-admin/dist/static/js/26.7278ea1f6b2a1a98c2e2.js.gz
  7. 0 0
      manager-admin/dist/static/js/30.6079df0fbdd669f661cb.js
  8. 0 0
      manager-admin/dist/static/js/30.bdec1d510dae913fa834.js
  9. BIN
      manager-admin/dist/static/js/30.bdec1d510dae913fa834.js.gz
  10. 0 0
      manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js
  11. BIN
      manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js.gz
  12. 0 0
      manager-admin/dist/static/js/53.fbfb25da2c300c17cada.js
  13. BIN
      manager-admin/dist/static/js/53.fbfb25da2c300c17cada.js.gz
  14. 0 0
      manager-admin/dist/static/js/54.ef974302411bd82e2e03.js
  15. BIN
      manager-admin/dist/static/js/54.ef974302411bd82e2e03.js.gz
  16. 0 0
      manager-admin/dist/static/js/55.843821abd850ebf5595b.js
  17. BIN
      manager-admin/dist/static/js/55.e75636c7cf1f299c7fe5.js.gz
  18. 0 0
      manager-admin/dist/static/js/56.f9c4b2f3d0c512e12e1a.js
  19. 0 0
      manager-admin/dist/static/js/57.778b2549c1180d850fa7.js
  20. 0 0
      manager-admin/dist/static/js/58.94901aaf264c085f92fc.js
  21. 0 0
      manager-admin/dist/static/js/app.41d6267d7b2f5f53a14c.js
  22. BIN
      manager-admin/dist/static/js/app.41d6267d7b2f5f53a14c.js.gz
  23. 0 0
      manager-admin/dist/static/js/manifest.dea6faf3524da4d241b7.js
  24. 2 2
      manager-admin/src/views/stock/goodsInventory/goodsInventory.vue
  25. 1 1
      manager-admin/src/views/stock/order.vue
  26. 1 1
      manager-admin/src/views/stock/warehouseList.vue
  27. 2 2
      ui-domain/api.js

BIN
manager-admin/dist.7z


+ 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.dfa394222055907fdb85.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.c749700e5fd41cd56146.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.dea6faf3524da4d241b7.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.41d6267d7b2f5f53a14c.js></script></body></html>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/26.3780de35be8fea35c153.js


BIN
manager-admin/dist/static/js/26.3780de35be8fea35c153.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/26.7278ea1f6b2a1a98c2e2.js


BIN
manager-admin/dist/static/js/26.7278ea1f6b2a1a98c2e2.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/30.6079df0fbdd669f661cb.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/30.bdec1d510dae913fa834.js


BIN
manager-admin/dist/static/js/30.bdec1d510dae913fa834.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js


BIN
manager-admin/dist/static/js/54.592190fcedcf3d1902aa.js.gz → manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/53.fbfb25da2c300c17cada.js


BIN
manager-admin/dist/static/js/53.fbfb25da2c300c17cada.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/54.ef974302411bd82e2e03.js


BIN
manager-admin/dist/static/js/54.ef974302411bd82e2e03.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/55.843821abd850ebf5595b.js


BIN
manager-admin/dist/static/js/55.e75636c7cf1f299c7fe5.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/56.f9c4b2f3d0c512e12e1a.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/57.778b2549c1180d850fa7.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/58.94901aaf264c085f92fc.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/app.41d6267d7b2f5f53a14c.js


BIN
manager-admin/dist/static/js/app.c749700e5fd41cd56146.js.gz → manager-admin/dist/static/js/app.41d6267d7b2f5f53a14c.js.gz


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
manager-admin/dist/static/js/manifest.dea6faf3524da4d241b7.js


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

@@ -88,10 +88,10 @@
           <template slot-scope="scope">
             <el-button size="mini" @click="handleCheckGoodsInventory(scope.row)"
               v-if="checkPermission(['goodsInventoryCheck'])">查看</el-button>
-            <el-button v-if="scope.row.status == 'NOT_HANDLE' &&checkPermission(['goodsInventory:edit'])" size="mini"
+            <el-button v-if="scope.row.status == 'NOT_HANDLE' && checkPermission(['goodsInventory:update'])" size="mini"
               @click=" handleEditGoodsInventory(scope.row)">编辑</el-button>
             <el-button type="mini" size="mini"
-              v-if="scope.row.status == 'NOT_HANDLE' && checkPermission(['syncStock:update'])"
+              v-if="scope.row.status == 'NOT_HANDLE' && checkPermission(['goodsInventory:sync'])"
               @click="handleSubmitGoodsInventory(scope.row)">同步</el-button>
             <!-- <el-button v-if="scope.row.allowable.allow_audit && checkPermission(['goodsInventory:audit'])" type="mini"
               size="mini" @click="handleAuditGoodsInventory(scope.row)">审核</el-button>

+ 1 - 1
manager-admin/src/views/stock/order.vue

@@ -168,7 +168,7 @@
             <el-button size="mini" v-if="!scope.row.has_pay_return && scope.row.type === 'TO_C'"
               @click="reimbursement(scope.row)">交通费</el-button>
             <el-button size="mini" style="margin-top: 5px;"
-              v-if="scope.row.status !== 'TO_BE_SEND' && checkPermission(['orderReturn2:add'])"
+              v-if="scope.row.status !== 'TO_BE_SEND' && checkPermission(['orderReturnAdd'])"
               @click="afterSales(scope.row.id)">售后</el-button>
             <el-button size="mini" @click="handleRevoke(scope.row)" style="margin-top: 5px;"
               v-if="(scope.row.status === 'TO_BE_COMMIT' || scope.row.status === 'TO_BE_SEND') && checkPermission(['order:withdraw'])"

+ 1 - 1
manager-admin/src/views/stock/warehouseList.vue

@@ -31,7 +31,7 @@
         <el-table-column prop="description" label="仓库说明" />
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <el-button size="mini" v-if="checkPermission(['warehouse:edit'])"
+            <el-button size="mini" v-if="checkPermission(['warehouse:update'])"
               @click="handleEditWarehouse(scope.$index, scope.row)">编辑</el-button>
             <!-- <el-button
               size="mini"

+ 2 - 2
ui-domain/api.js

@@ -9,7 +9,7 @@
 module.exports = {
   // 开发环境 192.168.8.103:9999
   dev: {
-    admin: window.__ENV__.API_ADMIN || 'http://192.168.155.147:9999'//https://apidoc.raycos.net http://192.168.8.103:9999
+    admin: window.__ENV__.API_ADMIN || 'http://192.168.8.111:9999'//https://apidoc.raycos.net http://192.168.8.103:9999
   },
   // 测试环境apidoc.raycos.net 60.204.236.53:9999
   test: {
@@ -17,6 +17,6 @@ module.exports = {
   },
   // 生产环境
   pro: {
-    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'//api.v3rental.com  apidoc.raycos.net
+    admin: window.__ENV__.API_ADMIN || 'https://api.v3rental.com'//api.v3rental.com  apidoc.raycos.net
   }
 }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно