预托书临时

src/api/document/pre-book.js

@@ -23,4 +23,7 @@ const submit = params => postAction('/letterDeposit/syLetterDeposit/syShippingDe
 // 取消提交
 const cancelSubmit = params => postAction('/letterDeposit/syLetterDeposit/syShippingDetailsSubmit', params)
 
-export { preBookList, addPreBook, preBookById, editById, deletePreBook, submit, cancelSubmit }
+// 参照预装箱单
+const querySyPreAssembledPackingList = params => getAction('/letterDeposit/syLetterDeposit/querySyPreAssembledPackingList', params)
+
+export { preBookList, addPreBook, preBookById, editById, deletePreBook, submit, cancelSubmit, querySyPreAssembledPackingList }

src/views/pre-book/addPreBookDrawer.vue

@@ -15,6 +15,13 @@
           <!-- :rules="validatorRules" -->
           <a-form-model layout="inline" ref="form" :model="addPreBook">
             <a-row :gutter="24">
+              
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="托书号" prop="shippingOrderNumber">
+                  <a-input placeholder="自动生产" v-model="addPreBook.shippingOrderNumber" readOnly></a-input>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="托书日期" prop="shippingOrderDate">
                   <a-date-picker
@@ -27,12 +34,6 @@
               </a-col>
 
               <a-col :md="6" :sm="8">
-                <a-form-model-item label="托书号" prop="shippingOrderNumber">
-                  <a-input placeholder="请输入托书号" v-model="addPreBook.shippingOrderNumber"></a-input>
-                </a-form-model-item>
-              </a-col>
-
-              <a-col :md="12" :sm="12">
                 <a-form-model-item label="外销发票号码" prop="exportInvoiceNo">
                   <a-input placeholder="请输入外销发票号码" v-model="addPreBook.exportInvoiceNo"></a-input>
                 </a-form-model-item>
@@ -46,12 +47,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="经营单位地址" prop="unitInOperationAddress">
-                  <a-select placeholder="请选择经营单位地址" v-model="addPreBook.unitInOperationAddress">
-                    <a-select-option value="">请选择</a-select-option>
-                    <a-select-option :value="0">客户1</a-select-option>
-                    <a-select-option :value="1">客户2</a-select-option>
-                    <a-select-option :value="2">客户3</a-select-option>
-                  </a-select>
+                  <a-input placeholder="请输入经营单位地址" v-model="addPreBook.unitInOperationAddress"></a-input>
                 </a-form-model-item>
               </a-col>
 
@@ -80,12 +76,7 @@
 
               <a-col :md="6" :sm="8">
                 <a-form-model-item label="收货人地址" prop="consigneeAddress">
-                  <a-select placeholder="请选择收货人地址" v-model="addPreBook.consigneeAddress">
-                    <a-select-option value="">请选择</a-select-option>
-                    <a-select-option value="0">收货人1</a-select-option>
-                    <a-select-option value="1">收货人2</a-select-option>
-                    <a-select-option value="2">收货人3</a-select-option>
-                  </a-select>
+                  <a-input placeholder="请输入收货人地址" v-model="addPreBook.consigneeAddress"></a-input>
                 </a-form-model-item>
               </a-col>
 
@@ -160,51 +151,44 @@
 
       <!--操作按钮区域 参照预装箱单  増行-->
       <a-card :bordered="true" style="marginTop:10px;">
-        <div class="table-operator">
-          <a-button type="primary" @click="referadvancePackingList" icon="ordered-list">参照预装箱单</a-button>
-          <a-button type="primary" @click="handleAddColumn" icon="plus" style="margin-left: 20px">増行</a-button>
-        </div>
+        
 
         <!-- table-->
         <a-spin :spinning="confirmLoading">
           <!-- :rules="validatorRules" -->
-          <a-form-model ref="formRef">
-            <a-table
-              bordered
-              v-if="addPerBookData"
-              :row-key="record => record.id"
-              :columns="addPerBookColumns"
-              :data-source="addPerBookData"
-              :loading="loading"
-              :pagination="ipagination"
-              :scroll="{ x: 1500 }"
-              @change="handleTableChange"
-            >
-              <!-- 集装箱代号 输入框 -->
-              <template slot="containerCode" slot-scope="text, record, index">
-                <a-form-model-item prop="containerCode" :rules="rules.containerCode" required>
-                  <a-input style="width:100%" type="text" v-model="record.containerCode" />
-                </a-form-model-item>
-              </template>
-
-              <!-- 集装箱号 输入框-->
-              <template slot="containerNumber" slot-scope="text, record, index">
-                <a-form-model-item prop="containerNumber" :rules="rules.containerNumber">
-                  <a-input style="width:100%" type="text" v-model="record.containerNumber" />
-                </a-form-model-item>
-              </template>
-
-              <!-- 操作 -->
-              <span slot="operationSlot" slot-scope="text, record">
-                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record.id)">
-                  <a href="javascript:void(0);" style="color:red;">删除</a>
-                </a-popconfirm>
-              </span>
-            </a-table>
-          </a-form-model>
+          <j-vxe-table
+            ref="vTable"
+            toolbar
+            row-number
+            row-selection
+            drag-sort
+            keep-source
+            :height="400"
+            :loading="loading"
+            :dataSource="addPreBook.syLetterDepositItemList"
+            :columns="addPerBookColumns"
+            :alwaysEdit=true
+            :bordered=true
+            :toolbarConfig="toolbarConfig"
+            @valueChange="handleValueChange"
+          >
+
+            <template v-slot:toolbarSuffix>
+              <a-button @click="referadvancePackingList" type="primary" icon="ordered-list">参照预装箱单</a-button>
+            </template>
+
+            <template v-slot:action="props">
+              <a @click="handleCK(props)">查看</a>
+              <a-divider type="vertical"/>
+              <a-popconfirm title="确定删除吗？" @confirm="handleDL(props)">
+                <a>删除</a>
+              </a-popconfirm>
+            </template>
+
+          </j-vxe-table>
         </a-spin>
 
-        <!-- 人民币、美金 -->
+         <!-- 人民币、美金 -->
         <a-row style="marginTop:10px;marginBottom:50px;background:white;padding:10px;">
           <div class="purchase-order-table" style="width:48%;marginRight:4%;float:left;">
             <h6 class="table-title">人民币</h6>
@@ -488,7 +472,12 @@ export default {
       addPreBook: {}, //主表信息
       confirmLoading: false,
       visible: false,
-      dateFormat: 'YYYY-MM-DD'
+      dateFormat: 'YYYY-MM-DD',
+      toolbarConfig: {
+          btn: []
+        },
+        handleValueChange(event) {
+      },
       // validatorRules: {
       //   shippingOrderDate: [{ required: true, message: '托书日期不能为空', trigger: 'blur' }]
       //   // 确定必填项
@@ -499,8 +488,9 @@ export default {
   methods: {
     // 参照预装箱单
     referadvancePackingList() {
-      console.log('打开参照预装箱单')
-      this.$refs.advancePackingListModal.advancePackingListModVis = true
+      this.$refs.advancePackingListModal.advancePackingListModVis = true;
+      this.$refs.advancePackingListModal.queryParam = {};
+      this.$refs.advancePackingListModal.searchQuery();
     },
     // 増行
     handleAddColumn() {

src/views/pre-book/advancePackingListModal.vue

@@ -70,6 +70,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+import { querySyPreAssembledPackingList } from '@api/document/pre-book.js'
 
 export default {
   name: 'AdvancePackingListModal', // 参照预装箱单 弹框
@@ -244,7 +245,7 @@ export default {
           className: 'replacecolor'
         }
       ],
-      advancePackingListData: [{}, {}, {}],
+      advancePackingListData: [],
 
       // orderDataform: this.$form.createForm(this),
       confirmLoading: false,
@@ -258,10 +259,25 @@ export default {
       default: null
     }
   },
-  created() {},
+  created() {
+  },
   methods: {
     // 弹框查询按钮
-    searchQuery() {},
+    searchQuery() {
+      this.$nextTick(() => {
+        querySyPreAssembledPackingList(this.queryParam).then(res => {
+          if (res.success) {
+            this.advancePackingListData = res.result.records
+            console.log('预托书列表', this.advancePackingListData)
+            this.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+          }
+        })
+      })
+    },
     // 重置
     searchReset() {
       this.queryParam = {}

src/views/pre-book/preBookList.vue

@@ -273,7 +273,8 @@ export default {
         // current: 0,
         // pageSize: 0
       },
-      dateFormat: 'YYYY-MM-DD'
+      dateFormat: 'YYYY-MM-DD',
+      
     }
   },
 
@@ -299,8 +300,8 @@ export default {
     },
     // 新增
     addPreBook() {
-      console.log('新增预托书')
-      this.$refs.addPreBookDrawer.visible = true
+      this.$refs.addPreBookDrawer.visible = true;
+      this.$refs.addPreBookDrawer.addPreBook = {syLetterDepositItemList:[],syRmbList:[],syUsdList:[]};
     },
 
     //  详情