|
@@ -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) {
|
|
|
+ },
|
|
|
|
|
|
},
|
|
|
|