前端

src/views/profitable/contractcost.vue

@@ -47,7 +47,7 @@
           </el-table-column>
           <el-table-column prop="expensesName" label="费用名称"></el-table-column>
           <el-table-column prop="warehouseName" label="所属库点"></el-table-column>
-          <el-table-column prop="expensesPrice" label="费用金额"></el-table-column>
+          <el-table-column prop="expensesPrice" label="费用金额（元）"></el-table-column>
           <el-table-column prop="personName" label="请款人/收款人"></el-table-column>
           <el-table-column prop="payDeadline" label="日期"></el-table-column>
         </el-table>

src/views/profitable/contractinventory.vue

@@ -37,7 +37,7 @@
           <el-table-column prop="removeStorage" label="移出量（吨）"></el-table-column>
           <el-table-column prop="loss" label="盘亏（吨）"></el-table-column>
           <el-table-column prop="surplus" label="盘盈（吨）"></el-table-column>
-          <el-table-column prop="cost" label="成本（元/吨）"></el-table-column>
+          <el-table-column prop="weight" label="剩余重量（吨）"></el-table-column>
         </el-table>
       </div>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -176,6 +176,11 @@
           })
           .toPromise()
           .then(response => {
+            if(response.records.length){
+              for (let i = 0; i < response.records.length; i++) {
+                response.records[i].weight=response.records[i].inStorage-response.records[i].removeStorage-response.records[i].saleStorage-response.records[i].loss-response.records[i].surplus
+              }
+            }
             this.tableData = response.records
             
            this.deptBudgetTotal = response.total

src/views/profitable/contractprofitsdetails.vue

@@ -74,7 +74,8 @@
           <el-table-column prop="buyer" label="买方"></el-table-column>
           <el-table-column prop="seller" label="卖方"></el-table-column>
           <el-table-column prop="surplus" label="剩余（吨）"></el-table-column>
-          <el-table-column prop="profit" label="利润（万元）"></el-table-column>
+          <el-table-column prop="profit" label="利润（万元）">
+          </el-table-column>
           <el-table-column prop="status" label="状态"></el-table-column>
           <el-table-column prop="signingDate" label="签订日期"></el-table-column>
           <el-table-column prop="address" label="操作" width="200">
@@ -187,8 +188,15 @@
           })
           .toPromise()
           .then(response => {
+            if(response.records.length){
+              for (let i = 0; i < response.records.length; i++) {
+                response.records[i].profit=Number(Number(response.records[i].profit/10000).toFixed(3))
+                response.records[i].surplus=Number(Number(response.records[i].surplus).toFixed(3))
+              }
+            }
             this.tableData = response.records
             if(this.tableData.length > 0){
+              
               this.intotal = Number(this.tableData[0].inContractMoney) + Number(this.tableData[0].inWarehouseMoney) + Number(this.tableData[0].inManageMoney)
             this.outtotal = Number(this.tableData[0].outContractMoney) + Number(this.tableData[0].outWarehouseMoney) + Number(this.tableData[0].outManageMoney)
             }

src/views/profitable/warehousecost.vue

@@ -51,7 +51,7 @@
               <div v-if='scope.row.expensesType==2'>支出</div>
             </template>
           </el-table-column>
-          <el-table-column prop="expensesName" label="费用名称"></el-table-column>
+          <el-table-column prop="expensesName" label="费用名称（元）"></el-table-column>
           <el-table-column prop="warehouseName" label="所属库点"></el-table-column>
           <el-table-column prop="expensesPrice" label="费用金额"></el-table-column>
           <el-table-column prop="personName" label="请款人/收款人"></el-table-column>

src/views/taskManagement/outsupplyofgoods.vue

@@ -41,17 +41,11 @@
           <span v-else>合同编号：{{contractNo}}</span> ，合计退库  {{num}}吨
         </el-col>
         <el-col style='text-align:right;' :span="12">
-            <ws-button type="primary" @click="preview()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">预览
+            <ws-button type="primary" @click="preview()">预览
         </ws-button>
-         <ws-button type="primary" @click="cancelpreview()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">取消预览
+         <ws-button type="primary" @click="cancelpreview()">取消预览
         </ws-button>
-         <ws-button type="primary" @click="submit()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">提交
+         <ws-button type="primary" @click="submit()">提交
         </ws-button>
         </el-col>
     </el-row>   
@@ -210,8 +204,8 @@
     mounted() {
       this.contractNo=this.$route.query.contractNo
       this.taskTypeKey=this.$route.query.taskTypeKey
-      this.value2=this.getNowTime()
-      this.getList()
+      this.getNowTime()
+      
       this.showType = this.isShow
     },
     methods: {
@@ -226,16 +220,23 @@
         }
     },
     getNowTime() {
-      const start = new Date(new Date().getTime())
-        .toISOString()
-        .replace('T', ' ')
-        .split('.')[0] //默认开始时间1天前
-      const end = new Date(new Date().getTime())
-        .toISOString()
-        .replace('T', ' ')
-        .split('.')[0]//默认结束时间今天
-      // console.log([start.split(' '), end])
-      return [start.split(' ')[0], end.split(' ')[0]]
+      getSourceOfGoodslist({
+            startDate:this.startDate,
+            endDate:this.endDate,
+            compId: localStorage.getItem('ws-pf_compId'),
+            contractNo:this.$route.query.contractNo
+          })
+          .toPromise()
+          .then((response) => {
+            const start = response.records[0].issuingTimeElse //默认开始时间1天前
+            const end = new Date(new Date().getTime())
+              .toISOString()
+              .replace('T', ' ')
+              .split('.')[0]//默认结束时间今天
+            // console.log([start.split(' '), end])
+            this.value2=[start, end.split(' ')[0]]
+            this.getList()
+          })
     },
     datechange(e){
         this.value2=e
@@ -380,10 +381,18 @@
           })
           .then(() => {
             console.log(this.multipleSelection)
-            localStorage.setItem("supplygoodsstauts",1);
-            localStorage.setItem("supplygoods",JSON.stringify(this.multipleSelection));
-            localStorage.setItem("supplygoods1",JSON.stringify(this.multipleSelection));
-            that.$router.go(-1)
+            if(this.multipleSelection.length>0){
+              localStorage.setItem("supplygoodsstatus",1);
+              localStorage.setItem("supplygoods",JSON.stringify(this.multipleSelection));
+              localStorage.setItem("supplygoods1",JSON.stringify(this.multipleSelection));
+              that.$router.go(-1)
+            }else{
+              this.$message({
+							message: '请先选择货源',
+							type: 'warning'
+						});
+            }
+            
 
           })
       },

src/views/taskManagement/outsupplyofgoodsedit.vue

@@ -37,17 +37,11 @@
         <el-col :span="12"> <span v-if='taskTypeKey==4'>移库编号：{{contractNo}}</span>
           <span v-else>合同编号：{{contractNo}}</span> ，合计退库  {{num}}吨</el-col>
         <el-col style='text-align:right;' :span="12">
-            <ws-button type="primary" @click="preview()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">预览
+            <ws-button type="primary" @click="preview()">预览
         </ws-button>
-         <ws-button type="primary" @click="cancelpreview()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">取消预览
+         <ws-button type="primary" @click="cancelpreview()">取消预览
         </ws-button>
-         <ws-button type="primary" @click="submit()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">提交
+         <ws-button type="primary" @click="submit()">提交
         </ws-button>
         </el-col>
     </el-row>   

src/views/taskManagement/outsupplyofgoodslook.vue

@@ -26,7 +26,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="carNo" label="车牌号" width="160"></el-table-column>
-        <el-table-column prop="updateDate" label="出库时间" width="160">
+        <el-table-column prop="issuingTime" label="出库时间" width="160">
         </el-table-column>
         <el-table-column prop="estimateOutWarehouseWeight" class="table_td" label="净重（吨）"></el-table-column>
         <el-table-column prop="warehouseName" class="table_td" label="出货库"></el-table-column>

src/views/taskManagement/supplyofgoods.vue

@@ -20,13 +20,9 @@
         </el-date-picker>
   
           </div>
-        <ws-button :type="flag==0?'primary':''" @click="costsort(0)" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">按日期排序
+        <ws-button :type="flag==0?'primary':''" @click="costsort(0)">按日期排序
         </ws-button>
-        <ws-button :type="flag==1?'primary':''" @click="costsort(1)" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">按成本排序
+        <ws-button :type="flag==1?'primary':''" @click="costsort(1)">按成本排序
         </ws-button>
       </template>
       <template slot="right">
@@ -44,17 +40,11 @@
     <el-row style='margin:10px;'>
         <el-col :span="12">已选 {{this.multipleSelection.length}} 条，合计出库重量  {{num}}吨，{{content}}</el-col>
         <el-col style='text-align:right;' :span="12">
-             <ws-button type="primary" @click="preview()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">预览
+             <ws-button type="primary" @click="preview()">预览
         </ws-button>
-         <ws-button type="primary" @click="cancelpreview()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">取消预览
+         <ws-button type="primary" @click="cancelpreview()">取消预览
         </ws-button>
-         <ws-button type="primary" @click="submit()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">提交
+         <ws-button type="primary" @click="submit()">提交
         </ws-button>
         </el-col>
     </el-row>   
@@ -219,9 +209,9 @@
       // this.showType = this.isShow
     // },
     mounted() {
-      this.value2=this.getNowTime()
+      this.getNowTime()
       this.baseId=this.$route.query.baseId
-      this.getList()
+      
       this.showType = this.isShow
     },
     methods: {
@@ -234,16 +224,27 @@
         console.log(e)
       },
       getNowTime() {
-      const start = new Date(new Date().getTime())
-        .toISOString()
-        .replace('T', ' ')
-        .split('.')[0] //默认开始时间1天前
-      const end = new Date(new Date().getTime())
+          getSourceOfGoodsinfo({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+            // inOutType:this.inOutType,
+            baseId:this.baseId,
+            flag:this.flag
+          })
+          .toPromise().then((response) => {
+            const start = response.records[0].issuingTimeElse//默认开始时间1天前
+            const end = new Date(new Date().getTime())
         .toISOString()
         .replace('T', ' ')
         .split('.')[0]//默认结束时间今天
-      // console.log([start.split(' '), end])
-      return [start.split(' ')[0], end.split(' ')[0]]
+          this.value2=[start, end.split(' ')[0]]
+        this.getList()
+          })
+      
+      
     },
       preview(){
         this.gainList=this.multipleSelection
@@ -425,10 +426,17 @@
 				// 	message: '提交成功',
 				// 	type: 'success'
 				// 	});
+        if(this.multipleSelection.length>0){
         localStorage.setItem("supplygoodsstatus",0);
             localStorage.setItem("supplygoods",JSON.stringify(this.multipleSelection));
             localStorage.setItem("supplygoods1",JSON.stringify(this.multipleSelection1));
             that.$router.go(-1)
+            }else{
+              this.$message({
+							message: '请先选择货源',
+							type: 'warning'
+						});
+            }
           // }).catch((response) => {
           //    this.$message({
           //     message: '提交失败',

src/views/taskManagement/supplyofgoodsedit.vue

@@ -20,13 +20,9 @@
         </el-date-picker>
   
           </div>
-        <ws-button type="primary" @click="getList()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">按日期排序
+        <ws-button type="primary" @click="getList()">按日期排序
         </ws-button>
-        <ws-button type="primary" @click="costsort()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">按成本排序
+        <ws-button type="primary" @click="costsort()">按成本排序
         </ws-button>
       </template>
       <template slot="right">
@@ -71,8 +67,8 @@
         <el-table-column prop="actualOutWarehouseWeight" class="table_td" label="实际出库重量（吨）">
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+      <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination> -->
   </div>
 </template>
 <script>
@@ -116,7 +112,6 @@
         monetaryKey: null,
         // 表格显示数据
         tableDate: [],
-
         // 是否显示
         showType: true,
         // 年
@@ -125,7 +120,7 @@
         gainList1:[],
         currentPage: 1,
         primary: '1',
-                pickerOptions: {
+        pickerOptions: {
           shortcuts: [{
               text: '本周',
               onClick(picker) {

src/views/taskManagement/supplyofgoodslook.vue

@@ -38,8 +38,8 @@
         <el-table-column prop="actualOutWarehouseWeight" class="table_td" label="实际出库重量（吨）">
         </el-table-column>
       </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+      <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination> -->
   </div>
 </template>
 <script>

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -516,11 +516,39 @@
 				this.dataList.taskTypeKey=localStorage.getItem("taskTypeKey")
 				this.dataList1.taskTypeKey=localStorage.getItem("taskTypeKey")
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
-					this.dataList.warehouseName=localStorage.getItem("warehouse")
+					if(localStorage.getItem("warehouse")){
+						this.dataList.warehouseName=localStorage.getItem("warehouse")
+					}
+					if(localStorage.getItem("warehouseId")){
+						this.baseId=localStorage.getItem("warehouseId")
+					}
+					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
+					.toPromise()
+					.then(response => {
+						this.options = response
+						this.staffList = response
+						//  this.agent = response
+					})
 					this.dataList.contractNo=localStorage.getItem("contractNo")
+					if(this.dataList.taskTypeKey==3){
+						this.dataList.moveTaskNo=localStorage.getItem("contractNo")
+						this.dataList1.moveTaskNo=localStorage.getItem("contractNo")
+					}
 				}
 				else if(this.dataList.taskTypeKey==2||this.dataList.taskTypeKey==4){
-					this.dataList1.warehouseName=localStorage.getItem("warehouse")
+					if(localStorage.getItem("warehouse")){
+						this.dataList1.warehouseName=localStorage.getItem("warehouse")
+					}
+					if(localStorage.getItem("warehouseId")){
+						this.baseId=localStorage.getItem("warehouseId")
+					}
+					getstaff({compId: localStorage.getItem('ws-pf_compId'),warehouseId: this.dataList.warehouseId})
+					.toPromise()
+					.then(response => {
+						this.options = response
+						this.staffList = response
+						//  this.agent = response
+					})
 					this.dataList1.contractNo=localStorage.getItem("contractNo")
 				}
 			}
@@ -566,8 +594,13 @@
 				if(this.dataList.taskTypeKey==1||this.dataList.taskTypeKey==3){
 					if(this.dataList.warehouseName){
 						localStorage.setItem("warehouse",this.dataList.warehouseName);
-						localStorage.setItem("contractNo",this.dataList.contractNo);
+						if(this.dataList.taskTypeKey==3){
+							localStorage.setItem("contractNo",this.dataList.moveTaskNo);
+						}else{
+							localStorage.setItem("contractNo",this.dataList.contractNo);
+						}
             			localStorage.setItem("taskTypeKey",this.dataList.taskTypeKey);
+						localStorage.setItem("warehouseId",this.baseId);
 						this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId}})
 					}else{
 						this.$message({
@@ -580,6 +613,7 @@
 						localStorage.setItem("warehouse",this.dataList1.warehouseName);
 						localStorage.setItem("contractNo",this.dataList1.contractNo);
             			localStorage.setItem("taskTypeKey",this.dataList1.taskTypeKey);
+						localStorage.setItem("warehouseId",this.baseId);
 						this.$router.push({name:'outsupplyofgoods',query:{contractNo:this.dataList1.contractNo,taskTypeKey:this.dataList1.taskTypeKey}})
 					}else{
 						this.$message({
@@ -1197,6 +1231,7 @@
 						})
 						return
 					}
+					this.dataList.contractNo=''
 					this.dataList1.contractNo=''
 					if (!this.dataList1.moveTaskNo) {
 						this.$message({
@@ -1663,19 +1698,32 @@
 			},
 			getList() {
 				this.tasknumber()
-				if(localStorage.getItem("supplygoods1")){
-					if(this.dataList.taskTypeKey == 1){
+				if(localStorage.getItem("taskTypeKey")){
+					if(localStorage.getItem("taskTypeKey") == 1){
 						this.$set(this.dataList, 'inOutType', '销售出库')
 						this.$set(this.dataList, 'inOutTypeKey', '1')
 						this.$set(this.dataList, 'goodsName', '玉米')
 						this.$set(this.dataList, 'goodsNameKey', '1')
-						this.$set(this.dataList, 'grade', '一等品')
-						this.$set(this.dataList, 'gradeKey', '1')
 						this.$set(this.dataList1, 'goodsName', '玉米')
 						this.$set(this.dataList1, 'goodsNameKey', '1')
-						this.$set(this.dataList1, 'grade', '一等品')
-						this.$set(this.dataList1, 'gradeKey', '1')
+					}else if(localStorage.getItem("taskTypeKey") == 2){
+						this.$set(this.dataList1, 'inOutType', '采购入库')
+						this.$set(this.dataList1, 'inOutTypeKey', '2')
+					}else if(localStorage.getItem("taskTypeKey") == 3){
+						this.$set(this.dataList, 'inOutType', '移库出库')
+						this.$set(this.dataList, 'inOutTypeKey', '3')
+						this.$set(this.dataList1, 'inOutType', '移库入库')
+						this.$set(this.dataList1, 'inOutTypeKey', '3')
+					}else if(localStorage.getItem("taskTypeKey") == 4){
+						this.$set(this.dataList, 'inOutType', '销售出库')
+						this.$set(this.dataList, 'inOutTypeKey', '4')
+						this.$set(this.dataList1, 'inOutType', '退库')
+						this.$set(this.dataList1, 'inOutTypeKey', '4')
 					}
+					this.$set(this.dataList, 'grade', '一等品')
+					this.$set(this.dataList, 'gradeKey', '1')
+					this.$set(this.dataList1, 'grade', '一等品')
+					this.$set(this.dataList1, 'gradeKey', '1')
 				}else{
 					this.$set(this.dataList, 'inOutType', '销售出库')
 					this.$set(this.dataList, 'inOutTypeKey', '1')

src/views/warehousenew/inventoryCheck.vue

@@ -334,13 +334,21 @@
       radiochange(index,row){
         console.log(index,row)
         var data=this.gainList[index].warehousingOrderList
-        for (let i = 0; i < data.length; i++) {
+        
+        
+        if(row.select){
+          for (let i = 0; i < data.length; i++) {
+          data[i].select=false
+          }
+          this.multipleSelection[row.warehouseName]=row
+        }else{
+          for (let i = 0; i < data.length; i++) {
           data[i].select=false
+          }
+          row.select=!row.select
         }
-        row.select=true
         
-        this.multipleSelection[row.warehouseName]=row
-        console.log(this.multipleSelection[row.warehouseName])
+        // console.log(this.multipleSelection[row.warehouseName])
       },
        handleCurrentChange(val) {
         this.currentRow = val;
@@ -598,9 +606,12 @@
               for (let q = 0; q < data.length; q++) {
                 if(data[q].inType=='收购入库'){
                   data[q].inWarehouseWeight1=Number((data[q].inWarehouseWeight/1000).toFixed(3))
+                   data[q].surplusWeight=(data[q].inWarehouseWeight/1000)-data[q].outWarehouseWeight+data[q].profitAndLoss
+                }else{
+                  data[q].inWarehouseWeight1=data[q].inWarehouseWeight.toFixed(3)
+                  data[q].surplusWeight=data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss
                 }
                 data[q].select=false
-                data[q].surplusWeight=(data[q].inWarehouseWeight/1000)-data[q].outWarehouseWeight+data[q].profitAndLoss
                 data[q].weightedit=false
                 data[q].warehouseType=response.records[i].warehouseType
               }