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

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

@@ -792,6 +792,10 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
+                            <el-form-item label="　　" prop="dgFlashPoint">
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
                             <el-form-item label="易燃易爆品闪点" prop="dgFlashPoint">
                                 <el-input type="age" style="width: 100%;" v-model="assemblyForm.dgFlashPoint"
                                     size="small" autocomplete="off" :disabled="detailData.seeDisabled"

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

@@ -746,7 +746,7 @@ export default {
                     value: 'cyCnName',
                 },
             ],
-            imporiData: [{ id: 0, name: '导入one模板' }, { id: 1, name: '导入PIL订舱模板' }, { id: 2, name: '导入截单格式' }, { id: 3, name: '导入海信提单' }],
+            imporiData: [{ id: 0, name: '导入 ONE 模板' }, { id: 1, name: '导入 PIL 订舱模板' }, { id: 2, name: '导入截单格式' }, { id: 3, name: '导入海信提单' }],
             excelForm: {},
             excelLoading: false,
             excelOption: {
@@ -1017,7 +1017,7 @@ export default {
                 // 签单地点 默认 装货港
                 this.$set(this.form, 'issueAtId', this.form.polId)
                 this.$set(this.form, 'issueAt', this.form.polEnName)
-                
+
                 // 主单单付费地点 默认  如果主单付费方式 为PP 取装货港 如果主单付费地点为CC 取卸货港
                 if (this.form.mpaymode == 'PP') {
                     this.$set(this.form, 'mpayplace', this.form.polEnName)

vue.config.js

@@ -51,9 +51,9 @@ module.exports = {
         //本地服务接口地址
         // target: 'http://192.168.3.64:1080',
         // target: 'http://192.168.8.105:1080',
-        // target: 'http://127.0.0.1:1080',
+        target: 'http://127.0.0.1:1080',
         // 打包地址
-         target: 'http://121.37.83.47:10004',//服务器ip
+        // target: 'http://121.37.83.47:10004',//服务器ip
         //target: 'http://192.168.161.11:10004',//服务器ip
         // target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,