新增CMA提单确认,海信入货通知，科目代码，对账中心列增加createUserName

src/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue

@@ -52,7 +52,7 @@
 
     <!--添加编辑弹窗-->
     <el-dialog
-      :title="businesstypeData.label"
+      :title="businesstypeData.label +' - '+ businesstypeData.reportsType"
       :close-on-click-modal="false"
       :visible.sync="documentVisible"
       append-to-body
@@ -97,6 +97,12 @@
         :documentForm="documentForm"
       ></Receipt-Notice_ONE>
 
+      <Receipt-Notice_HISENSE
+        v-else-if="businesstypeData.reportsType == 'RHTZ-HISENSE'"
+        :businesstypeData="businesstypeData"
+        :documentForm="documentForm"
+      ></Receipt-Notice_HISENSE>
+
       <BillofLadingDetails
         v-else-if="businesstypeData.reportsType == 'TDXQ' || businesstypeData.reportsType == 'DCWTS'"
         :businesstypeData="businesstypeData"
@@ -212,6 +218,8 @@ import ReceiptNotice_HMM from "@/views/iosBasicData/SeafreightExportF/bills/asse
 import ReceiptNotice_MELL from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/receiptNotice_MELL.vue";
 import ReceiptNotice_OOCL from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/receiptNotice_OOCL.vue";
 import ReceiptNotice_ONE from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/receiptNotice_ONE.vue";
+import ReceiptNotice_HISENSE from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/receiptNotice_HISENSE.vue";
+
 export default {
   components: {
     ReceiptNotice_ONE,
@@ -219,6 +227,7 @@ export default {
     ReceiptNotice_MELL,
     ReceiptNotice_HMM,
     ReceiptNotice_CMA,
+    ReceiptNotice_HISENSE,
     businessReports,
     DispatchNotice,
     ReceiptNotice,
@@ -318,7 +327,10 @@ export default {
 
       documentVisible: false, // 单证添加编辑弹窗
       editData: {}, // 编辑弹窗的数据
-      documentForm: {}, // 添加编辑弹窗的数据
+      documentForm: {
+        dept:{},
+        user: {},
+      }, // 添加编辑弹窗的数据
       documenturl: "", // 报表的url 暂存
       // 左侧配置项
       treeOption: {
@@ -334,7 +346,8 @@ export default {
           children: "children"
         }
       },
-      reportTypeData: [
+      reportTypeData: [],
+      reportTypeData_backs: [
         {
           label: "标准入货通知",
           // cnName: '入货通知',
@@ -604,7 +617,10 @@ export default {
           if (type) {
             this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: row.reportsCode });
             this.editData = {};
-            this.documentForm = {};
+            this.documentForm = {
+              dept:{},
+              user: {},
+            };
             this.documenturl = {};
             this.documentVisible = false;
           }
@@ -766,6 +782,110 @@ export default {
             this.$set(this.documentForm, "reserve3", "请于周  中午12:00之前发推/退舱通知，\n过时收取退舱费 200/TEU");
           }
         }
+
+        this.$set(this.documentForm, "cmaENS", "");
+        this.$set(this.documentForm, "hlagICS2", "");
+
+        if(this.documentForm.hmmEdi){
+          for(const key in this.documentForm.hmmEdi){
+            if(this.documentForm.hmmEdi[key]==null){
+              this.documentForm.hmmEdi[key]=''
+            }
+          }
+          let hmmEdi = this.documentForm.hmmEdi;
+          let cmaENS = [], hlagICS2 = []
+          if(hmmEdi.ensFillingFlag==='A'){
+            // F12/F13
+            cmaENS.push("ENS申报方式：" + hmmEdi.ensFillingFlag + " - F12/F13")
+            if(hmmEdi.applicant) cmaENS.push("EORI NO：" + hmmEdi.applicant)
+            if(hmmEdi.ensHblNo) cmaENS.push("HB/L NO：" + hmmEdi.ensHblNo)
+          }
+          if(hmmEdi.ensFillingFlag==='B'){
+            // F10
+            cmaENS.push("ENS申报方式：" + hmmEdi.ensFillingFlag + " - F10")
+            if(hmmEdi.ucrNo) cmaENS.push("UCR NO：" + hmmEdi.ucrNo)
+            if(hmmEdi.cusCode) cmaENS.push("CUS CODE：" + hmmEdi.cusCode)
+            let lines1 = hmmEdi.sellerDetails.split("\n")
+            if(lines1.length>0) {
+              cmaENS.push("Seller：" + lines1[0])
+              for (var i=1; i<lines1.length;i++) {
+                cmaENS.push("       " + lines1[i]);
+              }
+            }
+            if(hmmEdi.buyerCode){
+              cmaENS.push("Buyer EORI NO：" + hmmEdi.buyerCode)
+            }
+            let lines2 = hmmEdi.buyerDetails.split("\n")
+            if(lines2.length>0) {
+              cmaENS.push("Buyer：" + lines2[0])
+              for (var i=1; i<lines2.length;i++) {
+                cmaENS.push("      " + lines2[i]);
+              }
+            }
+          }
+          if(hmmEdi.ensFillingFlag==='C'){
+            // F11
+            cmaENS.push("ENS申报方式：" + hmmEdi.ensFillingFlag + " - F11")
+            if(hmmEdi.ucrNo) cmaENS.push("UCR NO：" + hmmEdi.ucrNo)
+
+            let lines1 = hmmEdi.hblShipperDetails.split("\n")
+            if(lines1.length>0) {
+              cmaENS.push("HBL发货人：" + lines1[0])
+              for (var i=1; i<lines1.length;i++) {
+                cmaENS.push("       " + lines1[i]);
+              }
+            }
+
+            if(hmmEdi.hblConsigneeCode){
+              cmaENS.push("HBL收货人 EORI NO：" + hmmEdi.hblConsigneeCode)
+            }
+            let lines2 = hmmEdi.hblConsigneeDetails.split("\n")
+            if(lines2.length>0) {
+              cmaENS.push("HBL收货人：" + lines2[0])
+              for (var i=1; i<lines2.length;i++) {
+                cmaENS.push("      " + lines2[i]);
+              }
+            }
+
+            if(hmmEdi.hblNotifyCode){
+              cmaENS.push("HBL通知人 EORI NO：" + hmmEdi.hblNotifyCode)
+            }
+            let lines3 = hmmEdi.hblNotifyDetails.split("\n")
+            if(lines3.length>0) {
+              cmaENS.push("HBL通知人：" + lines3[0])
+              for (var i=1; i<lines3.length;i++) {
+                cmaENS.push("      " + lines3[i]);
+              }
+            }
+
+            let lines8 = hmmEdi.sellerDetails.split("\n")
+            if(lines8.length>0) {
+              cmaENS.push("Seller：" + lines8[0])
+              for (var i=1; i<lines8.length;i++) {
+                cmaENS.push("       " + lines8[i]);
+              }
+            }
+            if(hmmEdi.buyerCode){
+              cmaENS.push("Buyer EORI NO：" + hmmEdi.buyerCode)
+            }
+            let lines9 = hmmEdi.buyerDetails.split("\n")
+            if(lines9.length>0) {
+              cmaENS.push("Buyer：" + lines9[0])
+              for (var i=1; i<lines9.length;i++) {
+                cmaENS.push("      " + lines9[i]);
+              }
+            }
+          }
+
+          this.$set(this.documentForm, "cmaENS", cmaENS.join("\n"));
+          this.$set(this.documentForm, "hlagICS2", hlagICS2.join("\n"));
+        }
+
+        if(this.documentForm.user){
+          this.$set(this.documentForm.user, "password", "82668660-272");
+        }else{
+          this.$set(this.documentForm, user, {password: "82668660-272"});
+        }
         console.log(this.documentForm);
         this.documentVisible = true;
       });
@@ -922,7 +1042,10 @@ export default {
             this.$message.success("操作成功");
             this.reportslogListfun(this.documentPage, { ...this.query, reportsCode: res.data.data.reportsCode });
             this.editData = {};
-            this.documentForm = {};
+            this.documentForm = {
+              dept:{},
+              user: {},
+            };
             this.documenturl = {};
             this.documentVisible = false;
           }
@@ -932,7 +1055,10 @@ export default {
           this.dialogPreviewfun(obj);
         }else{
           this.editData = {};
-          this.documentForm = {};
+          this.documentForm = {
+            dept:{},
+            user: {},
+          };
           this.documenturl = {};
           this.documentVisible = false;
         }
@@ -941,14 +1067,20 @@ export default {
     // 打印取消
     printingCanceling() {
       this.editData = {};
-      this.documentForm = {};
+      this.documentForm = {
+        dept:{},
+        user: {},
+      };
       this.documenturl = {};
       this.documentVisible = false;
     },
     // 左侧筛选
     nodeClick(data) {
       this.editData = {};
-      this.documentForm = {};
+      this.documentForm = {
+        dept:{},
+        user: {},
+      };
       this.businesstypeData = {};
       this.businesstypeData = data;
       this.reportslogListfun(this.documentPage, { reportsType: data.reportsType });
@@ -992,7 +1124,10 @@ export default {
     // 类别弹窗关闭
     corpTypeClose(done) {
       this.editData = {};
-      this.documentForm = {};
+      this.documentForm = {
+        dept:{},
+        user: {},
+      };
       // this.businesstypeData = {}
       done();
     },

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/BillofLadingDetailsSI.vue

@@ -108,7 +108,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+              <el-row style="margin-left: 10px;">
                 <el-col :span="24">
                   <el-form-item label="Shipping Remark" prop="siRemarks">
                     <el-input
@@ -124,7 +124,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+              <el-row style="margin-left: 10px;">
                 <el-col :span="24">
                   <el-form-item label="For delivery please apply to" prop="mshipperDetails">
                     <el-input
@@ -140,7 +140,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row style="line-height: 40px;">
+              <el-row style="line-height: 40px; margin-left: 10px;">
                 <el-col :span="6" style="text-align: center;">
                   <span style="width: 100px;">HS CODE</span>
                 </el-col>
@@ -150,6 +150,22 @@
                   </el-form-item>
                 </el-col>
               </el-row>
+              <el-row style="margin-left: 10px;">
+                <el-col :span="24">
+                  <el-form-item label="CMA ENS 申报内容：" prop="cmaENS">
+                    <el-input
+                      type="textarea"
+                      :rows="8"
+                      style="width: 100%;"
+                      v-model="documentForm.cmaENS"
+                      size="small"
+                      autocomplete="off"
+                      clearable
+                    >
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
               <!--
                 <div style="border: 1px solid #000;">
                     <el-form-item label=" " prop="">

src/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsFrame/receiptNotice_HISENSE.vue

@@ -0,0 +1,403 @@
+<template>
+  <el-form :model="documentForm" ref="form" label-width="160px" style="margin-bottom: 4px" class="demo-ruleForm">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="TO:" prop="corpCnName">
+          <el-input type="age" style="width: 100%;" v-model="documentForm.corpCnName" size="small" autocomplete="off" clearable placeholder="TO">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="ATTN:" prop="corpAttnName">
+          <el-input type="age" style="width: 100%;" v-model="documentForm.corpAttnName" size="small" autocomplete="off" clearable placeholder="ATTN">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="FM:" prop="name">
+          <el-input type="age" style="width: 100%;" v-model="documentForm.user.name" size="small" autocomplete="off" clearable placeholder="TO">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="TEL:" prop="phone">
+          <el-input type="age" style="width: 100%;" v-model="documentForm.user.phone" size="small" autocomplete="off" clearable placeholder="TO">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="EMAIL:" prop="email">
+          <el-input type="age" style="width: 100%;" v-model="documentForm.user.email" size="small" autocomplete="off" clearable placeholder="TO">
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="FAX:" prop="password">
+          <el-input type="age" style="width: 100%;" v-model="documentForm.user.password" size="small" autocomplete="off" clearable placeholder="TO">
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24">
+        <div>贵公司委托我司出运之货物:</div>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="装货港" prop="polNamePrint">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.polNamePrint"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="船公司" prop="carrierShortName">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.carrierShortName"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="目的港" prop="podNamePrint">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.podNamePrint"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="合同号" prop="corpArgreementNo">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.corpArgreementNo"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="箱型" prop="quantityCntrDescr">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.quantityCntrDescr"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="箱型" prop="mpaymode">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.mpaymode"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="B/L" prop="mblno">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.mblno"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="服务方式" prop="serviceTerms">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.serviceTerms"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24">
+        <el-form-item label="船代:" prop="corpCnName">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.shippingAgencyCname"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="船代"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="VSL" prop="vesselCnName">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.vesselCnName"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="预配船名/航次"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="预计 ETA" prop="eta">
+          <el-date-picker
+            v-model="documentForm.eta"
+            clearable
+            style="width: 100%"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="开船日" prop="etd">
+          <el-date-picker
+            v-model="documentForm.etd"
+            clearable
+            style="width: 100%"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item label="备注" prop="reserve10">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.remarks"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder=""
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24">
+        <el-form-item label="截港时间" prop="goodsTime">
+          <el-date-picker
+            v-model="documentForm.goodsTime"
+            clearable
+            style="width: 160px"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择日期"
+          >
+          </el-date-picker>
+          <el-time-select
+            v-model="documentForm.goodsTime2"
+            format="HH:mm:ss"
+            value-format="HH:mm:ss"
+            style="width: 100px"
+            placeholder="请选择时间"
+            :picker-options="{ start: '00:00', step: '00:30', end: '23:30' }"
+            size="small"
+          >
+          </el-time-select>
+          <span style="margin-left: 10px">前(以码头计划为准）</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="截单时间" prop="clearanceTime">
+          <el-date-picker
+            v-model="documentForm.clearanceTime"
+            clearable
+            style="width: 160px"
+            type="date"
+            size="small"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择日期"
+          >
+          </el-date-picker>
+          <el-time-select
+            v-model="documentForm.clearanceTime2"
+            format="HH:mm"
+            value-format="HH:mm"
+            style="width: 100px"
+            placeholder="请选择时间"
+            :picker-options="{ start: '00:00', step: '00:30', end: '23:30' }"
+            size="small"
+          >
+          </el-time-select>
+          <span style="margin-left: 10px">前(晚于该时间将产生晚单费）</span>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-col :span="8">
+        <el-form-item label="场站" prop="cyShortName">
+          <el-input
+            type="age"
+            style="width: 100%;"
+            v-model="documentForm.cyShortName"
+            size="small"
+            autocomplete="off"
+            clearable
+          >
+          </el-input>
+        </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="联系人:" prop="cyContacts">
+            <el-input
+              type="age"
+              style="width: 100%;"
+              v-model="documentForm.cyContacts"
+              size="small"
+              autocomplete="off"
+              clearable
+              placeholder="联系人"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="联系电话:" prop="cyTel">
+            <el-input type="age" style="width: 100%;" v-model="documentForm.cyTel" size="small" autocomplete="off" clearable placeholder="联系电话">
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-col>
+
+      <el-col :span="24">
+        <el-form-item label="场站备注" prop="cyRemarks">
+          <el-input
+            type="textarea"
+            style="width: 100%;"
+            v-model="documentForm.cyRemarks"
+            size="small"
+            autocomplete="off"
+            clearable
+            placeholder="REMARKS"
+          >
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { bportsList } from "@/api/iosBasicData/bports";
+import { getLazyList, getDeptTree } from "@/api/system/dept";
+import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
+export default {
+  components: { TreeSelect, SearchQuery },
+  data() {
+    return {
+      destinationData: [], // 目的港数据
+      departmentData: [] // 部门
+    };
+  },
+  props: {
+    // 表单对象
+    documentForm: {
+      type: Object,
+      default: {}
+    },
+    businesstypeData :{
+      type: Object,
+      default: {}
+    },
+  },
+  created() {
+    this.getLazylistfun();
+  },
+  methods: {
+    corpChange(value, name) {
+      if (name == "destinationName") {
+        for (let item of this.destinationData) {
+          if (item.enName == value) {
+            this.$set(this.documentForm, "destinationId", item.id);
+            this.$set(this.documentForm, "destinationName", item.enName);
+            this.$set(this.documentForm, "destinationCode", item.code);
+            this.$set(this.documentForm, "destinationNamePrint", item.enName);
+          }
+        }
+      } else if (name == "department") {
+        this.$set(this.documentForm, "fax", null);
+        this.$set(this.documentForm, "ematl", null);
+        this.$set(this.documentForm, "tel", null);
+        if (value) {
+          getLazyList(null, { deptName: value }).then(res => {
+            if (res.data.data.length) {
+              this.$set(this.documentForm, "department", res.data.data[0].title);
+              this.$set(this.documentForm, "fax", res.data.data[0].fax);
+              this.$set(this.documentForm, "ematl", res.data.data[0].email);
+              this.$set(this.documentForm, "tel", res.data.data[0].tel);
+            }
+          });
+        }
+      } else {
+        this.$set(this.documentForm, name, value);
+      }
+    },
+    // 目的地
+    destinationBportsListfun(enName) {
+      bportsList(1, 10, { enName, status: 0 }).then(res => {
+        this.destinationData = res.data.data.records;
+      });
+    },
+    // 获取机构管理接口
+    getLazylistfun() {
+      getDeptTree().then(res => {
+        this.departmentData = res.data.data;
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+::v-deep.el-form-item {
+  margin-bottom: 0;
+}
+</style>

src/views/iosBasicData/accounts/assembly/accountsDialog.vue

@@ -127,7 +127,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初借方" prop="amountOpenDr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountOpenDr"
                 size="small"
@@ -135,13 +135,18 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入年初借方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountOpenDr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初贷方" prop="amountOpenCr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountOpenCr"
                 size="small"
@@ -149,19 +154,24 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入年初贷方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountOpenCr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初余额" prop="amountOpenBlc" label-width="60px">
-              <el-input style="width: 100%" v-model="form.amountOpenBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
-              </el-input>
+              <el-input-number style="width: 100%;" v-model="form.amountOpenBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="" :precision="2" :controls="false" >
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="本年借方" prop="amountDr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountDr"
                 size="small"
@@ -169,13 +179,18 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入本初借方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountDr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="本年贷方" prop="amountCr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountCr"
                 size="small"
@@ -183,14 +198,19 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入本年贷方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountCr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="当前余额" prop="amountBlc" label-width="60px">
-              <el-input style="width: 100%" v-model="form.amountBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
-              </el-input>
+              <el-input-number style="width: 100%" v-model="form.amountBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="" :precision="2" :controls="false">
+              </el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -200,7 +220,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初借方" prop="amountOpenDrUsd" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountOpenDrUsd"
                 size="small"
@@ -208,13 +228,18 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入年初借方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountOpenDrUsd')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初贷方" prop="amountOpenCrUsd" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountOpenCrUsd"
                 size="small"
@@ -222,19 +247,24 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入年初贷方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountOpenCrUsd')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初余额" prop="amountOpenUsdBlc" label-width="60px">
-              <el-input style="width: 100%" v-model="form.amountOpenUsdBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
-              </el-input>
+              <el-input-number style="width: 100%" v-model="form.amountOpenUsdBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="" :precision="2" :controls="false">
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="本年借方" prop="amountDrUsd" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountDrUsd"
                 size="small"
@@ -242,13 +272,18 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入本初借方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountDrUsd')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="本年贷方" prop="amountCrUsd" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.amountCrUsd"
                 size="small"
@@ -256,14 +291,19 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入本年贷方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                align="right"
+                @change="amountChange(row, 'amountCrUsd')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="当前余额" prop="amountUsdBlc" label-width="60px">
-              <el-input style="width: 100%" v-model="form.amountUsdBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
-              </el-input>
+              <el-input-number style="width: 100%" v-model="form.amountUsdBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="" :precision="2" :controls="false">
+              </el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -273,7 +313,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初借方" prop="quantityOpenDr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.quantityOpenDr"
                 size="small"
@@ -281,13 +321,17 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入年初借方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                @change="amountChange(row, 'quantityOpenDr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初贷方" prop="quantityOpenCr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.quantityOpenCr"
                 size="small"
@@ -295,19 +339,23 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入年初贷方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                @change="amountChange(row, 'quantityOpenCr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="年初余额" prop="quantityOpenBlc" label-width="60px">
-              <el-input style="width: 100%" v-model="form.quantityOpenBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
-              </el-input>
+              <el-input-number style="width: 100%" v-model="form.quantityOpenBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="" :precision="2" :controls="false">
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="本年借方" prop="quantityDr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.quantityDr"
                 size="small"
@@ -315,13 +363,17 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入本初借方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                @change="amountChange(row, 'quantityDr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="本年贷方" prop="quantityCr" label-width="60px">
-              <el-input
+              <el-input-number
                 style="width: 100%"
                 v-model="form.quantityCr"
                 size="small"
@@ -329,14 +381,18 @@
                 :disabled="isCalc || !isDetail"
                 clearable
                 placeholder="请输入本年贷方金额"
+                :precision="2"
+                :controls="false"
+                value-on-clear="0"
+                @change="amountChange(row, 'quantityCr')"
               >
-              </el-input>
+              </el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="当前余额" prop="quantityBlc" label-width="60px">
-              <el-input style="width: 100%" v-model="form.quantityBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="">
-              </el-input>
+              <el-input-number style="width: 100%" v-model="form.quantityBlc" size="small" autocomplete="off" :disabled="true" clearable placeholder="" :precision="2" :controls="false">
+              </el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -400,6 +456,9 @@ export default {
         numinput(val){
             this.$set(this.form,'code',regularInteger(val))
         },
+        amountChange(row, fieldName){
+
+        },
         // 金额计算
         countBlur(){
             this.$set(this.form,'price',this.form.price?Number(this.form.price):0) // 单价
@@ -486,4 +545,7 @@ export default {
 ::v-deep.el-form-item {
   margin-bottom: 0;
 }
+.right-align .el-input__inner {
+  text-align: right;
+}
 </style>

src/views/iosBasicData/financialManagement/finstlbills/index.vue

@@ -99,22 +99,45 @@ export default {
         expand: true,
         column: [
           {
+            label: "对账单号",
+            prop: "billNo",
+            search: true,
+            width: 140,
+            overHidden: true,
+          },
+          {
+            label: "制单人",
+            prop: "createUserName",
+            overHidden: true,
+            width: 100,
+          },
+          {
+            label: "对账日期",
+            prop: "billDate",
+            overHidden: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 120,
+          },
+          {
             label: "对账单位",
             prop: "corpCnName",
             search: true,
-            width: 120,
+            width: 160,
             overHidden: true,
           },
           {
             label: "业务编号",
             prop: "businessNo",
-            width: "120",
+            width: 140,
             search: true,
             overHidden: true,
           },
           {
             label: "主单号",
             prop: "mblnos",
+            width: 140,
             search: true,
             overHidden: true,
           },
@@ -122,31 +145,21 @@ export default {
             label: "分单号",
             prop: "hblnos",
             search: true,
-            overHidden: true,
-          },
-          {
-            label: "对账日期",
-            prop: "billDate",
-            overHidden: true,
-            width: "150",
-          },
-          {
-            label: "对账单号",
-            prop: "billNo",
-            search: true,
-            width: "100",
+            width: 140,
             overHidden: true,
           },
           {
             label: "船名",
             prop: "vesselCnName",
             search: true,
+            width: 140,
             overHidden: true,
           },
           {
             label: "航次",
             prop: "voyageNo",
             search: true,
+            width: 80,
             overHidden: true,
           },
           {
@@ -158,6 +171,7 @@ export default {
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
+            width: 140,
           },
           // {
           //   label: "业务开始日期",
@@ -184,18 +198,19 @@ export default {
           {
             label: "客户英文名称",
             prop: "corpEnName",
-            width: "120",
+            width: 180,
             overHidden: true,
           },
           {
             label: "客户约号",
             prop: "corpArgreementNo",
             overHidden: true,
+            width: 140,
           },
           {
             label: "业务类型",
             prop: "businessTypes",
-            width: "120",
+            width: 120,
             overHidden: true,
             type: "select",
             multiple: true,
@@ -213,42 +228,42 @@ export default {
           {
             label: "本位币应收(CNY)",
             prop: "amountDr",
-            width: "160",
+            width: 160,
           },
           {
             label: "本位币应付(CNY)",
             prop: "amountCr",
-            width: "160",
+            width: 160,
           },
           {
             label: "合计本位币应收(CNY)",
             prop: "amountDrLoc",
-            width: "160",
+            width: 160,
           },
           {
             label: "合计本位币应付(CNY)",
             prop: "amountCrLoc",
-            width: "160",
+            width: 160,
           },
           {
             label: "本位币税后应收(CNY)",
             prop: "amountDrNet",
-            width: "160",
+            width: 160,
           },
           {
             label: "本位币税后应付(CNY)",
             prop: "amountCrNet",
-            width: "160",
+            width: 160,
           },
           {
             label: "合计本位币税后应收(CNY)",
             prop: "amountDrLocNet",
-            width: "170",
+            width: 180,
           },
           {
             label: "合计本位币税后应付(CNY)",
             prop: "amountCrLocNet",
-            width: "170",
+            width: 180,
           },
           {
             label: "审核",
@@ -269,11 +284,13 @@ export default {
               },
             ],
             overHidden: true,
+            width: 100,
           },
           {
             label: "备注",
             prop: "remarks",
             overHidden: true,
+            width: 200,
           },
         ],
       },