Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/operation/seaexport/detail/index.vue

@@ -143,10 +143,7 @@
                   ></mastetMore>
                 </div>
                 <div id="tab-content5" class="tab-content" v-show="mainOrderActiveKey === '5-5'">
-                  <costEntry
+                  <costEntry v-if="$route.query.id" :details="bookingDetails"></costEntry>
-                    v-if="$route.query.id"
-                    :details="bookingDetails"
-                  ></costEntry>
                   <!-- <mastetMore
                     ref="RefmastetMore"
                     class="pane-box"
@@ -824,6 +821,27 @@
     lastPages[key] = $data
     appStore.setneedSavePages(lastPages)
   }
+  // 获取默认值
+  function getDefault() {
+    console.log('getDefault')
+    getFormSetInfoByModule({ permissionId: permissionsInfo().permissionId }).then((res) => {
+      if (res?.data?.content) {
+        const content = JSON.parse(res.data.content)
+        updateSchema(content.columns)
+      }
+    })
+  }
+  // 更新表单
+  function updateSchema(data) {
+    console.log(data, 'updateSchema')
+
+    RefbasicInfo.value.updateSchema(data)
+    // RefmailingInfo.value.updateSchemaL(data)
+    // RefmailingInfo.value.updateSchemaR(data)
+    // RefcargoInfo.value.updateSchema(data)
+    // RefediMore.value.updateSchema(data)
+    // RefmastetMore.value.updateSchema(data)
+  }
   //存默认值
   function setDefault() {
     let _data: any = []
@@ -996,7 +1014,7 @@
     console.log(_data)
 
     const Apidata: any = {
-      // id: 0,
+      id: 0,
       permissionId: permissionsInfo().permissionId,
       templateName: permissionsInfo().permissionName,
       permissionName: permissionsInfo().permissionName,
@@ -1010,25 +1028,7 @@
       }
     })
   }
-  function updateSchema(data) {
-    console.log(data, 'updateSchema')
 
-    RefbasicInfo.value.updateSchema(data)
-    // RefmailingInfo.value.updateSchemaL(data)
-    // RefmailingInfo.value.updateSchemaR(data)
-    // RefcargoInfo.value.updateSchema(data)
-    // RefediMore.value.updateSchema(data)
-    // RefmastetMore.value.updateSchema(data)
-  }
-  function getDefault() {
-    console.log('getDefault')
-    getFormSetInfoByModule({ permissionId: permissionsInfo().permissionId }).then((res) => {
-      if (res?.data?.content) {
-        const content = JSON.parse(res.data.content)
-        updateSchema(content.columns)
-      }
-    })
-  }
   // ============================================
   function getRouterHis() {
     inChildLoading.value = true

src/views/operation/seaexport/detail/modules/rightContent.vue

@@ -233,7 +233,7 @@
             <div class="remark-btn"><i class="iconfont icon-shanchu1"></i></div>
           </a-popconfirm>
         </div>
-        <div class="remark no-data" v-if="!details.remark || details.remark.length === 0">
+        <div class="no-data" v-if="!details.remark || details.remark.length === 0">
           <i class="iconfont icon-wushuju"></i>
           <div class="text">暂无内容</div>
         </div>