Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/warehouseBusiness/inStock/index.vue

@@ -1150,7 +1150,7 @@
         <el-table-column
           prop="fDriverTel"
           header-align="center"
-          width="130px"
+          width="200px"
           align="center"
           label="*司机电话"
         >
@@ -2343,7 +2343,7 @@
           id="print_area3"
           class="biaoge zzss"
           border="1"
-          style="border-collapse: collapse; border: none;margin-top;100px;"
+          style="border-collapse: collapse; border: none;margin-top:100px;"
         >
           <tr>
             <td
@@ -2510,7 +2510,7 @@
             <td width="280" class="zzss"></td>
             <td width="280" class="zzss"></td>
             <td width="290" class="zzss">地址：{{ fAddr }}</td>
-            <td width="290" class="zzss">电话：{{ fDriverTel }}</td>
+            <td width="290" class="zzss">电话：{{ form.fTel }}</td>
           </tr>
         </table>
         <div style="display: flex; justify-content: space-between">
@@ -2740,13 +2740,13 @@ export default {
         fCntrtype: null,
         fCntqty: null,
       },
-      // 作业费参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        fCorpid: null,
-        fLineno: null,
-      },
+      // // 作业费参数
+      // queryParams: {
+      //   pageNum: 1,
+      //   pageSize: 10,
+      //   fCorpid: null,
+      //   fLineno: null,
+      // },
       planningList: {
         fPlanqty: null,
         fPlannetweight: null,
@@ -3036,6 +3036,7 @@ export default {
             return false;
           }
           if (this.dataListSelection.length > 0) {
+            console.log(this.dataListSelection)
             this.fTruckno = this.dataListSelection[0].fTruckno;
             this.fCntrtype = this.dataListSelection[0].fCntrtype;
             this.fGoodsids = this.dataListSelection[0].fGoodsids;
@@ -4074,6 +4075,7 @@ export default {
                   }
                 }
               }
+              this.dataList = response.data.warehousebillsitems
               this.msgSuccess("卸货成功");
               this.$refs.tableList.clearSelection();
             });