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

src/api/document/book.js

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

src/views/book/book-list.vue

@@ -155,6 +155,7 @@
               <a-menu-item><a @click="edit(record,'2')">详情</a></a-menu-item>
               <a-menu-item v-if="record.readyFabric=='辅料'"><a @click="copyForm(record)">复制</a></a-menu-item>
               <a-menu-item ><a @click="pushU8(record)" >推送u8</a></a-menu-item>
+              <a-menu-item ><a @click="pushPackLst(record)" >推送装箱单发票</a></a-menu-item>
             </a-menu>
           </a-dropdown>
         </span>
@@ -179,7 +180,7 @@ import { downFile } from '@/api/manage'
 import addBookDrawer from '@views/book/addBookDrawer.vue'
 import detailsBookDrawer from '@views/book/detailsBookDrawer.vue'
 import editBookDrawer from '@views/book/editBookDrawer.vue'
-import {bookList,bookListId,submitPackingList,deletePackingList,settlement,pushU8} from '@api/document/book.js'
+import {bookList,bookListId,submitPackingList,deletePackingList,settlement,pushU8,pushPackeList} from '@api/document/book.js'
 
 export default {
   name: 'BookList', // 托书列表
@@ -477,6 +478,17 @@ export default {
           }
         })
     },
+    pushPackLst(record){
+      pushPackeList({ id: record.id}).then(res => {
+          if (res.success) {
+           this.$message.success('推送装箱单发票成功')
+          //  record.theDocumentsState = '0'
+           this.getBookList()
+          }else {
+             this.$message.error(res.message);
+          }
+        })
+    },
     // 操作 详情
     details(record) {
       this.$refs.detailsBookDrawer.visible = true

src/views/cost-allocation-total/fabricLossesSummary.vue

@@ -100,10 +100,10 @@
         @change="handleTableChange"
       >
       <span slot="action" slot-scope="text, record">
-          <!-- <a @click="handleApply(record)" v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)">发起申请</a>
-          <a-divider type="vertical"  v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)"/> -->
+          <a @click="handleApply(record)" v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)">发起申请</a>
+          <a-divider type="vertical"  v-if="apply == 1 && (record.status=='保存' ||record.status=='完成'|| record.status=='' || record.status==undefined)"/>
           <a @click="openAppendixList(record)" v-if="record.attachs!==''&&record.attachs">附件</a>
-          <a-divider v-if="record.attachs!==''&&record.attachs"/>
+          <!-- <a-divider v-if="record.attachs!==''&&record.attachs"/>
           <a-dropdown>
           <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
             <a-menu slot="overlay" >
@@ -111,7 +111,7 @@
               <a-menu-item><a @click="details(record)">详情</a></a-menu-item>
               <a-menu-item><a @click="approvalHistory(record)">审批历史</a></a-menu-item>
             </a-menu>
-            </a-dropdown>                  
+            </a-dropdown>                   -->
         </span>
       </a-table>
     </a-card>