Forráskód Böngészése

Merge branch 'develop_yh30' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh30

chenrui 1 éve
szülő
commit
195f5353ad

+ 1 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -204,7 +204,7 @@ export default {
       return this.detailData&&this.detailData.promoFlag==1
     },
     hasNoPushedActive(){
-      const a = this.dataSource.filter(item => item.promotionFlag != 0).filter(item => item.pushedQty>0)
+      const a = this.dataSource.filter(item => item.pushedQty>0)
       return this.dataSource.length==0 ? false : !(a.length > 0)
     },
     checkboxOption () {

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.103:8602/ocs-admin',
+        // target: 'http://192.168.2.103:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {