前端

src/views/houseSelfCollect/paymentManagement.vue

@@ -796,12 +796,13 @@ import download from '../../components/WsDownload/download'
         if (this.searchType != -1) {
           searchParam = this.searchType
         }
-
+      var startDate=this.value2[0]?this.value2[0]:''
+      var endDate=this.value2[1]?this.value2[1]:''
       getpayment({
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        startDate:this.value2[0],
-        endDate:this.value2[1],
+        startDate:startDate,
+        endDate:endDate,
         searchKeyWord: this.searchKeyWord,
         searchType: searchParam,
         warehouseName: this.warehouseName,

src/views/warehouse/warehouseManagementTare.vue

@@ -58,7 +58,7 @@
               v-model="deptBudgetList.contractNo"
               placeholder="请选择合同编号或移库任务编号"
               class="typeselect"
-              @change='contractNoChange'
+              @change='contractNoChange1'
             >
               <ws-option
                 v-for="item in outContractNo"
@@ -650,9 +650,33 @@ export default {
       for(let i = 0 ; i < this.deptBudgetList1.length ; i ++){
         if(this.deptBudgetList1[i].inOutTaskNo == e){
           this.deptBudgetList.contractNo = this.deptBudgetList1[i].contractNo
-          return
         }
       }
+      for (var i = 0; i < this.outContractNo.length; i++) {
+        if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
+             if (this.outContractNo[i].inOutType == '销售出库') {
+              this.deptBudgetList.inOutTypeKey = 1
+            } else if (this.outContractNo[i].inOutType == '移库出库') {
+              this.deptBudgetList.inOutTypeKey = 3
+            } else if (this.outContractNo[i].inOutType == '暂存入库') {
+              this.deptBudgetList.inOutTypeKey = 4
+            } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
+              this.deptBudgetList.inOutTypeKey = 5
+            } else if (this.outContractNo[i].inOutType == '采购出库') {
+              this.deptBudgetList.inOutTypeKey = 6
+            }
+          this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
+          this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
+          this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
+          if(this.outContractNo[i].tranCarInfoList){
+            this.options2=this.outContractNo[i].tranCarInfoList
+            this.tranCarInfoList=this.outContractNo[i].tranCarInfoList
+            this.carstatus=true
+          }
+        }
+      }
+    },
+    contractNoChange1(e){
       for (var i = 0; i < this.outContractNo.length; i++) {
         if (this.outContractNo[i].contractNo == e) {
              if (this.outContractNo[i].inOutType == '销售出库') {
@@ -663,7 +687,7 @@ export default {
               this.deptBudgetList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
               this.deptBudgetList.inOutTypeKey = 5
-            } else if (this.detailData.inOutType == '采购出库') {
+            } else if (this.outContractNo[i].inOutType == '采购出库') {
               this.deptBudgetList.inOutTypeKey = 6
             }
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName