海运出口 集装箱 页面调整

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

@@ -904,6 +904,51 @@
                             clearable placeholder="地址"></el-input>
                     </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="截单时间" prop="cyTrailerTime">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">截单时间</span>
+                                </span>
+                                <el-date-picker v-model="assemblyForm.cyTrailerTime" type="datetime" style="width: 100%;"
+                                    format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" size="small"
+                                    :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    placeholder="请选择截单时间">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                            <el-form-item label="截港时间" prop="cyReturnTime">
+                                <span slot="label">
+                                    <span style="color: #1e9fff">截港时间</span>
+                                </span>
+                                <el-date-picker v-model="assemblyForm.cyReturnTime" type="datetime" style="width: 100%;"
+                                    format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" size="small"
+                                    :disabled="detailData.seeDisabled || (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0)"
+                                    placeholder="请选择截港时间">
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="12">
+                            <el-form-item label="箱属" prop="boxBelongsTo">
+                        <span slot="label">
+                            <span style="color: #1e9fff">箱属</span>
+                        </span>
+                                <div>
+                                    <dic-select v-model="assemblyForm.boxBelongsTo" placeholder="箱属" key="dictKey"
+                                                label="dictValue" url="/blade-system/dict-biz/dictionary?code=boxBelongsTo"
+                                                :filterable="true" :disabled="detailData.seeDisabled"></dic-select>
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                </el-col>
+
+
             </el-row>
             <el-row>
                 <el-col :span="12">

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

@@ -13,7 +13,7 @@
                         </search-query>
                     </el-form-item>
                 </el-col> -->
-                
+
 
                 <el-col :span="6">
                     <el-form-item label="应结日期" prop="dueDate">
@@ -37,7 +37,7 @@
                             placeholder="请选择截港时间">
                         </el-date-picker>
                     </el-form-item>
-                </el-col>
+                </el-col>-->
 
                 <!-- <el-col :span="6">
                     <el-form-item label="签单方式" prop="issueType">
@@ -52,7 +52,7 @@
                         </el-select>
                     </el-form-item>
                 </el-col> -->
-                <el-col :span="6">
+<!--                <el-col :span="6">
                     <el-form-item label="航线" prop="lineCnName">
                         <span slot="label">
                             <span style="color: #1e9fff">航线</span>
@@ -125,7 +125,7 @@
 
                     </el-form-item>
                 </el-col>
-               
+
                 <el-col :span="6">
                     <el-form-item label="装箱方式" prop="loadType">
                         <span slot="label">
@@ -203,7 +203,7 @@
                         </search-query>
                     </el-form-item>
                 </el-col>
-                <el-col :span="6">
+<!--                <el-col :span="6">
                     <el-form-item label="MB/L付款地点" prop="mPayplace">
                         <span slot="label">
                             <span style="color: #1e9fff">MB/L付款地点</span>
@@ -217,7 +217,7 @@
                         </search-query>
                     </el-form-item>
                 </el-col>
-                
+
                 <el-col :span="6">
                     <el-form-item label="舱位类型" prop="cabinType">
                         <span slot="label">
@@ -265,7 +265,7 @@
                                 :disabled="detailData.seeDisabled"></el-input>
                         </div>
                     </el-form-item>
-                </el-col>
+                </el-col>-->
                 <el-col :span="6">
                     <el-form-item label="限制舱位(T)" prop="restrictedCabinSpace">
                         <span slot="label">
@@ -707,6 +707,7 @@ export default {
             }
         },
         // 选择框的回调
+
         corpChange(value, name) {
             let inttraArr = ['inttraDoorTo', 'inttraToDoor']
             let numberOfArr = ['Obl', 'Copy']

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

@@ -15,13 +15,13 @@
                     </el-radio-group>
                 </template>
                 <template slot="menuLeft">
-                    <el-button type="primary" size="small" @click="addbtnfun('DD')">新建直单
+                    <el-button type="primary" size="small" @click="addbtnfun('DD')">创建直单
                     </el-button>
-                    <el-button type="success" size="small" @click="addbtnfun('MM')">新建主单
+                    <el-button type="success" size="small" @click="addbtnfun('MM')">创建主单
                     </el-button>
-                    <el-button type="warning" size="small" @click="addbtnfun('MH')">新建分单
+                    <el-button type="warning" size="small" @click="addbtnfun('MH')">创建分单
                     </el-button>
-                    <el-button type="primary" size="small" plain @click="CopyDocumentsfun">复制单据
+                    <el-button type="primary" size="small" plain @click="CopyDocumentsfun">复制
                     </el-button>
                     <el-button type="success" size="small" plain @click="increaseMawb">分单->主单
                     </el-button>
@@ -37,11 +37,11 @@
                     </el-button>
                     <el-button
                         v-if="roleName.indexOf('admin') >= 0 || roleName.indexOf('应收修改') >= 0 || roleName.indexOf('应收查看') >= 0"
-                        type="primary" size="small" @click="templateImport('D')" :disabled="!selectionList.length">收费模板
+                        type="primary" size="small" @click="templateImport('D')" :disabled="!selectionList.length">模板(收)
                     </el-button>
                     <el-button
                         v-if="roleName.indexOf('admin') >= 0 || roleName.indexOf('应付修改') >= 0 || roleName.indexOf('应付查看') >= 0"
-                        type="warning" size="small" @click="templateImport('C')" :disabled="!selectionList.length">付费模板
+                        type="warning" size="small" @click="templateImport('C')" :disabled="!selectionList.length">模板(付)
                     </el-button>
                     <el-button
                         v-if="roleName.indexOf('admin') >= 0 || roleName.indexOf('应付修改') >= 0 || roleName.indexOf('应付查看') >= 0"
@@ -49,13 +49,13 @@
                         :disabled="!selectionList.length">提取成本</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">请核应收
+                        type="primary" size="small" @click="pleaseVerify('D')" :disabled="!selectionList.length">提交收
                     </el-button>
                     <el-button
                         v-if="roleName.indexOf('admin') >= 0 || roleName.indexOf('应付修改') >= 0 || roleName.indexOf('应付查看') >= 0"
-                        type="warning" size="small" @click="pleaseVerify('C')" :disabled="!selectionList.length">请核应付
+                        type="warning" size="small" @click="pleaseVerify('C')" :disabled="!selectionList.length">提交付
                     </el-button>
-                    <el-button type="success" size="small" @click="checkBills" :disabled="!selectionList.length">单据请核
+                    <el-button type="success" size="small" @click="checkBills" :disabled="!selectionList.length">请核
                     </el-button>
 
                     <!-- <el-dropdown style="line-height: 0">