仓库修改

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -154,6 +154,7 @@
               value-format="timestamp"
               placeholder="业务日期"
               @change="changeDate"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -868,6 +869,7 @@
                     type="date"
                     value-format="timestamp"
                     placeholder="业务日期"
+                    format="yyyy-MM-dd"
                   >
                   </el-date-picker>
                 </span>

src/views/Warehousing/components/payMoney.vue

@@ -31,6 +31,13 @@
           >作业费协议</el-button
         >
         <el-button
+          type="info"
+          size="small"
+          @click.prevent="printCr"
+        >请款单
+        </el-button
+        >
+        <el-button
           type="primary"
           size="small"
           v-if="browseStatus"
@@ -48,6 +55,7 @@
       stripe
       show-summary
       :summary-method="warehouseDrSummaries"
+      @selection-change="SelectCr"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="80"> </el-table-column>
@@ -496,12 +504,121 @@
         >
       </div>
     </el-dialog>
+    <!--    付款信息作业单-->
+    <el-dialog
+      :visible.sync="print_Cr"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_Cr" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}请款单
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 18px;
+            margin-bottom: 5px;
+          "
+        ></div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 5px;
+          "
+          class="print_form"
+        >
+          <div style="display: flex; flex-direction: column;">
+            <!--            <div>请款单号：</div>-->
+            <div>源业务编码：{{ form.fBillno }}</div>
+            <div>委托单位：{{ form.fCorpid | fMblnoFormat(fMblnoOptions) }}</div>
+          </div>
+          <div style="display: flex; flex-direction: column;margin-right: 15px;width: 150px">
+            <div style="">请款日期：</div>
+          </div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>结算单位</td>
+              <td>提单号</td>
+              <!--              <td>源业务编码</td>-->
+              <td>业务日期</td>
+              <td>数量</td>
+              <td>单价</td>
+              <td>费用</td>
+              <td>人民币</td>
+              <td>美元</td>
+            </tr>
+            <tr v-for="(item, index) in PrintingCrlist" :key="index">
+              <td>{{ item.fCorpid | fMblnoFormat(fMblnoOptions) }}</td>
+              <td>{{ form.fMblno }}</td>
+              <!--              <td>{{ form.fBillno }}</td>-->
+              <td>{{ form.fBsdate | fBsdateFormat }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{ item.fUnitprice }}</td>
+              <td>{{ item.fFeeid | fFeetFormat(fCNameOptions) }}</td>
+              <td>{{ item.fAmount }}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>合计</td>
+              <td></td>
+              <td></td>
+              <td>{{ allCrfQty }}</td>
+              <td></td>
+              <td></td>
+              <td>{{ allCrfAmount }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>领款人：</div>
+          <div>业务经理：</div>
+          <div>财务：</div>
+          <div style="width: 150px">经理：</div>
+        </div>
+      </div>
+      <span lot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="
+            print_Cr = false;
+            addprint('crzyd');
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_Cr = false" size="mini">取消 </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { operationAgreement } from "@/api/agreement/agreement";
 import {feesCheck,revokefeeCheck} from "@/api/warehouseBusiness/warehouseInStock";
+import Cookies from "js-cookie";
+import print from "print-js";
 
 export default {
   name: 'payMoney',
@@ -565,8 +682,48 @@ export default {
       // dialogWhgenlegList: [],
       pageNum: 1,
       pageSize: 10,
+      // 收款信息明细
+      PrintingCrlist: [],
+      allCrfAmount: 0,
+      allCrfQty: 0,
+      // Cr打印弹窗是否开启
+      print_Cr: false,
+      company: '',
     };
   },
+  created() {
+    this.company = Cookies.get("companyName")
+  },
+  filters: {
+    fMblnoFormat(row, fMblnoOptions) {
+      let name;
+      fMblnoOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+    fBsdateFormat(row) {
+      if (row) {
+        const dateMat = new Date(row);
+        const year = dateMat.getFullYear();
+        const month = dateMat.getMonth() + 1;
+        const day = dateMat.getDate();
+        const timeFormat = year + "-" + month + "-" + day;
+        return timeFormat;
+      }
+    },
+    fFeetFormat(row, fCNameOptions) {
+      let name;
+      fCNameOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+  },
   methods: {
     feeChange() {
       this.$emit("feeChangeC", 'C');
@@ -758,6 +915,45 @@ export default {
         }
       })
     },
+    // 付款明细多选
+    SelectCr(selection) {
+      this.PrintingCrlist = selection;
+    },
+    // 付款信息打印准备
+    printCr() {
+      if (this.PrintingCrlist.length > 0) {
+        for (let item in this.PrintingCrlist) {
+          if (!this.PrintingCrlist[item].fId) {
+            return this.$message.error("请先保存!");
+          }
+        }
+        this.allCrfAmount = 0;
+        this.allCrfQty = 0;
+        this.PrintingCrlist.forEach(item => {
+          this.allCrfAmount = this.allCrfAmount + item.fAmount
+          this.allCrfQty += item.fQty
+        })
+        this.print_Cr = true;
+      } else {
+        this.$message.error("请选择需要打印的明细!");
+      }
+    },
+    // 打印
+    addprint(status) {
+      const style =
+        "@page {  } " +
+        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
+      switch (status) {
+        case "crzyd":
+          print({
+            printable: "print_Cr",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+      }
+    },
   },
   watch: {
     browseStatus(val) {
@@ -771,4 +967,24 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.print_table {
+  table {
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+    font-size: 12px;
+    margin-bottom: 5px;
+  }
+
+  table td {
+    border-left: 1px solid #000;
+    border-top: 1px solid #000;
+    vertical-align: middle;
+    padding: 2px;
+    text-align: center;
+  }
+}
+
+.print_form {
+  font-size: 12px;
+}
 </style>

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -21,6 +21,18 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="8">
+          <el-form-item label="提单号" prop="fMblno">
+            <el-input
+              v-model="form.fMblno"
+              style="width: 80%"
+              placeholder="请输入提单号"
+              :disabled="detailList.length != 0"
+              @change="changeMblno"
+              clearable
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label="客户" prop="fCorpid">
             <el-select
               v-model="form.fCorpid"
@@ -31,7 +43,7 @@
               :disabled="detailList.length > 0"
             >
               <el-option
-                v-for="(item, index) in fMblnoOptions"
+                v-for="(item, index) in fGetMblnoOptions"
                 :key="index.fId"
                 :label="item.fName"
                 :value="item.fId"
@@ -59,16 +71,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="业务编号" prop="fBillno">
-            <el-input
-              v-model="form.fBillno"
-              style="width: 80%"
-              disabled
-              placeholder="业务编号"
-            />
-          </el-form-item>
-        </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
@@ -81,6 +83,7 @@
               value-format="timestamp"
               placeholder="货转日期"
               @change="changeDate"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -174,12 +177,12 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="提单号" prop="fMblno">
+          <el-form-item label="业务编号" prop="fBillno">
             <el-input
-              v-model="form.fMblno"
+              v-model="form.fBillno"
               style="width: 80%"
-              placeholder="请输入提单号"
-              :disabled="detailList.length != 0"
+              disabled
+              placeholder="业务编号"
             />
           </el-form-item>
         </el-col>
@@ -469,6 +472,7 @@
                     type="date"
                     value-format="timestamp"
                     placeholder="货转日期"
+                    format="yyyy-MM-dd"
                   >
                   </el-date-picker>
                 </span>
@@ -1045,6 +1049,13 @@
               >作业费协议</el-button
             >
             <el-button
+              type="info"
+              size="small"
+              @click.prevent="printCr"
+            >请款单
+            </el-button
+            >
+            <el-button
               type="primary"
               size="small"
               v-if="browseStatus"
@@ -1062,6 +1073,7 @@
           stripe
           show-summary
           :summary-method="warehouseDrSummaries"
+          @selection-change="SelectCr"
         >
           <el-table-column type="selection" width="50" align="center" fixed />
           <el-table-column
@@ -1782,6 +1794,114 @@
       >
       <el-button @click="cancel">取 消</el-button>
     </div>
+
+    <!--    付款信息作业单-->
+    <el-dialog
+      :visible.sync="print_Cr"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_Cr" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}请款单
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 18px;
+            margin-bottom: 5px;
+          "
+        ></div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 5px;
+          "
+          class="print_form"
+        >
+          <div style="display: flex; flex-direction: column;">
+            <!--            <div>请款单号：</div>-->
+            <div>源业务编码：{{ form.fBillno }}</div>
+            <div>委托单位：{{ form.fCorpid | fMblnoFormat(fMblnoOptions) }}</div>
+          </div>
+          <div style="display: flex; flex-direction: column;margin-right: 15px;width: 150px">
+            <div style="">请款日期：</div>
+          </div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>结算单位</td>
+              <td>提单号</td>
+              <!--              <td>源业务编码</td>-->
+              <td>业务日期</td>
+              <td>数量</td>
+              <td>单价</td>
+              <td>费用</td>
+              <td>人民币</td>
+              <td>美元</td>
+            </tr>
+            <tr v-for="(item, index) in PrintingCrlist" :key="index">
+              <td>{{ item.fCorpid | fMblnoFormat(fMblnoOptions) }}</td>
+              <td>{{ form.fMblno }}</td>
+              <!--              <td>{{ form.fBillno }}</td>-->
+              <td>{{ form.fBsdate | fBsdateFormat }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{ item.fUnitprice }}</td>
+              <td>{{ item.fFeeid | fFeetFormat(fCNameOptions) }}</td>
+              <td>{{ item.fAmount }}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>合计</td>
+              <td></td>
+              <td></td>
+              <td>{{ allCrfQty }}</td>
+              <td></td>
+              <td></td>
+              <td>{{ allCrfAmount }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>领款人：</div>
+          <div>业务经理：</div>
+          <div>财务：</div>
+          <div style="width: 150px">经理：</div>
+        </div>
+      </div>
+      <span lot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="
+            print_Cr = false;
+            addprint('crzyd');
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_Cr = false" size="mini">取消 </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -1800,7 +1920,8 @@ import {
   exportgoodsTransfer,
   updateCredit,
   feesCheck,
-  revokefeeCheck
+  revokefeeCheck,
+  fromMblno
 } from "@/api/warehouseBusiness/goodsTransfer";
 import { operationAgreement } from "@/api/agreement/agreement";
 import { listCorps } from "@/api/basicdata/corps";
@@ -1855,6 +1976,7 @@ export default {
       mblnoStatus: "",
       selectloading: false,
       fMblnoOptions: [],
+      fGetMblnoOptions: [],
       warehouseDrList: [],
       relevantAttachments: [],
       warehouseCrList: [],
@@ -2257,6 +2379,12 @@ export default {
       showSetting2: false,
       dataListSelection: [],
       unloadModes: [],
+      // 收款信息明细
+      PrintingCrlist: [],
+      allCrfAmount: 0,
+      allCrfQty: 0,
+      // Cr打印弹窗是否开启
+      print_Cr: false,
     };
   },
   created() {
@@ -2301,6 +2429,7 @@ export default {
     });
     listCorps({ type: 1 }).then((response) => {
       this.fMblnoOptions = response.rows;
+      this.fGetMblnoOptions = response.rows;
     });
     listCorps().then((response) => {
       this.fSbuOptions = response.rows;
@@ -2356,6 +2485,34 @@ export default {
       });
       return goods;
     },
+    fMblnoFormat(row, fMblnoOptions) {
+      let name;
+      fMblnoOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+    fBsdateFormat(row) {
+      if (row) {
+        const dateMat = new Date(row);
+        const year = dateMat.getFullYear();
+        const month = dateMat.getMonth() + 1;
+        const day = dateMat.getDate();
+        const timeFormat = year + "-" + month + "-" + day;
+        return timeFormat;
+      }
+    },
+    fFeetFormat(row, fCNameOptions) {
+      let name;
+      fCNameOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
   },
   methods: {
     init() {
@@ -2542,6 +2699,23 @@ export default {
         return false;
       }
     },
+    // 改变提单号获取客户和仓库
+    changeMblno() {
+      if (this.form.fMblno) {
+        fromMblno(this.form.fMblno).then(res => {
+          console.log(res)
+          this.fGetMblnoOptions = res.data.corpsList
+          this.warehouseOptions = res.data.warehouseList
+        })
+      } else {
+        listCorps({ type: 1 }).then((response) => {
+          this.fGetMblnoOptions = response.rows
+        })
+        listWarehousesss({ fStatus: 0, delFlag: 0 }).then((response) => {
+          this.warehouseOptions = response.rows;
+        })
+      }
+    },
     // 出库件数的计算
     qtyChange(row) {
       // if (!row.fQty || row.fQty === "") {
@@ -4061,6 +4235,45 @@ export default {
         }
       })
     },
+    // 付款明细多选
+    SelectCr(selection) {
+      this.PrintingCrlist = selection;
+    },
+    // 付款信息打印准备
+    printCr() {
+      if (this.PrintingCrlist.length > 0) {
+        for (let item in this.PrintingCrlist) {
+          if (!this.PrintingCrlist[item].fId) {
+            return this.$message.error("请先保存!");
+          }
+        }
+        this.allCrfAmount = 0;
+        this.allCrfQty = 0;
+        this.PrintingCrlist.forEach(item => {
+          this.allCrfAmount = this.allCrfAmount + item.fAmount
+          this.allCrfQty += item.fQty
+        })
+        this.print_Cr = true;
+      } else {
+        this.$message.error("请选择需要打印的明细!");
+      }
+    },
+    // 打印
+    addprint(status) {
+      const style =
+        "@page {  } " +
+        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
+      switch (status) {
+        case "crzyd":
+          print({
+            printable: "print_Cr",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
+      }
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -124,6 +124,7 @@
                 value-format="timestamp"
                 placeholder="业务日期"
                 @change="changeDate"
+                format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -1005,6 +1006,7 @@
                   type="date"
                   value-format="timestamp"
                   placeholder="入库日期"
+                  format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </template>
@@ -1734,6 +1736,7 @@
                       type="date"
                       value-format="timestamp"
                       placeholder="业务日期"
+                      format="yyyy-MM-dd"
                   >
                   </el-date-picker>
                 </span>

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -147,6 +147,7 @@
                 type="date"
                 :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
                 value-format="timestamp"
+                format="yyyy-MM-dd"
                 placeholder="请选择计划日期"
                 @change="changeDate"
             >
@@ -1441,6 +1442,7 @@
                     style="width: 100%"
                     value-format="timestamp"
                     placeholder="入库日期"
+                    format="yyyy-MM-dd"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -1795,6 +1797,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area1" class="print-div">
         <div
             class="print-title"
@@ -1840,7 +1844,8 @@
               <td>物品名称</td>
               <td>提单号</td>
               <td>品牌/规格/产地</td>
-              <td>净重(KG)</td>
+              <td v-if="radio == 2">净重(KG)</td>
+              <td v-else>净重(T)</td>
               <td>件数/规格</td>
               <td>箱号</td>
             </tr>
@@ -1852,7 +1857,8 @@
               <td>
                 {{ item.fBusinessType | fStorageFormat }}/{{ item.fMarks }}
               </td>
-              <td>{{ item.fNetweight }}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
+              <td v-else>{{ (item.fNetweight / 1000).toFixed(4) }}</td>
               <td>{{ item.fQty }}/{{ item.fPackagespecs }}</td>
               <td>{{ item.fCntrno }}</td>
             </tr>
@@ -1985,6 +1991,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area18" class="print-div">
         <div
             class="print-title"
@@ -2043,7 +2051,8 @@
               <td v-if="Printinglist.length > 0">{{Printinglist[0].fCntrtype | fCntrtypeFormat(cntrList)}}</td>
               <td>{{ Printinglist.length > 0? Printinglist[0].fMarks: '' }}</td>
               <td></td>
-              <td>吨</td>
+              <td v-if="radio == 1">吨</td>
+              <td v-if="radio == 2">千克</td>
               <td>{{ Printinglist.length > 0? Printinglist[0].fPackagespecs: '' }}</td>
             </tr>
             <tr>
@@ -2068,23 +2077,31 @@
               <td>{{ item.fTruckno }}/{{ item.fCntrno }}</td>
               <td>{{ item.fBsdate }}</td>
               <td>{{ item.fCntqty }}</td>
-              <td v-if="item.fGrossweight">
+              <td v-if="item.fGrossweight && radio == 1">
                 {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
+              <td v-else-if="item.fGrossweight && radio == 2">
+                {{ item.fGrossweight }}
+              </td>
               <td v-else></td>
               <td>{{ item.fPlanqty }}</td>
-              <td v-if="item.fNetweight">
+              <td v-if="item.fNetweight && radio == 1">
                 {{ (item.fNetweight / 1000).toFixed(4) }}
               </td>
+              <td v-else-if="item.fNetweight && radio == 2">
+                {{ item.fNetweight }}
+              </td>
               <td v-else></td>
               <td>{{ item.fQty }}</td>
             </tr>
             <tr>
               <td colspan="2">合计</td>
               <td>{{ allfCntqty }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
               <td>{{ allfPlanqty }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
               <td>{{ allfQty }}</td>
             </tr>
             <tr>
@@ -2130,6 +2147,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area4" class="print-div">
         <div
             class="print-title"
@@ -2170,8 +2189,10 @@
               <td>货名</td>
               <td>箱量</td>
               <td>件数</td>
-              <td>毛重(吨)</td>
-              <td>净重(吨)</td>
+              <td v-if="radio == 1">毛重(吨)</td>
+              <td v-if="radio == 1">净重(吨)</td>
+              <td v-if="radio == 2">毛重(千克)</td>
+              <td v-if="radio == 2">净重(千克)</td>
               <td>规格</td>
               <td>区位</td>
               <td>备注</td>
@@ -2180,11 +2201,15 @@
               <td>{{ item.fGoodsids }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight">
+              <td v-if="item.fGrossweight && radio == 1">
                 {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
+              <td v-else-if="item.fGrossweight && radio == 2">
+                {{ item.fGrossweight }}
+              </td>
               <td v-else></td>
-              <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td  v-if="radio == 2">{{ item.fNetweight }}</td>
               <td>{{ item.fPackagespecs }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.remark }}</td>
@@ -2228,6 +2253,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area15" class="print-div">
         <div
             class="print-title"
@@ -2252,7 +2279,7 @@
               <td>{{ form.fCorpidName }}</td>
               <td>入库日期</td>
               <td colspan="2" v-if="Printinglist.length">
-                {{ Printinglist[0].fBsdate | fBsdateFormat }}{{ " " + rkTime }}
+                {{ Printinglist[0].fBsdate | fBsdateFormat }}
               </td>
               <td colspan="2" v-else></td>
               <td>流水号</td>
@@ -2273,8 +2300,10 @@
               <td>箱号</td>
               <td>箱量</td>
               <td>件数</td>
-              <td>毛重(吨)</td>
-              <td>净重(吨)</td>
+              <td v-if="radio == 1">毛重(吨)</td>
+              <td v-if="radio == 1">净重(吨)</td>
+              <td v-if="radio == 2">毛重(千克)</td>
+              <td v-if="radio == 2">净重(千克)</td>
               <td>规格</td>
               <td>区位</td>
               <td style="width: 20%">备注</td>
@@ -2284,11 +2313,15 @@
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight">
+              <td v-if="item.fGrossweight && radio == 1">
                 {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
+              <td v-else-if="item.fGrossweight && radio == 2">
+                {{ item.fGrossweight }}
+              </td>
               <td v-else></td>
-              <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
               <td>{{ item.fPackagespecs }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.remark }}</td>
@@ -2329,6 +2362,8 @@
       :close-on-click-modal="false"
       :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area16" class="print-div">
         <div
           class="print-title"
@@ -2371,8 +2406,10 @@
               <td>货物属性</td>
               <td>属性详情</td>
               <td>件数</td>
-              <td>毛重(吨)</td>
-              <td>净重(吨)</td>
+              <td v-if="radio == 1">毛重(吨)</td>
+              <td v-if="radio == 1">净重(吨)</td>
+              <td v-if="radio == 2">毛重(千克)</td>
+              <td v-if="radio == 2">净重(千克)</td>
               <td>规格</td>
               <td>区位</td>
               <td>备注</td>
@@ -2383,11 +2420,15 @@
               <td>{{ item.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}</td>
               <td>{{ item.fMarks }}</td>
               <td>{{ item.fQty }}</td>
-              <td v-if="item.fGrossweight">
+              <td v-if="item.fGrossweight && radio == 1">
                 {{ (item.fGrossweight / 1000).toFixed(4) }}
               </td>
+              <td v-else-if="item.fGrossweight && radio == 2">
+                {{ item.fGrossweight }}
+              </td>
               <td v-else></td>
-              <td>{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight/1000).toFixed(4)}}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
               <td>{{ item.fPackagespecs }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.remark }}</td>
@@ -2962,6 +3003,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
       <div id="print_area8" class="print-div">
         <div
             class="print-title"
@@ -2993,8 +3036,10 @@
               <td>预计件数</td>
               <td>垛位</td>
               <td>实收件数</td>
-              <td class="oneHundred">实收净重（吨）</td>
-              <td class="oneHundred">毛重（吨）</td>
+              <td class="oneHundred" v-if="radio == 1">实收净重（吨）</td>
+              <td class="oneHundred" v-if="radio == 1">毛重（吨）</td>
+              <td class="oneHundred" v-if="radio == 2">实收净重（千克）</td>
+              <td class="oneHundred" v-if="radio == 2">毛重（千克）</td>
               <td class="twoHundred">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
@@ -3004,8 +3049,10 @@
               <td>{{ form.fPlanqty }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
-              <td>{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
+              <td v-if="radio == 2">{{ item.fGrossweight }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -3015,8 +3062,10 @@
               <td></td>
               <td></td>
               <td>{{ allfQty.toFixed(0) }}</td>
-              <td>{{ allfNetweight.toSuperFixed(4) }}</td>
-              <td>{{ allfGrossweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfNetweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfGrossweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
               <td></td>
             </tr>
           </table>
@@ -3090,20 +3139,28 @@
             <tr>
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
-              <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">总净重(吨)</td>
+              <td v-if="radio == 2">总净重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
             </tr>
             <tr>
-              <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
-              <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">总毛重(吨)</td>
+              <td v-if="radio == 2">总毛重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
+              <td v-if="radio == 1">本垛毛重(吨)</td>
+              <td v-if="radio == 2">本垛毛重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
-              <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">本垛净重(吨)</td>
+              <td v-if="radio == 2">本垛净重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -3248,6 +3305,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
       <div id="print_area10" class="print-div">
         <div
             class="print-title"
@@ -3290,8 +3349,10 @@
               <td>提单号</td>
               <td>箱号</td>
               <td>件数</td>
-              <td>毛重（吨）</td>
-              <td>净重（吨）</td>
+              <td v-if="radio == 1">毛重（吨）</td>
+              <td v-if="radio == 1">净重（吨）</td>
+              <td v-if="radio == 2">毛重（千克）</td>
+              <td v-if="radio == 2">净重（千克）</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
@@ -3301,8 +3362,10 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
-              <td>{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ item.fGrossweight }}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -3312,8 +3375,10 @@
               <td></td>
               <td></td>
               <td>{{ allfQty.toFixed(0) }}</td>
-              <td>{{ allfGrossweight.toSuperFixed(4) }}</td>
-              <td>{{ allfNetweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfGrossweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfNetweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
               <td></td>
             </tr>
           </table>
@@ -3445,6 +3510,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area12" class="print-div">
         <div
             class="print-title"
@@ -3480,24 +3547,28 @@
             <tr>
               <td>总件数</td>
               <td colspan="2">{{ form.fPlanqty }}</td>
-              <td>总净重</td>
-              <td colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">总净重(吨)</td>
+              <td v-if="radio == 2">总净重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ allfNetweight }}</td>
             </tr>
             <tr>
-              <td>总毛重</td>
-              <td colspan="2">
-                {{ (form.fPlangrossweight / 1000).toFixed(4) }}
-              </td>
-              <td>本垛毛重</td>
-              <td colspan="2">
-                {{ (form.fPlangrossweight / 1000).toFixed(4) }}
-              </td>
+              <td v-if="radio == 1">总毛重(吨)</td>
+              <td v-if="radio == 2">总毛重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ allfGrossweight }}</td>
+              <td v-if="radio == 1">本垛毛重(吨)</td>
+              <td v-if="radio == 2">本垛毛重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (form.fPlangrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ form.fPlangrossweight }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ form.fPlanqty }}</td>
-              <td>本垛净重</td>
-              <td colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">本垛净重(吨)</td>
+              <td v-if="radio == 2">本垛净重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (form.fPlannetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ form.fPlannetweight }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -4824,6 +4895,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
       <div id="print_area8" class="print-div">
         <div
             class="print-title"
@@ -4855,8 +4928,10 @@
               <td>预计件数</td>
               <td>垛位</td>
               <td>实收件数</td>
-              <td class="oneHundred" style="width: 100px;">实收净重（吨）</td>
-              <td class="oneHundred" style="width: 100px;">毛重（吨）</td>
+              <td class="oneHundred" style="width: 100px;" v-if="radio == 1">实收净重（吨）</td>
+              <td class="oneHundred" style="width: 100px;" v-if="radio == 1">毛重（吨）</td>
+              <td class="oneHundred" style="width: 100px;" v-if="radio == 2">实收净重（千克）</td>
+              <td class="oneHundred" style="width: 100px;" v-if="radio == 2">毛重（千克）</td>
               <td class="twoHundred" style="width: 200px;">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
@@ -4866,8 +4941,10 @@
               <td>{{ item.fQty }}</td>
               <td>{{ item.fWarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
-              <td>{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
+              <td v-if="radio == 2">{{ item.fGrossweight }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -4877,8 +4954,10 @@
               <td></td>
               <td></td>
               <td>{{ allfQty.toFixed(0) }}</td>
-              <td>{{ allfNetweight.toSuperFixed(4) }}</td>
-              <td>{{ allfGrossweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfNetweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfGrossweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
               <td></td>
             </tr>
           </table>
@@ -5202,6 +5281,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area11" class="print-div">
         <div
             class="print-title"
@@ -5232,13 +5313,15 @@
             <div>系统编号：{{ form.fBillno }}</div>
             <div>计划入库日期：{{ form.fBsdate }}&nbsp;{{ timeOut }}</div>
             <div>制单日期：{{ form.createTime }}</div>
-            <div>毛重：{{ (form.fPlangrossweight / 1000).toFixed(4) }}</div>
+            <div v-if="radio == 1">毛重(吨)：{{ (form.fPlangrossweight / 1000).toFixed(4) }}</div>
+            <div v-if="radio == 2">毛重(千克)：{{ form.fPlangrossweight }}</div>
           </div>
           <div>
             <div>报关单号：{{ form.fCustomno }}</div>
 <!--            <div>清单号：{{ form.fCustomsdeclartion }}</div>-->
             <div>存放仓库：{{ stockName }}</div>
-            <div>净重：{{ (form.fPlannetweight / 1000).toFixed(4) }}</div>
+            <div v-if="radio == 1">净重(吨)：{{ (form.fPlannetweight / 1000).toFixed(4) }}</div>
+            <div v-if="radio == 2">净重(千克)：{{ form.fPlannetweight }}</div>
           </div>
         </div>
         <div class="print_table" style="display: flex">
@@ -5414,6 +5497,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
       <div id="print_area9" class="print-div">
         <div
             class="print-title"
@@ -5450,20 +5535,28 @@
             <tr>
               <td>总件数</td>
               <td colspan="2">{{ item.fQty }}</td>
-              <td>总净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">总净重(吨)</td>
+              <td v-if="radio == 2">总净重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
             </tr>
             <tr>
-              <td>总毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
-              <td>本垛毛重</td>
-              <td colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">总毛重(吨)</td>
+              <td v-if="radio == 2">总毛重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
+              <td v-if="radio == 1">本垛毛重(吨)</td>
+              <td v-if="radio == 2">本垛毛重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fGrossweight }}</td>
             </tr>
             <tr>
               <td>本垛件数</td>
               <td colspan="2">{{ item.fQty }}</td>
-              <td>本垛净重</td>
-              <td colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">本垛净重(吨)</td>
+              <td v-if="radio == 2">本垛净重(千克)</td>
+              <td v-if="radio == 1" colspan="2">{{ (item.fNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2" colspan="2">{{ item.fNetweight }}</td>
             </tr>
             <tr>
               <td>入库日期</td>
@@ -5608,6 +5701,8 @@
         :close-on-click-modal="false"
         :modal="false"
     >
+      <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
       <div id="print_area10" class="print-div">
         <div
             class="print-title"
@@ -5650,8 +5745,10 @@
               <td>提单号</td>
               <td>箱号</td>
               <td>件数</td>
-              <td>毛重（吨）</td>
-              <td>净重（吨）</td>
+              <td v-if="radio == 1">毛重（吨）</td>
+              <td v-if="radio == 1">净重（吨）</td>
+              <td v-if="radio == 2">毛重（千克）</td>
+              <td v-if="radio == 2">净重（千克）</td>
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
@@ -5661,8 +5758,10 @@
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
-              <td>{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ item.fGrossweight }}</td>
+              <td v-if="radio == 2">{{ item.fNetweight }}</td>
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
@@ -5672,8 +5771,10 @@
               <td></td>
               <td></td>
               <td>{{ allfQty.toFixed(0) }}</td>
-              <td>{{ allfGrossweight.toSuperFixed(4) }}</td>
-              <td>{{ allfNetweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfGrossweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 1">{{ allfNetweight.toSuperFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
               <td></td>
             </tr>
           </table>
@@ -6152,6 +6253,7 @@ export default {
   },
   data() {
     return {
+      radio: 1,
       nowTime: null,
       recordStatus: false,
       timeOut: '',
@@ -8357,6 +8459,7 @@ export default {
             return this.$message.error("请选择车相同车号");
           }
         }
+        this.radio = 1
         this.print_zyd = true;
         this.warehouseOptions.map((e) => {
           if (e.fId == this.form.fWarehouseid) {
@@ -8431,6 +8534,7 @@ export default {
                 )
               }
             })
+            this.radio = 1
             this.fDriverTel = this.Printinglist[0].fDriverTel;
             this.fBsdate = this.Printinglist[0].fBsdate;
             this.fTruckno = this.Printinglist[0].fTruckno;
@@ -8499,11 +8603,20 @@ export default {
               this.allfGrossweight = 0;
               this.allfNetweight = 0;
               this.Printinglist.map((e) => {
-                if (e.fGrossweight) {
-                  this.allfGrossweight += parseFloat((e.fGrossweight / 1000).toSuperFixed(4));
-                }
-                if (e.fNetweight) {
-                  this.allfNetweight += parseFloat((e.fNetweight / 1000).toSuperFixed(4));
+                if (this.radio == 1) {
+                  if (e.fGrossweight) {
+                    this.allfGrossweight += parseFloat((e.fGrossweight / 1000).toSuperFixed(4));
+                  }
+                  if (e.fNetweight) {
+                    this.allfNetweight += parseFloat((e.fNetweight / 1000).toSuperFixed(4));
+                  }
+                } else {
+                  if (e.fGrossweight) {
+                    this.allfGrossweight += e.fGrossweight;
+                  }
+                  if (e.fNetweight) {
+                    this.allfNetweight += e.fNetweight;
+                  }
                 }
               })
               this.print_ccdzrkd = true
@@ -8580,6 +8693,27 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    radioChange(radio) {
+      this.allfGrossweight = 0
+      this.allfNetweight = 0
+      this.Printinglist.map((e) => {
+        if (radio == 1) {
+          if (e.fGrossweight) {
+            this.allfGrossweight += parseFloat((e.fGrossweight / 1000).toSuperFixed(4));
+          }
+          if (e.fNetweight) {
+            this.allfNetweight += parseFloat((e.fNetweight / 1000).toSuperFixed(4));
+          }
+        } else {
+          if (e.fGrossweight) {
+            this.allfGrossweight += e.fGrossweight;
+          }
+          if (e.fNetweight) {
+            this.allfNetweight += e.fNetweight;
+          }
+        }
+      })
+    },
     //计算仓储费日期变更
     changeDate() {
       this.$set(this.form, "fChargedate", this.form.fBsdate);

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -122,6 +122,7 @@
                 type="date"
                 :disabled="browseStatus || form.warehouseStatus > 3"
                 value-format="timestamp"
+                format="yyyy-MM-dd"
                 placeholder="业务日期"
                 @change="changeDate"
             >
@@ -958,6 +959,7 @@
                       style="width: 138px"
                       :disabled="browseStatus || scope.row.fBillstatus == 40"
                       type="date"
+                      format="yyyy-MM-dd"
                       value-format="timestamp"
                       placeholder="业务日期"
                   >
@@ -2446,7 +2448,7 @@
               <td>合计</td>
               <td></td>
               <td></td>
-              <td></td>
+              <td>{{ allCrfQty }}</td>
               <td></td>
               <td></td>
               <td>{{ allCrfAmount }}</td>
@@ -3920,6 +3922,7 @@ export default {
       // 收款信息明细
       PrintingCrlist: [],
       allCrfAmount: 0,
+      allCrfQty: 0,
       //库位
       stockName: "",
       //库位地址
@@ -6482,9 +6485,11 @@ export default {
             return this.$message.error("请先保存!");
           }
         }
-        this.allCrfAmount = 0
+        this.allCrfAmount = 0;
+        this.allCrfQty = 0;
         this.PrintingCrlist.forEach(item => {
           this.allCrfAmount = this.allCrfAmount + item.fAmount
+          this.allCrfQty += item.fQty
         })
         this.print_Cr = true;
       } else {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -149,6 +149,7 @@
               value-format="timestamp"
               placeholder="业务日期"
               @change="changeDate"
+              format="yyyy-MM-dd"
             >
             </el-date-picker>
           </el-form-item>
@@ -856,6 +857,7 @@
                     type="date"
                     value-format="timestamp"
                     placeholder="业务日期"
+                    format="yyyy-MM-dd"
                   >
                   </el-date-picker>
                 </span>
@@ -1861,6 +1863,13 @@
               >作业费协议</el-button
             >
             <el-button
+              type="info"
+              size="small"
+              @click.prevent="printCr"
+            >请款单
+            </el-button
+            >
+            <el-button
               type="primary"
               size="small"
               v-if="browseStatus"
@@ -1878,6 +1887,7 @@
           stripe
           show-summary
           :summary-method="warehouseDrSummaries"
+          @selection-change="SelectCr"
         >
           <el-table-column type="selection" width="50" align="center" fixed />
           <el-table-column
@@ -2520,7 +2530,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area2" class="print-div">
         <div
           class="print-title"
           style="
@@ -2579,7 +2589,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ index + 1 }}</td>
-              <td>{{ item.fBsdate }}</td>
+              <td>{{ item.fBsdate | fBsdateFormat }}</td>
               <td>{{ item.fCntqty }}</td>
               <td v-if="item.fGrossweight">
                 {{ (item.fGrossweight / 1000).toFixed(2) }}
@@ -2630,7 +2640,7 @@
           :disabled="browseStatus"
           @click="
             print_rkd = false;
-            addprint();
+            addprint('rkd');
           "
           >打印
         </el-button>
@@ -2643,7 +2653,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area3" class="print-div">
         <div
           class="print-title"
           style="
@@ -2699,7 +2709,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('shd');
             print_shd = false;
           "
           >打印
@@ -2713,7 +2723,7 @@
       :close-on-click-modal="false"
       :modal="false"
     >
-      <div id="print_area1" class="print-div">
+      <div id="print_area4" class="print-div">
         <div
           class="print-title"
           style="
@@ -2789,7 +2799,7 @@
           type="primary"
           :disabled="browseStatus"
           @click="
-            addprint();
+            addprint('ykd');
             print_ykd = false;
           "
           >打印
@@ -3078,6 +3088,114 @@
       >
       <el-button @click="cancel">取 消</el-button>
     </div>
+
+    <!--    付款信息作业单-->
+    <el-dialog
+      :visible.sync="print_Cr"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_Cr" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ company }}请款单
+        </div>
+        <div
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 18px;
+            margin-bottom: 5px;
+          "
+        ></div>
+        <div
+          style="
+            display: flex;
+            justify-content: space-between;
+            margin-bottom: 5px;
+          "
+          class="print_form"
+        >
+          <div style="display: flex; flex-direction: column;">
+            <!--            <div>请款单号：</div>-->
+            <div>源业务编码：{{ form.fBillno }}</div>
+            <div>委托单位：{{ form.fCorpid | fMblnoFormat(fMblnoOptions) }}</div>
+          </div>
+          <div style="display: flex; flex-direction: column;margin-right: 15px;width: 150px">
+            <div style="">请款日期：</div>
+          </div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>结算单位</td>
+              <td>提单号</td>
+              <!--              <td>源业务编码</td>-->
+              <td>业务日期</td>
+              <td>数量</td>
+              <td>单价</td>
+              <td>费用</td>
+              <td>人民币</td>
+              <td>美元</td>
+            </tr>
+            <tr v-for="(item, index) in PrintingCrlist" :key="index">
+              <td>{{ item.fCorpid | fMblnoFormat(fMblnoOptions) }}</td>
+              <td>{{ form.fMblno }}</td>
+              <!--              <td>{{ form.fBillno }}</td>-->
+              <td>{{ form.fBsdate | fBsdateFormat }}</td>
+              <td>{{ item.fQty }}</td>
+              <td>{{ item.fUnitprice }}</td>
+              <td>{{ item.fFeeid | fFeetFormat(fCNameOptions) }}</td>
+              <td>{{ item.fAmount }}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>合计</td>
+              <td></td>
+              <td></td>
+              <td>{{ allCrfQty }}</td>
+              <td></td>
+              <td></td>
+              <td>{{ allCrfAmount }}</td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>领款人：</div>
+          <div>业务经理：</div>
+          <div>财务：</div>
+          <div style="width: 150px">经理：</div>
+        </div>
+      </div>
+      <span lot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="
+            print_Cr = false;
+            addprint('crzyd');
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_Cr = false" size="mini">取消 </el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -3599,6 +3717,12 @@ export default {
       tfNetweightnum: 0,
       tfGrossweightnum: 0,
       showApproval: null,
+      // 收款信息明细
+      PrintingCrlist: [],
+      allCrfAmount: 0,
+      allCrfQty: 0,
+      // Cr打印弹窗是否开启
+      print_Cr: false,
     };
   },
   created() {
@@ -3709,6 +3833,34 @@ export default {
       });
       return goods;
     },
+    fMblnoFormat(row, fMblnoOptions) {
+      let name;
+      fMblnoOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
+    fBsdateFormat(row) {
+      if (row) {
+        const dateMat = new Date(row);
+        const year = dateMat.getFullYear();
+        const month = dateMat.getMonth() + 1;
+        const day = dateMat.getDate();
+        const timeFormat = year + "-" + month + "-" + day;
+        return timeFormat;
+      }
+    },
+    fFeetFormat(row, fCNameOptions) {
+      let name;
+      fCNameOptions.map((e) => {
+        if (row == e.fId) {
+          name = e.fName;
+        }
+      });
+      return name;
+    },
   },
   methods: {
     init() {
@@ -5580,6 +5732,9 @@ export default {
     },
     //打印
     addprint(status) {
+      const style =
+        "@page {  } " +
+        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
       if (status == "zyd") {
         if (this.CntrTable.length > 0) {
           let arr = [];
@@ -5671,7 +5826,36 @@ export default {
           style: style, // 亦可使用引入的外部css;
           scanStyles: false,
         });
-      }else{
+      } else if (status == 'crzyd') {
+        print({
+          printable: "print_Cr",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }else if (status == 'shd') {
+        print({
+          printable: "print_area3",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }else if (status == 'rkd') {
+        print({
+          printable: "print_area2",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }else if (status == 'ykd') {
+        print({
+          printable: "print_area4",
+          type: "html",
+          style: style, // 亦可使用引入的外部css;
+          scanStyles: false,
+        });
+      }
+      else{
         print({
           printable: "print_area1",
           type: "html",
@@ -5679,9 +5863,6 @@ export default {
           scanStyles: false,
         });
       }
-      const style =
-        "@page {  } " +
-        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
       // print({
       //   printable: "print_area1",
       //   type: "html",
@@ -5763,6 +5944,29 @@ export default {
         console.log(this.warehouseDrList)
       })
     },
+    // 付款明细多选
+    SelectCr(selection) {
+      this.PrintingCrlist = selection;
+    },
+    // 付款信息打印准备
+    printCr() {
+      if (this.PrintingCrlist.length > 0) {
+        for (let item in this.PrintingCrlist) {
+          if (!this.PrintingCrlist[item].fId) {
+            return this.$message.error("请先保存!");
+          }
+        }
+        this.allCrfAmount = 0;
+        this.allCrfQty = 0;
+        this.PrintingCrlist.forEach(item => {
+          this.allCrfAmount = this.allCrfAmount + item.fAmount
+          this.allCrfQty += item.fQty
+        })
+        this.print_Cr = true;
+      } else {
+        this.$message.error("请选择需要打印的明细!");
+      }
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变