Bläddra i källkod

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

chenrui 11 månader sedan
förälder
incheckning
551cbc18f2

+ 1 - 1
src/components/Select/index.js

@@ -28,7 +28,7 @@ export default {
     },
     isEnable: { // 是否只获取已启用的数据
       type: Boolean,
-      default: false
+      default: true
     },
     notIn: {
       type: Array,

+ 2 - 1
src/store/modules/app.js

@@ -141,7 +141,8 @@ const app = {
           'purchase/saveDetail',
           'purchase/deleteDetail',
           'purchase/detail/batchInsert',
-          'purchase/setSupplierInfo'
+          'purchase/setSupplierInfo',
+          'purchase/submit'
           ],
         timeStr: ''
       },

+ 2 - 3
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -127,7 +127,7 @@ export default {
         return []
       }
     },
-    payerType:{
+    payerType: {
       type: String,
       default: ''
     },
@@ -159,7 +159,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return dispatchlList(Object.assign(parameter, this.queryParam, {authFlag:this.payerType=='DEALER'?1:0})).then(res => {
+        return dispatchlList(Object.assign(parameter, this.queryParam, { authFlag: this.payerType == 'DEALER' ? 1 : 0 })).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -212,7 +212,6 @@ export default {
       this.detailType = type
       this.bizSn = type == 0 ? row.salesBillSn : row.dispatchBillSn
       this.showDetailModal = true
-      console.log(this.bizSn)
     },
     cancelDetail () {
       this.showDetailModal = false

+ 1 - 1
src/views/salesManagement/salesQueryNew/detail.vue

@@ -395,7 +395,7 @@ export default {
         if (this.$refs.productList.hasJGtire) {
           this.$info({
             title: '提示',
-            content: '存在箭冠轮胎产品,不可一键审核!',
+            content: '销售单内有品牌是【箭冠】,且三级分类是【轮胎】的产品,不可一键审核!',
             centered: true
           })
           return

+ 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.113:8660/ocs-admin',
+        // target: 'http://192.168.2.117/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: {