yangg 1 жил өмнө
parent
commit
6d6a479306

+ 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.e53dc2b5b85bd822782d.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.684fc2d60d92e47e5780.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.dd8ada7b308184bca28e.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.ce1cdbf43978e82e25b6.js></script></body></html>

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


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


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


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


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


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


BIN
manager-admin/dist/static/js/26.652c7bf604edec883283.js.gz


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


BIN
manager-admin/dist/static/js/6.67d968954218ae0fdb16.js.gz


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


BIN
manager-admin/dist/static/js/7.b8b8a39970ac826ea53e.js.gz


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


BIN
manager-admin/dist/static/js/6.7dccafff9023d6860fff.js.gz → manager-admin/dist/static/js/7.d62ac25830eb485d6408.js.gz


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


BIN
manager-admin/dist/static/js/app.684fc2d60d92e47e5780.js.gz → manager-admin/dist/static/js/app.ce1cdbf43978e82e25b6.js.gz


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


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

@@ -88,7 +88,7 @@
           <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:update'])" size="mini"
+            <el-button v-if="scope.row.status == 'NOT_HANDLE' && checkPermission(['goodsInventoryEdit'])" size="mini"
               @click=" handleEditGoodsInventory(scope.row)">编辑</el-button>
             <el-button type="mini" size="mini"
               v-if="scope.row.status == 'NOT_HANDLE' && checkPermission(['goodsInventory:sync'])"

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

@@ -369,14 +369,14 @@ export default {
           this.goodsInventoryAddForm.product_list.push(res);
         } else {
           this.index = indexs;
-          this.goodsInventoryAddForm.product_list[this.index].num += 1
         }
         if (res.product_vo.have_sn) {
           this.$nextTick(() => {
             this.$refs.sn_input.focus();
           });
         } else {
-          
+          this.goodsInventoryAddForm.product_list[this.index].inventory_num += 1
+         console.log( this.goodsInventoryAddForm.product_list[this.index].inventory_num)
           /* this.scanDialogVisible = false; */
         }
       });
@@ -514,8 +514,8 @@ export default {
             }
             return query
           })
-          if ( this.id) {
-            API_GoodsInventory.editgoodsInventoryAdd( this.id, params).then(response => {
+          if (this.id) {
+            API_GoodsInventory.editgoodsInventoryAdd(this.id, params).then(response => {
               this.$message.success('修改成功!')
               const { callback } = this.$route.params
               if (typeof callback === 'function') callback()

+ 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.8.111:9999'//https://apidoc.raycos.net http://192.168.8.103:9999
+    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'//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://api.v3rental.com'//api.v3rental.com  apidoc.raycos.net
+    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'//api.v3rental.com  apidoc.raycos.net
   }
 }

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