Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/api/document/book.js

@@ -30,8 +30,9 @@ const editMoney =params => postAction('/syShippingOrder/syShippingOrder/updateUS
 //获取经营单位数据字典
 const Dictionaries =params => getAction('/sys/api/queryEnableDictItemsByCode', params)
 
+//合并
+const syShippingOrderMerge = params => postAction('/syShippingOrder/syShippingOrder/syShippingOrderMerge', params)
 
 
-
-export {bookList,PackingList,addPackingList,editPackingList,deletePackingList,bookListId,submitPackingList,settlement,editMoney,Dictionaries}
+export {bookList,PackingList,addPackingList,editPackingList,deletePackingList,bookListId,submitPackingList,settlement,editMoney,Dictionaries,syShippingOrderMerge}
 

src/api/document/shipmentList.js

@@ -56,6 +56,9 @@ const exportXls = params => getAction('/shippingDetails/syShippingDetails/export
 // 编辑删除
 const deleteEdit = params => postAction('/shippingDetails/syShippingDetails/singleRowdelect', params)
 
+//报关要素查询按钮
+const queryLatelyDeclarationElements = params => getAction('/shippingDetails/syShippingDetails/queryLatelyDeclarationElements',params)
+
 export {
   shipmentList,
   addShipmentList,
@@ -73,5 +76,6 @@ export {
   addItemNumEle,
   confimOrderData,
   exportXls,
-  deleteEdit
+  deleteEdit,
+  queryLatelyDeclarationElements
 }

src/views/book/addBookDrawer.vue

@@ -239,7 +239,7 @@
         <div class="table-operator">
           <a-button type="primary" @click="referPackingList('0')" icon="ordered-list">参照装箱单-成衣</a-button>
           <a-button type="primary" @click="referPackingList('1')" icon="ordered-list">参照装箱单-面料</a-button>
-          <!-- <a-button type="primary" @click="handleAddColumn" icon="plus" style="margin-left: 20px">増行</a-button> -->
+          <a-button type="primary" @click="syShippingOrderMerge" :disabled="query=='1'" icon="plus" style="margin-left: 20px">合并</a-button>
         </div>
 
         <!-- 子表-->
@@ -399,7 +399,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
-import {addPackingList,editPackingList,Dictionaries} from '@api/document/book.js'
+import {addPackingList,editPackingList,Dictionaries,syShippingOrderMerge} from '@api/document/book.js'
 import packingListModal from '@views/book/packingListModal.vue'
 import packingListModalFabrics from '@views/book/packingListModalFabrics.vue'
 
@@ -410,6 +410,7 @@ export default {
   data() {
     let ellipsis = (v, l = 20) => <j-ellipsis value={v} length={l} />
     return {
+      query:'1',
       // 表头
       addBookColumns: [
         // {
@@ -614,6 +615,7 @@ export default {
       confirmLoading: false,
       visible: false,
       dateFormat: 'YYYY-MM-DD',
+      itemIds:[],//参照面料选中的ID集合
       validatorRules: {
           shippingOrderDate:[{required: true, message: '托书日期不能为空!'}],
           shippingOrderNumber:[{required: true, message: '托书号不能为空!'}],
@@ -675,9 +677,10 @@ export default {
          item.number = (Number(item.number)).toFixed(2)
          item.volume = item.totalVolume
          //参照面料时，单价许计算 金额/净重
-        //  if(item.readyFabric == '面料'){
-        //     item.price = (item.totalPrice/item.netWeight).toFixed(2)
-        //  }
+         if(item.readyFabric == '面料'){
+            item.price = (item.totalPrice/item.netWeight).toFixed(4)
+            this.query = '0'
+         }
       })
         // var subList = this.convertReferToSub(data);
         this.addBookData = this.addBookData.concat(data);
@@ -734,30 +737,24 @@ export default {
     //   }
     //   return ret;
     // },
-    // 増行
-    // handleAddColumn() {
-    //   console.log('増行')
 
-    //   const addrow = {
-    //     englishName: '',
-    //     styleNum: '',
-    //     smallPoNum: '',
-    //     quantity: '',
-    //     boxedNum: '',
-    //     roughWeigh: '',
-    //     suttle: '',
-    //     volume: '',
-    //     distributionPoint: '',
-    //     containerCode: '',
-    //     containerNo: '',
-    //     price: '',
-    //     preShipmentDate: '',
-    //     salesman: '',
-    //     operatingDepartment: '',
-    //     purchaseAboardOrderNum: '',
-    //     purchaseAboardFactory: '',
-    //     operation: ''
-    //   }
+    // 合并数据
+    syShippingOrderMerge() {
+      var moneytotal = 0;
+      this.itemIds = []
+      this.addBookData.map(item=>this.itemIds.push(item.tailoringFabricItemId))
+      syShippingOrderMerge(this.itemIds).then(res=>{
+       if(res.success){
+       this.addBookData = res.result;
+       res.result.map(item=>{
+        moneytotal += item.totalPrice;
+       })
+       this.addBook.money = moneytotal.toFixed(2);
+       }
+      })
+
+
+      },
 
     //   this.addBookData.push(addrow)
     // },

src/views/book/book-list.vue

@@ -324,6 +324,7 @@ export default {
     addBookDrawer() {
       console.log('新增托书')
       this.$refs.addBookDrawer.visible = true
+      this.$refs.addBookDrawer.query ='1'
     },
 
     // -----------------------------------
@@ -455,7 +456,7 @@ export default {
               }
             }
              
-          //  this.bookListData = res.result.records
+            this.$refs.addBookDrawer.query = '1'
           }else {
              this.$message.error(res.message);
           }

src/views/shipment-details/declareElementsModal.vue

@@ -82,7 +82,7 @@
         <a-button type="primary" @click="handleAddColumn" icon="plus" style="margin:10px 10px;">
           増行
         </a-button>
-        <a-button type="primary" @click="handleAddColumn" icon="plus" style="margin:10px 0;">
+        <a-button type="primary" @click="queryLatelyDeclarationElements" :disabled="query=='1'" icon="plus" style="margin:10px 0;">
           查询
         </a-button>
         <!-- 子表 -->
@@ -170,7 +170,7 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
-import { syDeclarationElementsAdd } from '@api/document/shipmentList'
+import { syDeclarationElementsAdd,queryLatelyDeclarationElements } from '@api/document/shipmentList'
 import {Dictionaries} from '@api/document/book.js'
 
 export default {
@@ -184,6 +184,7 @@ export default {
     return {
       loading: false, // 表格加载
       pushState: false, //是否推送
+      query:'1',//是否查询
       // 子表表头
       declareElementsColumns: [
         {
@@ -253,6 +254,24 @@ export default {
       }
       this.declareElementsData.push(addrow)
     },
+
+    //查询最近报关信息
+    queryLatelyDeclarationElements(){
+
+      var hscode = this.declareElements.hsCode;
+    
+      queryLatelyDeclarationElements({hscode:hscode}).then(res=>{
+ 
+      if(res.success){
+        res.result['itemIds'] = this.declareElements.itemIds;
+        this.declareElements=res.result;
+        this.declareElementsData=res.result.syDeclarationElementsItemList;
+        //console.info("赋值数据："+JSON.stringify(this.declareElements))
+      }else{
+        this.$message.error(res.message);
+      }
+      })
+    },
     // 报关要素 保存
     addSave() {
     //表单验证

src/views/shipment-details/shipmentList.vue

@@ -713,6 +713,12 @@ export default {
             res.result['itemIds'] = record.itemIds;
 
             this.$refs.declareElementsModal.declareElements = res.result
+            if(!res.result.hsCode  || res.result.hsCode == ''){
+             this.$refs.declareElementsModal.query = '0'
+            }else{
+             this.$refs.declareElementsModal.query = '1'
+            }
+          
             // 子表赋值
             this.$refs.declareElementsModal.declareElementsData = res.result.syDeclarationElementsItemList
             if(record.pushState == '1' && record.submitStatus == '1'){