Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/home/index.vue

@@ -490,7 +490,6 @@
       that.$router.push({ path: currentPage })
     },
     setOncloseMessage () {
-      debugger
       console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
     },
       //跳转

src/views/houseSelfCollect/paymentManagement.vue

@@ -677,14 +677,11 @@
           }
         })
         }else{
-          console.log(22222)
           columns.forEach((column, index) => {
           if (index === 0) {
             sums[index] = '合计'
           } else if (
-            index === 10 ||
-            index === 11 || index === 15 || index === 16
-
+            index === 11 || index === 16 || index === 17
           ) {
             const values = data.map((item) => Number(item[column.property]))
             if (!values.every((value) => isNaN(value))) {

src/views/login/index.vue

@@ -862,6 +862,7 @@
               JSON.stringify(res.accountId)
             )
           } else {
+            this.$message.error("您输入的用户名或密码错误!")
             return false
           }
         })

src/views/warehouse/warehouseManagementDelivery.vue

@@ -37,12 +37,31 @@
         <div class="flex">
           <div class="left" style='width:66.6666%'>
             <ws-info-table>
+              <!-- 任务编号 -->
+            <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
+            <el-select
+              filterable
+              clearable
+              v-model="deptBudgetList.inOutTaskNo"
+              placeholder="请选择任务编号"
+              class="typeselect"
+              @change="contractNoChange"
+            >
+              <el-option
+                v-for="item in deptBudgetList1"
+                :key="item.inOutTaskNo"
+                :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo"
+              />
+            </el-select>
+          </ws-form-item>
               <ws-form-item label="合同编号" span="1" prop="contractNo">
                 <ws-select
                   v-model="deptBudgetList.contractNo"
                   placeholder="请选择合同编号或移库任务编号"
                   class="typeselect"
                   @change='contractNoChange'
+                  disabled
                 >
                   <ws-option
                     v-for="item in outContractNo"
@@ -583,6 +602,7 @@ import {
   xialaNo,
   getstaff,
   goodsnameXiala,
+  getReceiptTaskNo,
 } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -689,6 +709,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      deptBudgetList1:[],
     }
   },
   mounted() {
@@ -730,8 +751,18 @@ export default {
 
     },
     contractNoChange(e){
+      for (let i = 0; i < this.deptBudgetList1.length; i++) {
+        if (this.deptBudgetList1[i].inOutTaskNo == e) {
+          var data = this.deptBudgetList1[i]
+          if (this.deptBudgetList1[i].contractNo) {
+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+          } else {
+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].moveTaskNo
+          }
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
-        if (this.outContractNo[i].contractNo == e) {
+        if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
              if (this.outContractNo[i].inOutType == '销售出库') {
               if(!this.outContractNo[i].unitContractPrice){
               this.deptBudgetList.tips =
@@ -1664,6 +1695,15 @@ export default {
             this.deliveryType = response
           })
       }
+       getReceiptTaskNo({
+      flag: 1,
+      warehouseName: this.deptBudgetList.warehouseName,
+      agentKey: localStorage.getItem('ws-pf_userId'),
+    })
+      .toPromise()
+      .then((response) => {
+        this.deptBudgetList1 = response
+      })
       //合同编号
       xialaNo({ compId: localStorage.getItem('ws-pf_compId'),flag:5  })
         .toPromise()

src/views/warehouse/warehouseManagementList.vue

@@ -45,7 +45,7 @@
       </template>
     </BaseHeaderLayout>
     <div v-show="this.warehouseType == '1'" class="main_css">
-      <el-table class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" height="100%">
+      <el-table class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px;" height="calc(100vh - 10vh)">
         <el-table-column prop="warehouseName" label="仓库名">
         </el-table-column>
         <el-table-column prop="binNumber" label="仓位编号">

src/views/warehouse/warehouseManagementPut.vue

@@ -42,6 +42,24 @@
         <div class="flex">
           <div class="left" style='width:66.6666%;'>
             <ws-info-table>
+               <!-- 任务编号 -->
+            <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
+            <el-select
+              filterable
+              clearable
+              v-model="deptBudgetList.inOutTaskNo"
+              placeholder="请选择任务编号"
+              class="typeselect"
+              @change="contractNoChange"
+            >
+              <el-option
+                v-for="item in deptBudgetList1"
+                :key="item.inOutTaskNo"
+                :label="item.inOutTaskNo"
+                :value="item.inOutTaskNo"
+              />
+            </el-select>
+          </ws-form-item>
               <!--合同编号-->
               <ws-form-item label="合同编号" span="1" prop="contractNo">
                 <el-select
@@ -51,6 +69,7 @@
                   placeholder="请选择合同编号或移库任务编号"
                   class="typeselect"
                   @change="contractNoChange"
+                  disabled
                 >
                   <el-option
                     v-for="item in options1"
@@ -764,6 +783,7 @@ import {
   addstorageputList,
   xialaNo,
   getstaff,
+  getReceiptTaskNo,
 } from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -886,6 +906,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      deptBudgetList1:[],
     }
   },
   mounted() {
@@ -2085,8 +2106,18 @@ export default {
       }
     },
     contractNoChange(e) {
+       for (let i = 0; i < this.deptBudgetList1.length; i++) {
+        if (this.deptBudgetList1[i].inOutTaskNo == e) {
+          var data = this.deptBudgetList1[i]
+          if (this.deptBudgetList1[i].contractNo) {
+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
+          } else {
+            this.deptBudgetList.contractNo = this.deptBudgetList1[i].moveTaskNo
+          }
+        }
+      }
       for (var i = 0; i < this.outContractNo.length; i++) {
-        if (this.outContractNo[i].contractNo == e) {
+        if (this.outContractNo[i].contractNo ==  this.deptBudgetList.contractNo) {
           if (this.outContractNo[i].inOutType == '采购入库') {
            if(!this.outContractNo[i].unitContractPrice){
               this.deptBudgetList.tips =
@@ -2242,6 +2273,15 @@ export default {
             this.deliveryType = response
           })
       }
+      getReceiptTaskNo({
+      flag: 2,
+      warehouseName: this.deptBudgetList.warehouseName,
+      agentKey: localStorage.getItem('ws-pf_userId'),
+    })
+      .toPromise()
+      .then((response) => {
+        this.deptBudgetList1 = response
+      })
       //合同编号
       xialaNo({ compId: localStorage.getItem('ws-pf_compId'), flag: 6 })
         .toPromise()

src/views/warehouse/warehouseManagementRecord.vue

@@ -75,7 +75,7 @@
           />
         </ws-button>
 		<el-button type="primary" @click="batchPrint">批量打印</el-button>
-				<el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
+				<el-table show-summary :summary-method="getSummaries" 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>
 					<el-table-column type="expand">
 						<template #default="props">
@@ -412,7 +412,10 @@
 		},
 		methods: {
 			batchPrint(){
-				localStorage.removeItem("warehouseBatchPrint")
+				if(this.modification.length == 0 ){
+					this.$message.error("请勾选要打印的条目！")
+				}else{
+					localStorage.removeItem("warehouseBatchPrint")
 				var count = 0
 				for(var i = 0 ; i < this.modification.length ; i++){
 						getPrintInfo({
@@ -428,6 +431,8 @@
 					  }
                      })
 				}
+				}
+				
 			},
 			   handleSelectionChange(val) {
 			this.modification = val