Quellcode durchsuchen

Merge commit '10f8717050c06e66f14c8a690a432ae6833f4047' into HEAD

gitadmin vor 1 Jahr
Ursprung
Commit
b1333d5af4

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.45",
+    "version": "2.2.49",
     "message": "发现有新版本发布,确定更新系统?"
 }

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

@@ -157,7 +157,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 8 - 2
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -48,7 +48,9 @@
           <a-col :md="12" :sm="24" v-if="!isEdit">
             <a-form-model-item label="调出仓库" prop="warehouseSn">
               <warehouse
+                isPermission
                 v-model="form.warehouseSn"
+                ref="warehouse"
                 id="allocateBill-basicInfo-warehouseSn"
                 placeholder="请选择调出仓库"
               />
@@ -253,9 +255,13 @@ export default {
     // 调往对象名称经销商  change
     handleChange (value) {
       const ind = this.dealerData.findIndex(item => item.dealerSn == value)
-      console.log(this.dealerData[ind])
       this.form.targetName = this.dealerData[ind].dealerName
-      this.form.warehouseSn = this.dealerData[ind].defaultWarehouseSn
+      const wsn = this.dealerData[ind].defaultWarehouseSn
+      if(this.$refs.warehouse.hasWarehouse(wsn)){
+        this.form.warehouseSn = wsn
+      }else{
+        this.form.warehouseSn = undefined
+      }
     },
     //  保存
     handleSave () {

+ 2 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -46,6 +46,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="调出仓库">
                   <warehouse
+                    isPermission
                     v-model="queryParam.warehouseSn"
                     id="allocateBillList-warehouseSn"
                     placeholder="请选择调出仓库"
@@ -237,7 +238,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag: 0})).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 1 - 1
src/views/allocationManagement/transfersPrint/list.vue

@@ -232,7 +232,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

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

@@ -109,6 +109,9 @@ const warehouse = {
         }
       })
     },
+    hasWarehouse(sn){
+      return this.warehouseData.find(item => item.warehouseSn == sn)
+    },
     clearData () {
       this.handleChange([])
     }

+ 1 - 1
src/views/reportData/allocationDetails/list.vue

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

+ 1 - 1
src/views/reportData/salesDetails/list.vue

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

+ 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.111/ocs-admin',
+        // target: 'http://192.168.2.111/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: {