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

src/views/shipment-details/shipmentList.vue

@@ -1010,7 +1010,7 @@ export default {
           this.$refs.editShipDetDrawer.editShipDet = res.result
           res.result.syShippingDetailsItemList.map(item =>{
             item.manualYarnFlag =  res.result.syShippingDetailsItemList[0].mjudageAddanualYarnFlag
-            item.customsDeclarationUnitPrice = item.salesUnitPrice - item.ymoney
+            // item.customsDeclarationUnitPrice = item.salesUnitPrice - item.ymoney
             if(item.manualYarnFlag === 0){
                item.manualYarnUnitPrice = null
                item.manualYarnProportion = null