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

src/views/personnelManagement/component/router/route.js

@@ -59,22 +59,22 @@ const checkWorkListRouter = {
             },
             // hidden: true
         },
-        {
-            path: 'carNoList',
-            component: () =>
-                import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/carNoList'),
-            name: 'carNoList',
-            meta: {
-                title: '车辆管理',
-                shortcutEntrance: 'leaveList',
-                module: 'kaoqin.buka.view',
-                permissicon: [],
-                keepAlive: true,
-                _title:'车辆管理'
-                // module: 'procurement.sparepart.applDetail'
-            },
-            // hidden: true
-        },
+        // {
+        //     path: 'carNoList',
+        //     component: () =>
+        //         import ( /* webpackChunkName: "applDetail" */ '@/views/personnelManagement/carNoList'),
+        //     name: 'carNoList',
+        //     meta: {
+        //         title: '车辆管理',
+        //         shortcutEntrance: 'leaveList',
+        //         module: 'kaoqin.buka.view',
+        //         permissicon: [],
+        //         keepAlive: true,
+        //         _title:'车辆管理'
+        //         // module: 'procurement.sparepart.applDetail'
+        //     },
+        //     // hidden: true
+        // },
 
 
     ],

src/views/warehousenew/warehouseManagementRecord.vue

@@ -67,7 +67,7 @@
             src="../../../public/img/sousuo.png" alt />
         </ws-button>
         <el-button type="primary" @click="batchPrint">批量打印</el-button>
-        <el-button type="primary" @click="salesTransfer">销售转移</el-button>
+        <!-- <el-button type="primary" @click="salesTransfer">销售转移</el-button> -->
         <el-table show-summary ref="tableData" :data="warehouseList.records" height="570"
           v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
@@ -187,8 +187,8 @@
               <span v-if='scope.row.inOutFlag==1'>{{ scope.row.backOffice }}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
-          </el-table-column>
+          <!-- <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
+          </el-table-column> -->
           
           <el-table-column prop="addressUrl" label="操作" width="100px">
             <template slot-scope="scope">
@@ -292,8 +292,8 @@
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
           <el-table-column prop="backOffice" label="操作人"> </el-table-column>
-          <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
-          </el-table-column>
+          <!-- <el-table-column prop="salesTransferStatus" label="销售转移状态"  width="150px">
+          </el-table-column> -->
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -528,7 +528,12 @@
 
         this.contractNo=await getcontract({contractNo:this.currectdata.contractNoNew,warehouseName:this.warehouseName,compId:localStorage.getItem('ws-pf_compId')}).toPromise()
         this.currectdata.pointOutNew=this.contractNo.pointOut
-        this.currectdata.contractNopointOut=this.currectdata.contractNoNew+'（'+this.currectdata.pointOutNew+'）'
+        if(this.contractNo.pointOut){
+          this.currectdata.contractNopointOut=this.currectdata.contractNoNew+'（'+this.currectdata.pointOutNew+'）'
+        }else{
+           this.currectdata.contractNopointOut=this.currectdata.contractNoNew
+        }
+       
         
         var data=await getYunShuNumber({contractNo:this.currectdata.contractNoNew}).toPromise()
         this.currectdata.tranTaskNew=data[0].taskNo