Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/api/iosBasicData/blines.js

@@ -40,3 +40,10 @@ export const blinesSubmit = (row) => {
   })
 }
 
+export const getReceiptUrl = (id) => {
+    return request({
+        url: '/api/blade-los/bills/getReceiptUrl',
+        method: 'post',
+        params: {billId : id}
+    })
+}

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

@@ -300,6 +300,8 @@
                             v-model="assemblyForm.isNeedIq">需三检</el-checkbox>
                         <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled"
                             v-model="assemblyForm.isLargeCargo">大件货</el-checkbox>
+                        <el-checkbox size="medium" :true-label="1" :false-label="0" :disabled="detailData.seeDisabled"
+                                     v-model="assemblyForm.whetherAmericaMoney">美国货</el-checkbox>
                     </div>
                 </el-col>
                 <el-col :span="6">

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

@@ -12,7 +12,7 @@
                             placeholder="请输入提单号"></el-input>
                     </el-form-item>
                     <el-row>
-                        <el-col :span="12">
+                        <el-col :span="10">
                             <el-form-item label="船名" prop="vesselCnName">
                                 <span slot="label">
                                     <span style="color: #1e9fff">船名</span>
@@ -27,14 +27,16 @@
                                 </search-query>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="14">
                             <el-form-item label="航次" prop="voyageNo">
                                 <span slot="label">
                                     <span style="color: #1e9fff">航次</span>
                                 </span>
-                                <el-input type="age" style="width: 100%;" v-model="assemblyForm.voyageNo" size="small"
+                                <el-input type="age" style="width: 70%;" v-model="assemblyForm.voyageNo" size="small"
                                     autocomplete="off" :disabled="detailData.seeDisabled" clearable
                                     placeholder="请输入航次"></el-input>
+                                <el-button size="small" type="primary"  @click="copyReceiptUrl(assemblyForm.id)">背箱小票链接
+                                </el-button>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -259,7 +261,7 @@
 import SearchQuery from "@/components/iosbasic-data/searchquery.vue";
 import { getBvesselsList } from "@/api/iosBasicData/bvessels";
 import { getBcorpsList, getBcorpslistByType } from "@/api/iosBasicData/bcorps";
-import { blinesList } from "@/api/iosBasicData/blines";
+import { blinesList, getReceiptUrl } from "@/api/iosBasicData/blines";
 import { NdayDate } from "@/util/date";
 import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
@@ -452,6 +454,18 @@ export default {
             })
         },
 
+        copyReceiptUrl(id){
+            getReceiptUrl(id).then(res => {
+                console.info('res---', res)
+                const input = document.createElement('textarea');
+                document.body.appendChild(input);
+                input.value = res.data.data;
+                input.select();
+                document.execCommand('copy');
+                document.body.removeChild(input);
+            })
+        },
+
         // 获取航线数据
         lineblinesListfun(cnName) {
             blinesList(1, 10, { cnName, status: 0 }).then(res => {