货代下拉框

src/api/document/book.js

@@ -35,7 +35,9 @@ const syShippingOrderMerge = params => postAction('/syShippingOrder/syShippingOr
 
 //推送U8
 const pushU8 =params => getAction('/syShippingOrder/syShippingOrder/expensesU8', params)
+//货代下拉框
+const freightForwarderOption =params => getAction('/syShippingOrder/syShippingOrder/queryU8vendor', params)
 
 
-export {bookList,PackingList,addPackingList,editPackingList,deletePackingList,bookListId,submitPackingList,settlement,editMoney,Dictionaries,syShippingOrderMerge,pushU8}
+export {bookList,PackingList,addPackingList,editPackingList,deletePackingList,bookListId,submitPackingList,settlement,editMoney,Dictionaries,syShippingOrderMerge,pushU8,freightForwarderOption}
 

src/views/book/addBookDrawer.vue

@@ -297,7 +297,15 @@
               >
               <template slot="CNYfreighForward" slot-scope="text, record, index">
                 <a-form-model-item prop="CNYfreighForward" :rules="rules.CNYfreighForward" >
-                  <a-input placeholder="请输入货代" v-model="record.freightForwarder" />
+                  <a-select  v-model="record.freightForwarder" style="width:100%"> 
+                      <a-select-option
+                     v-for="(item,index) in FreightOption"
+                     :key="index"
+                     :value="item.cvencode">
+                     {{item.cvenname}}
+                     </a-select-option>
+                   </a-select>
+                  <!-- <a-input placeholder="请输入货代" v-model="record.freightForwarder" /> -->
                 </a-form-model-item>
               </template>
               <template slot="CNYmoney" slot-scope="text, record, index">
@@ -341,7 +349,15 @@
               >
                <template slot="USDfreighForward" slot-scope="text, record, index">
                 <a-form-model-item prop="USDfreighForward" :rules="rules.USDfreighForward" >
-                  <a-input placeholder="请输入货代" v-model="record.freightForwarder" />
+                  <a-select  v-model="record.freightForwarder" style="width:100%"> 
+                      <a-select-option
+                     v-for="(item,index) in FreightOption"
+                     :key="index"
+                     :value="item.cvencode">
+                     {{item.cvenname}}
+                     </a-select-option>
+                   </a-select>
+                  <!-- <a-input placeholder="请输入货代" v-model="record.freightForwarder" /> -->
                 </a-form-model-item>
               </template>
               <template slot="USDoption" slot-scope="text, record, index">
@@ -407,7 +423,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
-import {addPackingList,editPackingList,Dictionaries,syShippingOrderMerge} from '@api/document/book.js'
+import {addPackingList,editPackingList,Dictionaries,syShippingOrderMerge,freightForwarderOption} from '@api/document/book.js'
 import packingListModal from '@views/book/packingListModal.vue'
 import packingListModalFabrics from '@views/book/packingListModalFabrics.vue'
 
@@ -634,6 +650,7 @@ export default {
       addBook: {},
       arrOption:[],
       itemArrOption:[],
+      FreightOption:[],//货代下拉框
       defaultMethod : 'add',
       confirmLoading: false,
       visible: false,
@@ -746,6 +763,7 @@ export default {
            this.addBook.dutyParagraph = duty
          }
         this.setHeadCalField()
+        this.getFreightForwarder(this.addBookData[0].acSetNo)
     },
 
     // 参照数据转换成子表
@@ -764,6 +782,15 @@ export default {
     //   return ret;
     // },
 
+    //货代下拉框数据
+    getFreightForwarder(data){
+      freightForwarderOption({pkorg:data}).then(res=>{
+       if(res.success){
+         this.FreightOption = res.result
+       }
+      })
+    },
+
     // 合并数据
     syShippingOrderMerge() {
       var moneytotal = 0;
@@ -969,6 +996,7 @@ export default {
       this.addBookData =[]
       this.rmbList = [{}]
       this.usdList = [{}]
+      this.FreightOption=[]
       this.visible = false
       this.defaultMethod = 'add'
       this.$refs.form.resetFields()

src/views/book/book-list.vue

@@ -445,6 +445,7 @@ export default {
               if(data.latestDateOfShipment!==''&&data.latestDateOfShipment){
                  data.latestDateOfShipment = (moment(data.latestDateOfShipment)).format('YYYY-MM-DD')
               }
+              this.$refs.addBookDrawer.getFreightForwarder(data.syShippingOrderItemList[0].pkOrg)
               this.$refs.addBookDrawer.addBook = data
               this.$refs.addBookDrawer.addBookData = data.syShippingOrderItemList
               this.$refs.addBookDrawer.addBookData.map(item =>{