修改换页问题

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -4491,8 +4491,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fLabour: this.form.fLabour,
         };
@@ -4500,8 +4500,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fFleet: this.form.fFleet,
         };
@@ -4509,8 +4509,8 @@ export default {
         this.Navigation = false;
         this.key_id = key;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fCorpid: this.form.fCorpid,
         };
       }

src/views/Warehousing/components/incomeMoney.vue

@@ -817,8 +817,8 @@ export default {
       let data = {};
       this.Navigation = false;
       data = {
-        pageNum: 1,
-        pageSize: 10,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
         fCorpid: this.form.fCorpid,
       };
       operationAgreement(data).then((response) => {

src/views/Warehousing/components/payMoney.vue

@@ -651,8 +651,8 @@ export default {
       let data = {};
       this.Navigation = false;
       data = {
-        pageNum: 1,
-        pageSize: 10,
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
         fTaskType: 1,
         fFleet: this.form.fFleet,
       };

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -3524,8 +3524,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fLabour: this.form.fLabour,
         };
@@ -3533,8 +3533,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fFleet: this.form.fFleet,
         };
@@ -3542,8 +3542,8 @@ export default {
         this.Navigation = false;
         this.key_id = key;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fCorpid: this.form.fCorpid,
         };
       }

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1811,22 +1811,25 @@
             justify-content: center;
             font-size: 24px;
             margin-bottom: 5px;
+            position: relative;
           "
         >
           {{ company }}作业单
-        </div>
-        <div
-          style="
+          <div
+            style="
             display: flex;
             justify-content: space-between;
-            margin-bottom: 5px;
+            position: absolute;
+            right: 0;
+            font-size: 13px;
           "
-        >
-          <div>
-          </div>
-          <div>
-            <div>流水号：{{ form.fBillno }}</div>
-            <div>办单日期：{{ nowTime }}</div>
+          >
+            <div>
+            </div>
+            <div>
+              <div>流水号：{{ form.fBillno }}</div>
+              <div>办单日期：{{ nowTime }}</div>
+            </div>
           </div>
         </div>
         <div class="print_table" style="display: flex">
@@ -1837,7 +1840,7 @@
                 {{ form.fBusinessType | fBusinessTypeFormat }}
               </td>
               <td>入库时间</td>
-              <td colspan="3"></td>
+              <td colspan="3">{{ form.fBsdate | fBsdateFormat }}</td>
             </tr>
             <tr>
               <td>序号</td>
@@ -1862,14 +1865,20 @@
               <td>{{ item.fCntrno }}</td>
             </tr>
             <tr>
-              <td>备注</td>
-              <td colspan="7">{{ form.remark }}</td>
-            </tr>
-            <tr v-for="(item, index) in Collectionoptionss" :key="index">
               <td>收费</td>
-              <td colspan="3">{{ item.fFeeids }}</td>
-              <td colspan="3">{{ item.fAmount }} 元</td>
+              <td colspan="3">
+                <span v-for="(item, index) in Collectionoptionss" :key="index">
+                  {{ item.fFeeid | fFeetFormat(fDNameOptions) }}:{{ item.fAmount }} 元<b v-if="index + 1 != Collectionoptionss.length">,</b>
+                </span>
+              </td>
+              <td>备注</td>
+              <td colspan="3">{{ form.remark }}</td>
             </tr>
+<!--            <tr v-for="(item, index) in Collectionoptionss" :key="index">-->
+<!--              <td>收费</td>-->
+<!--              <td colspan="3">{{ item.fFeeid | fFeetFormat(fDNameOptions) }}</td>-->
+<!--              <td colspan="3">{{ item.fAmount }} 元</td>-->
+<!--            </tr>-->
             <tr>
               <td>司机签字</td>
               <td></td>
@@ -2068,12 +2077,12 @@
               <td>{{ item.fBsdate }}</td>
               <td>{{ item.fCntqty }}</td>
               <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(2) }}
+                {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
               <td v-else></td>
               <td>{{ item.fPlanqty }}</td>
               <td v-if="item.fNetweight">
-                {{ (item.fNetweight / 1000).toFixed(2) }}
+                {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
               <td v-else></td>
               <td>{{ item.fQty }}</td>
@@ -2081,9 +2090,9 @@
             <tr>
               <td colspan="2">合计</td>
               <td>{{ allfCntqty }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td>{{ allfPlanqty }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
               <td>{{ allfQty }}</td>
             </tr>
             <tr>
@@ -2807,8 +2816,7 @@
               <td>铅封号</td>
               <td>预计件数</td>
               <td>垛位</td>
-              <td>实收件数</td>
-              <td>实收净重(吨)</td>
+              <td>（</td>
               <td>毛重(吨)</td>
               <td>备注</td>
             </tr>
@@ -3014,9 +3022,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -3091,19 +3099,19 @@
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -3311,9 +3319,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -3481,27 +3489,27 @@
               <td>总件数</td>
               <td colspan="2">{{ form.fPlanqty }}</td>
               <td>总净重</td>
-              <td colspan="2">{{ (form.fPlannetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>总毛重</td>
               <td colspan="2">
-                {{ (form.fPlangrossweight / 1000).toFixed(2) }}
+                {{ (form.fPlangrossweight / 1000).toFixed(4) }}
               </td>
               <td>本垛毛重</td>
               <td colspan="2">
-                {{ (form.fPlangrossweight / 1000).toFixed(2) }}
+                {{ (form.fPlangrossweight / 1000).toFixed(4) }}
               </td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ form.fPlanqty }}</td>
               <td>本垛净重</td>
-              <td colspan="2">{{ (form.fPlannetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
-              <td colspan="2">{{ form.fBsdate }}</td>
+              <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
               <td>仓管员</td>
               <td colspan="2">{{ form.createBy }}</td>
             </tr>
@@ -3628,7 +3636,7 @@
             type="primary"
             :disabled="browseStatus"
             @click="
-            addprint('fxdkrkd');
+            addprint('zpdkrkd');
             print_zpdkrkd = false;
           "
         >打印
@@ -3694,9 +3702,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -3765,19 +3773,19 @@
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -3985,9 +3993,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -4273,19 +4281,19 @@
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -4493,9 +4501,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -4876,9 +4884,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -4947,19 +4955,19 @@
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -5167,9 +5175,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -5232,13 +5240,13 @@
             <div>系统编号：{{ form.fBillno }}</div>
             <div>计划入库日期：{{ form.fBsdate }}&nbsp;{{ timeOut }}</div>
             <div>制单日期：{{ form.createTime }}</div>
-            <div>毛重：{{ (form.fPlangrossweight / 1000).toFixed(2) }}</div>
+            <div>毛重：{{ (form.fPlangrossweight / 1000).toFixed(4) }}</div>
           </div>
           <div>
             <div>报关单号：{{ form.fCustomno }}</div>
 <!--            <div>清单号：{{ form.fCustomsdeclartion }}</div>-->
             <div>存放仓库：{{ stockName }}</div>
-            <div>净重：{{ (form.fPlannetweight / 1000).toFixed(2) }}</div>
+            <div>净重：{{ (form.fPlannetweight / 1000).toFixed(4) }}</div>
           </div>
         </div>
         <div class="print_table" style="display: flex">
@@ -5451,19 +5459,19 @@
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
               <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
               <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(2) }}</td>
+              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -5671,9 +5679,9 @@
               <td></td>
               <td></td>
               <td></td>
-              <td>{{ allfQty.toFixed(2) }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ allfQty.toFixed(0) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td></td>
             </tr>
           </table>
@@ -6773,6 +6781,15 @@ export default {
       }
       return Name;
     },
+    fFeetFormat(row, fCNameOptions) {
+      let name;
+      fCNameOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
   },
   methods: {
     init() {
@@ -7954,7 +7971,7 @@ export default {
                         if (response.data.enclosures) {
                           this.relevantAttachments = response.data.enclosures;
                         }
-                      } 
+                      }
                       // else {
                       //   this.approvalStatus = false;
                       //   this.browseStatus = false;

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -922,6 +922,7 @@
               :summary-method="getSummaries"
               @selection-change="Selectinventory"
               show-summary
+              ref="detailTable"
           >
             <el-table-column type="selection" width="55" align="center" fixed/>
             <el-table-column label="序号" type="index" width="80" fixed/>
@@ -2477,22 +2478,25 @@
             justify-content: center;
             font-size: 24px;
             margin-bottom: 5px;
+            position:relative;
           "
         >
           {{ company }}作业单
-        </div>
-        <div
-          style="
+          <div
+            style="
             display: flex;
             justify-content: space-between;
-            margin-bottom: 5px;
+            position: absolute;
+            right: 0;
+            font-size: 13px;
           "
-        >
-          <div>
-          </div>
-          <div>
-            <div>流水号：{{ Printinglist.length > 0 ? Printinglist[0].fSerialNumber : '' }}</div>
-            <div>办单日期：{{ nowTime }}</div>
+          >
+            <div>
+            </div>
+            <div>
+              <div>流水号：{{ Printinglist.length > 0 ? Printinglist[0].fSerialNumber : '' }}</div>
+              <div>办单日期：{{ nowTime }}</div>
+            </div>
           </div>
         </div>
         <div class="print_table" style="display: flex">
@@ -2507,8 +2511,8 @@
               <td colspan="4">
                 {{ form.fBusinessType | fBusinessTypeFormat }}
               </td>
-              <td>入库时间</td>
-              <td colspan="4"></td>
+              <td>出库时间</td>
+              <td colspan="4">{{ form.fBsdate | fBsdateFormat }}</td>
             </tr>
             <tr>
               <td>序号</td>
@@ -2537,14 +2541,20 @@
               <td>{{ item.fCartypeId | fCartypeFormat(fCartypeOptions) }}</td>
             </tr>
             <tr>
-              <td>备注</td>
-              <td colspan="9">{{ form.remark }}</td>
-            </tr>
-            <tr v-for="(item, index) in Collectionoptionss" :key="index">
               <td>收费</td>
-              <td colspan="4">{{ item.fFeeids }}</td>
-              <td colspan="4">{{ item.fAmount }} 元</td>
+              <td colspan="4">
+                <span v-for="(item, index) in Collectionoptionss" :key="index">
+                  {{ item.fFeeid | fFeetFormat(fDNameOptions) }}:{{ item.fAmount }} 元<b v-if="index + 1 != Collectionoptionss.length">,</b>
+                </span>
+              </td>
+              <td>备注</td>
+              <td colspan="4">{{ form.remark }}</td>
             </tr>
+<!--            <tr v-for="(item, index) in Collectionoptionss" :key="index">-->
+<!--              <td>收费</td>-->
+<!--              <td colspan="4">{{ item.fFeeid | fFeetFormat(fDNameOptions) }}</td>-->
+<!--              <td colspan="5">{{ item.fAmount }} 元</td>-->
+<!--            </tr>-->
             <tr>
               <td>司机签字</td>
               <td colspan="2"></td>
@@ -2645,9 +2655,9 @@
               <td>序号</td>
               <td>出货日期</td>
               <td>箱量(20GP)</td>
-              <td>重量</td>
+              <td>重量(吨)</td>
               <td>件数</td>
-              <td>出库重量</td>
+              <td>出库重量(吨)</td>
               <td>出库件数</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="'info2-' + index">
@@ -2655,12 +2665,12 @@
               <td>{{ item.fBsdate | fBsdateFormat }}</td>
               <td>{{ item.fCntqty }}</td>
               <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(2) }}
+                {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
               <td v-else></td>
               <td>{{ item.fPlanqty }}</td>
               <td v-if="item.fNetweight">
-                {{ (item.fNetweight / 1000).toFixed(2) }}
+                {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
               <td v-else></td>
               <td>{{ item.fQty }}</td>
@@ -2668,9 +2678,9 @@
             <tr>
               <td colspan="2">合计</td>
               <td>{{ allfCntqty }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
+              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
               <td>{{ allfPlanqty }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
+              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
               <td>{{ allfQty }}</td>
             </tr>
             <tr>
@@ -2871,7 +2881,7 @@
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(2) }}
+                {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
               <td v-else></td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
@@ -2974,7 +2984,7 @@
               <td>{{ item.fMarks }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(2) }}
+                {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
               <td v-else></td>
               <td>{{ form.fCartype | fCartypeFormat(fCartypeOptions) }}</td>
@@ -3385,13 +3395,13 @@
               <td>品名</td>
               <td colspan="2">{{ form.fProductName }}</td>
               <td>清单号</td>
-              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+              <td colspan="4">{{ form.fCustomsdeclartion }}</td>
             </tr>
             <tr>
               <td>提单号</td>
               <td colspan="2">{{ form.fMblno }}</td>
               <td>出库日期</td>
-              <td colspan="3">{{ fBsdate }}</td>
+              <td colspan="4">{{ fBsdate }}</td>
             </tr>
             <tr>
               <td>原入库箱号</td>
@@ -3400,6 +3410,7 @@
               <td>垛位</td>
               <td>件数</td>
               <td>净重</td>
+              <td>毛重</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
@@ -3409,12 +3420,14 @@
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
               <td>{{ item.fNetweight }}</td>
+              <td>{{ item.fGrossweight }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
               <td colspan="4">合计：</td>
               <td>{{ allfQty }}</td>
               <td>{{ allfNetweight }}</td>
+              <td>{{ allfGrossweight }}</td>
               <td></td>
             </tr>
           </table>
@@ -3483,13 +3496,13 @@
             <tr>
               <td>品名</td>
               <td colspan="3">{{ form.fProductName }}</td>
-              <td colspan="2">清单号</td>
+              <td colspan="3">清单号</td>
               <td colspan="3">{{ form.fCustomsdeclartion }}</td>
             </tr>
             <tr>
               <td>提单号</td>
               <td colspan="3">{{ form.fMblno }}</td>
-              <td colspan="2">出库日期</td>
+              <td colspan="3">出库日期</td>
               <td colspan="3">{{ fBsdate }}</td>
             </tr>
             <tr>
@@ -3498,6 +3511,7 @@
               <td>垛位</td>
               <td>件数</td>
               <td>净重</td>
+              <td>毛重</td>
               <td>提货人签字手印</td>
               <td>提货人电话</td>
               <td>所收费用</td>
@@ -3509,6 +3523,7 @@
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
               <td>{{ item.fNetweight }}</td>
+              <td>{{ item.fGrossweight }}</td>
               <td></td>
               <td></td>
               <td></td>
@@ -3518,6 +3533,7 @@
               <td colspan="3">合计：</td>
               <td>{{ allfQty }}</td>
               <td>{{ allfNetweight }}</td>
+              <td>{{ allfGrossweight }}</td>
               <td></td>
               <td></td>
               <td></td>
@@ -3526,17 +3542,17 @@
           </table>
         </div>
         <div
-            style="display: flex; justify-content: space-between; font-size: 12px"
+            style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 20px"
         >
           <div>库管：{{ form.fContacts }}</div>
-          <div style="width: 100px">叉车：</div>
+          <div style="width: 100px;margin-right: 15px">叉车：</div>
         </div>
         <div
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <div>制单人：{{ form.createBy }}</div>
           <div style="width: 100px">初审核人：</div>
-          <div style="width: 100px">复式审核人：</div>
+          <div style="width: 100px;margin-right: 15px">复式审核人：</div>
         </div>
       </div>
 
@@ -4660,6 +4676,7 @@ export default {
     },
     // 修改毛重净重
     changeOutStock(row) {
+      this.$refs['detailTable'].clearSelection()
       let fNetweight = 0;
       let fGrossweight = 0;
       if (row.fNetweight) {
@@ -5901,6 +5918,20 @@ export default {
               } else {
                 this.form.fMarks = "";
               }
+              // 主表没有司机信息 从表添加
+              if (!this.form.fTruckno && !this.form.fDriverName && !this.form.fDriverTel && !this.form.fDriverIdCar) {
+                if (this.detailList.length > 0) {
+                  for (let i = 0;i < this.detailList.length;i++) {
+                    if (this.detailList[i].fTruckno || this.detailList[i].fDriverName || this.detailList[i].fDriverTel || this.detailList[i].fDriverIdCar) {
+                      this.form.fTruckno = this.detailList[i].fTruckno
+                      this.form.fDriverName = this.detailList[i].fDriverName
+                      this.form.fDriverTel = this.detailList[i].fDriverTel
+                      this.form.fDriverIdCar = this.detailList[i].fDriverIdCar
+                      break;
+                    }
+                  }
+                }
+              }
               formData.append("warehouseBills", JSON.stringify(this.form));
               this.detailList.forEach(item => {
                 if (item.srcId !== null) {
@@ -6060,15 +6091,16 @@ export default {
                         if (response.data.enclosures) {
                           this.relevantAttachments = response.data.enclosures;
                         }
-                      } else {
-                        this.$set(this.form, "fId", null);
-                        this.$set(this.form, "fMblno", null);
-                        this.$set(this.form, "fMarks", null);
-                        this.$set(this.form, "fProductName",null);
-                        this.$set(this.form, "fNetweight", 0);
-                        this.$set(this.form, "fPlanvolumn", 0);
-                        this.$set(this.form, "fGrossweight", 0);
                       }
+                      // else {
+                      //   this.$set(this.form, "fId", null);
+                      //   this.$set(this.form, "fMblno", null);
+                      //   this.$set(this.form, "fMarks", null);
+                      //   this.$set(this.form, "fProductName",null);
+                      //   this.$set(this.form, "fNetweight", 0);
+                      //   this.$set(this.form, "fPlanvolumn", 0);
+                      //   this.$set(this.form, "fGrossweight", 0);
+                      // }
                     });
                     if (status == "goBack") {
                       this.cancel();
@@ -6239,8 +6271,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fLabour: this.form.fLabour,
         };
@@ -6248,8 +6280,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fFleet: this.form.fFleet,
         };
@@ -6257,8 +6289,8 @@ export default {
         this.Navigation = false;
         this.key_id = key;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fCorpid: this.form.fCorpid,
         };
       }
@@ -6507,6 +6539,9 @@ export default {
             } else if (command == "f") {
               this.print_ccckd = true;
             } else if (command == "g") {
+              for (let i = 1; i < this.Printinglist.length;i++) {
+                if (this.Printinglist[i].fTruckno !== this.Printinglist[0].fTruckno) return this.$message.error('请选择相同的车号')
+              }
               this.print_dcckd = true;
             } else if (command == "h") {
               this.print_zccdckd = true;
@@ -6648,6 +6683,7 @@ export default {
           let fAmount = 0;
           fAmount = e.fPrice * qty;
           if (this.key_id == 3) {
+            console.log(e)
             this.warehouseDrList.push({
               fQty: qty,
               fCorpid: e.fCorpid,
@@ -6663,6 +6699,8 @@ export default {
               fMarks: this.form.fMarks,
               fBusinessType: this.form.fBusinessType,
               fSrcTypeId: e.fId,
+              fBillingway: e.fFeeUnitid,
+              remark: e.remark,
             });
           } else {
             this.warehouseCrList.push({
@@ -6690,6 +6728,7 @@ export default {
     // 收款选
     Collectionoptions(selection) {
       this.Collectionoptionss = selection;
+      console.log(selection)
       for (let item in this.fWbuOptions) {
         for (let li in this.Collectionoptionss) {
           if (

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -4153,9 +4153,9 @@ export default {
         if (this.Printinglist[item].fBillstatus == 10) {
           return this.$message.error("请存在未打印的作业单");
         }
-        if (!this.Printinglist[item].fTruckno) {
-          return this.$message.error("车号不能为空");
-        }
+        // if (!this.Printinglist[item].fTruckno) {
+        //   return this.$message.error("车号不能为空");
+        // }
         if (!this.Printinglist[item].fTransferWarehouselocid) {
           return this.$message.error("调入库位不能为空");
         }
@@ -5005,8 +5005,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fLabour: this.form.fLabour,
         };
@@ -5014,8 +5014,8 @@ export default {
         this.key_id = key;
         this.Navigation = true;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fTaskType: key,
           fFleet: this.form.fFleet,
         };
@@ -5023,8 +5023,8 @@ export default {
         this.Navigation = false;
         this.key_id = key;
         data = {
-          pageNum: 1,
-          pageSize: 10,
+          pageNum: this.pageNum,
+          pageSize: this.pageSize,
           fCorpid: this.form.fCorpid,
         };
       }
@@ -5091,11 +5091,11 @@ export default {
           if (!this.Printinglist[item].fId) {
             return this.$message.error("请先保存!");
           }
-          if (
-            this.Printinglist[item].fTruckno !== this.Printinglist[0].fTruckno
-          ) {
-            return this.$message.error("请选择车相同车号");
-          }
+          // if (
+          //   this.Printinglist[item].fTruckno !== this.Printinglist[0].fTruckno
+          // ) {
+          //   return this.$message.error("请选择车相同车号");
+          // }
         }
         this.print_zyd = true;
         this.warehouseOptions.map((e) => {