Browse Source

处理问题添加搜索条件

yangg 1 year ago
parent
commit
1351359113
80 changed files with 138 additions and 103 deletions
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/js/0.49a91c9660383735ef85.js
  3. BIN
      manager-admin/dist/static/js/0.49a91c9660383735ef85.js.gz
  4. 0 0
      manager-admin/dist/static/js/2.130a82c1e760a5ed2379.js
  5. BIN
      manager-admin/dist/static/js/2.130a82c1e760a5ed2379.js.gz
  6. 0 0
      manager-admin/dist/static/js/2.b5c59f6177fcef02e492.js
  7. BIN
      manager-admin/dist/static/js/2.b5c59f6177fcef02e492.js.gz
  8. 0 0
      manager-admin/dist/static/js/30.6bec70a23c2c968d796d.js
  9. BIN
      manager-admin/dist/static/js/30.6bec70a23c2c968d796d.js.gz
  10. 0 0
      manager-admin/dist/static/js/30.6c2eb2165ebb09120bff.js
  11. 0 0
      manager-admin/dist/static/js/31.44308873503e68029b54.js
  12. BIN
      manager-admin/dist/static/js/31.44308873503e68029b54.js.gz
  13. 0 0
      manager-admin/dist/static/js/38.30a3b02c8de8770aaf39.js
  14. BIN
      manager-admin/dist/static/js/38.30a3b02c8de8770aaf39.js.gz
  15. 0 0
      manager-admin/dist/static/js/38.38bc67badc2e9721c55b.js
  16. 0 0
      manager-admin/dist/static/js/39.0ce88a3d6b6e47de3b92.js
  17. 0 0
      manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js
  18. BIN
      manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js.gz
  19. 0 0
      manager-admin/dist/static/js/41.105519940ff667762160.js
  20. BIN
      manager-admin/dist/static/js/41.105519940ff667762160.js.gz
  21. 0 0
      manager-admin/dist/static/js/42.3bc7ef2e016f1c602ea5.js
  22. BIN
      manager-admin/dist/static/js/42.3c2b40c033cf637774d0.js.gz
  23. 0 0
      manager-admin/dist/static/js/43.37ddb3e5d5f03148bcc0.js
  24. 0 0
      manager-admin/dist/static/js/44.dada9c01e6a2c9fa6618.js
  25. BIN
      manager-admin/dist/static/js/44.dada9c01e6a2c9fa6618.js.gz
  26. BIN
      manager-admin/dist/static/js/45.e0c735ab8c8de19f8130.js.gz
  27. 0 0
      manager-admin/dist/static/js/45.fe04795de9ac58db60d3.js
  28. BIN
      manager-admin/dist/static/js/45.fe04795de9ac58db60d3.js.gz
  29. 0 0
      manager-admin/dist/static/js/46.d1e37171be2305fab29e.js
  30. BIN
      manager-admin/dist/static/js/46.d1e37171be2305fab29e.js.gz
  31. 0 0
      manager-admin/dist/static/js/47.98220d84da52a6770638.js
  32. 0 0
      manager-admin/dist/static/js/47.b5852a821f6290128d2b.js
  33. BIN
      manager-admin/dist/static/js/47.b5852a821f6290128d2b.js.gz
  34. 0 0
      manager-admin/dist/static/js/48.0fa05ef298ed351b0abb.js
  35. BIN
      manager-admin/dist/static/js/48.0fa05ef298ed351b0abb.js.gz
  36. BIN
      manager-admin/dist/static/js/48.8e8a035af0ab312832f0.js.gz
  37. 0 0
      manager-admin/dist/static/js/49.98fd28b0cde1362069d8.js
  38. BIN
      manager-admin/dist/static/js/49.98fd28b0cde1362069d8.js.gz
  39. 0 0
      manager-admin/dist/static/js/49.9937e8ff2e6c76729ffa.js
  40. BIN
      manager-admin/dist/static/js/49.9937e8ff2e6c76729ffa.js.gz
  41. 0 0
      manager-admin/dist/static/js/52.076ae03c64c27fa94ab7.js
  42. BIN
      manager-admin/dist/static/js/52.076ae03c64c27fa94ab7.js.gz
  43. 0 0
      manager-admin/dist/static/js/52.8bbbee3ffd66fffb0100.js
  44. BIN
      manager-admin/dist/static/js/52.8bbbee3ffd66fffb0100.js.gz
  45. 0 0
      manager-admin/dist/static/js/53.562d3838a2b9a0b9634a.js
  46. BIN
      manager-admin/dist/static/js/53.562d3838a2b9a0b9634a.js.gz
  47. 0 0
      manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js
  48. BIN
      manager-admin/dist/static/js/53.aadd2c3baf90889cac90.js.gz
  49. 0 0
      manager-admin/dist/static/js/56.1b3928466d2b91f4f678.js
  50. BIN
      manager-admin/dist/static/js/56.1b3928466d2b91f4f678.js.gz
  51. 0 0
      manager-admin/dist/static/js/6.7dccafff9023d6860fff.js
  52. BIN
      manager-admin/dist/static/js/6.7dccafff9023d6860fff.js.gz
  53. 0 0
      manager-admin/dist/static/js/6.e0d5c9d383fc7c5d0d85.js
  54. BIN
      manager-admin/dist/static/js/6.e0d5c9d383fc7c5d0d85.js.gz
  55. 0 0
      manager-admin/dist/static/js/7.f9baf50fb2c8d2d6fab5.js
  56. BIN
      manager-admin/dist/static/js/7.f9baf50fb2c8d2d6fab5.js.gz
  57. 0 0
      manager-admin/dist/static/js/8.9901c0a8aff751d40567.js
  58. BIN
      manager-admin/dist/static/js/8.9901c0a8aff751d40567.js.gz
  59. 0 0
      manager-admin/dist/static/js/8.a2e61f46351b4da9b35b.js
  60. BIN
      manager-admin/dist/static/js/8.a2e61f46351b4da9b35b.js.gz
  61. 0 0
      manager-admin/dist/static/js/9.1142e5c0a92459aca6a7.js
  62. BIN
      manager-admin/dist/static/js/9.1142e5c0a92459aca6a7.js.gz
  63. 0 0
      manager-admin/dist/static/js/9.56ad90763b51e0b59cfb.js
  64. BIN
      manager-admin/dist/static/js/9.56ad90763b51e0b59cfb.js.gz
  65. 0 0
      manager-admin/dist/static/js/app.2731d956d557dc16b8e0.js
  66. BIN
      manager-admin/dist/static/js/app.2731d956d557dc16b8e0.js.gz
  67. 0 0
      manager-admin/dist/static/js/manifest.70f0b836b393120bf8a3.js
  68. 0 0
      manager-admin/dist/static/js/manifest.a8afe649e5d39e9136a3.js
  69. 2 0
      manager-admin/src/api/collectingAccount.js
  70. 16 17
      manager-admin/src/views/basicSetting/collectingAccount/index.vue
  71. 1 1
      manager-admin/src/views/basicSetting/goods/index.vue
  72. 14 9
      manager-admin/src/views/stock/goodsExchange/addInventory.vue
  73. 10 13
      manager-admin/src/views/stock/goodsExchange/checkInventory.vue
  74. 29 10
      manager-admin/src/views/stock/goodsExchange/goodsExchange.vue
  75. 15 18
      manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue
  76. 2 2
      manager-admin/src/views/stock/orderAdd.vue
  77. 6 2
      manager-admin/src/views/stock/orderCheck.vue
  78. 38 26
      manager-admin/src/views/stock/orderOutbound.vue
  79. 3 3
      manager-admin/src/views/stock/sendOrder.vue
  80. 1 1
      ui-domain/api.js

+ 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.272b55526ecb830fa2670366c6155191.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.a8afe649e5d39e9136a3.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.cfded0d030204805ff79.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.272b55526ecb830fa2670366c6155191.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.70f0b836b393120bf8a3.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.2731d956d557dc16b8e0.js></script></body></html>

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


BIN
manager-admin/dist/static/js/0.3eec1c14516b20fe9007.js.gz → manager-admin/dist/static/js/0.49a91c9660383735ef85.js.gz


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


BIN
manager-admin/dist/static/js/2.130a82c1e760a5ed2379.js.gz


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


BIN
manager-admin/dist/static/js/2.b5c59f6177fcef02e492.js.gz


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


BIN
manager-admin/dist/static/js/30.6bec70a23c2c968d796d.js.gz


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


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


BIN
manager-admin/dist/static/js/31.44308873503e68029b54.js.gz


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


BIN
manager-admin/dist/static/js/38.30a3b02c8de8770aaf39.js.gz


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


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


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


BIN
manager-admin/dist/static/js/41.6fd63fb8802e535592e0.js.gz → manager-admin/dist/static/js/40.64f5a5b8a710eef71f8f.js.gz


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


BIN
manager-admin/dist/static/js/41.105519940ff667762160.js.gz


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


BIN
manager-admin/dist/static/js/42.3c2b40c033cf637774d0.js.gz


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


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


BIN
manager-admin/dist/static/js/44.dada9c01e6a2c9fa6618.js.gz


BIN
manager-admin/dist/static/js/45.e0c735ab8c8de19f8130.js.gz


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


BIN
manager-admin/dist/static/js/45.fe04795de9ac58db60d3.js.gz


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


BIN
manager-admin/dist/static/js/46.d1e37171be2305fab29e.js.gz


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


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


BIN
manager-admin/dist/static/js/47.b5852a821f6290128d2b.js.gz


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


BIN
manager-admin/dist/static/js/48.0fa05ef298ed351b0abb.js.gz


BIN
manager-admin/dist/static/js/48.8e8a035af0ab312832f0.js.gz


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


BIN
manager-admin/dist/static/js/49.98fd28b0cde1362069d8.js.gz


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


BIN
manager-admin/dist/static/js/49.9937e8ff2e6c76729ffa.js.gz


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


BIN
manager-admin/dist/static/js/52.076ae03c64c27fa94ab7.js.gz


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


BIN
manager-admin/dist/static/js/52.8bbbee3ffd66fffb0100.js.gz


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


BIN
manager-admin/dist/static/js/53.562d3838a2b9a0b9634a.js.gz


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


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


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


BIN
manager-admin/dist/static/js/56.212cf2257952e46f856d.js.gz → manager-admin/dist/static/js/56.1b3928466d2b91f4f678.js.gz


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


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


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


BIN
manager-admin/dist/static/js/6.e0d5c9d383fc7c5d0d85.js.gz


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


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


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


BIN
manager-admin/dist/static/js/8.9901c0a8aff751d40567.js.gz


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


BIN
manager-admin/dist/static/js/8.a2e61f46351b4da9b35b.js.gz


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


BIN
manager-admin/dist/static/js/9.1142e5c0a92459aca6a7.js.gz


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


BIN
manager-admin/dist/static/js/9.56ad90763b51e0b59cfb.js.gz


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


BIN
manager-admin/dist/static/js/app.cfded0d030204805ff79.js.gz → manager-admin/dist/static/js/app.2731d956d557dc16b8e0.js.gz


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


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


+ 2 - 0
manager-admin/src/api/collectingAccount.js

@@ -88,3 +88,5 @@ export function updateDefault(id) {
     method: 'put'
   })
 }
+
+/* 查看详情 */

+ 16 - 17
manager-admin/src/views/basicSetting/collectingAccount/index.vue

@@ -34,19 +34,15 @@
       <template slot="table-columns">
         <el-table-column prop="name" label="名称" />
         <el-table-column prop="sn" label="编号" />
-        <el-table-column prop="default_flag" label="是否默认" >
+        <el-table-column prop="default_flag" label="是否默认">
           <template slot-scope="scope">
             {{ scope.row.default_flag ? '是' : '否' }}
           </template>
         </el-table-column>
         <el-table-column label="是否启用" key="enable_flag">
           <template slot-scope="scope">
-            <el-switch v-if="checkPermission(['collectingAccount:updateEnableFlag'])"
-              v-model="scope.row.enable_flag"
-              :active-value="true"
-              :inactive-value="false"
-              @change="handleUpdateEnableFlag(scope.row)"
-            />
+            <el-switch v-if="checkPermission(['collectingAccount:updateEnableFlag'])" v-model="scope.row.enable_flag"
+              :active-value="true" :inactive-value="false" @change="handleUpdateEnableFlag(scope.row)" />
             <span v-else>{{ scope.row.enable_flag ? '启用' : '禁用' }}</span>
           </template>
         </el-table-column>
@@ -56,9 +52,8 @@
             <el-button size="mini" type="primary" v-if="checkPermission(['collectingAccount:edit'])"
               @click="handleEdit(scope.row)">编辑</el-button>
             <el-button size="mini" type="primary" v-if="checkPermission(['collectingAccount:updateDefault'])"
-                       @click="handleUpdateDefault(scope.row.id)">设为默认</el-button>
-            <el-button size="mini" type="danger"
-              v-if="checkPermission(['collectingAccount:delete'])"
+              @click="handleUpdateDefault(scope.row.id)">设为默认</el-button>
+            <el-button size="mini" type="danger" v-if="checkPermission(['collectingAccount:delete'])"
               @click="handleDelete(scope.row.id)">删除</el-button>
           </template>
         </el-table-column>
@@ -70,10 +65,11 @@
       </el-pagination>
     </en-table-layout>
     <el-dialog :title="collectingAccountForm.id ? '编辑支付方式' : '添加支付方式'" :visible.sync="dialogVisible" width="500px"
-      @open="handleDialogOpen" :modal-append-to-body="false" :close-on-click-modal="false" :close-on-press-escape="false">
+      @open="handleDialogOpen" :modal-append-to-body="false" :close-on-click-modal="false"
+      :close-on-press-escape="false">
       <el-form :model="collectingAccountForm" :rules="formRules" ref="collectingAccountForm" label-width="80px">
         <el-form-item label="编号" prop="sn" v-if="collectingAccountForm.id">
-          <el-input v-model="collectingAccountForm.sn" disabled ></el-input>
+          <el-input v-model="collectingAccountForm.sn" disabled></el-input>
         </el-form-item>
         <el-form-item label="名称" prop="name">
           <el-input v-model="collectingAccountForm.name" :maxlength="20" clearable placeholder="请输入支付方式名称"></el-input>
@@ -82,7 +78,8 @@
           <el-input v-model="collectingAccountForm.invoice" :maxlength="20" clearable placeholder="请输入抬头"></el-input>
         </el-form-item>
         <el-form-item label="税号" prop="duty_paragraph">
-          <el-input v-model="collectingAccountForm.duty_paragraph" :maxlength="20" clearable placeholder="请输入税号"></el-input>
+          <el-input v-model="collectingAccountForm.duty_paragraph" :maxlength="20" clearable
+            placeholder="请输入税号"></el-input>
         </el-form-item>
         <el-form-item label="开户行" prop="bank">
           <el-input v-model="collectingAccountForm.bank" :maxlength="20" clearable placeholder="请输入开户行"></el-input>
@@ -104,7 +101,7 @@
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="collectingAccountForm.remark" type="textarea" :autosize="{ minRows: 3, maxRows: 4 }"
-                    placeholder="请输入备注"></el-input>
+            placeholder="请输入备注"></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -184,8 +181,10 @@ export default {
 
     /** 编辑弹窗 */
     handleEdit(row) {
-      this.collectingAccountForm = this.MixinClone(row)
-      this.dialogVisible = true
+      API_CollectingAccount.getDetail(row.id).then(res => {
+        this.collectingAccountForm = this.MixinClone(res)
+        this.dialogVisible = true
+      })
     },
     /** 设为默认 */
     async handleUpdateDefault(id) {
@@ -282,7 +281,7 @@ export default {
   margin: 0 auto;
 }
 
-.birthday{
+.birthday {
   width: 94%;
 }
 

+ 1 - 1
manager-admin/src/views/basicSetting/goods/index.vue

@@ -48,7 +48,7 @@
                 @click="handleAddGoods('hire')">新增租赁商品</el-button>
             </div>
             <div class="toolbar-search" style="display: flex; align-items: center;">
-              <span style=" white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">商品编号/sku/序列号:</span>
+              <span style=" white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">商品编号/序列号:</span>
               <en-table-search @search="searchEvent" placeholder="请输入关键字搜索" />
               <el-button @click="refresh" icon="el-icon-refresh" type="info" plain></el-button>
             </div>

+ 14 - 9
manager-admin/src/views/stock/goodsExchange/addInventory.vue

@@ -115,7 +115,7 @@
               </template>
             </el-table-column>
             <el-table-column label="订单数量"
-              v-if="goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER'">
+              v-if="goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER' || goodsExchangeAddForm.type == 'TRANSFER_ENTRY'">
               <template slot-scope="scope">
                 {{ scope.row.order_num }}
               </template>
@@ -130,7 +130,7 @@
                 {{ scope.row.stock_num }}
               </template>
             </el-table-column>
-            <el-table-column label="差异">
+            <el-table-column label="差异" v-if="id">
               <template slot-scope="scope">
                 <span v-if="scope.row.order_num">{{
                   scope.row.num - scope.row.order_num || 0
@@ -884,9 +884,9 @@ export default {
         if (indexs === -1) {
           this.index = this.goodsExchangeAddForm.product_list.length;
           if (
-            this.goodsExchangeAddForm.type === 'TRANSFER_ENTRY' ||
-            this.goodsExchangeAddForm.type === 'HAIL_ENTRY' ||
-            this.goodsExchangeAddForm.type === 'SALE_AFTER'
+            this.goodsExchangeAddForm.type !== 'TRANSFER_ENTRY' ||
+            this.goodsExchangeAddForm.type !== 'HAIL_ENTRY' ||
+            this.goodsExchangeAddForm.type !== 'SALE_AFTER'
           ) {
             this.goodsExchangeAddForm.product_list.push({ ...res, num: 1 });
           } else {
@@ -895,7 +895,6 @@ export default {
         } else {
           this.index = indexs;
         }
-
         if (res.product_vo.have_sn) {
           this.$nextTick(() => {
             this.$refs.sn_input.focus();
@@ -1344,7 +1343,6 @@ export default {
             if (response.type !== 'SALE_AFTER') {
               el.return_num = el.num
             }
-
             /* Object.keys(response).map(item => {
               if (el.id == item) {
                 el.sn_code_list = response[item]
@@ -1352,11 +1350,18 @@ export default {
               }
             }) */
             el.num = 0
-            if (!el.sn_code_list) {
+            if (this.goodsExchangeAddForm.type === 'TRANSFER_ENTRY' ||
+              this.goodsExchangeAddForm.type === 'HAIL_ENTRY' ||
+              this.goodsExchangeAddForm.type === 'SALE_AFTER') {
               el.sn_code_list = [];
             } else {
-              el.num = el.sn_code_list.length
+              if (!el.sn_code_list) {
+                el.sn_code_list = [];
+              } else {
+                el.num = el.sn_code_list.length
+              }
             }
+
           });
           console.log(response.product_list);
           this.goodsExchangeAddForm.distribution_name = response.staff_name;

+ 10 - 13
manager-admin/src/views/stock/goodsExchange/checkInventory.vue

@@ -91,26 +91,23 @@
               <el-table-column v-if="checkType == 'first'" label="出库数量">
                 <template slot-scope="scope">
                   {{ scope.row.out_num }}
-                  <!-- <el-input v-model="scope.row.out_num" type="number" :min="0" :maxlength="20"
-                    :disabled="true"></el-input> -->
                 </template>
               </el-table-column>
-              <el-table-column v-else label="入库数量">
+              <!--  <el-table-column v-else label="入库数量">
                 <template slot-scope="scope">
                   {{ scope.row.num }}
-                  <!--  <el-input
-                    v-model="scope.row.num"
-                    type="number"
-                    :min="0"
-                    :maxlength="20"
-                    :disabled="true"
-                  ></el-input> -->
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column prop="entry_num" label="已入库数量"
-                v-if="(goodsExchangeAddForm.type == 'TRANSFER_ENTRY' || goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER') &&checkType !== 'first' "></el-table-column>
+                v-if="(goodsExchangeAddForm.type == 'TRANSFER_ENTRY' || goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER') && checkType !== 'first'"></el-table-column>
               <el-table-column prop="not_entry_num" label="未入库数量"
-                v-if="(goodsExchangeAddForm.type == 'TRANSFER_ENTRY' || goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER') &&checkType !== 'first'">
+                v-if="(goodsExchangeAddForm.type == 'TRANSFER_ENTRY' || goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER') && checkType !== 'first'">
+              </el-table-column>
+              <el-table-column label="订单数量"
+                v-if="(goodsExchangeAddForm.type == 'HAIL_ENTRY' || goodsExchangeAddForm.type == 'SALE_AFTER' || goodsExchangeAddForm.type == 'TRANSFER_ENTRY') && checkType !== 'first'">
+                <template slot-scope="scope">
+                  {{ scope.row.order_num }}
+                </template>
               </el-table-column>
               <el-table-column label="可用库存">
                 <template slot-scope="scope">

+ 29 - 10
manager-admin/src/views/stock/goodsExchange/goodsExchange.vue

@@ -11,7 +11,7 @@
     <div class="search">
       <el-form ref="advancedForm" :model="advancedForm" label-width="160px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="activeName=='first'?12:8">
             <el-form-item label="出入时间">
               <el-date-picker v-model="advancedForm.goodsExchange_time_range" type="daterange" align="center"
                 :editable="false" unlink-panels :clearable="true" :default-time="['00:00:00', '23:59:59']"
@@ -34,20 +34,29 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="仓库">
-              <el-select v-model="advancedForm.warehouse_id">
+              <el-select v-model="advancedForm.warehouse_id" clearable>
                 <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <!-- <el-form-item label="出入库">
-              <el-select v-model="advancedForm.status">
-                <el-option key="WAIT" label="出库" value="WAIT" />
-                <el-option key="NEW" label="入库" value="NEW" />
+          <el-col :span="6" v-if="activeName == 'second'">
+            <el-form-item label="入库类型">
+              <el-select v-model="advancedForm.type" clearable>
+                <el-option v-for="item in entryList" :key="item.id" :label="item.label" :value="item.value" />
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="activeName == 'second'">
+            <el-form-item label="客户名称">
+              <el-input v-model="advancedForm.customer_name" clearable placeholder="请输入客户名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="activeName == 'second'">
+            <el-form-item label="手机号">
+              <el-input v-model="advancedForm.customer_phone" clearable placeholder="请输入手机号"></el-input>
+            </el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -91,6 +100,16 @@
             {{ warehouseName(scope.row.warehouse_id) }}
           </template>
         </el-table-column>
+        <el-table-column prop="warehouse_id" label="客户名称">
+          <template slot-scope="scope">
+            {{ scope.row.customer_name }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="warehouse_id" label="客户手机号">
+          <template slot-scope="scope">
+            {{ scope.row.customer_phone }}
+          </template>
+        </el-table-column>
         <el-table-column prop="memo" label="出库类型" v-if="activeName == 'first'">
           <template slot-scope="scope">
             <span>{{ outName(scope.row.type) }}</span>
@@ -131,7 +150,7 @@
             <el-button size="mini"
               v-if="scope.row.has_submit == 'N' && checkPermission(['editInventory']) && checkPermission(['goodsExchangeEdit']) && activeName == 'first'"
               @click="handleEditGoodsExchange(scope.row)">出库</el-button>
-              <el-button size="mini"
+            <el-button size="mini"
               v-if="scope.row.has_submit == 'N' && checkPermission(['editInventory']) && checkPermission(['goodsExchangeEdit']) && activeName == 'second'"
               @click="handleEditGoodsExchange(scope.row)">入库</el-button>
           </template>

+ 15 - 18
manager-admin/src/views/stock/goodsExchange/goodsExchangeAdd.vue

@@ -102,7 +102,8 @@
                   <div>
                     <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
                   </div>
-                  <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                  <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
+                    scope.row.area_stock_list[0].warehouse_area_name }}</span>
                 </el-popover>
               </template>
             </el-table-column>
@@ -457,9 +458,9 @@ export default {
       });
     },
     //扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
-    toSnCode() {
+    async toSnCode() {
       if (this.sku == '') return this.$message.error('请录入正确的sku')
-      API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
+      await API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then(async (res) => {
         this.sn_code = "";
         // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
         let exists = this.goodsExchangeAddForm.product_list[
@@ -469,7 +470,7 @@ export default {
         );
         if (!exists) {
           if (this.id) {
-            API_GoodsExchange.skuRedis({
+            await API_GoodsExchange.skuRedis({
               send_order_id: this.id, item_id: this.goodsExchangeAddForm.product_list[
                 this.index
               ].id, sku: res
@@ -489,6 +490,7 @@ export default {
           ); */
         }
         this.goodsExchangeAddForm.product_list[this.index].out_num = this.goodsExchangeAddForm.product_list[this.index].sn_code_list.length
+        console.log(this.goodsExchangeAddForm.product_list);
         this.scanGoodsForm.bar_code = "";
         this.$nextTick(() => {
           this.$refs.input.focus();
@@ -920,20 +922,15 @@ export default {
             this.goodsExchangeAddForm.change_time * 1000
           );
           /* 获取缓存数据 */
-          API_GoodsExchange.skuRedis({ send_order_id: this.id, type: 'enter' }).then(response => {
-            response.product_list.map(el => {
-              el.order_num = el.out_num
-              el.out_num = 0
-              Object.keys(response).map(item => {
-                if (el.id == item) {
-                  el.sn_code_list = response[item]
-                  el.num = el.sn_code_list.length
-                }
-              })
-              if (!el.sn_code_list) {
-                el.sn_code_list = []
-              }
-            })
+
+          response.product_list.map(el => {
+            el.order_num = el.out_num
+            el.out_num = 0
+            if (!el.sn_code_list) {
+              el.sn_code_list = []
+            } else {
+              el.out_num = el.sn_code_list
+            }
           })
           this.goodsExchangeAddForm.distribution_name = response.staff_name;
           this.goodsExchangeAddForm.product_list =

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

@@ -438,7 +438,7 @@
         <el-table-column prop="money" label="金额"> </el-table-column>
         <el-table-column prop="file_url" label="图片">
           <template slot-scope="scope">
-            <img :src="scope.row.file_url" alt="" style="width: 60px;height: 60px">
+            <img :src="scope.row.file_url" alt="" @click="showImage(scope.row.file_url)" style="width: 60px;height: 60px">
           </template>
         </el-table-column>
         <el-table-column label="操作">
@@ -832,8 +832,8 @@ export default {
     },
     /* 修改 */
     editReim(row) {
-      this.reimburForm = row
       this.reimburForm.file_url = ''
+      this.reimburForm = row
       this.reimburVisible = true
     },
     /* 交通费明细 */

+ 6 - 2
manager-admin/src/views/stock/orderCheck.vue

@@ -307,7 +307,7 @@
                 <el-table-column prop="money" label="金额"> </el-table-column>
                 <el-table-column prop="file_url" label="图片">
                     <template slot-scope="scope">
-                        <img :src="scope.file_url" alt="" style="width: 60px;height: 60px">
+                        <img :src="scope.row.file_url" alt=""  @click="showImage(scope.row.file_url)" style="width: 60px;height: 60px">
                     </template>
                 </el-table-column>
             </el-table>
@@ -319,7 +319,7 @@
         <el-button type="primary" @click="submitGoosData()">确 定</el-button>
       </span> -->
         </el-dialog>
-        <el-dialog :visible.sync="imgDialogVisible" width="50%">
+        <el-dialog :visible.sync="imgDialogVisible" width="60%">
             <img :src="currentImage" alt="" style="width: 100%">
         </el-dialog>
     </div>
@@ -1289,6 +1289,10 @@ export default {
 
                 this.OrderForm = response;
                 if (response.type == "TO_C") {
+                    const dateTime = response.start_time
+                    response.start_time = dateTime.split(' ')[0];
+                    const dateEndTime = response.end_time
+                    response.end_time = dateEndTime.split(' ')[0];
                     this.time.push(response.start_time);
                     this.time.push(response.end_time);
                 }

+ 38 - 26
manager-admin/src/views/stock/orderOutbound.vue

@@ -44,9 +44,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="手机号:" prop="sender.phone">
-                    {{ deliveryForms.sender.phone }}
-                    <!--  <el-input v-model="deliveryForms.sender.phone" :minlength="1" :maxlength="20" :disabled="true"
+                  <el-form-item label="手机号:" prop="sender.mobile">
+                    {{ deliveryForms.sender.mobile }}
+                    <!--  <el-input v-model="deliveryForms.sender.mobile" :minlength="1" :maxlength="20" :disabled="true"
                   placeholder="请输入手机号"></el-input>  --> </el-form-item></el-col>
                 <el-col :span="18">
                   <el-form-item label="发货地址:" prop="sender.address">
@@ -95,8 +95,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="手机号:" prop="receiver.phone">
-                    {{ deliveryForms.receiver.phone }}
+                  <el-form-item label="手机号:" prop="receiver.mobile">
+                    {{ deliveryForms.receiver.mobile }}
                     <!--  <el-input v-model="deliveryForms.receiver.phone" :minlength="1" :maxlength="20" :disabled="true"
                   placeholder="请输入手机号"></el-input>  --></el-form-item></el-col>
                 <el-col :span="18">
@@ -194,7 +194,8 @@
                     <div>
                       <p v-for="item in scope.row.area_stock_list" :key="item.id">{{ item.warehouse_area_name }}</p>
                     </div>
-                    <span slot="reference" v-if="scope.row.area_stock_list.length!==0">{{ scope.row.area_stock_list[0].warehouse_area_name }}</span>
+                    <span slot="reference" v-if="scope.row.area_stock_list.length !== 0">{{
+                      scope.row.area_stock_list[0].warehouse_area_name }}</span>
                   </el-popover>
                 </template>
               </el-table-column>
@@ -662,13 +663,13 @@ export default {
         //发货人
         sender: {
           name: "",
-          phone: "",
+          mobile: "",
           address: "",
         },
         //收货人
         receiver: {
           name: "",
-          phone: "",
+          mobile: "",
           address: "",
         },
         //商品信息列表
@@ -699,7 +700,7 @@ export default {
             { required: true, message: "请输入发货人姓名", trigger: "blur" },
           ],
 
-          phone: [
+          mobile: [
             this.MixinRequired("请输入手机号码!"),
             {
               validator: (rule, value, callback) => {
@@ -717,7 +718,7 @@ export default {
           name: [
             { required: true, message: "请输入收货人姓名", trigger: "blur" },
           ],
-          phone: [
+          mobile: [
             this.MixinRequired("请输入手机号码!"),
             {
               validator: (rule, value, callback) => {
@@ -805,7 +806,6 @@ export default {
       return -1;
     },
     fullSenderAddress() {
-      console.log(this.deliveryForms.sender);
       const { province_name, city_name, area_name, address } = this.deliveryForms.sender;
       return [province_name, city_name, area_name, address].filter(Boolean).join("");
     },
@@ -881,9 +881,9 @@ export default {
       });
     },
     //扫序列号goodsExchangeAddForm.product_list[this.index].sn_code_list
-    toSnCode() {
+    async toSnCode() {
       if (this.sku == '') return this.$message.error('请录入正确的sku')
-      API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then((res) => {
+      await API_GoodsExchange.getSnCode("out", this.sku, this.sn_code.replace(/\s+/g, '')).then(async (res) => {
         this.sn_code = "";
         // 假设res是一个对象,我们根据res的某个属性(如sn)来检查重复
         let exists = this.goodsExchangeAddForm.product_list[
@@ -891,8 +891,10 @@ export default {
         ].sn_code_list.find(
           (item) => item.sn_code === res.sn_code && item.sku === res.sku
         );
+        console.log(this.goodsExchangeAddForm.product_list[this.index]);
+        if (this.goodsExchangeAddForm.product_list[this.index].num >= this.goodsExchangeAddForm.product_list[this.index].orderNum) return this.$message.warning('录入完成,请录入下一条!')
         if (!exists) {
-          API_GoodsExchange.skuRedis({
+          await API_GoodsExchange.skuRedis({
             send_order_id: this.id, item_id: this.goodsExchangeAddForm.product_list[
               this.index
             ].id, sku: res
@@ -913,8 +915,7 @@ export default {
         this.goodsExchangeAddForm.product_list[this.index].id = this.product_list[indexs].id
         if (this.goodsExchangeAddForm.product_list[this.index].num == this.product_list[indexs].num) {
           this.scanGoodsForm.bar_code = "";
-          return this.$message.warning('录入完成,请录入下一条!')
-          /*  this.scanDialogVisible = false; */
+
         } else {
           this.scanGoodsForm.bar_code = "";
           this.$nextTick(() => {
@@ -982,7 +983,7 @@ export default {
             item.goods_name = el.goods_vo.name;
             /* item.goods_price = el.product_vo.price; */
             item.quantity = el.orderNum;
-            item.unit = el.product_vo.unit;
+            /*             item.unit = el.product_vo.unit; */
             return params.goods_list.push(item);
           });
           params.goods_num = this.product_list.reduce(
@@ -996,6 +997,10 @@ export default {
           params.send_address = this.send_address;
           params.receive_address = this.receive_address;
           params.order_code = this.id;
+          if(params.total_weight==0) {
+            this.btnType = false;
+            return this.$message.error("请填写物品总重量!")
+          }
           API_order.getKdShip(this.id, params).then((res) => {
             this.kdnCode = res;
             this.btnType = false;
@@ -1215,21 +1220,28 @@ export default {
         if (res.order_vo && res.order_vo.province_city_area) {
           this.receiverOptions = res.order_vo.province_city_area.split(",");
         }
-        if (this.outType !== undefined || res.kdn_order_code !== undefined) {
+        if (this.outType !== undefined || res.kdn_order_code !== undefined && res.kdn_order_code !== '') {
           this.goodsExchangeAddForm.product_list = res.order_item_vos
           this.disabledType = true;
           this.deliveryForms.appointment_type = res.appointment_type;
           this.deliveryForms.appointment_time = res.appointment_time;
           this.deliveryForms.sender.name = res.sender_name;
-          this.deliveryForms.sender.phone = res.sender_phone;
+          this.deliveryForms.sender.mobile = res.sender_mobile;
           this.deliveryForms.sender.address = res.sender_address;
+          this.deliveryForms.sender.province_name = res.sender_province_name;
+          this.deliveryForms.sender.city_name = res.sender_city_name;
+          this.deliveryForms.sender.area_name = res.sender_area_name;
           this.deliveryForms.receiver.name = res.receiver_name;
-          this.deliveryForms.receiver.phone = res.receiver_phone;
+          this.deliveryForms.receiver.mobile = res.receiver_mobile;
           this.deliveryForms.receiver.address = res.receiver_address;
+          this.deliveryForms.receiver.province_name = res.receiver_province_name;
+          this.deliveryForms.receiver.city_name = res.receiver_city_name;
+          this.deliveryForms.receiver.area_name = res.receiver_area_name;
           this.deliveryForms.total_volume = res.total_volume;
           this.deliveryForms.declared_value = res.order_vo.real_price;
           this.deliveryForms.remark = res.remark;
           this.kdnCode = res.kdn_order_code;
+          console.log(this.deliveryForms.sender);
           if (
             JSON.stringify(res.create_order_fail) == "{}" ||
             JSON.stringify(res.create_order_success) == "{}" ||
@@ -1250,7 +1262,7 @@ export default {
         } else {
           const params = this.deliveryForms
           params.sender.name = res.warehouse_vo.user_name;
-          params.sender.phone = res.warehouse_vo.phone;
+          params.sender.mobile = res.warehouse_vo.phone;
           //this.selectedOptions = res.warehouse_vo.ware_pro_city_area.split(",")
           params.sender.province_name =
             codeToText[this.selectedOptions[0]];
@@ -1258,7 +1270,7 @@ export default {
           params.sender.area_name = codeToText[this.selectedOptions[2]];
           params.sender.address = res.warehouse_vo.warehouse_address;
           params.receiver.name = res.order_vo.customer_name;
-          params.receiver.phone = res.order_vo.customer_phone;
+          params.receiver.mobile = res.order_vo.customer_phone;
           //this.receiverOptions = res.order_vo.province_city_area.split(",");
           params.receiver.province_name =
             codeToText[this.receiverOptions[0]];
@@ -1273,9 +1285,10 @@ export default {
         API_GoodsExchange.skuRedis({ send_order_id: this.id, type: 'enter' }).then(response => {
           res.order_item_vos.map((el) => {
             el.orderNum = el.num
-            if (res.kdn_order_code == undefined || res.kdn_order_code == '') {
-              el.num = 0
-            }
+            el.num = 0
+            /*   if (res.kdn_order_code == undefined || res.kdn_order_code == ''|| JSON.stringify(response) == "{}") {
+              
+              } */
             Object.keys(response).map(item => {
               if (el.id == item) {
                 el.sn_code_list = response[item]
@@ -1290,7 +1303,6 @@ export default {
             this.deliveryForms.total_weight = Number(
               el.product_vo.weight * el.num
             );
-            console.log(el.orderNum);
           });
         })
         this.deliveryForms.status = res.status

+ 3 - 3
manager-admin/src/views/stock/sendOrder.vue

@@ -34,14 +34,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="仓库">
-              <el-select v-model="advancedForm.warehouse_id">
+              <el-select v-model="advancedForm.warehouse_id" clearable>
                 <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="订单编号">
-              <el-input v-model="advancedForm.sn" placeholder="请输入订单编号"></el-input>
+              <el-input v-model="advancedForm.sn" clearable placeholder="请输入订单编号"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -63,7 +63,7 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="" label="订单编号">
           <template slot-scope="scope">
-            {{ scope.row.order_vo.sn }}
+            {{ scope.row.sn }}
           </template>
         </el-table-column>
         <el-table-column prop="sn" label="出库单编号" v-if="params.selectType == 'sending'">

+ 1 - 1
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.107: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: {

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