Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehouse/warehouseManagementEdit.vue

@@ -132,7 +132,8 @@
     billoperatehis,
     getLook,
     edit,
-    delPosition
+    delPosition,
+    getstaff
   } from '@/model/warehouse/index'
   import {
     regionData,
@@ -222,16 +223,29 @@
     },
     activated() {
       this.loaddata()
-      getstafffind({
-          roles: 'd6a5c8a52da544309259f91f75de1ec6'
-        })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.optionsOther = response
-          this.staffList1 = response
-          this.staffList = response
-        })
+      // getstafffind({
+      //     roles: 'd6a5c8a52da544309259f91f75de1ec6'
+      //   })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.options = response
+      //     this.optionsOther = response
+      //     this.staffList1 = response
+      //     this.staffList = response
+      //   })
+      getstaff({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+      .toPromise()
+      .then((response) => {
+        this.options = response
+        this.optionsOther = response
+        this.staffList = response
+        this.staffList1 = response
+        // for(var i=0;i<response.length;i++){
+        //   this.optionsOther.push(response[i].staffName+" "+response[i].staffMobilePhone)
+        // }
+      })
       this.showType = this.isShow
     },
     computed: {
@@ -251,7 +265,7 @@
     },
     methods: {
       getAddress(data) {
-        console.log("getAddress", data)
+        console.log('getAddress', data)
         this.deptBudgetList.warehousePrivate = data[0]
         this.deptBudgetList.warehouseCity = data[1]
         this.deptBudgetList.warehouseArea = data[2]

src/views/warehouse/warehouseManagementGross.vue

@@ -1745,7 +1745,9 @@
           }
         }
         for (var i = 0; i < this.outContractNo.length; i++) {
+          console.log(this.outContractNo[i].contractNo,this.deptBudgetList.contractNo)
           if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
+            
             if (this.outContractNo[i].inOutType == '采购入库') {
               this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
               this.deptBudgetList.inOutTypeKey = 1
@@ -1759,7 +1761,7 @@
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
               this.deptBudgetList.inOutTypeKey = 5
             } else if (this.outContractNo[i].inOutType == '退库') {
-              if(this.deptBudgetList1[i].contractNo){
+              if(this.outContractNo[i].contractNo){
                 this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
               }
               else{