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

src/components/item-wrap/item-wrap.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <dv-border-box-13 class="lr_titles">
-    <div class="item_title" v-if="title !== ''">
+    <div @click="console.log(111111111)" class="item_title" v-if="title !== ''">
       <div class="zuo"></div>
       <span class="title-inner"> &nbsp;&nbsp;{{ title }}&nbsp;&nbsp; </span>
       <div class="you"></div>

src/views/home/index.vue

@@ -34,16 +34,22 @@
           <div class="item">实时监测</div>
 
         </div> -->
-        <ItemWrap class="contetn_left-top contetn_lr-item" title="在途信息统计">
+        <div @click="routergo(1)">
+          <ItemWrap class="contetn_left-top contetn_lr-item" title="在途信息统计">
           <LeftTop :listData="leftTopDataList"/>
         </ItemWrap>
+        </div>
+        <div @click="routergo(2)">
         <ItemWrap class="contetn_left-center contetn_lr-item" title="合营比例">
           <LeftCenter :hylistData="leftCenterDataList"/>
         </ItemWrap>
+        </div>
+        <div @click="routergo(3)">
         <ItemWrap class="contetn_left-bottom contetn_lr-item" title="车辆信息" style="padding: 0 10px 16px 10px">
           <LeftBottom :ztxxlistData="leftBottomDataList"/>
         </ItemWrap>
       </div>
+      </div>
       <div class="contetn_center">
         <div class="maptitle">
           <div class="zuo"></div>
@@ -54,7 +60,7 @@
           <div id="china-map"></div>
         </dv-border-box-13>
         <dv-border-box-1 class="center_bottom">
-          <div class="center_bottom_content">
+          <div @click="routergo(2)" class="center_bottom_content">
             <div class="item">
               <div class="title">头寸</div>
               <div class="number">*****吨</div>
@@ -103,12 +109,16 @@
       </ItemWrap> -->
       </div>
       <div class="contetn_right">
+        <div @click="routergo(2)">
         <ItemWrap class="contetn_left-bottom contetn_lr-item" title="出入库分布">
           <RightTop :crklistData="rightTopDataObj"/>
         </ItemWrap>
+        </div>
+        <div @click="routergo(2)">
         <ItemWrap class="contetn_left-bottom contetn_lr-item" title="库存排名" style="padding: 0 10px 16px 10px">
           <RightCenter :phklistData="rightCenterDataList"/>
         </ItemWrap>
+        </div>
         <ItemWrap class="contetn_left-bottom contetn_lr-item" title="最新合同 ">
           <RightBottom :htlistData="rightBottomDataList"/>
         </ItemWrap>
@@ -168,6 +178,7 @@ export default {
   created() {
   },
   mounted() {
+    
     this.timeFn();
     this.selectData(1)
 
@@ -183,6 +194,15 @@ export default {
     
   },
   methods: {
+    routergo(status){
+      if(status==1){
+        this.$router.push({name:'autoSettlementList',query:{status:true}})
+      }else if(status==2){
+        this.$router.push({name:'warehouseManagementList'})
+      }else if(status==3){
+        this.$router.push({name:'autoSettlementList'})
+      }
+    },
     selectData(type){
       let _seachMoth = ''
       this.btnIndex = type

src/views/home/right-bottom.vue

@@ -9,7 +9,7 @@
 	<div v-if="pageflag" class="right_center_wrap beautify-scroll-def" :class="{ 'overflow-y-auto': !sbtxSwiperFlag }">
 		<component :is="components" :data="list" :class-option="defaultOption">
 			<ul class="right_center ">
-				<li class="right_center_item" v-for="(item, i) in list" :key="i">
+				<li class="right_center_item" v-for="(item, i) in list" :key="i" @click="routergo(item)">
 					<div class="inner_right">
 						<div class="dibu"></div>
 						<div class="flex">
@@ -103,6 +103,19 @@ export default {
 	},
 	mounted() { },
 	methods: {
+		routergo(item){
+			if(item.agreementType=='采购合同'){
+				this.$router.push({name:'buyContract'})
+			}else if(item.agreementType=='销售合同'){
+				this.$router.push({name:'salesContract'})
+			}else if(item.agreementType=='收购合同'){
+				this.$router.push({name:'acquisitionContract'})
+			}else if(item.agreementType=='代收合同'){
+				this.$router.push({name:'collectionContract'})
+			}else if(item.agreementType=='代储合同'){
+				this.$router.push({name:'storageContract'})
+			}
+		},
 		//     getData() {
 		//       this.pageflag = true
 		//       let res = {

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/profitable/contractprofitsdetails.vue

@@ -83,7 +83,7 @@
           </el-table-column>
            <el-table-column width="150" prop="settlementPrice" label="结算单价（元/吨）">
           </el-table-column>
-          <el-table-column width="120" prop="profit" label="利润（万元）">
+          <el-table-column width="120" prop="profit1" label="利润（万元）">
           </el-table-column>
           <el-table-column width="80" prop="status" label="状态"></el-table-column>
           <el-table-column width="100" prop="signingDate" label="签订日期"></el-table-column>
@@ -135,7 +135,12 @@
             <td class="col">{{tableData.seller}}</td>
           </tr>
           <tr class="row">
-            <td class="col col-bgc">结算单价（元/吨）</td>
+            <td class="col col-bgc">
+              <span v-if="tableData.agreementType == '采购合同'">采购</span>
+            <span v-if="tableData.agreementType == '收购合同'">收购</span>
+            <span v-if="tableData.agreementType == '销售合同'">销售</span>结算单价（元/吨）
+
+            </td>
             <td class="col">{{tableData.settlementPrice}}</td>
             <td class="col col-bgc">合计利润（元）</td>
             <td class="col">{{tableData.profit}}</td>
@@ -147,7 +152,11 @@
             <td class="col col-bgc">利润（元）</td>
           </tr>
           <tr v-for="item in tableData.contractList" class="row">
-            <td class="col">{{item.contractNo}}</td>
+            <td class="col">{{item.contractNo}}
+            <span v-if="item.agreementType == '采购合同'">(采购)</span>
+            <span v-if="item.agreementType == '收购合同'">(收购)</span>
+            <span v-if="item.agreementType == '销售合同'">(销售)</span>
+          </td>
             <td class="col">{{item.settlementPrice}}</td>
             <td class="col">{{item.weight}}</td>
             <td class="col">{{item.profit}}</td>
@@ -354,7 +363,7 @@
         this.tableData.buyer=row.buyer
         this.tableData.seller=row.seller
         this.tableData.settlementPrice=row.settlementPrice
-        this.tableData.profit=(row.profit*10000).toFixed(2)
+        this.tableData.profit=Number(row.profit).toFixed(2)
         getrelationcontract({
           agreementType:row.agreementType,contractNo:row.contractNo,compId:this.compId})
           .toPromise()
@@ -448,7 +457,8 @@
                     response.records[i].profit=weightprice
                  
                 }
-                response.records[i].profit=Number(Number(response.records[i].profit/10000).toFixed(3))
+  
+                response.records[i].profit1=Number(Number(response.records[i].profit/10000)).toFixed(3)
                 response.records[i].surplus=Number(Number(response.records[i].surplus).toFixed(3))
               }
             }

src/views/statisticalReport/autoSettlementList.vue

@@ -24,7 +24,7 @@
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input">
             <el-option v-for="item in options" :key="item.id"
-              :label="item.reportStatus?(item.contractNo + '(' + item.reportStatus + ')'):item.contractNo" :value="item.contractNo" />
+              :label="item.reportStatus?(item.contractNo + '(' + item.reportStatus + ')'+(item.pointOut?'/'+item.pointOut:'')):item.contractNo+(item.pointOut?'/'+item.pointOut:'')" :value="item.contractNo" />
             <!-- <el-option v-if="!item.reportStatus" v-for="item in options" :key="item.constKey" :label="item.contractNo"
               :value="item.contractNo" /> -->
           </el-select>
@@ -681,6 +681,11 @@ export default {
     }
   },
   activated() {
+    if(this.$route.query.status==true){
+      this.carType=1
+    }else{
+      this.carType=''
+    }
     getwarehouse({
             compId: localStorage.getItem('ws-pf_compId'),
           })

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -825,17 +825,21 @@
             sums[index] = '--'
           }
         })
+        console.log(sums[sums.length - 4])
         if (typeof sums[sums.length - 3] == 'number') {
-          sums[sums.length - 3] = sums[sums.length - 3].toFixed(2)
+          sums[sums.length - 3] = sums[sums.length - 3].toFixed(3)
         }
         if (typeof sums[sums.length - 4] == 'number') {
-          sums[sums.length - 4] = sums[sums.length - 4].toFixed(2)
+          sums[sums.length - 4] = sums[sums.length - 4].toFixed(3)
         }
         if (typeof sums[sums.length - 5] == 'number') {
-          sums[sums.length - 5] = sums[sums.length - 5].toFixed(2)
+          sums[sums.length - 5] = sums[sums.length - 5].toFixed(3)
+        }
+        if (typeof sums[sums.length - 6] == 'number') {
+          sums[sums.length - 6] = sums[sums.length - 6].toFixed(3)
         }
         if (typeof sums[sums.length - 7] == 'number') {
-          sums[sums.length - 7] = sums[sums.length - 7].toFixed(2)
+          sums[sums.length - 7] = sums[sums.length - 7].toFixed(3)
         }
         return sums
       },

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -128,7 +128,7 @@
               v-if="scope.row.identification2 == 'true'" @click="weightsave(scope.row,4)"></i>
           </template>
         </el-table-column> -->
-        <el-table-column key="21" width='120' class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
+        <!-- <el-table-column key="21" width='120' class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column> -->
         <el-table-column key="22" class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
           <template slot-scope="scope">
             <div class="inputChenge">
@@ -213,42 +213,44 @@
           </template>
         </el-table-column>
 
-        <el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)">
+        
+        <el-table-column width='120' class="table_td" prop="feedbackWeight" label="卸车重量（吨）">
           <template slot-scope="scope">
             <div class="inputChenge">
-              <el-input v-model="scope.row.settlementWeight" v-if="scope.row.identification == 'true'">
+              <el-input v-model="scope.row.feedbackWeight" v-if="scope.row.identification2 == 'true'">
               </el-input>
-              <div v-if="scope.row.identification == 'false'" class="inputs">
-                <span style="color: #ce4545;" v-if="scope.row.returnFlag == 1">{{scope.row.settlementWeight}}</span>
-                <span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
+              <div v-if="scope.row.identification2 == 'false'" class="inputs">
+                <span>{{scope.row.feedbackWeight}}</span>
               </div>
             </div>
-            <div style='display:inline-block;' v-if="scope.row.identification == 'false'">
-              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
-                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-                @click="whether(scope.row,1)" alt="" />
+            <div style='display:inline-block;' v-if="scope.row.identification2 == 'false'">
+              <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+                src="../../../public/img/edit.png" @click="weightedit(scope.row)" alt="" />
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row,1)"></i>
+              v-if="scope.row.identification2 == 'true'" @click="weightsave(scope.row,4)"></i>
           </template>
         </el-table-column>
-        <el-table-column width='120' class="table_td" prop="feedbackWeight" label="反馈重量（吨）">
+        <el-table-column class="table_td" prop="deductionWeight" label="扣重(吨)"></el-table-column>
+        <el-table-column class="table_td" prop="settlementWeight" label="结算重量(吨)">
           <template slot-scope="scope">
             <div class="inputChenge">
-              <el-input v-model="scope.row.feedbackWeight" v-if="scope.row.identification2 == 'true'">
+              <el-input v-model="scope.row.settlementWeight" v-if="scope.row.identification == 'true'">
               </el-input>
-              <div v-if="scope.row.identification2 == 'false'" class="inputs">
-                <span>{{scope.row.feedbackWeight}}</span>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                <span style="color: #ce4545;" v-if="scope.row.returnFlag == 1">{{scope.row.settlementWeight}}</span>
+                <span v-if="scope.row.returnFlag == null">{{scope.row.settlementWeight }}</span>
               </div>
             </div>
-            <div style='display:inline-block;' v-if="scope.row.identification2 == 'false'">
-              <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-                src="../../../public/img/edit.png" @click="weightedit(scope.row)" alt="" />
+            <div style='display:inline-block;' v-if="scope.row.identification == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,1)" alt="" />
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification2 == 'true'" @click="weightsave(scope.row,4)"></i>
+              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row,1)"></i>
           </template>
         </el-table-column>
         <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">

src/views/taskManagement/supplyofgoods.vue

@@ -67,6 +67,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
+        <el-table-column prop="pointOut" label="合同提示" width="160"></el-table-column>
         <!-- <el-table-column prop="goodsSource" label="货源" width="160"></el-table-column> -->
         <el-table-column prop="goodsName" label="货名" width="160">
         </el-table-column>

src/views/taskManagement/supplyofgoodslook.vue

@@ -25,6 +25,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
+        <el-table-column prop="pointOut" label="合同提示" width="160"></el-table-column>
         <el-table-column prop="goodsSource" label="货源" width="160"></el-table-column>
         <el-table-column prop="goodsName" label="货名" width="160">
         </el-table-column>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -235,6 +235,28 @@
                   maxlength="20"
                   size="small"
                 />
+              </ws-form-item>
+              <!--扣重(吨)-->
+              <ws-form-item
+                label="扣重(吨):"
+                span="1"
+                prop="deductionWeight"
+              >
+                <ws-input
+                  v-if="item.status == '已送达' || item.status == '未装车'"
+                  v-model="item.deductionWeight"
+                  placeholder="请输入扣重"
+                  maxlength="20"
+                  :disabled="readonly"
+                  size="small"
+                />
+                <ws-input
+                  v-else
+                  v-model="item.deductionWeight"
+                  placeholder="请输入扣重"
+                  maxlength="20"
+                  size="small"
+                />
               </ws-form-item>
                <!--装车日期-->
               <ws-form-item
@@ -650,6 +672,7 @@ export default {
               )
               this.tranCarInfoList.unloadNetWeight =
                 this.deptBudgetList.unloadNetWeight
+              this.tranCarInfoList.deductionWeight =this.deptBudgetList.deductionWeight
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
                 if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {

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"
@@ -329,13 +329,13 @@
     <WinseaContentModal class="sale-form" v-model="show" title="销售转移"
       @on-cancel="handleClose">
       <div>
-        <div class="title">转移前</div>
+        <div class="title">转移前：</div>
         <div style="display:inline-block;" v-for="item in modification">{{ item.carNo }} ({{ item.netWeight }})</div>
       </div>
-      <div>合计：{{modification.length}}车 {{num}}吨 合同编号：{{currectdata.contractNo}}（{{currectdata.pointOut}}）</div>
+      <div style="margin:10px 0;">合计：{{modification.length}}车 {{num}}吨 合同编号：{{currectdata.contractNo}}（{{currectdata.pointOut}}）</div>
       
       <el-form label-position="left" class="sale-form" ref="form" :model="currectdata" label-width="160px">
-        <div class="title">转移后</div>
+        <div class="title">转移后：</div>
         <el-form-item label="出入库任务">
           <el-select @change="taskNochange" v-model="currectdata.taskNoNew" placeholder="选择转移后的出入库任务编号">
             <el-option v-for="item in arr2"  :key="item.id" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')" :value="item.inOutTaskNo"></el-option>
@@ -503,6 +503,10 @@
           this.$message.error("出入库任务编号不能为空！")
           return
         }
+        if(!this.currectdata.tranTaskNew&&this.currectdata.inOutType=='移库出库'||!this.currectdata.tranTaskNew&&this.currectdata.inOutType=='移库入库'){
+          this.$message.error("移库运输任务编号不能为空！")
+          return
+        }
         this.$confirm('确定转移出库数据？', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -522,6 +526,7 @@
       async taskNochange(e){
         for (let i = 0; i < this.taskNolist.length; i++) {
           if(this.taskNolist[i].inOutTaskNo==e){
+            this.currectdata.inOutType=this.taskNolist[i].inOutType
             this.currectdata.contractNoNew=this.taskNolist[i].contractNo?this.taskNolist[i].contractNo:this.taskNolist[i].moveTaskNo
           }
         }

src/views/warehousenew/warehousingOrder.vue

@@ -221,7 +221,7 @@
       </el-table>
     </div>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+        style="text-align: center" :page-size="pageSize"  :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
       </el-pagination>
     <el-dialog title="付款" :visible.sync="aduitshow" width="50%" :before-close="handleClose">