Browse Source

修改快递鸟门店及修改快递鸟返回信息

yangg 1 year ago
parent
commit
766a64a653
57 changed files with 32 additions and 14 deletions
  1. BIN
      manager-admin/dist.7z
  2. 1 1
      manager-admin/dist/index.html
  3. 0 0
      manager-admin/dist/static/js/27.2493fcbe2784d028e107.js
  4. BIN
      manager-admin/dist/static/js/27.2493fcbe2784d028e107.js.gz
  5. BIN
      manager-admin/dist/static/js/28.03661fcbc7ee496489a4.js.gz
  6. 0 0
      manager-admin/dist/static/js/28.0467d1942db1ffc64089.js
  7. 0 0
      manager-admin/dist/static/js/29.270343970960319aa48b.js
  8. BIN
      manager-admin/dist/static/js/29.270343970960319aa48b.js.gz
  9. 0 0
      manager-admin/dist/static/js/30.6079df0fbdd669f661cb.js
  10. BIN
      manager-admin/dist/static/js/31.4ad42ae07e4e14dacf7a.js.gz
  11. 0 0
      manager-admin/dist/static/js/31.ba61025faa41bdbc8dd0.js
  12. 0 0
      manager-admin/dist/static/js/32.48c49c3656efe0eeaada.js
  13. BIN
      manager-admin/dist/static/js/32.48c49c3656efe0eeaada.js.gz
  14. 0 0
      manager-admin/dist/static/js/33.fdd5f9d2df0cf7c166de.js
  15. 0 0
      manager-admin/dist/static/js/34.d3ffdf5f12fb72057d37.js
  16. BIN
      manager-admin/dist/static/js/34.d3ffdf5f12fb72057d37.js.gz
  17. BIN
      manager-admin/dist/static/js/35.9cfed83e3b43bfd45856.js.gz
  18. 0 0
      manager-admin/dist/static/js/35.a03f26b00840483045c5.js
  19. 0 0
      manager-admin/dist/static/js/36.1b35970b8288b3b505f4.js
  20. BIN
      manager-admin/dist/static/js/36.1b35970b8288b3b505f4.js.gz
  21. 0 0
      manager-admin/dist/static/js/36.da2fea8de2a884320a7c.js
  22. BIN
      manager-admin/dist/static/js/36.da2fea8de2a884320a7c.js.gz
  23. 0 0
      manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js
  24. BIN
      manager-admin/dist/static/js/47.c17c770acd8d959a87d3.js.gz
  25. BIN
      manager-admin/dist/static/js/47.f018867bed1fd151a721.js.gz
  26. 0 0
      manager-admin/dist/static/js/48.f6d71eb8b1ec79b13c3f.js
  27. BIN
      manager-admin/dist/static/js/48.f6d71eb8b1ec79b13c3f.js.gz
  28. BIN
      manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js.gz
  29. 0 0
      manager-admin/dist/static/js/49.e1117c832790b4e827fc.js
  30. 0 0
      manager-admin/dist/static/js/50.8f686eb1bb02332ad97f.js
  31. BIN
      manager-admin/dist/static/js/50.8f686eb1bb02332ad97f.js.gz
  32. 0 0
      manager-admin/dist/static/js/51.7158439eb44f6cf81ff2.js
  33. BIN
      manager-admin/dist/static/js/51.7158439eb44f6cf81ff2.js.gz
  34. BIN
      manager-admin/dist/static/js/51.b3e7662584b9eb6a3147.js.gz
  35. 1 1
      manager-admin/dist/static/js/52.77fa8d14ad3d7d30e510.js
  36. BIN
      manager-admin/dist/static/js/52.8bbbee3ffd66fffb0100.js.gz
  37. 0 0
      manager-admin/dist/static/js/53.fbfb25da2c300c17cada.js
  38. BIN
      manager-admin/dist/static/js/53.fbfb25da2c300c17cada.js.gz
  39. 0 0
      manager-admin/dist/static/js/54.592190fcedcf3d1902aa.js
  40. BIN
      manager-admin/dist/static/js/54.592190fcedcf3d1902aa.js.gz
  41. BIN
      manager-admin/dist/static/js/54.ef974302411bd82e2e03.js.gz
  42. 0 0
      manager-admin/dist/static/js/55.0e89d87d55c3bac64507.js
  43. BIN
      manager-admin/dist/static/js/55.0e89d87d55c3bac64507.js.gz
  44. 0 0
      manager-admin/dist/static/js/55.e75636c7cf1f299c7fe5.js
  45. BIN
      manager-admin/dist/static/js/55.e75636c7cf1f299c7fe5.js.gz
  46. 0 0
      manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js
  47. BIN
      manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js.gz
  48. BIN
      manager-admin/dist/static/js/9.cef3ededcd61722c8005.js.gz
  49. BIN
      manager-admin/dist/static/js/app.3cc8b31149b918cd9820.js.gz
  50. 0 0
      manager-admin/dist/static/js/app.c749700e5fd41cd56146.js
  51. BIN
      manager-admin/dist/static/js/app.c749700e5fd41cd56146.js.gz
  52. 0 0
      manager-admin/dist/static/js/manifest.2c4e3c65bf8cb3a8a4ab.js
  53. 0 0
      manager-admin/dist/static/js/manifest.dfa394222055907fdb85.js
  54. 16 4
      manager-admin/src/views/basicSetting/kdnStore.vue
  55. 12 6
      manager-admin/src/views/stock/orderOutbound.vue
  56. 1 1
      manager-admin/src/views/stock/sendOrder.vue
  57. 1 1
      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.2c4e3c65bf8cb3a8a4ab.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.3cc8b31149b918cd9820.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.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>

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


BIN
manager-admin/dist/static/js/27.2493fcbe2784d028e107.js.gz


BIN
manager-admin/dist/static/js/28.03661fcbc7ee496489a4.js.gz


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


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


BIN
manager-admin/dist/static/js/29.270343970960319aa48b.js.gz


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


BIN
manager-admin/dist/static/js/31.4ad42ae07e4e14dacf7a.js.gz


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


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


BIN
manager-admin/dist/static/js/32.48c49c3656efe0eeaada.js.gz


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


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


BIN
manager-admin/dist/static/js/33.f80a2f66e84d106a23a5.js.gz → manager-admin/dist/static/js/34.d3ffdf5f12fb72057d37.js.gz


BIN
manager-admin/dist/static/js/35.9cfed83e3b43bfd45856.js.gz


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


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


BIN
manager-admin/dist/static/js/36.1b35970b8288b3b505f4.js.gz


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


BIN
manager-admin/dist/static/js/36.da2fea8de2a884320a7c.js.gz


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


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


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


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


BIN
manager-admin/dist/static/js/48.f6d71eb8b1ec79b13c3f.js.gz


BIN
manager-admin/dist/static/js/49.55335791aa1da3bdaaf5.js.gz


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


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


BIN
manager-admin/dist/static/js/50.8f686eb1bb02332ad97f.js.gz


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


BIN
manager-admin/dist/static/js/51.7158439eb44f6cf81ff2.js.gz


BIN
manager-admin/dist/static/js/51.b3e7662584b9eb6a3147.js.gz


+ 1 - 1
manager-admin/dist/static/js/50.2ad874b7bed510a80191.js → manager-admin/dist/static/js/52.77fa8d14ad3d7d30e510.js

@@ -1 +1 @@
-webpackJsonp([50],{P95X:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=e("hky6"),i={data:function(){return{scanSource:"未知扫码来源",sn:"",price:"",payUrl:""}},methods:{goPay:function(){r.v({order_id:this.$route.query.id,pay_type:this.scanSource}).then(function(n){window.open(n)})},detectScanSource:function(){this.price=this.$route.query.price,this.sn=this.$route.query.sn;var n=window.navigator.userAgent.toLowerCase();"micromessenger"==n.match(/MicroMessenger/i)?this.scanSource="wx":"alipayclient"==n.match(/AlipayClient/i)?this.scanSource="ali":this.scanSource="unknown"}},mounted:function(){this.detectScanSource()}},a=e("XyMi");var s=function(n){e("wsQH")},o=Object(a.a)(i,function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"center"},[e("div",{staticClass:"header_info"},[e("p",[n._v("订单编号: "),e("span",[n._v(n._s(n.sn))])]),n._v(" "),e("p",[n._v("付款金额:"),e("span",[n._v(" ¥")]),e("span",[n._v(n._s(n.price))])])]),n._v(" "),e("div",{staticClass:"btn"},[e("el-button",{staticStyle:{width:"100%","font-size":"18px"},attrs:{type:"primary"},on:{click:n.goPay}},[n._v("\n            确认支付\n        ")])],1)])},[],!1,s,"data-v-5b7fdbb8",null);t.default=o.exports},bfTO:function(n,t,e){(n.exports=e("FZ+f")(!1)).push([n.i,"\n.center[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    padding: 15px;\n}\n.header_info[data-v-5b7fdbb8] {\r\n    border-radius: 10px;\r\n    padding: 10px;\r\n    width: 100%;\r\n    background-color: #fff;\n}\np[data-v-5b7fdbb8] {\r\n    padding-top: 5px;\r\n    padding-bottom: 5px;\n}\n.btn[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    margin-top: 80px;\n}\r\n",""])},wsQH:function(n,t,e){var r=e("bfTO");"string"==typeof r&&(r=[[n.i,r,""]]),r.locals&&(n.exports=r.locals);e("rjj0")("9e3ee174",r,!0)}});
+webpackJsonp([52],{P95X:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=e("hky6"),i={data:function(){return{scanSource:"未知扫码来源",sn:"",price:"",payUrl:""}},methods:{goPay:function(){r.v({order_id:this.$route.query.id,pay_type:this.scanSource}).then(function(n){window.open(n)})},detectScanSource:function(){this.price=this.$route.query.price,this.sn=this.$route.query.sn;var n=window.navigator.userAgent.toLowerCase();"micromessenger"==n.match(/MicroMessenger/i)?this.scanSource="wx":"alipayclient"==n.match(/AlipayClient/i)?this.scanSource="ali":this.scanSource="unknown"}},mounted:function(){this.detectScanSource()}},a=e("XyMi");var s=function(n){e("wsQH")},o=Object(a.a)(i,function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("div",{staticClass:"center"},[e("div",{staticClass:"header_info"},[e("p",[n._v("订单编号: "),e("span",[n._v(n._s(n.sn))])]),n._v(" "),e("p",[n._v("付款金额:"),e("span",[n._v(" ¥")]),e("span",[n._v(n._s(n.price))])])]),n._v(" "),e("div",{staticClass:"btn"},[e("el-button",{staticStyle:{width:"100%","font-size":"18px"},attrs:{type:"primary"},on:{click:n.goPay}},[n._v("\n            确认支付\n        ")])],1)])},[],!1,s,"data-v-5b7fdbb8",null);t.default=o.exports},bfTO:function(n,t,e){(n.exports=e("FZ+f")(!1)).push([n.i,"\n.center[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    padding: 15px;\n}\n.header_info[data-v-5b7fdbb8] {\r\n    border-radius: 10px;\r\n    padding: 10px;\r\n    width: 100%;\r\n    background-color: #fff;\n}\np[data-v-5b7fdbb8] {\r\n    padding-top: 5px;\r\n    padding-bottom: 5px;\n}\n.btn[data-v-5b7fdbb8] {\r\n    width: 100%;\r\n    margin-top: 80px;\n}\r\n",""])},wsQH:function(n,t,e){var r=e("bfTO");"string"==typeof r&&(r=[[n.i,r,""]]),r.locals&&(n.exports=r.locals);e("rjj0")("9e3ee174",r,!0)}});

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.fbfb25da2c300c17cada.js


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


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


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


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


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


BIN
manager-admin/dist/static/js/55.0e89d87d55c3bac64507.js.gz


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


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


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


BIN
manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js.gz


BIN
manager-admin/dist/static/js/9.cef3ededcd61722c8005.js.gz


BIN
manager-admin/dist/static/js/app.3cc8b31149b918cd9820.js.gz


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


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


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


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


+ 16 - 4
manager-admin/src/views/basicSetting/kdnStore.vue

@@ -15,7 +15,7 @@
             <template slot="table-columns">
                 <el-table-column prop="store_name" label="门店名称" />
                 <el-table-column prop="contact_name" label="联系人" />
-                <el-table-column prop="phone" label="手机号" />
+                <el-table-column prop="mobile" label="手机号" />
                 <el-table-column prop="address" label="门店地址">
                     <template slot-scope="{ row }">
                         {{ row.province_name + row.city_name + row.area_name + row.address }}
@@ -90,8 +90,8 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="10">
-                        <el-form-item label="联系人电话" prop="phone">
-                            <el-input v-model="storeForm.phone" placeholder="请填写联系人电话" :maxlength="20"></el-input>
+                        <el-form-item label="联系人电话" prop="mobile">
+                            <el-input v-model="storeForm.mobile" placeholder="请填写联系人电话" :maxlength="20"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="10">
@@ -233,7 +233,19 @@ export default {
                 }],
                 store_goods_type: [this.MixinRequired('请填写名店名称!')],
                 contact_name: [this.MixinRequired('请填写门店联系人姓名!')],
-                phone: [this.MixinRequired('请填写联系人电话!')],
+                mobile: [this.MixinRequired('请填写联系人电话!'),
+                {
+                    validator: (rule, value, callback) => {
+                        const mobileRegex = /^1[3-9]\d{9}$/; // 中国大陆手机号正则表达式
+                        if (!mobileRegex.test(value)) {
+                            callback(new Error("手机号码格式有误!"));
+                        } else {
+                            callback();
+                        }
+                    },
+                    trigger: ["change", "blur"],
+                },
+                ],
                 id_card_name: [this.MixinRequired('请填写身份证姓名!')],
                 id_card: [this.MixinRequired('请填写身份证号码!')],
                 id_card_front: [this.MixinRequired('请上传身份证正面照片!')],

+ 12 - 6
manager-admin/src/views/stock/orderOutbound.vue

@@ -323,7 +323,7 @@
         <h3>物流状态:</h3>
         <div class="steps-wrap" v-if="JSON.stringify(deliveryForms.create_order_fail) !== '{}'">
           <el-steps class="steps" direction="vertical" process-status="finish">
-            <el-step icon="el-icon-error" :title="deliveryForms.create_order_fail && deliveryForms.create_order_fail.orderStatus == 600
+            <!-- <el-step icon="el-icon-error" :title="deliveryForms.create_order_fail && deliveryForms.create_order_fail.orderStatus == 600
               ? '下单失败'
               : ''
               ">
@@ -340,7 +340,7 @@
                   </p>
                 </div>
               </div>
-            </el-step>
+            </el-step> -->
           </el-steps>
         </div>
         <div class="steps-wrap" v-else>
@@ -414,7 +414,7 @@
                   {{ deliveryForms.user_arrives.remark }}
                 </p>
                 <p class="row-remark">
-                  快递员名:{{ deliveryForms.user_arrives.courierInfo.courierName }}
+                  快递员名:{{ deliveryForms.user_arrives.courierInfo.courierName }}
                 </p>
                 <p class="row-remark">
                   快递员电话:{{ deliveryForms.user_arrives.courierInfo.courierMobile }}
@@ -438,6 +438,12 @@
                 <p class="row-remark">
                   {{ deliveryForms.user_take_order.remark }}
                 </p>
+                <p class="row-remark">
+                  快递员姓名:{{ deliveryForms.user_take_order.courierInfo.courierName }}
+                </p>
+                <p class="row-remark">
+                  快递员电话:{{ deliveryForms.user_take_order.courierInfo.courierMobile }}
+                </p>
                 <p class="row-time">
                   {{
                     (deliveryForms.user_take_order.requestTime / 1000)
@@ -468,7 +474,7 @@
                 </p>
               </div>
             </el-step>
-            <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.cancel_order_kdn) !== '{}'" :title="deliveryForms.create_order_success.orderStatus == 500
+            <!-- <el-step icon="el-icon-success" v-if="JSON.stringify(deliveryForms.cancel_order_kdn) !== '{}'" :title="deliveryForms.create_order_success.orderStatus == 500
               ? '拒绝接单'
               : ''
               ">
@@ -489,7 +495,7 @@
                   }}
                 </p>
               </div>
-            </el-step>
+            </el-step> -->
           </el-steps>
         </div>
       </div>
@@ -997,7 +1003,7 @@ export default {
           params.send_address = this.send_address;
           params.receive_address = this.receive_address;
           params.order_code = this.id;
-          if(params.total_weight==0) {
+          if (params.total_weight == 0) {
             this.btnType = false;
             return this.$message.error("请填写物品总重量!")
           }

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

@@ -113,7 +113,7 @@
             <!---->
             <!--  <el-button size="mini" v-if="scope.row.allowable.ship && checkPermission(['warehouseOut:send'])" type="success"
               @click="handleSendWarehouseOut(scope.row)">发货</el-button> -->
-            <el-button v-if="scope.row.status == 'TO_BE_SEND' && checkPermission(['orderSend'])" size="mini"
+            <el-button v-if="scope.row.status == 'TO_BE_SEND' && checkPermission(['orderOutboundAdd'])" size="mini"
               @click="addWarehouse(scope.row)">发货</el-button>
             <!-- <el-button type="primary" size="mini" @click="handlePrintWarehouseOutDialog(scope.row)">删除</el-button> -->
           </template>

+ 1 - 1
ui-domain/api.js

@@ -17,6 +17,6 @@ module.exports = {
   },
   // 生产环境
   pro: {
-    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'
+    admin: window.__ENV__.API_ADMIN || 'https://apidoc.raycos.net'//api.v3rental.com  apidoc.raycos.net
   }
 }

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