Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	src/layout/index/index.vue

src/api/V2/houseSelfCollect/index.js

@@ -130,4 +130,6 @@ export const API_POST_CUSTOMER = `/weighingManagement/api/changeCustomer`
 export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
 // 检查客户送粮量
 export const API_GETQUALITY = '/qualityInspectionManagement/getQualityInspectionManagementMap'
+// 查询仓库接口新
+export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouseSelfNew'
 

src/layout/index/index.vue

@@ -22,13 +22,7 @@
           </keep-alive>
           <router-view class="winseaview-view" v-if="!$route.meta.keepAlive" />
         </BaseContainer>
-        <!-- <div class="bottom">
-          <div class="row1">
-          Copyright www.eliangeyun.com All Right Reserved @淘粮（海南）科技发展有限公司  </div>
-          <div class="">
-          <a href="https://beian.miit.gov.cn">琼ICP备2021004821号-2</a>
-          </div>
-        </div> -->
+
       </div>
     </div>
     <div class="winseaview-shade" @click="showCollapse"></div>

src/model/houseSelfCollect/index.js

@@ -67,7 +67,8 @@ import {
   API_GET_CONTRACT,
   API_SPONSOR_WITHDRAW,
   API_GET_BASEID,
-  API_GETQUALITY
+  API_GETQUALITY,
+  API_GET_WAREHOUSE
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -203,3 +204,5 @@ export const dandongOrder = appRx.post(API_POST_DANDONG_ORDER, errorCatcher, err
 export const getquality = appRx.get(API_GETQUALITY, errorCatcher, errorHandle, filter)
 // 换客户
 export const changeCustomer = appRx.post(API_POST_CUSTOMER, errorCatcher, errorHandle, filter)
+// 查询仓库新
+export const getwarehouse = appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHandle, filter)

src/styles/media.scss

@@ -71,7 +71,7 @@
   left: 200px;
   padding: 0;
   width: calc(100% - 200px);
-  height: calc(100% - 150px);
+  height: calc(100% - 100px);
   box-sizing: border-box;
   .el-tabs__item {
     color: #999999;

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -80,7 +80,8 @@
     purchasePriceAllowEdit,
     purchasePriceLook,
     purchasePriceDel,
-    sponsorWithdraw
+    sponsorWithdraw,
+    getwarehouse
   } from '@/model/houseSelfCollect/index'
   import {
     getHp
@@ -210,7 +211,7 @@
       },
       //获取仓库
       getWarehouseSelf() {
-        selectWarehouseSelf({
+        getwarehouse({
             compId: this.compId
           })
           .toPromise()

src/views/houseSelfCollect/paymentManagement.vue

@@ -454,6 +454,7 @@
     suspendinstance,
     importWord,
     getPrint,
+    getwarehouse
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -1568,7 +1569,7 @@
       getWarehouse() {
         let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
         _wareHouse = JSON.parse(_wareHouse)
-        selectWarehouseSelf({
+        getwarehouse({
             compId: localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()

src/views/profitable/expensemanagementdetails.vue

@@ -335,6 +335,9 @@ import {
   getcostNo,
   editfujian
 } from '@/model/profitable/index'
+import {
+    getwarehouse
+  } from '@/model/houseSelfCollect/index'
 import { getwarehousName } from '@/model/warehouse/index'
 import {
   downloadFile
@@ -470,7 +473,7 @@ export default {
     },
     xiala() {
       //仓库筛选
-      getwarehousName({
+    getwarehouse({
         compId: localStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
@@ -827,9 +830,9 @@ export default {
       }
     },
     allot(row) {
+      var role = allRoles()
       if (
-        localStorage.getItem('ws-pf_roleName') == '销售内勤' ||
-        localStorage.getItem('ws-pf_roleName') == '采购内勤'
+        role.roleName.indexOf('销售内勤') != -1||role.roleName.indexOf('采购内勤') != -1
       ) {
         this.$router.push({ name: 'expenseallot', query: { id: row.id } })
       } else {

src/views/statisticalReport/autoSettlementList.vue

@@ -492,6 +492,9 @@ import {
 import {
   downloadFile
 } from '@/utils/batchDown'
+import {
+    getwarehouse
+  } from '@/model/houseSelfCollect/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import {
@@ -676,7 +679,7 @@ export default {
   },
   activated() {
     console.log(11111111)
-      selectWarehouseSelf({
+    getwarehouse({
             compId: localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -162,8 +162,10 @@
     setcorrect,
     sponsorWithdraw
   } from '@/model/tasksport/index'
+
   import {
-  selectWarehouseSelf,
+  // selectWarehouseSelf,
+  getwarehouse
 } from '@/model/houseSelfCollect/index'
   import {
     getstafffind,
@@ -311,7 +313,7 @@
       this.showType = this.isShow
     },
     mounted() {
-      selectWarehouseSelf({
+      getwarehouse({
         compId: localStorage.getItem('ws-pf_compId'),
       })
         .toPromise()

src/views/warehousenew/warehousingOrder.vue

@@ -934,7 +934,6 @@ export default {
       this.getList()
     },
     goodsNameChange(e){
-      console.log(e,1111111111)
       if (e == '全部货名' || e == '0') {
         this.goodsName = '0'
         this.reserves = ''