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

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,10 +49,7 @@
                 :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="dataList.tips"
-              maxlength="20" size="small" />
-          </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" />
@@ -603,8 +604,9 @@
             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.dataList.tips='买方'+this.outContractNo[i].buyer+ '（ '+this.outContractNo[i].unitContractPrice+'元/吨）'
               this.dataList.inOutTypeKey = 1
@@ -1462,4 +1464,4 @@
   .el-input__inner {
     width: 150px;
   }
-</style>
+</style>