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

src/views/warehouse/warehouseManagementDelivery.vue

@@ -66,6 +66,10 @@
                 :value="item.constValue"
               />
             </ws-select>
+          </ws-form-item>
+           <ws-form-item label="提示" span="1" prop="tips">
+           <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
+              maxlength="20" size="small" />
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
               <ws-select disabled v-model="deptBudgetList.type"  @change="typeChange">
@@ -534,8 +538,15 @@ export default {
       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].buyer+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
+               if(this.outContractNo[i].unitContractPrice){
+                   this.deptBudgetList.tips='入货库'+data.receiveWarehouse+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
+              }
+              else{
+                this.deptBudgetList.tips='入货库'+data.receiveWarehouse
+              }
               this.deptBudgetList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
               this.deptBudgetList.inOutTypeKey = 4

src/views/warehouse/warehouseManagementGross.vue

@@ -32,14 +32,14 @@
           </ws-form-item>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <el-select disabled filterable clearable v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号"
+            <el-select disabled filterable clearable v-model="deptBudgetList.contractNo" 
               class="typeselect" @change="contractNoChange1">
               <el-option v-for="item in options1" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
             </el-select>
           </ws-form-item>
           <ws-form-item label="提示" span="1" prop="tips">
-           <ws-input disabled v-model="deptBudgetList.tips"
+           <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
               maxlength="20" size="small" />
           </ws-form-item>
           <!-- 货名 -->
@@ -1803,14 +1803,14 @@
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
             this.deptBudgetList.grade = this.outContractNo[i].grade
             if (this.outContractNo[i].inOutType == '采购入库') {
-              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller+ ' '+this.outContractNo[i].unitContractPrice+'（元/吨）'
+              this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
                this.deptBudgetList.goodsName = data.goodsName
                this.deptBudgetList.goodsNameKey =data.goodsNameKey
                this.deptBudgetList.grade = data.grade
               if(this.outContractNo[i].unitContractPrice){
-                this.deptBudgetList.tips='出货库'+data.sendWarehouse+ ' '+this.outContractNo[i].unitContractPrice+'（元/吨）'
+                this.deptBudgetList.tips='出货库'+data.sendWarehouse+ ' （'+this.outContractNo[i].unitContractPrice+'元/吨）'
               }else{
                 this.deptBudgetList.tips='出货库'+data.sendWarehouse
               }
@@ -1827,7 +1827,7 @@
                 this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
               }
               else{
-                this.deptBudgetList.tips='出货库'+data.warehouseName
+                this.deptBudgetList.tips='出货库'+data.sendWarehouse
               }
               this.deptBudgetList.inOutTypeKey = 6
             }

src/views/warehouse/warehouseManagementPut.vue

@@ -74,6 +74,10 @@
                 :value="item.constValue"
               />
             </ws-select>
+          </ws-form-item>
+           <ws-form-item label="提示" span="1" prop="tips">
+           <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
+              maxlength="20" size="small" />
           </ws-form-item>
           <ws-form-item label="类型" span="1" prop="type">
             <ws-select disabled v-model="deptBudgetList.type" @change="typeChange">
@@ -1871,14 +1875,26 @@ export default {
       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.outContractNo[i].unitContractPrice+'元/吨）'
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库入库') {
+              if(this.outContractNo[i].unitContractPrice){
+                this.deptBudgetList.tips='出货库'+this.outContractNo[i].sendWarehouse+ ' （'+this.outContractNo[i].unitContractPrice+'元/吨）'
+              }else{
+                this.deptBudgetList.tips='出货库'+this.outContractNo[i].sendWarehouse
+              }
               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.detailData.inOutType == '退库') {
+              if(this.outContractNo[i].contractNo){
+                this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
+              }
+              else{
+                this.deptBudgetList.tips='出货库'+this.outContractNo[i].sendWarehouse
+              }
               this.deptBudgetList.inOutTypeKey = 6
             }
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName

src/views/warehouse/warehouseManagementTare.vue

@@ -31,14 +31,14 @@
             </el-select>
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-select disabled v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
+            <ws-select disabled v-model="deptBudgetList.contractNo" class="typeselect"
               @change='contractNoChange1'>
               <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
             </ws-select>
           </ws-form-item>
           <ws-form-item label="提示" span="1" prop="tips">
-           <ws-input disabled v-model="deptBudgetList.tips"
+           <ws-input  onmouseover="this.title=this.value" v-model="deptBudgetList.tips"
               maxlength="20" size="small" />
           </ws-form-item>
           <!-- 货名 -->
@@ -553,13 +553,18 @@
             this.deptBudgetList.grade = this.outContractNo[i].grade
             this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
             if (this.outContractNo[i].inOutType == '销售出库') {
-              this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
+              this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               this.deptBudgetList.inOutTypeKey = 1
             } else if (this.outContractNo[i].inOutType == '移库出库') {
               this.deptBudgetList.goodsName = data.goodsName
               this.deptBudgetList.goodsNameKey = data.goodsNameKey
               this.deptBudgetList.grade = data.grade
-              this.deptBudgetList.tips='入货库'+data.receiveWarehouse
+               if(this.outContractNo[i].unitContractPrice){
+                   this.deptBudgetList.tips='入货库'+data.receiveWarehouse+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
+              }
+              else{
+                this.deptBudgetList.tips='入货库'+data.receiveWarehouse
+              }
               this.deptBudgetList.inOutTypeKey = 3
             } else if (this.outContractNo[i].inOutType == '暂存入库') {
               this.deptBudgetList.inOutTypeKey = 4