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

src/api/V2/houseSelfCollect/index.js

@@ -120,4 +120,6 @@ export const API_POST_CHANE_NO = `/weighingManagement/api/changeWarehouse`
 export const API_GET_CONTRACT ='/contractManagementInfo/getInContract'
 // 发起人撤回
 export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
+// 获取仓库id
+export const API_GET_BASEID ='/qualityInspectionManagement/selectBaseId'
 

src/layout/index/top/index.vue

@@ -219,7 +219,8 @@
     getLook
   } from '@/model/warehouse/index'
   import {
-    getQRCodeData
+    getQRCodeData,
+    getBaseId
   } from '@/model/houseSelfCollect/index'
 
 
@@ -414,6 +415,9 @@
         if(_userCompId.indexOf(',') != -1){
          _userCompId =  _userCompId.split(',')[1]
         }
+        if(!_userHouseId){
+          this.obtainBaseId(_userCompId,_qualityNo)
+        }
         this.tmp = {
           compId: _userCompId,
           number: _qualityNo,
@@ -421,7 +425,6 @@
         }
         //  this.barCode = ''
         //判断当前账号公司是否是二维码上公司
-        debugger
         if (this.userINfo.userCompany != _userCompId) {
           console.log('请切换公司在试！')
           this.$message.error('当前身份不可操作');
@@ -429,8 +432,9 @@
           return
         }
         //判断二维码上的仓库当前账号是否有权限操作
-        this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
-        
+        if(this.cangid){
+          this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
+        }
       },
       compNameChange(){
       //   this.complogin({username:this.UserInfo.loginInfo.userMobilePhone,
@@ -578,6 +582,26 @@
             
           })
       },
+      //根据公司id、业务编号，获取仓库id
+      async obtainBaseId(compId, qualityNo){
+        await getBaseId({
+            compId: compId,
+            qualityNo: qualityNo,
+          })
+          .toPromise()
+          .then((response) => {
+             this.warehouseId = response.baseId
+             this.cangid = response.baseId
+             this.getLook(this.cangid,localStorage.getItem('ws-pf_staffName'))
+            this.tmp = {
+              compId: compId,
+              number: qualityNo,
+              warehouseId: this.warehouseId
+            }
+            // debugger
+            // this.getQRCodeData(this.tmp)
+          })
+      },
       // 二维码获取数据
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)

src/model/houseSelfCollect/index.js

@@ -62,7 +62,8 @@ import {
   API_POST_CHANE_NO,
   API_POST_DELETE,
   API_GET_CONTRACT,
-  API_SPONSOR_WITHDRAW
+  API_SPONSOR_WITHDRAW,
+  API_GET_BASEID
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
 export const getCustomerManage = appRx.get(API_GET_CUSTOMER_MANAGE, errorCatcher, errorHandle, filter)
@@ -188,3 +189,5 @@ export const changeNo = appRx.post(API_POST_CHANE_NO, errorCatcher, errorHandle,
 export const getcontract = appRx.get(API_GET_CONTRACT, errorCatcher, errorHandle, filter)
 // 发起人撤回
 export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, errorHandle, filter)
+// 获取仓库id
+export const getBaseId = appRx.get(API_GET_BASEID, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -646,7 +646,7 @@
         return fmt
       },
       lookup() {
-        if (this.value2) {
+        if (this.value2&&this.value2.length>0) {
           this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
           this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
         } else {

src/views/profitable/expensemanagementdetails.vue

@@ -444,7 +444,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          this.choiceObj = response.records
+          this.choiceObj = response
         })
          //流向
          getXialaList({

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -125,10 +125,9 @@
               <!-- <el-button @click="examine(2)" v-else-if="deptBudgetList.priceStatus=='审核中'&&pricetype==2" type="primary">{{deptBudgetList.approveStatus}}</el-button> -->
             </div>
           </div>
-          <div class="content3" v-for="(item, index) in driverlist" :key="index">
+          <div class="content3" v-for="(item, index) in driverlist" :key="item.id">
             <div class="content3-item1">
-
-              <div class="">
+              <div>
                 <span style="margin-left: 30px;font-weight: 600;">司机-{{ index + 1 }}</span>
                 <span class="noservice" v-show="item.status == '未装车'">{{
                      item.status
@@ -140,7 +139,6 @@
                      item.status
                    }}</span>
               </div>
-
               <el-col :span="8">
 
                 <el-form-item label="姓名：" span="1" prop="driverName" label-width="125px">
@@ -1010,242 +1008,6 @@
   }
 </script>
 <style lang="scss" scoped>
-  // /deep/.basicInformation {
-  //   .ws-info-table {
-  //     border: none;
-  //   }
-
-  //   .myTest {
-  //     width: 800px;
-  //     display: flex;
-  //     height: 40px;
-  //   }
-
-  //   .el-form-item {
-  //     width: 33.3333%;
-  //     border: none;
-  //     height: 50px;
-
-  //     .el-form-item__label {
-  //       background: transparent;
-  //       border: none;
-  //     }
-
-  //     .el-form-item__content {
-  //       border: none;
-  //     }
-  //   }
-  // }
-
-  // .title {
-  //   position: relative;
-  //   padding-left: 10px;
-  // }
-
-  // .title::before {
-  //   content: '';
-  //   display: inline-block;
-  //   width: 5px;
-  //   height: 30px;
-  //   background: #5473e8;
-  //   position: absolute;
-  //   left: 0;
-  // }
-
-  // .el-form {
-  //   padding: 0 10%;
-  // }
-
-  // .el-button--primary {
-  //   background-color: #5878e8;
-  //   border-color: #5878e8;
-  // }
-
-  // .el-col {
-  //   background: #f6f7fc;
-  // }
-
-  // .bg-right {
-  //   text-align: right;
-  //   padding: 16px 20px;
-  // }
-
-  // .center {
-  //   margin: 0 auto;
-  //   width: 70%;
-  // }
-
-  //表格文字
-  // /deep/.ws-info-table .el-form-item .el-form-item__label {
-  //   text-align: center;
-  //   font-size: 14px;
-  //   font-weight: 400;
-  //   color: #8890b1;
-  //   line-height: 16px;
-  // }
-
-  // //蓝标
-  // .small-title {
-  //   position: relative;
-  //   padding: 10px;
-  //   font-weight: 600;
-  // }
-
-  // .small-title::before {
-  //   position: absolute;
-  //   content: '';
-  //   display: block;
-  //   background: #5473e8;
-  //   width: 4px;
-  //   height: 14px;
-  //   left: 0px;
-  //   top: 13px;
-  //   padding: 4px 2px;
-  // }
-
-  // .position {
-  //   position: relative;
-  // }
-
-  // .position .zaizhong {
-  //   width: 16%;
-  // }
-
-  // //减号
-  // .del {
-  //   position: absolute;
-  //   // right: -38px;
-  //   top: 9px;
-  //   cursor: pointer;
-  //   right: 0;
-  //   display: inline-block;
-  //   font-size: 20px;
-  //   width: 20px;
-  //   height: 10px;
-  //   line-height: 0px;
-  // }
-
-  // .driver .el-form-item {
-  //   width: 16.63%;
-  // }
-
-  // /deep/.ws-info-table .el-form-item .el-form-item__content {
-  //   background: #f5f7fa;
-  //   border-radius: 4px;
-  //   color: #8890b1;
-  //   font-size: 14px;
-  //   padding: 0 25px;
-  // }
-
-  // /deep/.driver .ws-info-table .el-form-item .el-form-item__label {
-  //   width: 72px;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item {
-  //   width: 220px;
-  //   color: #8890b1;
-  //   font-size: 14px;
-  // }
-
-  // /deep/.ws-info-table .el-form-item {
-  //   border: none;
-  //   height: 50px;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  //   width: 50%;
-  //   border: 0px solid #d8dce6;
-  //   background: #f5f7fa;
-  //   text-align: center;
-  // }
-
-  // /deep/.liaison {
-  //   background: #f5f7fa;
-  //   border-radius: 4px;
-  //   border: 0px solid #d8dce6;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  //   border: none;
-  //   background: #f5f7fa;
-  //   padding: 0px;
-  // }
-
-  // .catNos {
-  //   width: 100%;
-  //   height: 30px;
-  //   margin-top: 10px;
-  //   margin-left: 20px;
-  //   font-size: 14px;
-  // }
-
-  // /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  //   border-radius: 0px;
-  //   border-left: none;
-  //   border-bottom: none;
-  //   border-top: none;
-  // }
-
-  // /deep/.liaison .ws-info-table {
-  //   background: #f6f7fc;
-  //   border-radius: 4px;
-  //   border: 1px solid #d8dce6;
-  //   margin-top: 20px;
-  // }
-
-  //送达/未送达
-  // .noservice,
-  // .service {
-  //   display: inline-block;
-  //   border-radius: 4px;
-  //   border: 1px solid #d8dce6;
-  //   padding: 2px;
-  //   font-size: 12px;
-  // }
-
-  // .noservice {
-  //   background: #c4cada;
-  //   color: #ffffff;
-  // }
-
-  // .service {
-  //   background: #e5f1f7;
-  //   color: #50cad4;
-  // }
-
-  // .serviced {
-  //   display: inline-block;
-  //   border-radius: 4px;
-  //   border: 1px solid #d8dce6;
-  //   padding: 2px;
-  //   font-size: 12px;
-  //   background: #e5f1f7;
-  //   color: #2c81cf;
-  // }
-
-  // //添加司机
-  // .add {
-  //   width: 100px;
-  //   height: 34px;
-  //   background: #f6f7fb;
-  //   border-radius: 17px;
-  //   color: #5473e8;
-  //   font-size: 14px;
-  //   border: none;
-  // }
-
-  // .add img {
-  //   display: inline-block;
-  //   margin-top: 3px;
-  //   margin-left: -12px;
-  // }
-
-  // .add .spans {
-  //   display: table-caption;
-  //   width: 56px;
-  //   height: 20px;
-  //   line-height: 18px;
-  // }
 
   /deep/.el-form-item--small.el-form-item {
     margin-bottom: 0px
@@ -1335,14 +1097,7 @@
       height: 90px;
     }
 }
-  .content4 {
-    background: #F5F7FA;
-    display: flex;
-    margin: 10px 0;
-    border: 1px solid #E4E7ED;
-    border-radius: 5px;
-    position: relative;
-  }
+
 
   .del {
     position: absolute;

src/views/warehousenew/warehousingOrder.vue

@@ -19,11 +19,11 @@
           </el-select>
         </div>
         <div style='width:50%;margin-right:10px;display: flex;'>
-          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" :value="searchType"
+          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" 
             style="margin: 0 10px">
-            <el-option key="全部货名" label="全部货名" value="" style="color: #8890b1" />
-            <el-option v-for="(item,index) in goodsList" :key="index" :label="item.goodsName"
-              :value="index" style="color: #8890b1" />
+            <el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
+            <el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.goodsName"
+              :value="(index+1)" style="color: #8890b1" />
           </el-select>
           <span style="width:100px" v-if="warehouseName && goodsName">{{reserves?reserves:0}}吨</span>
         </div>
@@ -657,7 +657,7 @@ export default {
       endDate: '',
       startDate: '',
       warehouseName: '',
-      goodsName:'',
+      goodsName:'0',
       reserves:'',
       goodsList:[],
       compId: localStorage.getItem('ws-pf_compId'),
@@ -742,7 +742,7 @@ export default {
       if (e == '全部仓库' || e == '') {
         this.warehouseName = ''
         this.goodsList = []
-        this.goodsName = ''
+        this.goodsName = '0'
         this.baseId = ''
       }else{
         for(let i =0 ; i<this.warehouseList.length;i++){
@@ -768,19 +768,20 @@ export default {
             break
           }
         }
-        this.goodsName= ''
+        this.goodsName= '0'
         this.reserves = ''
       }
       this.multipleSelection1={}
       this.getList()
     },
     goodsNameChange(e){
-      if (e == '全部货名' || e == '') {
-        this.goodsName = ''
+      console.log(e,1111111111)
+      if (e == '全部货名' || e == '0') {
+        this.goodsName = '0'
         this.reserves = ''
       }else{
-        this.goodsName = this.goodsList[e].goodsName
-        this.reserves = this.goodsList[e].storage
+        this.goodsName = this.goodsList[e-1].goodsName
+        this.reserves = this.goodsList[e-1].storage
       }
         this.multipleSelection1={}
         this.getList()
@@ -1847,7 +1848,7 @@ export default {
         baseId: this.baseId,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
-        goodsName:this.goodsName,
+        goodsName:this.goodsName!='0'?this.goodsName:'',
         weightGreater:this.weightGreater
       })
         .toPromise()