瀏覽代碼

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

chenrui 1 年之前
父節點
當前提交
4fff7bfa8e

+ 2 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -413,7 +413,8 @@ export default {
       descDetail: null,
       promoProductClz: null, // 活动产品分类
       disablePromo: false,
-      countData: null
+      countData: null,
+      warehouseTit: ''
     }
   },
   computed: {

+ 2 - 2
src/views/supplierManagement/supplierInfo/edit.vue

@@ -136,7 +136,7 @@
                 </a-col>
                 <a-col :xs="24" :sm="24" :md="12" :lg="8" :xl="8">
                   <a-form-model-item label="ERP编码">
-                    <a-input v-model.trim="form.erpCode" :maxLength="50" allowClear placeholder="请输入ERP编码" />
+                    <a-input v-model.trim="form.kdSupplierCode" :maxLength="50" allowClear placeholder="请输入ERP编码" />
                   </a-form-model-item>
                 </a-col>
               </a-row>
@@ -291,7 +291,7 @@ export default {
         deliveryCycle: '',
         settleCycle: '',
         cooperateFlag: undefined,
-        erpCode:'',
+        kdSupplierCode:'',
         busniessMode: '',
         busniessScope: '',
         buildDate: '',

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