Browse Source

修改默认加载报错。预托书临时

fenghaifu 2 years ago
parent
commit
c78d6080e8

+ 2 - 0
src/mixins/JeecgListMixin.js

@@ -92,6 +92,8 @@ export const JeecgListMixin = {
   methods: {
     loadData(arg) {
       //  console.log('List前面的arg', arg)
+      if (this.url == undefined)
+        return;
       if (!this.url.list) {
         console.log('111:', this.url)
         //  console.log('this.url.list!!!!!', this.url.list)

+ 6 - 48
src/views/pre-book/addPreBookDrawer.vue

@@ -213,7 +213,7 @@
       </div>
     </a-drawer>
     <!-- 参照预装箱单 -->
-    <advancePackingList-modal ref="advancePackingListModal" @callback="referCallback" @ok="modalFormOk"></advancePackingList-modal>
+    <advancePackingList-modal ref="advancePackingListModal" :father="aa"  @callback="referCallback" @ok="modalFormOk"></advancePackingList-modal>
   </div>
 </template>
 
@@ -222,6 +222,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
 import AdvancePackingListModal from '@views/pre-book/advancePackingListModal.vue'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
 
 export default {
   name: 'AddPreBookDrawer', // 新增预托书
@@ -375,51 +376,6 @@ export default {
       ],
       addPerBookData: [],
 
-      CNYColumns: [
-        {
-          title: '货代',
-          dataIndex: 'freightForwarder',
-          width: 60,
-          className: 'replacecolor'
-        },
-        {
-          title: '金额',
-          dataIndex: 'amount',
-          width: 60,
-          className: 'replacecolor'
-        },
-        {
-          title: '项目列',
-          dataIndex: 'itemColumn',
-          width: 60,
-          scopedSlots: { customRender: 'itemColumn' },
-          className: 'replacecolor'
-        }
-      ],
-      CNYData: [],
-
-      USDColumns: [
-        {
-          title: '货代',
-          dataIndex: 'USDfreighForward',
-          width: 60,
-          className: 'replacecolor'
-        },
-        {
-          title: '金额',
-          dataIndex: 'USDmoney',
-          width: 60,
-          className: 'replacecolor'
-        },
-        {
-          title: '项目列',
-          dataIndex: 'USDProjectList',
-          width: 60,
-          scopedSlots: { customRender: 'USDProjectList' },
-          className: 'replacecolor'
-        }
-      ],
-      USDData: [],
 
       msgFormSon: 'test', // 子组件传来数据的变量
       loading: false, // 表格加载
@@ -429,9 +385,8 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       toolbarConfig: {
           btn: []
-        },
-        handleValueChange(event) {
       },
+       
       // validatorRules: {
       //   shippingOrderDate: [{ required: true, message: '托书日期不能为空', trigger: 'blur' }]
       //   // 确定必填项
@@ -505,6 +460,7 @@ export default {
 
     // ------------------------------------------
     modalFormOk() {},
+    aa() {},
     // 参照回调
     referCallback(dataList){
       var subList = this.convertReferToSub(dataList);
@@ -559,6 +515,8 @@ export default {
       }
       return ret;
     },
+     handleValueChange(event) {
+      },
     
   },
 

+ 2 - 1
src/views/pre-book/preBookList.vue

@@ -300,8 +300,9 @@ export default {
     },
     // 新增
     addPreBook() {
-      this.$refs.addPreBookDrawer.visible = true;
       this.$refs.addPreBookDrawer.addPreBook = {syLetterDepositItemList:[],syRmbList:[],syUsdList:[]};
+      this.$refs.addPreBookDrawer.visible = true;
+      
     },
 
     //  详情