货代往来单位增加参数 2024-2-23

src/views/iosBasicData/AirtransportExport/bills/assembly/EntrustmentLnformation.vue

@@ -1168,7 +1168,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取计算属性数据
             getBunitsListfun(code){
-                getBunitsList(1,10,{code:code?code:null}).then(res=>{
+                getBunitsList(1,10,{status:0,code:code?code:null}).then(res=>{
                     this.unitData = res.data.data.records
                 })
             },

src/views/iosBasicData/AirtransportExport/bills/assembly/feecenter.vue

@@ -25,17 +25,17 @@
                                       clearable placeholder="提单号" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="箱型箱量" prop="containers" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">箱型箱量</span>
-                            </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"
-                                      size="small" autocomplete="off"
-                                      disabled
-                                      clearable placeholder="箱型箱量" ></el-input>
-                        </el-form-item>
-                    </el-col>
+                    <!--<el-col :span="6">-->
+                    <!--    <el-form-item label="箱型箱量" prop="containers" >-->
+                    <!--        <span slot="label">-->
+                    <!--            <span style="color: #1e9fff">箱型箱量</span>-->
+                    <!--        </span>-->
+                    <!--        <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"-->
+                    <!--                  size="small" autocomplete="off"-->
+                    <!--                  disabled-->
+                    <!--                  clearable placeholder="箱型箱量" ></el-input>-->
+                    <!--    </el-form-item>-->
+                    <!--</el-col>-->
                 </el-row>
             </el-form>
         </div>
@@ -708,7 +708,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
-                    menu:true,
+                    menu:false,
                     column:[
                         {
                             label: "index",
@@ -849,7 +849,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
-                    menu:true,
+                    menu:false,
                     column:[
                         {
                             label: "index",

src/views/iosBasicData/AirtransportImport/bills/assembly/EntrustmentLnformation.vue

@@ -1172,7 +1172,7 @@ import {regularFloating, regularInteger} from "@/util/regularJudgment";
             },
             // 获取计算属性数据
             getBunitsListfun(code){
-                getBunitsList(1,10,{code:code?code:null}).then(res=>{
+                getBunitsList(1,10,{status:0,code:code?code:null}).then(res=>{
                     this.unitData = res.data.data.records
                 })
             },

src/views/iosBasicData/AirtransportImport/bills/assembly/feecenter.vue

@@ -25,17 +25,6 @@
                                       clearable placeholder="提单号" ></el-input>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="箱型箱量" prop="containers" >
-                            <span slot="label">
-                                <span style="color: #1e9fff">箱型箱量</span>
-                            </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.quantityCntrDescr"
-                                      size="small" autocomplete="off"
-                                      disabled
-                                      clearable placeholder="箱型箱量" ></el-input>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
             </el-form>
         </div>
@@ -714,7 +703,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
-                    menu:true,
+                    menu:false,
                     column:[
                         {
                             label: "index",
@@ -855,7 +844,7 @@
                     delBtn:false,
                     editBtn:false,
                     menuWidth:'100',
-                    menu:true,
+                    menu:false,
                     column:[
                         {
                             label: "index",

src/views/iosBasicData/AirtransportImport/bills/assembly/mbinformation.vue

@@ -14,8 +14,7 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="航班日期" prop="etd" label-width="90px"
-                                  :rules="[{required: true,message: ' ',trigger: 'blur' }]">
+                    <el-form-item label="航班日期" prop="etd" label-width="90px">
                             <span slot="label">
                                 <span style="color: #1e9fff">航班日期</span>
                             </span>
@@ -39,7 +38,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="ETA" prop="eta" label-width="90px" >
+                    <el-form-item label="ETA" prop="eta" label-width="90px"
+                                  :rules="[{required: true,message: ' ',trigger: 'blur' }]" >
                             <span slot="label">
                                 <span style="color: #1e9fff">ETA</span>
                             </span>

src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -1286,7 +1286,7 @@ import {
                             return;
                         }
                         // 赋值 ETD 日期
-                        this.form.billDate = this.form.etd?this.form.etd.slice(0,10) + ' 00:00:00':null // 单据日期
+                        this.form.billDate = this.form.eta?this.form.eta.slice(0,10) + ' 00:00:00':null // 单据日期
                         // 调用保存接口
                         this.billsSubmitfun()
                     }

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

@@ -386,7 +386,7 @@
                 <el-form :model="assemblyForm" ref="form" label-width="160px">
                     <el-row :gutter="20">
                         <el-col :span="12">
-                            <el-form-item :label="`${assemblyForm.serviceTerms} 客户名称`" prop="hNotify2CnName" >
+                            <el-form-item :label="`${inttraText} 客户名称`" prop="hNotify2CnName" >
                                 <search-query :datalist="inttraData"
                                               :selectValue="assemblyForm[`inttra${inttraTitle}CorpName`]"
                                               :filterable="true"
@@ -395,7 +395,7 @@
                                               :disabled="detailData.seeDisabled"
                                               :buttonIf="false"
                                               :forParameter="{key:'id',label:'cnName',value:'cnName'}"
-                                              :placeholder="`请选择${assemblyForm.serviceTerms} 客户名称`"
+                                              :placeholder="`请选择${inttraText} 客户名称`"
                                               @remoteMethod="remoteMethod($event,`inttra${inttraTitle}`)"
                                               @corpChange="corpChange($event,`inttra${inttraTitle}`)"
                                               @corpFocus="remoteMethod($event,`inttra${inttraTitle}`)" >
@@ -403,27 +403,27 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="`${assemblyForm.serviceTerms} 客户地址`"  >
+                            <el-form-item :label="`${inttraText} 客户地址`"  >
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpAddr`]"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${assemblyForm.serviceTerms} 客户地址`" ></el-input>
+                                          clearable :placeholder="`请输入${inttraText} 客户地址`" ></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="`${assemblyForm.serviceTerms} 客户联系人`" >
+                            <el-form-item :label="`${inttraText} 客户联系人`" >
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpContacts`]"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${assemblyForm.serviceTerms} 客户联系人`" ></el-input>
+                                          clearable :placeholder="`请输入${inttraText} 客户联系人`" ></el-input>
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item :label="`${assemblyForm.serviceTerms} 客户联系人电话`" >
+                            <el-form-item :label="`${inttraText} 客户联系人电话`" >
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm[`inttra${inttraTitle}CorpTel`]"
                                           size="small" autocomplete="off"
                                           :disabled="detailData.seeDisabled"
-                                          clearable :placeholder="`请输入${assemblyForm.serviceTerms} 客户联系人电话`" ></el-input>
+                                          clearable :placeholder="`请输入${inttraText} 客户联系人电话`" ></el-input>
                             </el-form-item>
                         </el-col>
 
@@ -479,6 +479,7 @@
                 issueAtData:[],
                 // INTTRA EDI弹窗
                 inttraVisible:false,
+                inttraText:'', // 服务方式弹窗字段拼接
                 inttraTitle:'',
                 inttraData:[],
                 // 份数
@@ -644,13 +645,18 @@
                     });
                     return
                 }
-                if (this.assemblyForm.serviceTerms == 'DOOR TO') {
+                if (this.assemblyForm.serviceTerms == 'DOOR to DOOR' || this.assemblyForm.serviceTerms == 'DOOR to CY') {
                     this.inttraTitle = 'ToDoor'
-                }else if (this.assemblyForm.serviceTerms == 'TO DOOR') {
+                    this.inttraText = 'DOOR TO'
+                    this.inttraBcorpslistByType()
+                    this.inttraVisible = true
+                }
+                if (this.assemblyForm.serviceTerms == 'CY to DOOR') {
                     this.inttraTitle = 'DoorTo'
-                }else {}
-                this.inttraBcorpslistByType()
-                this.inttraVisible = true
+                    this.inttraText = 'TO DOOR'
+                    this.inttraBcorpslistByType()
+                    this.inttraVisible = true
+                }
             },
             // INTTRA EDI弹窗清除
             inttraCancellation(name){

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

@@ -410,6 +410,8 @@
                     this.$set(row,'amountUsdBlc',Number(row.amountCrUsd) - Number(row.amountDrUsd))
                 }else {
                     // 本期借方本币金额 = 单价 * 本期借方数量
+                    console.log(row.price,413)
+                    console.log(row.amountDrUsd,414)
                     this.$set(row,'amountDr',Number(row.price) * Number(row.amountDrUsd))
                     // 本期贷方本币金额 = 单价 * 本期借方数量
                     this.$set(row,'amountCr',Number(row.price) * Number(row.amountCrUsd))

src/views/iosBasicData/aeamends/amendsDetails.vue

@@ -113,8 +113,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="制单日期" prop="voucherDate">
-                                <el-date-picker v-model="form.voucherDate" clearable
+                            <el-form-item label="制单日期" prop="createTime">
+                                <el-date-picker v-model="form.createTime" clearable
                                                 style="width: 100%;"
                                                 type="date" size="small"
                                                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -480,7 +480,7 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
-                voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList:[]
@@ -844,7 +844,7 @@ export default {
             this.form.etd = row.etd?row.etd.slice(0,10) + ' 00:00:00':null
             this.form.eta = row.eta?row.eta.slice(0,10) + ' 00:00:00':null
             this.form.businessType = 'AEA'
-            this.form.voucherDate = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
+            this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
 
             delete this.form.id
             delete this.form.status

src/views/iosBasicData/bcorps/detailsPage.vue

@@ -304,18 +304,30 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="5">
                 <el-form-item label="存在HP/S" prop="isPs">
                   <el-switch v-model="formData.isPs" size="small" :active-value="1" :inactive-value="0" active-text="开启"
                     inactive-text="关闭"></el-switch>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="5">
                 <el-form-item label="允许付大于收" prop="psAllowLargeCredit">
                   <el-switch v-model="formData.psAllowLargeCredit" size="small" :active-value="1" :inactive-value="0" active-text="开启"
                     inactive-text="关闭"></el-switch>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                  <el-form-item label="是否已签约" prop="isSigned">
+                      <el-switch v-model="formData.isSigned" size="small" :active-value="1" :inactive-value="0" active-text="是"
+                                 inactive-text="否"></el-switch>
+                  </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                  <el-form-item label="协议号" prop="agreementNo">
+                      <el-input v-model="formData.agreementNo" size="small" placeholder="请输入协议号" clearable :style="{ width: '100%' }">
+                      </el-input>
+                  </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="详情信息" prop="details">
                   <el-input v-model="formData.details" size="small" type="textarea" placeholder="请输入详情信息"
@@ -323,6 +335,110 @@
                 </el-form-item>
               </el-col>
             </el-tab-pane>
+              <el-tab-pane label="EDI数据" name="edi">
+                  <el-col :span="8">
+                      <el-form-item label="海运邮箱" prop="seaEmail">
+                          <el-input v-model="formData.seaEmail" size="small" placeholder="请输入海运邮箱" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="空运邮箱" prop="airEmail">
+                          <el-input v-model="formData.airEmail" size="small" placeholder="请输入空运邮箱" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="国际编码" prop="unCode">
+                          <el-input v-model="formData.unCode" size="small" placeholder="请输入国际编码" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="iGenZong 代码" prop="igenzongCode">
+                          <el-input v-model="formData.igenzongCode" size="small" placeholder="请输入iGenZong 代码" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="美线约号" prop="amLineAgreementno">
+                          <el-input v-model="formData.amLineAgreementno" size="small" placeholder="请输入美线约号" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="船公司代码" prop="carrierCode">
+                          <el-input v-model="formData.carrierCode" size="small" placeholder="请输入船公司代码" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="场站三字码" prop="cyCode">
+                          <el-input v-model="formData.cyCode" size="small" placeholder="请输入场站三字码" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="CMA Laracode" prop="cmaLaracode">
+                          <el-input v-model="formData.cmaLaracode" size="small" placeholder="请输入CMA Laracode" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="CMA Location" prop="cmaLocation">
+                          <el-input v-model="formData.cmaLocation" size="small" placeholder="请输入CMA Location" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="ZIM CUCC" prop="zimCucc">
+                          <el-input v-model="formData.zimCucc" size="small" placeholder="请输入ZIM CUCC" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="关贸云编码" prop="gmyCode">
+                          <el-input v-model="formData.gmyCode" size="small" placeholder="请输入关贸云编码" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="INTRRA ICUA" prop="inttraIcua">
+                          <el-input v-model="formData.inttraIcua" size="small" placeholder="请输入INTRRA ICUA" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="INTRRA ICUA 联系人" prop="inttraIcuaAttn" label-width="140px">
+                          <el-input v-model="formData.inttraIcuaAttn" size="small" placeholder="请输入INTRRA ICUA 联系人" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="INTRRA ICUA Email" prop="inttraIcuaEmail" label-width="140px">
+                          <el-input v-model="formData.inttraIcuaEmail" size="small" placeholder="请输入INTRRA ICUA Email" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="EDI 格式名称" prop="ediFmt">
+                          <el-input v-model="formData.ediFmt" size="small" placeholder="请输入EDI 格式名称" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="EDI FTP 地址" prop="ediFtp">
+                          <el-input v-model="formData.ediFtp" size="small" placeholder="请输入EDI FTP 地址" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="EDI 邮箱" prop="ediEmail">
+                          <el-input v-model="formData.ediEmail" size="small" placeholder="请输入EDI 邮箱" clearable :style="{ width: '100%' }">
+                          </el-input>
+                      </el-form-item>
+                  </el-col>
+              </el-tab-pane>
             <el-tab-pane label="财务信息" name="cwxx">
               <!-- <el-row style="display: flex; flex-direction: row; align-items: center;">
               <div style="width: 8px; height: 20px; border-radius: 2px; background-color: #bd3124; margin-right: 6px;"></div>
@@ -401,7 +517,7 @@
                 </div>
                 <h4>授信信息</h4>
                 <el-form-item label="授信状态" prop="creditStatus">
-                  <el-switch style="margin-bottom = 0" active-value="1" inactive-value="0"
+                  <el-switch style="margin-bottom:0" active-value="1" inactive-value="0"
                     v-model="formData.creditStatus" active-text="开启" inactive-text="关闭"></el-switch>
                 </el-form-item>
               </el-row>
@@ -424,6 +540,43 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                    <el-form-item label="授信币种" prop="creditCur">
+                        <el-input v-model="formData.creditCur" placeholder="请输入授信币种" clearable :style="{ width: '100%' }">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="付款方式" prop="paymentType">
+                        <el-input v-model="formData.paymentType" placeholder="请输入付款方式" clearable :style="{ width: '100%' }">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="账期设置" prop="accountPeriodType">
+                        <el-input v-model="formData.accountPeriodType" placeholder="请输入账期设置" clearable :style="{ width: '100%' }">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="最大欠款额" prop="maxArrears">
+                        <el-input v-model="formData.maxArrears" placeholder="请输入最大欠款额" clearable :style="{ width: '100%' }">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="绩效系数" prop="performanceRate">
+                        <el-input v-model="formData.performanceRate" placeholder="请输入绩效系数" clearable :style="{ width: '100%' }">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                    <el-form-item label="增值税率" prop="taxRate">
+                        <el-input v-model="formData.taxRate" placeholder="请输入增值税率" clearable :style="{ width: '100%' }">
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+
               </el-row>
               <!-- <el-row style="display: flex; flex-direction: row; align-items: center;">
               <div style="width: 8px; height: 20px; border-radius: 2px; background-color: #bd3124; margin-right: 6px;"></div>
@@ -562,6 +715,7 @@
                 <el-table-column prop="invoiceHeader" label="发票抬头" width="180" />
                 <el-table-column prop="uscc" label="税号" width="180" />
                 <el-table-column prop="address" label="地址" width="180" />
+                <el-table-column prop="address" label="地址" width="180" />
                 <el-table-column prop="attnName" label="联系人姓名" width="180" />
                 <el-table-column prop="attnTel" label="联系人电话" width="180" />
                 <el-table-column prop="email" label="电子邮箱" width="180" />
@@ -874,6 +1028,7 @@ import {getBcorpslistByType} from "@/api/iosBasicData/bcorps";
 import {blinesList} from "@/api/iosBasicData/blines";
 import blines from "@/views/iosBasicData/blines/index.vue";
 import {selectListLos} from "@/api/approval/processConfig";
+import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
 export default {
   components: {
     SearchQuery, bcountrys, user, rateManagement,blines
@@ -1375,6 +1530,14 @@ export default {
               this.$message.warning('请填写来源明细')
               return;
           }
+          // 联系人姓名 取 客户联系人里的第一项
+          if (this.formData.corpsAttnList.length > 0) {
+              this.formData.attnName = this.formData.corpsAttnList[0].cname
+              this.formData.attnTel = this.formData.corpsAttnList[0].tel
+          }
+          // 部门 取当前登录人的部门
+          this.formData.deptId = JSON.parse(localStorage.getItem("saber-userInfo")).content.dept_id
+
         // TODO 提交表单
         // 联系电话赋值
         if (this.formData.id != null) {

src/views/iosBasicData/finvouchers/index.vue

@@ -35,6 +35,10 @@
                              plain
                              @click="handleDelete">删 除
                   </el-button>
+                  <el-button type="success"
+                             size="small"
+                             plain @click.stop="voucherAccountingfun" >凭证记账
+                  </el-button>
               </template>
               <template slot="menu" slot-scope="{row}">
                   <el-button type="text"
@@ -255,6 +259,14 @@
         this.option = await this.getColumnData(this.getColumnName(321), this.optionBack);
     },
     methods: {
+      // 凭证记账
+      voucherAccountingfun(){
+          if (this.selectionList.length === 0) {
+              this.$message.warning("请选择至少一条数据");
+              return;
+          }
+          console.log(this.selectionList,'凭证记账选择数据')
+      },
       // 新建凭证
       addbtnfun(){
           this.isShow = false

src/views/iosBasicData/reportClose/AEreportClose/assembly/TableDetails.vue

@@ -73,7 +73,7 @@
                               @corpChange="corpChange($event,'destinationCountryCnName',row)"
                               @corpFocus="destinationCountrybcountrysListfun">
                 </search-query>
-                <span v-else >{{row.destinationCountryCnName}}}</span>
+                <span v-else >{{row.destinationCountryCnName}}</span>
             </template>
             <template slot="transactionUnit" slot-scope="{ row }">
                 <search-query v-if="row.edit"
@@ -133,7 +133,7 @@
                               @corpChange="corpChange($event,'legalUnit',row)"
                               @corpFocus="legalUnitBunitsListfun">
                 </search-query>
-                <span v-else >{{row.legalUnit}}}</span>
+                <span v-else >{{row.legalUnit}}</span>
             </template>
             <template slot="legalQuantity" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.legalQuantity" size="small"

src/views/iosBasicData/reportClose/AEreportClose/bgdetails.vue

@@ -251,23 +251,23 @@
                                                   clearable placeholder="请输入订舱号" ></el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="4">
-                                    <el-form-item label="船名" prop="vesselEnName" label-width="70px">
-                                        <search-query :datalist="vesselData"
-                                                      :selectValue="form.vesselEnName"
-                                                      :filterable="true"
-                                                      :clearable="true"
-                                                      :remote="true"
-                                                      :buttonIf="false"
-                                                      placeholder="请选择船名"
-                                                      :disabled="detailData.seeDisabled"
-                                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                                      @remoteMethod="vesselBvesselsListfun"
-                                                      @corpChange="corpChange($event,'vessel')"
-                                                      @corpFocus="vesselBvesselsListfun" >
-                                        </search-query>
-                                    </el-form-item>
-                                </el-col>
+                                <!--<el-col :span="4">-->
+                                <!--    <el-form-item label="船名" prop="vesselEnName" label-width="70px">-->
+                                <!--        <search-query :datalist="vesselData"-->
+                                <!--                      :selectValue="form.vesselEnName"-->
+                                <!--                      :filterable="true"-->
+                                <!--                      :clearable="true"-->
+                                <!--                      :remote="true"-->
+                                <!--                      :buttonIf="false"-->
+                                <!--                      placeholder="请选择船名"-->
+                                <!--                      :disabled="detailData.seeDisabled"-->
+                                <!--                      :forParameter="{key:'id',label:'enName',value:'enName'}"-->
+                                <!--                      @remoteMethod="vesselBvesselsListfun"-->
+                                <!--                      @corpChange="corpChange($event,'vessel')"-->
+                                <!--                      @corpFocus="vesselBvesselsListfun" >-->
+                                <!--        </search-query>-->
+                                <!--    </el-form-item>-->
+                                <!--</el-col>-->
                                 <el-col :span="4">
                                     <el-form-item label="三检单号" prop="tripleInspectionNumber" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.tripleInspectionNumber"
@@ -293,7 +293,7 @@
                                         </el-date-picker>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="4">
+                                <el-col :span="8">
                                     <el-form-item label="发票号码" prop="invoiceNumber" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.invoiceNumber"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -662,6 +662,8 @@
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
     import { postSelectByUser } from '@/api/iosBasicData/bills'
+    import {dateFormat} from "@/util/date";
+    import {bpackagesList} from "@/api/iosBasicData/bpackages";
 
     export default {
         components: {reports, reportformsList, reportContainer, feecenter, SearchQuery,TableDetails},
@@ -681,6 +683,7 @@
                 saberUserInfo:[], // 当前登录人的数据
                 // 绑定的数据
                 form:{
+                    billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 接单日期默认当天
                     businessType:'BGAE',
                     createUser:'', // 制单人id
                     createUserName:'', // 制单人名称
@@ -761,10 +764,6 @@
                         value:'portOfDestinationEnName',
                     },
                     {
-                        name:'船名',
-                        value:'vesselEnName',
-                    },
-                    {
                         name:'件数',
                         value:'quantity',
                     }
@@ -893,10 +892,13 @@
                 }
                 // 多选集合转换成字符串赋值
                 this.form.documentsAttached = multiArr.join(',')
-                this.form.customsDeclarationGoodsList.map((item,index)=>{
-                    item.sort = Number(index) + 1
-                    item.pid = this.form.id
-                })
+                // 判断是否是数组
+                if (this.form.customsDeclarationGoodsList instanceof Array) {
+                    this.form.customsDeclarationGoodsList.map((item,index)=>{
+                        item.sort = Number(index) + 1
+                        item.pid = this.form.id
+                    })
+                }
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'
                     row.sort = Number(index) + 1
@@ -1325,7 +1327,7 @@
             },
             // 包装种类
             packingUnitBunitsListfun(cnName){
-                getBunitsList(1,10,{cnName}).then(res=>{
+                bpackagesList(1,10,{cnName}).then(res=>{
                     this.packingUnitData = res.data.data.records
                 })
             },

src/views/iosBasicData/reportClose/AIreportClose/assembly/TableDetails.vue

@@ -52,7 +52,7 @@
                               @corpChange="corpChange($event,'commodityName',row)"
                               @corpFocus="commoditybcommodityListfun">
                 </search-query>
-                <span v-else >{{row.commodityName}}}</span>
+                <span v-else >{{row.commodityName}}</span>
             </template>
             <template slot="specificationModel" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.specificationModel" size="small"
@@ -73,7 +73,7 @@
                               @corpChange="corpChange($event,'destinationCountryCnName',row)"
                               @corpFocus="destinationCountrybcountrysListfun">
                 </search-query>
-                <span v-else >{{row.destinationCountryCnName}}}</span>
+                <span v-else >{{row.destinationCountryCnName}}</span>
             </template>
             <template slot="transactionUnit" slot-scope="{ row }">
                 <search-query v-if="row.edit"
@@ -133,7 +133,7 @@
                               @corpChange="corpChange($event,'legalUnit',row)"
                               @corpFocus="legalUnitBunitsListfun">
                 </search-query>
-                <span v-else >{{row.legalUnit}}}</span>
+                <span v-else >{{row.legalUnit}}</span>
             </template>
             <template slot="legalQuantity" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.legalQuantity" size="small"

src/views/iosBasicData/reportClose/AIreportClose/bgdetails.vue

@@ -251,23 +251,23 @@
                                                   clearable placeholder="请输入订舱号" ></el-input>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="4">
-                                    <el-form-item label="船名" prop="vesselEnName" label-width="70px">
-                                        <search-query :datalist="vesselData"
-                                                      :selectValue="form.vesselEnName"
-                                                      :filterable="true"
-                                                      :clearable="true"
-                                                      :remote="true"
-                                                      :buttonIf="false"
-                                                      :disabled="detailData.seeDisabled"
-                                                      placeholder="请输入船名"
-                                                      :forParameter="{key:'id',label:'enName',value:'enName'}"
-                                                      @remoteMethod="vesselBvesselsListfun"
-                                                      @corpChange="corpChange($event,'vessel')"
-                                                      @corpFocus="vesselBvesselsListfun" >
-                                        </search-query>
-                                    </el-form-item>
-                                </el-col>
+                                <!--<el-col :span="4">-->
+                                <!--    <el-form-item label="船名" prop="vesselEnName" label-width="70px">-->
+                                <!--        <search-query :datalist="vesselData"-->
+                                <!--                      :selectValue="form.vesselEnName"-->
+                                <!--                      :filterable="true"-->
+                                <!--                      :clearable="true"-->
+                                <!--                      :remote="true"-->
+                                <!--                      :buttonIf="false"-->
+                                <!--                      :disabled="detailData.seeDisabled"-->
+                                <!--                      placeholder="请输入船名"-->
+                                <!--                      :forParameter="{key:'id',label:'enName',value:'enName'}"-->
+                                <!--                      @remoteMethod="vesselBvesselsListfun"-->
+                                <!--                      @corpChange="corpChange($event,'vessel')"-->
+                                <!--                      @corpFocus="vesselBvesselsListfun" >-->
+                                <!--        </search-query>-->
+                                <!--    </el-form-item>-->
+                                <!--</el-col>-->
                                 <el-col :span="4">
                                     <el-form-item label="三检单号" prop="tripleInspectionNumber" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.tripleInspectionNumber"
@@ -293,7 +293,7 @@
                                         </el-date-picker>
                                     </el-form-item>
                                 </el-col>
-                                <el-col :span="4">
+                                <el-col :span="8">
                                     <el-form-item label="发票号码" prop="invoiceNumber" label-width="70px">
                                         <el-input style="width: 100%;" v-model="form.invoiceNumber"
                                                   size="small" autocomplete="off" :disabled="detailData.seeDisabled"
@@ -661,6 +661,8 @@
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
     import { postSelectByUser } from '@/api/iosBasicData/bills'
+    import {dateFormat} from "@/util/date";
+    import {bpackagesList} from "@/api/iosBasicData/bpackages";
 
     export default {
         components: {reports, reportformsList, reportContainer, feecenter, SearchQuery,TableDetails},
@@ -680,6 +682,7 @@
                 saberUserInfo:[], // 当前登录人的数据
                 // 绑定的数据
                 form:{
+                    billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 接单日期默认当天
                     businessType:'BGAI',
                     createUser:'', // 制单人id
                     createUserName:'', // 制单人名称
@@ -761,10 +764,6 @@
                         value:'portOfDestinationEnName',
                     },
                     {
-                        name:'船名',
-                        value:'vesselEnName',
-                    },
-                    {
                         name:'件数',
                         value:'quantity',
                     }
@@ -893,10 +892,13 @@
                 }
                 // 多选集合转换成字符串赋值
                 this.form.documentsAttached = multiArr.join(',')
-                this.form.customsDeclarationGoodsList.map((item,index)=>{
-                    item.sort = Number(index) + 1
-                    item.pid = this.form.id
-                })
+                // 判断是否是数组
+                if (this.form.customsDeclarationGoodsList instanceof Array) {
+                    this.form.customsDeclarationGoodsList.map((item,index)=>{
+                        item.sort = Number(index) + 1
+                        item.pid = this.form.id
+                    })
+                }
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'
                     row.sort = Number(index) + 1
@@ -1328,7 +1330,7 @@
             },
             // 包装种类
             packingUnitBunitsListfun(cnName){
-                getBunitsList(1,10,{cnName}).then(res=>{
+                bpackagesList(1,10,{cnName}).then(res=>{
                     this.packingUnitData = res.data.data.records
                 })
             },

src/views/iosBasicData/reportClose/SEreportClose/bgdetails.vue

@@ -663,6 +663,8 @@
     import reportContainer from "@/views/iosBasicData/report-container/report-container.vue";
     import reportformsList from "@/views/iosBasicData/SeafreightExportF/bills/assembly/reportformsList.vue";
     import { postSelectByUser } from '@/api/iosBasicData/bills'
+    import {dateFormat} from "@/util/date";
+    import {bpackagesList} from "@/api/iosBasicData/bpackages";
 
     export default {
         components: {reportformsList, reportContainer, reports, feecenter, SearchQuery,TableDetails},
@@ -682,6 +684,7 @@
                 saberUserInfo:[], // 当前登录人的数据
                 // 绑定的数据
                 form:{
+                    billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 接单日期默认当天
                     businessType:'BGSE',
                     createUser:'', // 制单人id
                     createUserName:'', // 制单人名称
@@ -896,10 +899,13 @@
                 }
                 // 多选集合转换成字符串赋值
                 this.form.documentsAttached = multiArr.join(',')
-                this.form.customsDeclarationGoodsList.map((item,index)=>{
-                    item.sort = Number(index) + 1
-                    item.pid = this.form.id
-                })
+                // 判断是否是数组
+                if (this.form.customsDeclarationGoodsList instanceof Array) {
+                    this.form.customsDeclarationGoodsList.map((item,index)=>{
+                        item.sort = Number(index) + 1
+                        item.pid = this.form.id
+                    })
+                }
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'
                     row.sort = Number(index) + 1
@@ -1328,7 +1334,7 @@
             },
             // 包装种类
             packingUnitBunitsListfun(cnName){
-                getBunitsList(1,10,{cnName}).then(res=>{
+                bpackagesList(1,10,{cnName}).then(res=>{
                     this.packingUnitData = res.data.data.records
                 })
             },

src/views/iosBasicData/reportClose/SIreportClose/assembly/TableDetails.vue

@@ -52,7 +52,7 @@
                               @corpChange="corpChange($event,'commodityName',row)"
                               @corpFocus="commoditybcommodityListfun">
                 </search-query>
-                <span v-else >{{row.commodityName}}}</span>
+                <span v-else >{{row.commodityName}}</span>
             </template>
             <template slot="specificationModel" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.specificationModel" size="small"
@@ -73,7 +73,7 @@
                               @corpChange="corpChange($event,'destinationCountryCnName',row)"
                               @corpFocus="destinationCountrybcountrysListfun">
                 </search-query>
-                <span v-else >{{row.destinationCountryCnName}}}</span>
+                <span v-else >{{row.destinationCountryCnName}}</span>
             </template>
             <template slot="transactionUnit" slot-scope="{ row }">
                 <search-query v-if="row.edit"
@@ -133,7 +133,7 @@
                               @corpChange="corpChange($event,'legalUnit',row)"
                               @corpFocus="legalUnitBunitsListfun">
                 </search-query>
-                <span v-else >{{row.legalUnit}}}</span>
+                <span v-else >{{row.legalUnit}}</span>
             </template>
             <template slot="legalQuantity" slot-scope="{ row }">
                 <el-input v-if="row.edit" v-model="row.legalQuantity" size="small"

src/views/iosBasicData/reportClose/SIreportClose/bgdetails.vue

@@ -661,6 +661,8 @@
     import {reportsGetReportData} from "@/api/iosBasicData/reports";
     import {getList as getreportsList} from "@/api/iosBasicData/reports";
     import { postSelectByUser } from '@/api/iosBasicData/bills'
+    import {dateFormat} from "@/util/date";
+    import {bpackagesList} from "@/api/iosBasicData/bpackages";
 
     export default {
         components: {reports, reportformsList, reportContainer, feecenter, SearchQuery,TableDetails},
@@ -680,6 +682,7 @@
                 saberUserInfo:[], // 当前登录人的数据
                 // 绑定的数据
                 form:{
+                    billDate:dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 接单日期默认当天
                     businessType:'BGSI',
                     createUser:'', // 制单人id
                     createUserName:'', // 制单人名称
@@ -892,10 +895,13 @@
                 }
                 // 多选集合转换成字符串赋值
                 this.form.documentsAttached = multiArr.join(',')
-                this.form.customsDeclarationGoodsList.map((item,index)=>{
-                    item.sort = Number(index) + 1
-                    item.pid = this.form.id
-                })
+                // 判断是否是数组
+                if (this.form.customsDeclarationGoodsList instanceof Array) {
+                    this.form.customsDeclarationGoodsList.map((item,index)=>{
+                        item.sort = Number(index) + 1
+                        item.pid = this.form.id
+                    })
+                }
                 this.form.feeCenterListD.map((row,index)=>{
                     row.dc = 'D'
                     row.sort = Number(index) + 1
@@ -1324,7 +1330,7 @@
             },
             // 包装种类
             packingUnitBunitsListfun(cnName){
-                getBunitsList(1,10,{cnName}).then(res=>{
+                bpackagesList(1,10,{cnName}).then(res=>{
                     this.packingUnitData = res.data.data.records
                 })
             },

src/views/iosBasicData/seamends/amendsDetails.vue

@@ -121,8 +121,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="制单日期" prop="voucherDate">
-                                <el-date-picker v-model="form.voucherDate" clearable
+                            <el-form-item label="制单日期" prop="createTime">
+                                <el-date-picker v-model="form.createTime" clearable
                                                 style="width: 100%;"
                                                 type="date" size="small"
                                                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -497,7 +497,7 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
-                voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList:[]
@@ -868,7 +868,7 @@ export default {
             this.form.etd = row.etd?row.etd.slice(0,10) + ' 00:00:00':null
             this.form.eta = row.eta?row.eta.slice(0,10) + ' 00:00:00':null
             this.form.businessType = 'SEA'
-            this.form.voucherDate = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
+            this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
 
             delete this.form.id
             delete this.form.status
@@ -1200,7 +1200,7 @@ export default {
                 type: "warning"
             }).then(res=>{
                 this.form = {
-                    voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                    createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                     feeCenterListD: [],
                     feeCenterListC: [],
                     feeCenterList:[]

src/views/iosBasicData/siamends/amendsDetails.vue

@@ -105,8 +105,8 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="4">
-                            <el-form-item label="制单日期" prop="voucherDate">
-                                <el-date-picker v-model="form.voucherDate" clearable
+                            <el-form-item label="制单日期" prop="createTime">
+                                <el-date-picker v-model="form.createTime" clearable
                                                 style="width: 100%;"
                                                 type="date" size="small"
                                                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -473,7 +473,7 @@ export default {
             saveLoading: false, // 按钮加载动画
             // 选择的数据
             form: {
-                voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                 feeCenterListD: [],
                 feeCenterListC: [],
                 feeCenterList:[]
@@ -840,7 +840,7 @@ export default {
             this.form.etd = row.etd?row.etd.slice(0,10) + ' 00:00:00':null
             this.form.eta = row.eta?row.eta.slice(0,10) + ' 00:00:00':null
             this.form.businessType = 'SIA'
-            this.form.voucherDate = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
+            this.form.createTime = dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00' // 制单日期 默认 当天,
 
             delete this.form.id
             delete this.form.status
@@ -1171,7 +1171,7 @@ export default {
                 type: "warning"
             }).then(res=>{
                 this.form = {
-                    voucherDate: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
+                    createTime: dateFormat(new Date(), "yyyy-MM-dd") + ' 00:00:00', // 制单日期 默认 当天,
                     feeCenterListD: [],
                     feeCenterListC: [],
                     feeCenterList:[]