1.海运进口 删掉多余的按钮

2.海运进出口 单证中心不论什么单据状态都不受限制 除了锁单
3.SEAMEND SIAMEND 单价允许输入负数
4.海运进出口 单证中心 修改报表字段和名称
5.业务配置 修改数据 新加字段和默认值 调整下拉数据
6.业务配置 配置修改 新加字段和默认值 调整下拉数据

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

@@ -453,7 +453,7 @@
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"
-                        :disabled="detailData.seeDisabled || showLock"></document-center>
+                        :disabled="showLock"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'" class="scrollable-container">
                     <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"

src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -51,8 +51,6 @@
                         v-if="roleName.indexOf('admin') >= 0 || roleName.indexOf('应付修改') >= 0 || roleName.indexOf('应付查看') >= 0"
                         type="warning" size="small" @click="templateImport('C')" :disabled="!selectionList.length">付费模板
                     </el-button>
-                    <el-button type="warning" size="small" @click="outExport">导 出
-                    </el-button>
                     <el-button
                         v-if="roleName.indexOf('admin') >= 0 || roleName.indexOf('应收修改') >= 0 || roleName.indexOf('应收查看') >= 0"
                         type="primary" size="small" @click="pleaseVerify('D')" :disabled="!selectionList.length">请核应收

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

@@ -653,7 +653,7 @@ export default {
             console.log(1111)
             this.editData = {}
             this.documentForm = {}
-            this.businesstypeData = {}
+            // this.businesstypeData = {}
             done();
         },
         // 点击搜索触发

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

@@ -567,7 +567,7 @@
                                         </el-popover>
                                         <!-- <span style="color: #1e9fff">包装</span> -->
                                     </span>
-                                    <search-query :datalist="packingUnitData" style="margin-right: -10px;"
+                                    <search-query ref="packingUnit" :datalist="packingUnitData" style="margin-right: -10px;"
                                         :selectValue="assemblyForm.packingUnit" :filterable="true" :clearable="true"
                                         :remote="true" :disabled="detailData.seeDisabled || generateBillsfalse"
                                         :buttonIf="false" placeholder="请选择包装"
@@ -1626,6 +1626,33 @@ export default {
             // }
             // 包装
             else if (name == 'packingUnit') {
+                if (this.assemblyForm.containersList && this.assemblyForm.containersList.length) {
+                    this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
+                        confirmButtonText: '确定',
+                    });
+                    this.$nextTick(() => {
+                        this.$refs.packingUnit.blur()
+                        this.$refs.quantityRef.blur()
+                        this.$refs.grossWeightRef.blur()
+                        this.$refs.measurementRef.blur()
+                    })
+                    return
+                    // let num=0
+                    // for(let item of this.assemblyForm.containersList){
+                    //     num+=Number(item.quantity)
+                    // }
+                    // if (Number(num) == 0) {
+                    //     this.$alert('当前数据已经均分箱量，请撤销之后再修改', '提示', {
+                    //         confirmButtonText: '确定',
+                    //     });
+                    //     this.$nextTick(() => {
+                    //         this.$refs.quantityRef.blur()
+                    //         this.$refs.grossWeightRef.blur()
+                    //         this.$refs.measurementRef.blur()
+                    //     })
+                    //     return
+                    // }
+                }
                 this.packingUnitBpackagesListfun(value)
             }
             // 船名

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

@@ -50,8 +50,8 @@
                 <el-row>
                     <el-col :span="12" >
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="BOOKING NO." prop="bookingNo" >
-                                <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.bookingNo"
+                            <el-form-item label="HB/L NO" prop="hblno" >
+                                <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hblno"
                                           size="small" autocomplete="off" clearable >
                                 </el-input>
                             </el-form-item>

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

@@ -3,43 +3,45 @@
         <el-row>
             <el-col :span="14">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="SHIPPER/EXPORTER:" prop="mshipperDetails" >
+                    <el-form-item label="SHIPPER/EXPORTER:" prop="mshipperDetails">
                         <el-input type="textarea" :rows="4" style="width: 100%;" v-model="documentForm.mshipperDetails"
-                                  size="small" autocomplete="off" clearable placeholder=" " >
+                            size="small" autocomplete="off" clearable placeholder=" ">
                         </el-input>
                     </el-form-item>
                 </div>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="CONSIGNEE:" prop="mconsigneeDetails" >
-                        <el-input type="textarea" :rows="4" style="width: 100%;" v-model="documentForm.mconsigneeDetails"
-                                  size="small" autocomplete="off" clearable placeholder=" " >
+                    <el-form-item label="CONSIGNEE:" prop="mconsigneeDetails">
+                        <el-input type="textarea" :rows="4" style="width: 100%;"
+                            v-model="documentForm.mconsigneeDetails" size="small" autocomplete="off" clearable
+                            placeholder=" ">
                         </el-input>
                     </el-form-item>
                 </div>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="NOTIFY PARTY (lt is agreed that no responsibility shall be attached to the Carrier or its Agents for failure to notify"
-                                  prop="mnotifyDetails" >
+                    <el-form-item
+                        label="NOTIFY PARTY (lt is agreed that no responsibility shall be attached to the Carrier or its Agents for failure to notify"
+                        prop="mnotifyDetails">
                         <el-input type="textarea" :rows="4" style="width: 100%;" v-model="documentForm.mnotifyDetails"
-                                  size="small" autocomplete="off" clearable
-                                  placeholder=" " >
+                            size="small" autocomplete="off" clearable placeholder=" ">
                         </el-input>
                     </el-form-item>
                 </div>
                 <el-row>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="PRE-CARRIAGE BY" prop="value1" >
+                            <el-form-item label="PRE-CARRIAGE BY" prop="value1">
                                 <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value1"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
                     <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="PLACE OF RECEIPT" prop="destinationNamePrint" >
-                                <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.destinationNamePrint"
-                                          size="small" autocomplete="off" clearable >
+                            <el-form-item label="PLACE OF RECEIPT" prop="destinationNamePrint">
+                                <el-input type="textarea" :rows="2" style="width: 100%;"
+                                    v-model="documentForm.destinationNamePrint" size="small" autocomplete="off"
+                                    clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -48,37 +50,38 @@
             </el-col>
             <el-col :span="10">
                 <el-row>
-                    <el-col :span="12" >
+                    <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="BOOKING NO." prop="bookingNo" >
-                                <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.bookingNo"
-                                          size="small" autocomplete="off" clearable >
+                            <el-form-item label="HB/L NO" prop="hblno">
+                                <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hblno"
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="12" >
+                    <el-col :span="12">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="BILLOF LADING NO." prop="mblno" >
+                            <el-form-item label="BILLOF LADING NO." prop="mblno">
                                 <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.mblno"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
                 </el-row>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="EXPORT REFERENCES(for the Merchant's and/or Carrier's reference only. See back clause 8. (4).)"
-                                  prop="value2" >
+                    <el-form-item
+                        label="EXPORT REFERENCES(for the Merchant's and/or Carrier's reference only. See back clause 8. (4).)"
+                        prop="value2">
                         <el-input type="textarea" :rows="3" style="width: 100%;" v-model="documentForm.value2"
-                                  size="small" autocomplete="off" clearable>
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="FORWARDING AGENT-REFERENCESFMC NO." prop="forwarding" >
+                    <el-form-item label="FORWARDING AGENT-REFERENCESFMC NO." prop="forwarding">
                         <el-input type="textarea" :rows="3" style="width: 100%;" v-model="documentForm.forwarding"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -87,28 +90,27 @@
         <el-row>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="OCEAN VESSELVOYAGE NO，FLAG" prop="vesselCnName" >
+                    <el-form-item label="OCEAN VESSELVOYAGE NO，FLAG" prop="vesselCnName">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.vesselCnName"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PORT OF LOADING" prop="polNamePrint" >
+                    <el-form-item label="PORT OF LOADING" prop="polNamePrint">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.polNamePrint"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="10">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="FINAL DESTINATION(for the Merchant's reference only" prop="value3" >
+                    <el-form-item label="FINAL DESTINATION(for the Merchant's reference only" prop="value3">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value3"
-                                  size="small" autocomplete="off" clearable
-                                  placeholder="" >
+                            size="small" autocomplete="off" clearable placeholder="">
                         </el-input>
                     </el-form-item>
                 </div>
@@ -117,27 +119,28 @@
         <el-row>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PORT OF DISCHARGE" prop="podNamePrint" >
+                    <el-form-item label="PORT OF DISCHARGE" prop="podNamePrint">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.podNamePrint"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PLACE OF DELIVERY" prop="placeDeliveryNamePrint" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.placeDeliveryNamePrint"
-                                  size="small" autocomplete="off" clearable >
+                    <el-form-item label="PLACE OF DELIVERY" prop="placeDeliveryNamePrint">
+                        <el-input type="textarea" :rows="2" style="width: 100%;"
+                            v-model="documentForm.placeDeliveryNamePrint" size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="10">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="TYPE OF MOVEMENTUIF MIXED.USE DESCRIPTION OF PACKAGESAND GOODS FIELDI" prop="value4" >
+                    <el-form-item label="TYPE OF MOVEMENTUIF MIXED.USE DESCRIPTION OF PACKAGESAND GOODS FIELDI"
+                        prop="value4">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value4"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -151,48 +154,48 @@
         <el-row>
             <el-col :span="6">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="CNTR.NOS.W/SEAL NOS.MARKS & NUMBERS" prop="marks" >
+                    <el-form-item label="CNTR.NOS.W/SEAL NOS.MARKS & NUMBERS" prop="marks">
                         <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.marks"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                         <el-input type="textarea" :rows="5" style="width: 100%;" v-model="documentForm.cntryString"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="7">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="QUANTITY(FOR CUSTOMS DECLARATION ONLY)" prop="quantity" >
+                    <el-form-item label="QUANTITY(FOR CUSTOMS DECLARATION ONLY)" prop="quantity">
                         <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.quantity"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="DESCRIPTION OF GOODS" prop="commodityDescr" >
+                    <el-form-item label="DESCRIPTION OF GOODS" prop="commodityDescr">
                         <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.commodityDescr"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="GROSS WEIGHT" prop="grossWeight" >
+                    <el-form-item label="GROSS WEIGHT" prop="grossWeight">
                         <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.grossWeight"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="GROSS MEASUREMENT" prop="measurement" >
+                    <el-form-item label="GROSS MEASUREMENT" prop="measurement">
                         <el-input type="textarea" :rows="10" style="width: 100%;" v-model="documentForm.measurement"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -201,60 +204,62 @@
 
         <div style="margin-top: 5px;">
             <span>Declared Cargo Value US $</span>
-            <el-input style="width: 10%" v-model="documentForm.value5" size="small" autocomplete="off" clearable ></el-input>
-            <span>. If Merchant enters a value. Carrier's limitation of liability shall not apply and the ad valorem rate will be charged.</span>
+            <el-input style="width: 10%" v-model="documentForm.value5" size="small" autocomplete="off"
+                clearable></el-input>
+            <span>. If Merchant enters a value. Carrier's limitation of liability shall not apply and the ad valorem
+                rate will be charged.</span>
         </div>
         <el-row>
             <el-col :span="2">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="FREIGHT" prop="hpaymode" >
+                    <el-form-item label="FREIGHT" prop="hpaymode">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hpaymode"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="CHARGES PAYABLE AT / BY:" prop="hpayplace" >
+                    <el-form-item label="CHARGES PAYABLE AT / BY:" prop="hpayplace">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hpayplace"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="SERVICE CONTRACT NO." prop="serviceTerms" >
+                    <el-form-item label="SERVICE CONTRACT NO." prop="serviceTerms">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.serviceTerms"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="DOC FROM NO." prop="value6" >
+                    <el-form-item label="DOC FROM NO." prop="value6">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value6"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="COMMODITY CODE" prop="hscode" >
+                    <el-form-item label="COMMODITY CODE" prop="hscode">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.hscode"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
             </el-col>
             <el-col :span="3">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="EXCHANGE RATE" prop="value7" >
+                    <el-form-item label="EXCHANGE RATE" prop="value7">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value7"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -264,47 +269,47 @@
         <el-row>
             <el-col :span="20">
                 <el-row>
-                    <el-col :span="4" >
+                    <el-col :span="4">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="COOE TARIFF ITEM" prop="value8" >
+                            <el-form-item label="COOE TARIFF ITEM" prop="value8">
                                 <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value8"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="4" >
+                    <el-col :span="4">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="FREIGHTED AS" prop="value9" >
+                            <el-form-item label="FREIGHTED AS" prop="value9">
                                 <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value9"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="4" >
+                    <el-col :span="4">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="RATE" prop="value10" >
+                            <el-form-item label="RATE" prop="value10">
                                 <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value10"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="4" >
+                    <el-col :span="4">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="PREPAID" prop="value11" >
+                            <el-form-item label="PREPAID" prop="value11">
                                 <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value11"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
                     </el-col>
-                    <el-col :span="5" >
+                    <el-col :span="5">
                         <div style="border: 1px solid #000;">
-                            <el-form-item label="COLLECT" prop="value12" >
+                            <el-form-item label="COLLECT" prop="value12">
                                 <el-input type="textarea" :rows="13" style="width: 100%;" v-model="documentForm.value12"
-                                          size="small" autocomplete="off" clearable >
+                                    size="small" autocomplete="off" clearable>
                                 </el-input>
                             </el-form-item>
                         </div>
@@ -313,30 +318,30 @@
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="DATE CARGO RECEIVED" prop="corpCnName" >
+                    <el-form-item label="DATE CARGO RECEIVED" prop="corpCnName">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value13"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="DATE LADEN ON BOARD" prop="etd" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.etd"
-                                  size="small" autocomplete="off" clearable >
+                    <el-form-item label="DATE LADEN ON BOARD" prop="etd">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.etd" size="small"
+                            autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="PLACE OF BILL(S)ISSUE" prop="issueAt" >
+                    <el-form-item label="PLACE OF BILL(S)ISSUE" prop="issueAt">
                         <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.issueAt"
-                                  size="small" autocomplete="off" clearable >
+                            size="small" autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
                 <div style="border: 1px solid #000;">
-                    <el-form-item label="DATED" prop="etd" >
-                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.etd"
-                                  size="small" autocomplete="off" clearable >
+                    <el-form-item label="DATED" prop="etd">
+                        <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.etd" size="small"
+                            autocomplete="off" clearable>
                         </el-input>
                     </el-form-item>
                 </div>
@@ -345,7 +350,8 @@
 
         <el-row>
             <el-col :span="6">
-                <span>The printed terms and conditions on this Bill are available at its website at www.one-line.com</span>
+                <span>The printed terms and conditions on this Bill are available at its website at
+                    www.one-line.com</span>
             </el-col>
             <el-col :span="4">
                 <div style="border: 1px solid #000;height: 80px;"></div>
@@ -354,9 +360,9 @@
                 <div style="border: 1px solid #000;height: 80px;"></div>
             </el-col>
             <el-col :span="5">
-                <el-form-item label="SIGNED BY:" prop="value14" >
-                    <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value14"
-                              size="small" autocomplete="off" clearable >
+                <el-form-item label="SIGNED BY:" prop="value14">
+                    <el-input type="textarea" :rows="2" style="width: 100%;" v-model="documentForm.value14" size="small"
+                        autocomplete="off" clearable>
                     </el-input>
                 </el-form-item>
             </el-col>
@@ -369,66 +375,67 @@
 </template>
 
 <script>
-    import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
-    import {bportsList} from "@/api/iosBasicData/bports";
-    import {getDeptTree} from "@/api/system/dept";
-    import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
+import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
+import { bportsList } from "@/api/iosBasicData/bports";
+import { getDeptTree } from "@/api/system/dept";
+import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
 
-    export default {
-        components: {TreeSelect, SearchQuery},
-        data(){
-            return {
-                destinationData:[], // 目的港数据
-                departmentData:[], // 部门
-            }
+export default {
+    components: { TreeSelect, SearchQuery },
+    data() {
+        return {
+            destinationData: [], // 目的港数据
+            departmentData: [], // 部门
+        }
+    },
+    props: {
+        // 表单对象
+        documentForm: {
+            type: Object,
+            default: {}
         },
-        props:{
-            // 表单对象
-            documentForm:{
-                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)
-                        }
+    },
+    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 {
-                    this.$set(this.documentForm,name,value)
                 }
-            },
-            // 目的地
-            destinationBportsListfun(enName){
-                bportsList(1,10,{enName}).then(res=>{
-                    this.destinationData = res.data.data.records
-                })
-            },
-            // 获取机构管理接口
-            getLazylistfun(){
-                getDeptTree().then(res=>{
-                    this.departmentData = res.data.data
-                })
-            },
+            } else {
+                this.$set(this.documentForm, name, value)
+            }
+        },
+        // 目的地
+        destinationBportsListfun(enName) {
+            bportsList(1, 10, { enName }).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;
 }
+
 ::v-deep.el-form--label-top .el-form-item__label {
     padding: 0;
     line-height: 20px;

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

@@ -292,7 +292,7 @@
                 </el-tab-pane>
                 <el-tab-pane label="单证中心" name="dz" class="scrollable-container">
                     <document-center ref="documentCenter" :detailData="detailData" :assemblyForm="form"
-                        :disabled="detailData.seeDisabled || showLock"></document-center>
+                        :disabled="showLock"></document-center>
                 </el-tab-pane>
                 <el-tab-pane label="分单列表" name="fd" v-if="form.billType == 'MM'" class="scrollable-container">
                     <Split-list :detailData="detailData" :assemblyForm="form" :data="billsListAllData"

src/views/iosBasicData/aeamends/assembly/amendsCostdetails.vue

@@ -762,13 +762,13 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
             },
             // 单价
             priceinputfun(value,row){
-                if (Number(value) <= 0) {
-                    this.$message({
-                        type: "warning",
-                        message: "单价不能输入负数!"
-                    });
-                    return
-                }
+                // if (Number(value) <= 0) {
+                //     this.$message({
+                //         type: "warning",
+                //         message: "单价不能输入负数!"
+                //     });
+                //     return
+                // }
                 this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                 // 判断是否有币种
                 if (!row.curCode) {

src/views/iosBasicData/aiamends/assembly/amendsCostdetails.vue

@@ -762,13 +762,13 @@ import {getBcorpsDetail, getBcorpsList} from "@/api/iosBasicData/bcorps";
             },
             // 单价
             priceinputfun(value,row){
-                if (Number(value) <= 0) {
-                    this.$message({
-                        type: "warning",
-                        message: "单价不能输入负数!"
-                    });
-                    return
-                }
+                // if (Number(value) <= 0) {
+                //     this.$message({
+                //         type: "warning",
+                //         message: "单价不能输入负数!"
+                //     });
+                //     return
+                // }
                 this.$set(row,'amount',Number(row.price) * Number(row.quantity?row.quantity:0))
                 // 判断是否有币种
                 if (!row.curCode) {

src/views/iosBasicData/seamends/assembly/amendsCostdetails.vue

@@ -80,7 +80,7 @@
                 <span>{{ row.isTax ? '是' : '否' }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-                <el-input-number v-if="row.editType" v-model="row.price" size="small" :min="1" placeholder="请输入单价"
+                <el-input-number v-if="row.editType" v-model="row.price" size="small" placeholder="请输入单价"
                     @blur="priceinputfun($event, row)" :controls="false"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </template>
@@ -680,13 +680,13 @@ export default {
         },
         // 单价
         priceinputfun(value, row) {
-            if (Number(value) <= 0) {
-                this.$message({
-                    type: "warning",
-                    message: "单价不能输入负数!"
-                });
-                return
-            }
+            // if (Number(value) <= 0) {
+            //     this.$message({
+            //         type: "warning",
+            //         message: "单价不能输入负数!"
+            //     });
+            //     return
+            // }
             this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {

src/views/iosBasicData/siamends/assembly/amendsCostdetails.vue

@@ -90,7 +90,7 @@
                 <span>{{ row.isTax ? '是' : '否' }}</span>
             </template>
             <template slot="price" slot-scope="{ row }">
-                <el-input-number v-if="row.editType" v-model="row.price" size="small" :min="1" placeholder="请输入单价"
+                <el-input-number v-if="row.editType" v-model="row.price" size="small" placeholder="请输入单价"
                     @blur="priceinputfun($event, row)" :controls="false"></el-input-number>
                 <span v-else>{{ row.price }}</span>
             </template>
@@ -674,13 +674,13 @@ export default {
         },
         // 单价
         priceinputfun(value, row) {
-            if (Number(value) <= 0) {
-                this.$message({
-                    type: "warning",
-                    message: "单价不能输入负数!"
-                });
-                return
-            }
+            // if (Number(value) <= 0) {
+            //     this.$message({
+            //         type: "warning",
+            //         message: "单价不能输入负数!"
+            //     });
+            //     return
+            // }
             this.$set(row, 'amount', Number(row.price) * Number(row.quantity ? row.quantity : 0))
             // 判断是否有币种
             if (!row.curCode) {

src/views/serviceConfiguration/configurationModification/detailsPage.vue

@@ -15,6 +15,12 @@
         <div style="margin-top: 50px">
             <trade-card title="基础信息">
                 <avue-form :option="optionForm" v-model="form" ref="form">
+                    <tempalte slot="branchName">
+                        <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
+                            url="/blade-system/dept/top-list" :filterable="true" :remote="true" dataName="deptName"
+                            @selectChange="dicChange('branchName', $event)" :default="true"
+                            :disabled="roleName.includes('secondaryAdmin')"></dic-select>
+                    </tempalte>
                 </avue-form>
             </trade-card>
             <trade-card title="字段明细">
@@ -59,6 +65,8 @@ export default {
             selectionList: [],
             form: {
                 type: 1,
+                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 updateItemList: []
             },
             optionForm: {
@@ -69,34 +77,42 @@ export default {
                 disabled: false,
                 column: [
                     {
+                        label: "所属公司",
+                        prop: "branchName",
+                        disabled: false,
+                    },
+                    {
                         label: "业务类型",
                         prop: "businessType",
                         type: 'select',
-                        dicData: [{
-                            value: 'SE',
-                            label: '海运出口'
-                        }, {
-                            value: 'SI',
-                            label: '海运进口'
-                        }, {
-                            value: 'AE',
-                            label: '空运出口'
-                        }, {
-                            value: 'AI',
-                            label: '空运进口'
-                        }, {
-                            value: 'BGSE',
-                            label: '海运报关出口'
-                        }, {
-                            value: 'BGSI',
-                            label: '海运报关进口'
-                        }, {
-                            value: 'BGAE',
-                            label: '空运报关出口'
-                        }, {
-                            value: 'BGAI',
-                            label: '空运报关进口'
-                        }],
+                        dicData: [
+                            {
+                                value: 'SE',
+                                label: '海运出口'
+                            }, {
+                                value: 'SI',
+                                label: '海运进口'
+                            },
+                            // {
+                            //     value: 'AE',
+                            //     label: '空运出口'
+                            // }, {
+                            //     value: 'AI',
+                            //     label: '空运进口'
+                            // }, {
+                            //     value: 'BGSE',
+                            //     label: '海运报关出口'
+                            // }, {
+                            //     value: 'BGSI',
+                            //     label: '海运报关进口'
+                            // }, {
+                            //     value: 'BGAE',
+                            //     label: '空运报关出口'
+                            // }, {
+                            //     value: 'BGAI',
+                            //     label: '空运报关进口'
+                            // }
+                        ],
                         rules: [{
                             required: true,
                             message: " ",

src/views/serviceConfiguration/configurationModification/index.vue

@@ -12,9 +12,9 @@
                     </el-button>
                 </template>
                 <template slot-scope="{row}" slot="menu">
-                    <el-button type="text" size="small"  icon="el-icon-edit" @click.stop="rowEdit(row)">编 辑
+                    <el-button type="text" size="small" icon="el-icon-edit" @click.stop="rowEdit(row)">编 辑
                     </el-button>
-                    <el-button type="text" size="small"  icon="el-icon-edit" @click.stop="rowDel(row)">删 除
+                    <el-button type="text" size="small" icon="el-icon-edit" @click.stop="rowDel(row)">删 除
                     </el-button>
                 </template>
             </avue-crud>
@@ -54,48 +54,56 @@ export default {
                 searchMenuSpan: 12,
                 border: true,
                 index: true,
-                indexFixed:false,
+                indexFixed: false,
                 addBtn: false,
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
                 selection: true,
-                selectionFixed:false,
+                selectionFixed: false,
                 searchIcon: true,
                 align: 'center',
                 searchIndex: 3,
                 column: [
                     {
+                        label: "所属公司",
+                        prop: "branchName",
+                        overHidden: true,
+                    },
+                    {
                         label: "业务类型",
                         prop: "businessType",
                         search: true,
                         overHidden: true,
                         type: 'select',
-                        dicData: [{
-                            value: 'SE',
-                            label: '海运出口'
-                        }, {
-                            value: 'SI',
-                            label: '海运进口'
-                        }, {
-                            value: 'AE',
-                            label: '空运出口'
-                        }, {
-                            value: 'AI',
-                            label: '空运进口'
-                        }, {
-                            value: 'BGSE',
-                            label: '海运报关出口'
-                        }, {
-                            value: 'BGSI',
-                            label: '海运报关进口'
-                        }, {
-                            value: 'BGAE',
-                            label: '空运报关出口'
-                        }, {
-                            value: 'BGAI',
-                            label: '空运报关进口'
-                        }],
+                        dicData: [
+                            {
+                                value: 'SE',
+                                label: '海运出口'
+                            }, {
+                                value: 'SI',
+                                label: '海运进口'
+                            },
+                            // {
+                            //     value: 'AE',
+                            //     label: '空运出口'
+                            // }, {
+                            //     value: 'AI',
+                            //     label: '空运进口'
+                            // }, {
+                            //     value: 'BGSE',
+                            //     label: '海运报关出口'
+                            // }, {
+                            //     value: 'BGSI',
+                            //     label: '海运报关进口'
+                            // }, {
+                            //     value: 'BGAE',
+                            //     label: '空运报关出口'
+                            // }, {
+                            //     value: 'BGAI',
+                            //     label: '空运报关进口'
+                            // }
+                        ],
                     },
                     {
                         label: "创建日期",

src/views/serviceConfiguration/modifyData/detailsPage.vue

@@ -17,6 +17,12 @@
         <div style="margin-top: 50px">
             <trade-card title="基础信息">
                 <avue-form :option="optionForm" v-model="form" ref="form">
+                    <tempalte slot="branchName">
+                        <dic-select v-model="form.branchName" placeholder="所属公司" key="id" label="deptName"
+                            url="/blade-system/dept/top-list" :filterable="true" :remote="true" dataName="deptName"
+                            @selectChange="dicChange('branchName', $event)" :default="true"
+                            :disabled="form.approvalStatus != '录入' || roleName.includes('secondaryAdmin')"></dic-select>
+                    </tempalte>
                     <template slot="menuForm">
                         <el-button icon="el-icon-search" type="primary"
                             :disabled="data.length > 0 || form.approvalStatus != '录入'"
@@ -43,8 +49,8 @@
                     <template slot-scope="{type,disabled}" slot="fieldValueNewNameForm">
                         <el-input v-if="rowFrom.fieldValueType == '输入框'" :disabled="disabled"
                             v-model="rowFrom.fieldValueNewName"></el-input>
-                        <el-date-picker v-if="rowFrom.fieldValueType == '日期选择器'" v-model="rowFrom.fieldValueNewName" type="date" placeholder="选择日期" format="yyyy-MM-dd"
-                            value-format="yyyy-MM-dd 00:00:00" >
+                        <el-date-picker v-if="rowFrom.fieldValueType == '日期选择器'" v-model="rowFrom.fieldValueNewName"
+                            type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd 00:00:00">
                         </el-date-picker>
                         <div v-if="rowFrom.queryType != '业务来源'">
                             <dic-select v-if="rowFrom.fieldValueType == '选择器' && rowFrom.queryType != '字典'"
@@ -67,7 +73,7 @@
                             </el-input>
                             <dic-select style="width: 100%;" v-show="rowFrom.fieldValueNew == 'OWN'"
                                 v-model="rowFrom.secondLevelName" placeholder="所属公司" key="id" label="deptName"
-                                url="/blade-system/dept/lazy-list?parentId=0" :filterable="true" 
+                                url="/blade-system/dept/lazy-list?parentId=0" :filterable="true"
                                 @selectChange="dicChange('所属公司', $event)"></dic-select>
                             <dic-select style="width: 100%;" v-show="rowFrom.fieldValueNew == 'AGENT'"
                                 v-model="rowFrom.secondLevelName" placeholder="代理" key="id" label="cnName" res="records"
@@ -104,6 +110,8 @@ export default {
             form: {
                 type: 2,
                 approvalStatus: "录入",
+                branchId: JSON.parse(localStorage.getItem('sysitemData')).deptId,
+                branchName: JSON.parse(localStorage.getItem('sysitemData')).deptName,
                 updateItemList: []
             },
             rowFrom: {},
@@ -115,34 +123,47 @@ export default {
                 disabled: false,
                 column: [
                     {
+                        label: "所属公司",
+                        prop: "branchName",
+                        disabled: false,
+                    },
+                    // {
+                    //     label: "创建日期",
+                    //     prop: "createTime",
+                    //     disabled: false,
+                    // },
+                    {
                         label: "业务类型",
                         prop: "businessType",
                         type: 'select',
-                        dicData: [{
-                            value: 'SE',
-                            label: '海运出口'
-                        }, {
-                            value: 'SI',
-                            label: '海运进口'
-                        }, {
-                            value: 'AE',
-                            label: '空运出口'
-                        }, {
-                            value: 'AI',
-                            label: '空运进口'
-                        }, {
-                            value: 'BGSE',
-                            label: '海运报关出口'
-                        }, {
-                            value: 'BGSI',
-                            label: '海运报关进口'
-                        }, {
-                            value: 'BGAE',
-                            label: '空运报关出口'
-                        }, {
-                            value: 'BGAI',
-                            label: '空运报关进口'
-                        }],
+                        dicData: [
+                            {
+                                value: 'SE',
+                                label: '海运出口'
+                            }, {
+                                value: 'SI',
+                                label: '海运进口'
+                            },
+                            // {
+                            //     value: 'AE',
+                            //     label: '空运出口'
+                            // }, {
+                            //     value: 'AI',
+                            //     label: '空运进口'
+                            // }, {
+                            //     value: 'BGSE',
+                            //     label: '海运报关出口'
+                            // }, {
+                            //     value: 'BGSI',
+                            //     label: '海运报关进口'
+                            // }, {
+                            //     value: 'BGAE',
+                            //     label: '空运报关出口'
+                            // }, {
+                            //     value: 'BGAI',
+                            //     label: '空运报关进口'
+                            // }
+                        ],
                         rules: [{
                             required: true,
                             message: " ",
@@ -159,6 +180,9 @@ export default {
                         }, {
                             value: '2',
                             label: '提单号'
+                        }, {
+                            value: '3',
+                            label: '分单号'
                         }],
                         rules: [{
                             required: true,
@@ -345,7 +369,7 @@ export default {
                     this.rowFrom.secondLevelName = null
                 }
 
-            }else if (name == '所属公司') {
+            } else if (name == '所属公司') {
                 if (row) {
                     // this.$set(this.rowFrom,'secondLevel',row.id)
                     // this.$set(this.rowFrom,'secondLevelName',row.cnName)
@@ -356,7 +380,7 @@ export default {
                     this.rowFrom.secondLevelName = null
                 }
 
-            }  else {
+            } else {
                 if (row) {
                     this.rowFrom.fieldValueNew = row.id
                     this.rowFrom.fieldValueNewName = row.cnName

src/views/serviceConfiguration/modifyData/index.vue

@@ -22,7 +22,8 @@
                 <template slot-scope="{row}" slot="menu">
                     <el-button type="text" size="small" icon="el-icon-edit" @click.stop="rowEdit(row)">编 辑
                     </el-button>
-                    <el-button type="text" size="small" icon="el-icon-edit" @click.stop="rowDel(row)" :disabled="row.approvalStatus=='审核提交'">删 除
+                    <el-button type="text" size="small" icon="el-icon-edit" @click.stop="rowDel(row)"
+                        :disabled="row.approvalStatus == '审核提交'">删 除
                     </el-button>
                 </template>
             </avue-crud>
@@ -74,6 +75,11 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
+                        label: "所属公司",
+                        prop: "branchName",
+                        overHidden: true,
+                    },
+                    {
                         label: "源单据单号",
                         prop: "retrievalValue",
                         search: true,
@@ -85,31 +91,35 @@ export default {
                         search: true,
                         overHidden: true,
                         type: 'select',
-                        dicData: [{
-                            value: 'SE',
-                            label: '海运出口'
-                        }, {
-                            value: 'SI',
-                            label: '海运进口'
-                        }, {
-                            value: 'AE',
-                            label: '空运出口'
-                        }, {
-                            value: 'AI',
-                            label: '空运进口'
-                        }, {
-                            value: 'BGSE',
-                            label: '海运报关出口'
-                        }, {
-                            value: 'BGSI',
-                            label: '海运报关进口'
-                        }, {
-                            value: 'BGAE',
-                            label: '空运报关出口'
-                        }, {
-                            value: 'BGAI',
-                            label: '空运报关进口'
-                        }],
+                        dicData: [
+                            {
+                                value: 'SE',
+                                label: '海运出口'
+                            },
+                            {
+                                value: 'SI',
+                                label: '海运进口'
+                            },
+                            // {
+                            //     value: 'AE',
+                            //     label: '空运出口'
+                            // }, {
+                            //     value: 'AI',
+                            //     label: '空运进口'
+                            // }, {
+                            //     value: 'BGSE',
+                            //     label: '海运报关出口'
+                            // }, {
+                            //     value: 'BGSI',
+                            //     label: '海运报关进口'
+                            // }, {
+                            //     value: 'BGAE',
+                            //     label: '空运报关出口'
+                            // }, {
+                            //     value: 'BGAI',
+                            //     label: '空运报关进口'
+                            // }
+                        ],
                     },
                     {
                         label: "创建日期",
@@ -183,7 +193,7 @@ export default {
             let obj = {}
             obj = {
                 ...Object.assign(params, this.query),
-                approvalStatus:this.query.approvalStatus=='审核通过'?'审核通过':null
+                approvalStatus: this.query.approvalStatus == '审核通过' ? '审核通过' : null
             }
             this.loading = true;
             getList(page.currentPage, page.pageSize, obj).then(res => {