lilei 2 anos atrás
pai
commit
9a012372bb

+ 5 - 0
src/utils/mixin.js

@@ -83,6 +83,11 @@ const commonMixin = {
       toThousands
     }
   },
+  computed:{
+    isShowWarehouse () {
+      return this.$store.state.app.isWarehouse
+    },
+  },
   watch: {
     '$store.state.app.loadingStatus': function (a, b) {
       if (!a) {

+ 2 - 1
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -28,10 +28,11 @@
             placeholder="请选择退货原因"
             allowClear></v-select>
         </a-form-model-item>
-        <a-form-model-item label="退货仓库" prop="warehouseSn">
+        <a-form-model-item label="退货仓库" prop="warehouseSn" v-if="isShowWarehouse">
           <warehouse
             v-model="form.warehouseSn"
             id="purchaseReturn-basicInfo-warehouseSn"
+            isPermission
             placeholder="请选择退货仓库"
           />
         </a-form-model-item>

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