增加打印抬头，从表文字移除隐藏

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -853,6 +853,7 @@
               align="center"
               :fixed="item.fixed"
               sortable
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <span v-if="item.label == 'fBillstatus'">
@@ -3202,6 +3203,14 @@ export default {
     this.getDicts("data_ifdamage_status").then((response) => {
       this.fIfdamageOptions = response.data;
     });
+    this.getDicts("st_trans_type").then((response) => {
+      this.businessTypeOption = response.data;
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
+    });
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
     this.getConfigKey("data_showcar").then((response) => {
       this.dataShowcar = response.msg;
       if (this.dataShowcar == "0") {
@@ -4750,7 +4759,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -4786,7 +4795,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -4838,7 +4847,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -4856,7 +4865,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,

src/views/Warehousing/components/incomeMoney.vue

@@ -675,7 +675,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
           style="
@@ -746,12 +746,12 @@
           </table>
         </div>
         <div>人民币汇款路径：</div>
-        <div>公司名称：{{ company }}</div>
-        <div>纳税人识别号：{{ Identifier }}</div>
-        <div>地址：{{ address }}</div>
-        <div>电话：{{ phone }}</div>
-        <div>开户行：{{ bank }}</div>
-        <div>银行账户：{{ bankAccount }}</div>
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button
@@ -843,6 +843,12 @@ export default {
       type: Array,
       default: [],
     },
+    fCompanyName: {
+      type: String
+    },
+    printFeeConfirm: {
+      type: Object,
+    },
   },
   data() {
     return {
@@ -864,16 +870,6 @@ export default {
       print_fyqr: false,
       company: '',
       warehouseOptions:[],
-      // 识别号
-      Identifier: '',
-      // 地址
-      address: '',
-      // 电话
-      phone: '',
-      // 开户行
-      bank: '',
-      // 银行账户
-      bankAccount: '',
       // 是否启用请款单
       isShowInvoice: null,
       // 是否启用费用确认单
@@ -881,21 +877,6 @@ export default {
     };
   },
   created() {
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
-      this.Identifier = response.msg;
-    });
-    this.getConfigKey("print.address").then((response) => {
-      this.address = response.msg;
-    });
-    this.getConfigKey("print.phone").then((response) => {
-      this.phone = response.msg;
-    });
-    this.getConfigKey("print.bank").then((response) => {
-      this.bank = response.msg;
-    });
-    this.getConfigKey("print.bank.account").then((response) => {
-      this.bankAccount = response.msg;
-    });
     this.getConfigKey("warehouse.show.invoice").then((response) => {
       this.isShowInvoice = response.msg;
     });
@@ -1123,7 +1104,7 @@ export default {
             fCurrency: "RMB",
             fExrate: 1,
             fAmount: fAmount,
-            fTaxrate: this.fTaxrate,
+            fTaxrate: '0',
             fMblno: this.form.fMblno,
             fProductName: this.form.fProductName,
             fMarks: this.form.fMarks,

src/views/Warehousing/components/payMoney.vue

@@ -1078,7 +1078,7 @@ export default {
             fCurrency: "RMB",
             fExrate: 1,
             fAmount: fAmount,
-            fTaxrate: this.fTaxrate,
+            fTaxrate: '0',
             fMblno: this.form.fMblno,
             fProductName: this.form.fProductName,
             fMarks: this.form.fMarks,

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -244,6 +244,28 @@
       </el-row>
       <el-row>
         <el-col :span="8">
+          <el-form-item label="打印抬头">
+            <el-select
+              v-model="form.fCompany"
+              clearable
+              filterable
+              placeholder="请输入关键词"
+              style="width: 80%"
+              @change="changePrint"
+              :disabled="browseStatus || form.warehouseStatus > 3"
+            >
+              <el-option
+                v-for="(item, index) in fMblnoOptions"
+                :key="index.fId"
+                :label="item.fName"
+                :value="item.fId"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
           <el-form-item>
             <div style="display: flex; align-items: center">
               <el-table
@@ -459,6 +481,7 @@
               align="center"
               :fixed="item.fixed"
               sortable
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <span v-if="item.label == 'fBillstatus'">
@@ -1830,7 +1853,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}请款单
+          {{ fCompanyName? fCompanyName: company }}请款单
         </div>
         <div
           style="
@@ -1937,7 +1960,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
           style="
@@ -2008,12 +2031,12 @@
           </table>
         </div>
         <div>人民币汇款路径：</div>
-        <div>公司名称：{{ company }}</div>
-        <div>纳税人识别号：{{ Identifier }}</div>
-        <div>地址：{{ address }}</div>
-        <div>电话：{{ phone }}</div>
-        <div>开户行：{{ bank }}</div>
-        <div>银行账户：{{ bankAccount }}</div>
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button
@@ -2151,7 +2174,7 @@ import {
   fromMblno
 } from "@/api/warehouseBusiness/goodsTransfer";
 import { operationAgreement } from "@/api/agreement/agreement";
-import { listCorps } from "@/api/basicdata/corps";
+import { listCorps, getCorps } from "@/api/basicdata/corps";
 import { listFees, getFees } from "@/api/basicdata/fees";
 import {
   listWarehouse,
@@ -2453,6 +2476,13 @@ export default {
           width: 100,
         },
         {
+          surface: "18",
+          label: "fShipper",
+          name: "发货方",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "19",
           label: "fLntype",
           name: "装卸方式",
@@ -2620,22 +2650,21 @@ export default {
       allDrAmount: 0,
       print_fyqr: false,
       activeName: 'searchList',
-      // 识别号
-      Identifier: '',
-      // 地址
-      address: '',
-      // 电话
-      phone: '',
-      // 开户行
-      bank: '',
-      // 银行账户
-      bankAccount: '',
       nowTime: null,
       print_Crfyqr: false,
       // 是否启用请款单
       isShowInvoice: null,
       // 是否启用费用确认单
       isShowFeesConfirm: null,
+      // 选择打印抬头中文名
+      fCompanyName: '',
+      printFeeConfirm: {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      },
     };
   },
   created() {
@@ -2661,20 +2690,13 @@ export default {
     this.getDicts("data_ifdamage_status").then((response) => {
       this.fIfdamageOptions = response.data;
     });
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
-      this.Identifier = response.msg;
-    });
-    this.getConfigKey("print.address").then((response) => {
-      this.address = response.msg;
-    });
-    this.getConfigKey("print.phone").then((response) => {
-      this.phone = response.msg;
-    });
-    this.getConfigKey("print.bank").then((response) => {
-      this.bank = response.msg;
+    this.getDicts("st_goodstf_type").then((response) => {
+      this.businessTypeOption = response.data;
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
     });
-    this.getConfigKey("print.bank.account").then((response) => {
-      this.bankAccount = response.msg;
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
     });
     this.getConfigKey("warehouse.show.invoice").then((response) => {
       this.isShowInvoice = response.msg;
@@ -3142,6 +3164,7 @@ export default {
           remark: null,
           fSrcid: e.fId,
           fSrcBsdate: e.fBsdate,
+          fShipper: e.fShipper,
         });
       });
       this.whgenlegVisible = false;
@@ -3536,6 +3559,7 @@ export default {
     getForm() {
       getGoodsTransfer(this.chiId).then((response) => {
         this.form = response.data.warehousebills;
+        if (this.form.fCompany) this.changePrint()
         if (this.form.fBillstatus > 3) {
           this.approvalStatus = false;
           this.browseStatus = true;
@@ -4240,7 +4264,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -4276,7 +4300,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -4328,7 +4352,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -4346,7 +4370,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -4491,6 +4515,14 @@ export default {
       this.warehouseCrList = [];
       this.warehouseDrList = [];
       this.CntrTable = [];
+      this.printFeeConfirm = {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      }
+      this.fCompanyName = '';
       this.$emit("changeShow", "true");
     },
     goBack() {
@@ -4739,6 +4771,27 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    changePrint() {
+      if (this.form.fCompany) {
+        getCorps(this.form.fCompany).then(res => {
+          this.fCompanyName = res.data.corp.fName
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
+          this.printFeeConfirm.fTel = res.data.corp.fTel
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
+          this.printFeeConfirm.fTax = res.data.corp.fTax
+        })
+      } else {
+        this.fCompanyName = ''
+        this.printFeeConfirm = {
+          fAddr: '',
+          fBankname: '',
+          fBankno: '',
+          fTel: '',
+          fTax: '',
+        }
+      }
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -5040,6 +5040,14 @@ export default {
     this.getDicts("data_ifdamage_status").then((response) => {
       this.fIfdamageOptions = response.data;
     });
+    this.getDicts("st_out_type").then((response) => {
+      this.businessTypeOption = response.data;
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
+    });
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
     this.getConfigKey("new.plan").then((response) => {
       this.newPlan = response.msg;
     });
@@ -7404,7 +7412,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -7441,7 +7449,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -7492,7 +7500,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -7510,7 +7518,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -305,37 +305,37 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
+          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
             <el-input
-                v-model="form.fPlannetweight"
-                style="width: 80%"
-                maxlength="16"
-                v-input-limit="2"
-                placeholder="计划净重"
-                @input="changePlannetWeight"
-                :disabled="
+              v-model="form.fPlangrossweight"
+              style="width: 80%"
+              v-input-limit="2"
+              placeholder="计划毛重"
+              maxlength="16"
+              :disabled="
                 browseStatus || current !== before || form.warehouseStatus > 3
               "
-                @change="tfNetweight"
+              @change="tfGrossweight"
             >
-              <template slot="append">{{ tfNetweightnum }}吨</template>
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
+          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
             <el-input
-                v-model="form.fPlangrossweight"
+                v-model="form.fPlannetweight"
                 style="width: 80%"
-                v-input-limit="2"
-                placeholder="计划毛重"
                 maxlength="16"
+                v-input-limit="2"
+                placeholder="计划净重"
+                @input="changePlannetWeight"
                 :disabled="
                 browseStatus || current !== before || form.warehouseStatus > 3
               "
-                @change="tfGrossweight"
+                @change="tfNetweight"
             >
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
+              <template slot="append">{{ tfNetweightnum }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
@@ -551,6 +551,26 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="打印抬头">
+                  <el-select
+                    v-model="form.fCompany"
+                    clearable
+                    filterable
+                    placeholder="请输入关键词"
+                    style="width: 80%"
+                    @change="changePrint"
+                    :disabled="browseStatus || form.warehouseStatus > 3"
+                  >
+                    <el-option
+                      v-for="(item, index) in fMblnoOptions"
+                      :key="index.fId"
+                      :label="item.fName"
+                      :value="item.fId"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </div>
           <el-row>
@@ -1440,6 +1460,8 @@
             :CntrTable="CntrTable"
             :cntrList="cntrList"
             :goodsOptions="goodsOptions"
+            :fCompanyName="fCompanyName"
+            :printFeeConfirm="printFeeConfirm"
         ></income-money>
       </el-collapse-item>
 
@@ -1879,7 +1901,7 @@
             position: relative;
           "
         >
-          {{ company }}作业单
+          {{ fCompanyName? fCompanyName: company }}作业单
           <div
             style="
             display: flex;
@@ -2010,7 +2032,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}收货单
+          {{ fCompanyName? fCompanyName: company }}收货单
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
@@ -2081,7 +2103,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}进仓单
+          {{ fCompanyName? fCompanyName: company }}进仓单
         </div>
         <div
           style="
@@ -2236,7 +2258,10 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}入库单
+          {{ fCompanyName? fCompanyName: company }}入库单
+        </div>
+        <div style="display: flex;justify-content: flex-end">
+          <div>制单人：{{ form.createBy }}</div>
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
@@ -2341,7 +2366,10 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}入库单
+          {{ fCompanyName? fCompanyName: company }}入库单
+        </div>
+        <div style="display: flex;justify-content: flex-end">
+          <div>制单人：{{ form.createBy }}</div>
         </div>
         <div class="print_table" style="display: flex">
           <table
@@ -2450,7 +2478,10 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}入库单
+          {{ fCompanyName? fCompanyName: company }}入库单
+        </div>
+        <div style="display: flex;justify-content: flex-end">
+          <div>制单人：{{ form.createBy }}</div>
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
@@ -2558,7 +2589,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}入库单
+          {{ fCompanyName? fCompanyName: company }}入库单
         </div>
         <div style="width: 100%">
           <div style="width: 100%;display: flex">
@@ -2683,7 +2714,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -2799,7 +2830,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -2887,7 +2918,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -2975,7 +3006,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div
             style="
@@ -3089,7 +3120,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div style="display: flex; flex-direction: column; margin-left: 70%">
           <div>{{ form.fBillno }}</div>
@@ -3180,7 +3211,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div class="print_table" style="display: flex;flex-direction: column">
           <table
@@ -3389,7 +3420,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -3593,7 +3624,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
@@ -3635,11 +3666,13 @@
             </tr>
             <tr>
               <td>本垛件数</td>
-              <td colspan="2">{{ form.fPlanqty }}</td>
+              <td colspan="2"></td>
+<!--              <td colspan="2">{{ form.fPlanqty }}</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>
+              <td colspan="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>
@@ -3793,7 +3826,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div style="display:flex;flex-direction: column;margin-left: 70%">
           <div>{{ form.fBillno }}</div>
@@ -3878,7 +3911,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
@@ -4071,7 +4104,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -4266,7 +4299,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div
             style="
@@ -4378,7 +4411,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div class="print_table" style="display: flex">
           <table
@@ -4577,7 +4610,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -4972,7 +5005,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div style="display:flex;flex-direction: column;margin-left: 70%">
           <div>{{ form.fBillno }}</div>
@@ -5063,7 +5096,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
@@ -5256,7 +5289,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -5355,7 +5388,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}入库单
+          {{ fCompanyName? fCompanyName: company }}入库单
         </div>
         <div
             style="
@@ -5570,7 +5603,7 @@
                 margin-bottom: 5px;
               "
         >
-          {{ company }}货物标识卡
+          {{ fCompanyName? fCompanyName: company }}货物标识卡
         </div>
         <div class="print_table" style="display: flex;flex-direction: column">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%" v-for="(item, index) in Printinglist"
@@ -5773,7 +5806,7 @@
                 margin-bottom: 5px;
               "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -6261,7 +6294,7 @@ import {
   feesCheck
 } from "@/api/warehouseBusiness/warehouseInStock";
 import {operationAgreement} from "@/api/agreement/agreement";
-import {listCorps} from "@/api/basicdata/corps";
+import {listCorps, getCorps} from "@/api/basicdata/corps";
 import {listFees, getFees} from "@/api/basicdata/fees";
 import {
   listWarehouse,
@@ -6699,12 +6732,29 @@ export default {
       entryPrinting: 1,
       weighedRequired: 1,
       inTime: '',
-      bring: null
+      bring: null,
+      // 选择打印抬头中文名
+      fCompanyName: '',
+      printFeeConfirm: {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      },
     };
   },
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate.filter((e) => e.checked == 0);
+    this.getDicts("st_in_type").then((response) => {
+      this.businessTypeOption = response.data;
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
+    });
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
     });
@@ -6773,7 +6823,6 @@ export default {
       this.showfPartNumber = response.msg;
     });
     this.getConfigKey("data_showcar").then((response) => {
-      console.log(response.msg)
       this.dataShowcar = response.msg;
       if (this.dataShowcar == "0") {
         this.detailsHidden2 = false;
@@ -7668,6 +7717,8 @@ export default {
       if (this.form.fStltypeid || this.form.fStltypeid == 0) {
         this.$set(this.form, "fStltypeid", this.form.fStltypeid.toString());
       }
+      // 判断有没有打印抬头
+      if (this.form.fCompany) this.changePrint()
     },
     getForm() {
       let fId = null
@@ -8071,6 +8122,7 @@ export default {
               }
               this.detailList.forEach(item => {
                 this.$set(item, 'fOriginalbillno', this.form.fMblno)
+                this.$set(item, 'fShipper', this.form.fShipper)
               })
               for (let item in this.warehouseDrList) {
                 if (!this.warehouseDrList[item].fCorpid) {
@@ -8246,7 +8298,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -8744,7 +8796,6 @@ export default {
                 this.container += item
               })
               this.container = this.container.slice(0, this.container.length - 1)
-              console.log(this.container)
               this.print_zpdkrkd = true
             } else if (command == "g") {
               let date = new Date();
@@ -8857,7 +8908,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -9178,6 +9229,14 @@ export default {
       this.form.fId = ''
       this.resetForm("form");
       this.resetForm("importList");
+      this.printFeeConfirm = {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      }
+      this.fCompanyName = '';
       this.detailList = [];
       this.relevantAttachments = [];
       this.warehouseCrList = [];
@@ -9308,6 +9367,27 @@ export default {
         this.$set(this.form, 'fTel', res.data.fTel)
       })
     },
+    changePrint() {
+      if (this.form.fCompany) {
+        getCorps(this.form.fCompany).then(res => {
+          this.fCompanyName = res.data.corp.fName
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
+          this.printFeeConfirm.fTel = res.data.corp.fTel
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
+          this.printFeeConfirm.fTax = res.data.corp.fTax
+        })
+      } else {
+        this.fCompanyName = ''
+        this.printFeeConfirm = {
+          fAddr: '',
+          fBankname: '',
+          fBankno: '',
+          fTel: '',
+          fTax: '',
+        }
+      }
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -248,36 +248,36 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
+          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
             <el-input
-                v-model="form.fPlannetweight"
-                style="width: 80%"
-                maxlength="16"
-                v-input-limit="2"
-                laceholder="计划净重"
-                :disabled="
+              v-model="form.fPlangrossweight"
+              v-input-limit="2"
+              style="width: 80%"
+              laceholder="计划毛重"
+              maxlength="16"
+              :disabled="
                 browseStatus || current !== before || form.warehouseStatus > 3
               "
-                @change="tfNetweight"
+              @change="tfGrossweight"
             >
-              <template slot="append">{{ tfNetweightnum }}吨</template>
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划毛重(kg)" prop="fPlangrossweight">
+          <el-form-item label="计划净重(kg)" prop="fPlannetweight">
             <el-input
-                v-model="form.fPlangrossweight"
-                v-input-limit="2"
+                v-model="form.fPlannetweight"
                 style="width: 80%"
-                laceholder="计划毛重"
                 maxlength="16"
+                v-input-limit="2"
+                laceholder="计划净重"
                 :disabled="
                 browseStatus || current !== before || form.warehouseStatus > 3
               "
-                @change="tfGrossweight"
+                @change="tfNetweight"
             >
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
+              <template slot="append">{{ tfNetweightnum }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
@@ -433,22 +433,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="发货方">
+              <el-form-item label="打印抬头">
                 <el-select
-                  v-model="form.fShipper"
+                  v-model="form.fCompany"
                   clearable
                   filterable
                   placeholder="请输入关键词"
-                  disabled
                   style="width: 80%"
-                  allow-create
-                  default-first-option
+                  @change="changePrint"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
                 >
                   <el-option
                     v-for="(item, index) in fMblnoOptions"
                     :key="index.fId"
                     :label="item.fName"
-                    :value="item.fName"
+                    :value="item.fId"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -968,6 +967,7 @@
                 align="center"
                 :fixed="item.fixed"
                 sortable
+                show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <span v-if="item.label == 'fBillstatus'">
@@ -2539,7 +2539,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}请款单
+          {{ fCompanyName? fCompanyName: company }}请款单
         </div>
         <div
           style="
@@ -2649,7 +2649,7 @@
             position:relative;
           "
         >
-          {{ company }}作业单
+          {{ fCompanyName? fCompanyName: company }}作业单
           <div
             style="
             display: flex;
@@ -2791,7 +2791,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}出库单
+          {{ fCompanyName? fCompanyName: company }}出库单
         </div>
         <div class="print_table" style="display: flex">
           <table
@@ -3036,7 +3036,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div style="font-size: 22px;margin-bottom: 5px;width: 100%;text-align: center">出库单</div>
         <div class="print_table" style="display: flex">
@@ -3144,7 +3144,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}出库单
+          {{ fCompanyName? fCompanyName: company }}出库单
         </div>
         <div class="print_table" style="display: flex">
           <table
@@ -3251,7 +3251,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -3367,7 +3367,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
             style="
@@ -3461,7 +3461,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
 
         <div
@@ -3572,7 +3572,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
 
         <div
@@ -3682,7 +3682,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
 
         <div
@@ -3807,7 +3807,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
           style="
@@ -3878,12 +3878,12 @@
           </table>
         </div>
         <div>人民币汇款路径：</div>
-        <div>公司名称：{{ company }}</div>
-        <div>纳税人识别号：{{ Identifier }}</div>
-        <div>地址：{{ address }}</div>
-        <div>电话：{{ phone }}</div>
-        <div>开户行：{{ bank }}</div>
-        <div>银行账户：{{ bankAccount }}</div>
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button
@@ -4211,7 +4211,7 @@ import {
   revokefeeCheck
 } from "@/api/warehouseBusiness/warehouseOutStock";
 import {operationAgreement} from "@/api/agreement/agreement";
-import {listCorps} from "@/api/basicdata/corps";
+import {listCorps, getCorps} from "@/api/basicdata/corps";
 import {listFees, getFees} from "@/api/basicdata/fees";
 import {
   listWarehouse,
@@ -4525,102 +4525,109 @@ export default {
         },
         {
           surface: "17",
+          label: "fShipper",
+          name: "发货方",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "18",
           label: "fGoodsval",
           name: "货值",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "19",
           label: "fFleet",
           name: "车队",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "20",
           label: "fTruckno",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "21",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "21",
+          surface: "22",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "23",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
           width: 150,
         },
         {
-          surface: "23",
+          surface: "24",
           label: "fIsPass",
           name: "是否放行",
           checked: 0,
           width: 150,
         },
         {
-          surface: "24",
+          surface: "25",
           label: "fLntype",
           name: "装卸方式",
           checked: 0,
           width: 100,
         },
         {
-          surface: "25",
+          surface: "26",
           label: "fForkliftman",
           name: "叉车工",
           checked: 0,
           width: 100,
         },
         {
-          surface: "26",
+          surface: "27",
           label: "fLocalcntrno",
           name: "库内箱号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "27",
+          surface: "28",
           label: "fSealno",
           name: "封号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "28",
+          surface: "29",
           label: "fSerialNumber",
           name: "流水号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "29",
+          surface: "30",
           label: "remark",
           name: "备注",
           checked: 0,
           width: 100,
         }, {
-          surface: "30",
+          surface: "31",
           label: "fNowCarton",
           name: "现箱号",
           checked: 0,
           width: 100,
         }, {
-          surface: "31",
+          surface: "32",
           label: "fCartypeId",
           name: "车辆类型",
           checked: 0,
@@ -4756,22 +4763,21 @@ export default {
       allDrAmount: 0,
       print_fyqr: false,
       activeName: 'searchList',
-      // 识别号
-      Identifier: '',
-      // 地址
-      address: '',
-      // 电话
-      phone: '',
-      // 开户行
-      bank: '',
-      // 银行账户
-      bankAccount: '',
       // 付款信息费用确认单
       print_Crfyqr: false,
       // 是否启用请款单
       isShowInvoice: null,
       // 是否启用费用确认单
       isShowFeesConfirm: null,
+      // 选择打印抬头中文名
+      fCompanyName: '',
+      printFeeConfirm: {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      },
     };
   },
   computed: {
@@ -4801,27 +4807,20 @@ export default {
     this.getConfigKey("entry.printing").then((response) => {
       this.entryPrinting = response.msg;
     });
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
-      this.Identifier = response.msg;
-    });
-    this.getConfigKey("print.address").then((response) => {
-      this.address = response.msg;
-    });
-    this.getConfigKey("print.phone").then((response) => {
-      this.phone = response.msg;
-    });
-    this.getConfigKey("print.bank").then((response) => {
-      this.bank = response.msg;
-    });
-    this.getConfigKey("print.bank.account").then((response) => {
-      this.bankAccount = response.msg;
-    });
     this.getConfigKey("warehouse.show.invoice").then((response) => {
       this.isShowInvoice = response.msg;
     });
     this.getConfigKey("warehouse.show.feesConfirm").then((response) => {
       this.isShowFeesConfirm = response.msg;
     });
+    this.getDicts("st_out_type").then((response) => {
+      this.businessTypeOption = response.data;
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
+    });
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
     });
@@ -6055,6 +6054,8 @@ export default {
     getForm() {
       getWarehousebills(this.chiId).then((response) => {
         this.form = response.data.warehousebills;
+        // 判断有没有打印抬头
+        if (this.form.fCompany) this.changePrint()
         // queryReviewer(this.form.fId).then(res => {
         //   if (!res.data) {
         //     this.firstReviewer = '';
@@ -6973,13 +6974,14 @@ export default {
           const index = this.detailList.findIndex(item => item.fSrcid === e.fId)
           if (index == -1) {
             arr.push(e)
-            total++
+          } else {
+            response.total --
           }
         });
         // this.whgenlegList = response.rows;
-        // this.whgenlegTotal = response.total;
+        this.whgenlegTotal = response.total;
         this.whgenlegList = arr;
-        this.whgenlegTotal = total;
+        // this.whgenlegTotal = total;
       });
     },
     async printZyd() {
@@ -7279,7 +7281,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -7316,7 +7318,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -7367,7 +7369,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -7387,7 +7389,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -7775,6 +7777,14 @@ export default {
       this.warehouseCrList = [];
       this.warehouseDrList = [];
       this.CntrTable = [];
+      this.printFeeConfirm = {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      }
+      this.fCompanyName = '';
       this.$emit("changeShow", "true");
     },
     goBack() {
@@ -8052,6 +8062,27 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    changePrint() {
+      if (this.form.fCompany) {
+        getCorps(this.form.fCompany).then(res => {
+          this.fCompanyName = res.data.corp.fName
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
+          this.printFeeConfirm.fTel = res.data.corp.fTel
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
+          this.printFeeConfirm.fTax = res.data.corp.fTax
+        })
+      } else {
+        this.fCompanyName = ''
+        this.printFeeConfirm = {
+          fAddr: '',
+          fBankname: '',
+          fBankno: '',
+          fTel: '',
+          fTax: '',
+        }
+      }
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -251,32 +251,32 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划调拨净重(kg)" prop="fPlannetweight">
+          <el-form-item label="计划调拨毛重(kg)" prop="fPlangrossweight">
             <el-input
-              v-model="form.fPlannetweight"
+              v-model="form.fPlangrossweight"
+              v-input-limit="2"
               style="width: 80%"
+              laceholder="计划毛重"
               maxlength="16"
-              v-input-limit="2"
-              laceholder="计划净重"
               :disabled="browseStatus || current !== before"
-              @change="tfNetweight"
+              @change="tfGrossweight"
             >
-              <template slot="append">{{ tfNetweightnum }}吨</template>
+              <template slot="append">{{ tfGrossweightnum }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="计划调拨毛重(kg)" prop="fPlangrossweight">
+          <el-form-item label="计划调拨净重(kg)" prop="fPlannetweight">
             <el-input
-              v-model="form.fPlangrossweight"
-              v-input-limit="2"
+              v-model="form.fPlannetweight"
               style="width: 80%"
-              laceholder="计划毛重"
               maxlength="16"
+              v-input-limit="2"
+              laceholder="计划净重"
               :disabled="browseStatus || current !== before"
-              @change="tfGrossweight"
+              @change="tfNetweight"
             >
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
+              <template slot="append">{{ tfNetweightnum }}吨</template>
             </el-input>
           </el-form-item>
         </el-col>
@@ -475,6 +475,26 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="打印抬头">
+                <el-select
+                  v-model="form.fCompany"
+                  clearable
+                  filterable
+                  placeholder="请输入关键词"
+                  style="width: 80%"
+                  @change="changePrint"
+                  :disabled="browseStatus || form.warehouseStatus > 3"
+                >
+                  <el-option
+                    v-for="(item, index) in fMblnoOptions"
+                    :key="index.fId"
+                    :label="item.fName"
+                    :value="item.fId"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -841,6 +861,7 @@
               align="center"
               :fixed="item.fixed"
               sortable
+              show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <span v-if="item.label == 'fBillstatus'">
@@ -2465,7 +2486,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}作业单
+          {{ fCompanyName? fCompanyName: company }}作业单
         </div>
         <div
           style="
@@ -2569,7 +2590,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}进仓单
+          {{ fCompanyName? fCompanyName: company }}进仓单
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
@@ -2701,7 +2722,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}收货单
+          {{ fCompanyName? fCompanyName: company }}收货单
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
@@ -2772,7 +2793,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
           style="
@@ -2867,7 +2888,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
 <!--        <div-->
 <!--          style="-->
@@ -3155,7 +3176,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}请款单
+          {{ fCompanyName? fCompanyName: company }}请款单
         </div>
         <div
           style="
@@ -3263,7 +3284,7 @@
             margin-bottom: 5px;
           "
         >
-          {{ company }}
+          {{ fCompanyName? fCompanyName: company }}
         </div>
         <div
           style="
@@ -3334,12 +3355,12 @@
           </table>
         </div>
         <div>人民币汇款路径：</div>
-        <div>公司名称：{{ company }}</div>
-        <div>纳税人识别号：{{ Identifier }}</div>
-        <div>地址：{{ address }}</div>
-        <div>电话：{{ phone }}</div>
-        <div>开户行：{{ bank }}</div>
-        <div>银行账户：{{ bankAccount }}</div>
+        <div>公司名称：{{ fCompanyName? fCompanyName: company }}</div>
+        <div>纳税人识别号：{{ printFeeConfirm.fTax }}</div>
+        <div>地址：{{ printFeeConfirm.fAddr }}</div>
+        <div>电话：{{ printFeeConfirm.fTel }}</div>
+        <div>开户行：{{ printFeeConfirm.fBankname }}</div>
+        <div>银行账户：{{ printFeeConfirm.fBankno }}</div>
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button
@@ -3482,7 +3503,7 @@ import {
   revokefeeCheck
 } from "@/api/warehouseBusiness/stockTransfer";
 import { operationAgreement } from "@/api/agreement/agreement";
-import { listCorps } from "@/api/basicdata/corps";
+import { listCorps, getCorps } from "@/api/basicdata/corps";
 import { listFees, getFees } from "@/api/basicdata/fees";
 import {
   listWarehouse,
@@ -3749,7 +3770,6 @@ export default {
           checked: 0,
           width: 120,
         },
-
         {
           surface: "14",
           label: "fPackagespecs",
@@ -3758,6 +3778,13 @@ export default {
           width: 100,
         },
         {
+          surface: "14",
+          label: "fShipper",
+          name: "发货方",
+          checked: 0,
+          width: 100,
+        },
+        {
           surface: "15",
           label: "fFleet",
           name: "车队",
@@ -3992,22 +4019,21 @@ export default {
       allDrAmount: 0,
       print_fyqr: false,
       activeName: 'searchList',
-      // 识别号
-      Identifier: '',
-      // 地址
-      address: '',
-      // 电话
-      phone: '',
-      // 开户行
-      bank: '',
-      // 银行账户
-      bankAccount: '',
       nowTime: null,
       print_Crfyqr: false,
       // 是否启用请款单
       isShowInvoice: null,
       // 是否启用费用确认单
       isShowFeesConfirm: null,
+      // 选择打印抬头中文名
+      fCompanyName: '',
+      printFeeConfirm: {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      },
     };
   },
   created() {
@@ -4036,6 +4062,14 @@ export default {
     this.getDicts("data_ifdamage_status").then((response) => {
       this.fIfdamageOptions = response.data;
     });
+    this.getDicts("st_trans_type").then((response) => {
+      this.businessTypeOption = response.data;
+      localStorage.setItem("businessTypeList", JSON.stringify(response.data));
+    });
+    this.getDicts("storage_type").then((response) => {
+      this.fStorageTypeOptions = response.data;
+      localStorage.setItem("fStorageTypeList", JSON.stringify(response.data));
+    });
     this.getConfigKey("data_showcar").then((response) => {
       this.dataShowcar = response.msg;
       if (this.dataShowcar == "0") {
@@ -4044,21 +4078,6 @@ export default {
         this.detailsHidden2 = true;
       }
     });
-    this.getConfigKey("taxpayer.identification.number").then((response) => {
-      this.Identifier = response.msg;
-    });
-    this.getConfigKey("print.address").then((response) => {
-      this.address = response.msg;
-    });
-    this.getConfigKey("print.phone").then((response) => {
-      this.phone = response.msg;
-    });
-    this.getConfigKey("print.bank").then((response) => {
-      this.bank = response.msg;
-    });
-    this.getConfigKey("print.bank.account").then((response) => {
-      this.bankAccount = response.msg;
-    });
     this.getConfigKey("warehouse.show.invoice").then((response) => {
       this.isShowInvoice = response.msg;
     });
@@ -4497,6 +4516,7 @@ export default {
           remark: null,
           fSrcid: e.fId,
           fSrcBsdate: e.fBsdate,
+          fShipper: e.fShipper,
         });
       });
       this.whgenlegVisible = false;
@@ -4905,6 +4925,7 @@ export default {
     getForm() {
       getStockTransfer(this.chiId).then((response) => {
         this.form = response.data.warehousebills;
+        if (this.form.fCompany) this.changePrint()
         if (this.form.fBillstatus > 3) {
           this.approvalStatus = false;
           this.browseStatus = true;
@@ -5824,7 +5845,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -5860,7 +5881,7 @@ export default {
               fAmount: null,
               fCurrency: "RMB",
               fExrate: "1",
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fCxrate: null,
               fRate: null,
               remarks: null,
@@ -5911,7 +5932,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -5929,7 +5950,7 @@ export default {
               fCurrency: "RMB",
               fExrate: 1,
               fAmount: fAmount,
-              fTaxrate: this.fTaxrate,
+              fTaxrate: '0',
               fMblno: this.form.fMblno,
               fProductName: this.form.fProductName,
               fMarks: this.form.fMarks,
@@ -6227,6 +6248,14 @@ export default {
       this.warehouseCrList = [];
       this.warehouseDrList = [];
       this.CntrTable = [];
+      this.printFeeConfirm = {
+        fAddr: '',
+        fBankname: '',
+        fBankno: '',
+        fTel: '',
+        fTax: '',
+      }
+      this.fCompanyName = '';
       this.$emit("changeShow", "true");
     },
     goBack() {
@@ -6441,6 +6470,27 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    changePrint() {
+      if (this.form.fCompany) {
+        getCorps(this.form.fCompany).then(res => {
+          this.fCompanyName = res.data.corp.fName
+          this.printFeeConfirm.fAddr = res.data.corp.fAddr
+          this.printFeeConfirm.fTel = res.data.corp.fTel
+          this.printFeeConfirm.fBankname = res.data.corp.fBankname
+          this.printFeeConfirm.fBankno = res.data.corp.fBankno
+          this.printFeeConfirm.fTax = res.data.corp.fTax
+        })
+      } else {
+        this.fCompanyName = ''
+        this.printFeeConfirm = {
+          fAddr: '',
+          fBankname: '',
+          fBankno: '',
+          fTel: '',
+          fTax: '',
+        }
+      }
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变