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

src/views/houseSelfCollect/paymentManagement.vue

@@ -1128,6 +1128,7 @@ export default {
         this.invoicing = ''
         this.searchType = num
       }
+      this.currentPage=1
       this.getList()
     },
     find() {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -25,7 +25,7 @@
         <ws-info-table>
           <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
-            <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
+            <el-select filterable clearable  v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
               @change="contractNoChange">
               <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                 :value="item.inOutTaskNo" />
@@ -38,6 +38,10 @@
                 :value="item.contractNo" />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="提示" span="1" prop="tips">
+           <ws-input  onmouseover="this.title=this.value" v-model="dataList.tips"
+              maxlength="20" size="small" />
+          </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select disabled v-model="dataList.goodsName" placeholder class="typeselect" @change="selectgoodsName">
@@ -663,20 +667,29 @@
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == e) {
             if (this.outContractNo[i].inOutType == '采购入库') {
-              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
-              this.deptBudgetList.inOutTypeKey = 1
+              this.dataList.tips='卖方'+this.outContractNo[i].seller+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
+              this.dataList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
-              this.deptBudgetList.tips='入货库'+data.warehouseName
-              this.deptBudgetList.inOutTypeKey = 3
+              if(this.outContractNo[i].unitContractPrice){
+                this.dataList.tips='出货库'+data.sendWarehouse+ ' （'+this.outContractNo[i].unitContractPrice+'元/吨）'
+              }else{
+                this.dataList.tips='出货库'+data.sendWarehouse
+              }
+              this.dataList.inOutTypeKey = 3
             }else if (this.outContractNo[i].inOutType == '移库出库') {
-              this.deptBudgetList.tips='出货库'+data.warehouseName
+              this.dataList.tips='出货库'+data.warehouseName
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
-              this.deptBudgetList.inOutTypeKey = 4
+              this.dataList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
-              this.deptBudgetList.inOutTypeKey = 5
+              this.dataList.inOutTypeKey = 5
             } else if (this.outContractNo[i].inOutType == '退库') {
-              this.deptBudgetList.tips='出货库'+data.warehouseName
-              this.deptBudgetList.inOutTypeKey = 6
+               if(this.outContractNo[i].contractNo){
+                this.dataList.tips='买方'+this.outContractNo[i].buyer
+              }
+              else{
+                this.dataList.tips='出货库'+data.sendWarehouse
+              }
+              this.dataList.inOutTypeKey = 6
             }
             this.dataList.goodsName = this.outContractNo[i].goodsName
             this.dataList.goodsNameKey = this.outContractNo[i].goodsNameKey
@@ -1493,7 +1506,7 @@
         //经办人
         getstaff({
             compId: localStorage.getItem('ws-pf_compId'),
-            warehouseId: this.dataList.id
+            warehouseId: this.dataList.baseId
           })
           .toPromise()
           .then((response) => {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -38,6 +38,10 @@
                 :value="item.contractNo" />
             </ws-select>
           </ws-form-item>
+          <ws-form-item label="提示" span="1" prop="tips">
+           <ws-input onmouseover="this.title=this.value" v-model="dataList.tips"
+              maxlength="20" size="small" />
+          </ws-form-item>
           <!-- 货名 -->
           <ws-form-item label="货名" span="1">
             <ws-select disabled v-model="dataList.goodsName" placeholder class="typeselect" @change="selectgoodsName">
@@ -45,6 +49,7 @@
                 :value="item.constValue" />
             </ws-select>
           </ws-form-item>
+           
           <ws-form-item label="类型" span="1" prop="type">
             <ws-select disabled v-model="dataList.type" @change="typeChange">
               <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
@@ -599,20 +604,26 @@
             this.dataList.contractNo = this.deptBudgetList2[i].contractNo
           }
         }
+
         for (var i = 0; i < this.outContractNo.length; i++) {
-          if (this.outContractNo[i].contractNo == e) {
+          if (this.outContractNo[i].contractNo == this.dataList.contractNo) {
             if (this.outContractNo[i].inOutType == '销售出库') {
-              this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
-              this.deptBudgetList.inOutTypeKey = 1
+              this.dataList.tips='买方'+this.outContractNo[i].buyer+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
+              this.dataList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
-              this.deptBudgetList.tips='出货库'+data.warehouseName
-              this.deptBudgetList.inOutTypeKey = 3
+              if(this.outContractNo[i].unitContractPrice){
+                   this.dataList.tips='入货库'+data.receiveWarehouse+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
+              }
+              else{
+                this.dataList.tips='入货库'+data.receiveWarehouse
+              }
+              this.dataList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
-              this.deptBudgetList.inOutTypeKey = 4
+              this.dataList.inOutTypeKey = 4
             } else if (this.outContractNo[i].inOutType == '贸易服务出库') {
-              this.deptBudgetList.inOutTypeKey = 5
+              this.dataList.inOutTypeKey = 5
             } else if (this.outContractNo[i].inOutType == '采购出库') {
-              this.deptBudgetList.inOutTypeKey = 6
+              this.dataList.inOutTypeKey = 6
             }
             this.dataList.goodsName = this.outContractNo[i].goodsName
             this.dataList.goodsNameKey = this.outContractNo[i].goodsNameKey
@@ -1453,4 +1464,4 @@
   .el-input__inner {
     width: 150px;
   }
-</style>
+</style>