浏览代码

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

mxx 3 年之前
父节点
当前提交
5dc3660147

+ 3 - 3
public/static/weightCheck.html

@@ -141,7 +141,7 @@
               </tr>
               </tr>
               <tr class="row">
               <tr class="row">
                 <td class="col col-bgc">收货单位</td>
                 <td class="col col-bgc">收货单位</td>
-                <td class="col" colspan="2">{{item.receivingUnit}}</td>
+                <td class="col" colspan="2">{{item.compName}}</td>
                 <td class="col col-bgc">联系人</td>
                 <td class="col col-bgc">联系人</td>
                 <td class="col">{{item.person}}</td>
                 <td class="col">{{item.person}}</td>
                 <td class="col col-bgc">联系电话</td>
                 <td class="col col-bgc">联系电话</td>
@@ -229,7 +229,7 @@
             </tr>
             </tr>
             <tr class="row">
             <tr class="row">
               <td class="col col-bgc">收货单位</td>
               <td class="col col-bgc">收货单位</td>
-              <td class="col" colspan="2">{{tableData.receivingUnit}}</td>
+              <td class="col" colspan="2">{{tableData.compName}}</td>
               <td class="col col-bgc">联系人</td>
               <td class="col col-bgc">联系人</td>
               <td class="col">{{tableData.person}}</td>
               <td class="col">{{tableData.person}}</td>
               <td class="col col-bgc">联系电话</td>
               <td class="col col-bgc">联系电话</td>
@@ -323,7 +323,7 @@
         </div>
         </div>
         <div class="small-row">
         <div class="small-row">
           <div>收货单位</div>
           <div>收货单位</div>
-          <div>{{tableData.receivingUnit}}</div>
+          <div>{{tableData.compName}}</div>
         </div>
         </div>
         <div class="small-row">
         <div class="small-row">
           <div>联系人</div>
           <div>联系人</div>

+ 1 - 0
src/views/houseSelfCollect/inspectionManagement.vue

@@ -215,6 +215,7 @@
 				})
 				})
 			},
 			},
 			warehouseNameChange(e) {
 			warehouseNameChange(e) {
+				debugger
 				for (let i = 0; i < this.warehouseList.length; i++) {
 				for (let i = 0; i < this.warehouseList.length; i++) {
 					if (this.warehouseList[i].value == e) {
 					if (this.warehouseList[i].value == e) {
 						this.warehouseName = this.warehouseList[i].value
 						this.warehouseName = this.warehouseList[i].value

+ 1 - 1
src/views/houseSelfCollect/weighingManagement.vue

@@ -288,7 +288,7 @@
               obj.customer = v.客户姓名
               obj.customer = v.客户姓名
               obj.customerPhone = v.客户电话
               obj.customerPhone = v.客户电话
               obj.carNumber = v.车牌号
               obj.carNumber = v.车牌号
-              obj.receivingUnit = v.收货单位
+              obj.compName = v.收货单位
               obj.person = v.联系人
               obj.person = v.联系人
               obj.personPhone = v.联系电话
               obj.personPhone = v.联系电话
               obj.goodsName = v.货名
               obj.goodsName = v.货名