lilei 2 vuotta sitten
vanhempi
commit
f1403730fd

+ 2 - 3
src/views/common/chooseWarehouse.js

@@ -72,11 +72,10 @@ const warehouse = {
       const ajaxName = this.isPermission ? queryAuthWarehouse : warehouseAllList
       ajaxName({}).then(res => {
         if (res.status == 200) {
-          if (res.data && res.data.length <= 1) {
-            this.$store.state.app.isWarehouse = true
-          }
+          this.$store.state.app.isWarehouse = res.data && res.data.length > 1
           this.warehouseData = res.data
         } else {
+          this.$store.state.app.isWarehouse = false
           this.warehouseData = []
         }
       })

+ 1 - 1
src/views/salesManagement/examineVerify/list.vue

@@ -63,7 +63,7 @@
                   <Area id="examineVerifyList-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                 </a-form-model-item>
               </a-col>
-              <a-col :md="6" :sm="24" v-if="!isShowWarehouse">
+              <a-col :md="6" :sm="24" v-if="isShowWarehouse">
                 <a-form-model-item label="仓库">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>

+ 1 - 1
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -81,7 +81,7 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-model-item label="仓库" v-if="!isShowWarehouse">
+                  <a-form-model-item label="仓库" v-if="isShowWarehouse">
                     <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                   </a-form-model-item>
                 </a-col>

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -70,7 +70,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库" v-if="!isShowWarehouse">
+                <a-form-model-item label="仓库" v-if="isShowWarehouse">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>

+ 1 - 1
src/views/salesManagement/receiptPrint/list.vue

@@ -53,7 +53,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库" v-if="!isShowWarehouse">
+                <a-form-model-item label="仓库" v-if="isShowWarehouse">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>

+ 1 - 1
src/views/salesManagement/sendOutOrder/list.vue

@@ -64,7 +64,7 @@
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="仓库" v-if="!isShowWarehouse">
+                <a-form-model-item label="仓库" v-if="isShowWarehouse">
                   <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>

+ 2 - 2
src/views/salesManagement/stockPrint/list.vue

@@ -83,7 +83,7 @@
                     <Area id="stockPrint-shippingAddrProvinceSn" v-model="queryParam.shippingAddrProvinceSn" placeholder="请选择省"></Area>
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="6" :sm="24" v-if="!isShowWarehouse">
+                <a-col :md="6" :sm="24" v-if="isShowWarehouse">
                   <a-form-model-item label="仓库">
                     <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn" :isPermission="true"></chooseWarehouse>
                   </a-form-model-item>
@@ -295,7 +295,7 @@ export default {
         { title: '打印次数', dataIndex: 'stockUpPrintTimes', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '100px', align: 'center', fixed: 'right' }
       ]
-      if (!this.isShowWarehouse) {
+      if (this.isShowWarehouse) {
         arr.splice(7, 0, { title: '仓库', dataIndex: 'warehouseName', width: '130px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true })
       }
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限

+ 2 - 2
vue.config.js

@@ -107,9 +107,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.111:8602/ocs-admin',
+        target: 'http://192.168.2.103/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {