付款单修复

src/views/ecw/financial/creatPayment.vue

@@ -531,7 +531,7 @@ export default {
         this.defaultList = [...res.data]
       })
     }else{
-      this.$set(this.form,'applicationAt',this.getYmd())
+      if(!this.form.applicationAt) this.$set(this.form,'applicationAt',this.getYmd())
     }
   },
   async created() {
@@ -572,7 +572,7 @@ export default {
         this.defaultList = [...res.data]
       })
     }else{
-      this.$set(this.form,'applicationAt',this.getYmd())
+      if(!this.form.applicationAt) this.$set(this.form,'applicationAt',this.getYmd())
     }
     listSimpleUsers().then((res) => (that.creatorData = res.data));
     getChannelList().then((res) => (that.channelList = res.data));
@@ -738,7 +738,8 @@ export default {
         getSupplier(val).then((res)=>{
           this.bankData = res.data.bankList
           var bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
-          if(this.bankData.length==0||!bank) this.form.supplierBankAccount= this.bankData[0]['bankAccount']
+          console.log(this.bankData)
+          if(this.bankData.length>0&&!bank) this.form.supplierBankAccount= this.bankData[0]['bankAccount']
         })
       }
 

src/views/ecw/financial/paymentDetail.vue

@@ -303,20 +303,22 @@ export default {
       this.selectChange(this.form.supplierId)
     });
     listSimpleDepts().then((res) => {
-      res.data.forEach((item) => {
-        if (item.parentId == 0) {
-          that.deptArr.push(item);
-        } else {
-          that.deptData.push(item);
-        }
-      });
+      that.deptData =  res.data
+      
+      // res.data.forEach((item) => {
+      //   if (item.parentId == 0) {
+      //     that.deptArr.push(item);
+      //   } else {
+      //     that.deptData.push(item);
+      //   }
+      // });
 
-      that.deptData.forEach((value) => {
-        var dept = that.deptArr.filter((itt) => itt.id == value.parentId);
-        if (dept.length > 0) {
-          value.name = dept[0].name + " | " + value.name;
-        }
-      });
+      // that.deptData.forEach((value) => {
+      //   var dept = that.deptArr.filter((itt) => itt.id == value.parentId);
+      //   if (dept.length > 0) {
+      //     value.name = dept[0].name + " | " + value.name;
+      //   }
+      // });
     });
   },
   computed: {

src/views/ecw/order/detail.vue

@@ -355,7 +355,7 @@
 
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
     <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
-    <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
+    <warehouse-detail :order="order" :orderItemId="showWarehouseInItemId" @openPackHistory="openPackHistory" v-if="showWarehouseInItemId" @close="showWarehouseInItemId=null" />
     <el-dialog :title="$t('付款人')" :visible.sync="showDarweeDialog" v-if="order && order.customDraweeVOList">
       <el-table :data="order.customDraweeVOList" v-if="order.drawee==3" >
         <el-table-column :label="$t('费用类型')" prop="label" width="200px">
@@ -423,6 +423,11 @@
 
     <!--日志详情-->
     <operate-log-detail v-if="showLogDetailId" :log-id="showLogDetailId" @close="showLogDetailId=null"></operate-log-detail>
+    <!--打包历史-->
+    <pack-history v-if="shopPackId" :order ="order" :orderItemId="shopPackId" @showPackDetail="showPackDetail" @close="shopPackId=null"></pack-history>
+    <!--打包历史详情-->
+    <pack-history-detail v-if="packAfterData" :order="order" :packAfterData="packAfterData" :orderItemId="showWarehouseInItemId"   @close="packAfterData=null"></pack-history-detail>
+
     <!-- 报关资料 -->
     <declaration-documents v-if="showDeclaration" :order-id="order.orderId" :order-no="order.orderNo" @close="showDeclaration=false" />
     <!--费用汇总-->
@@ -453,13 +458,16 @@ import OperateLogDetail from "@/views/ecw/order/components/OprateLogDetail";
 import DeclarationDocuments from './components/DeclarationDocuments';
 import ImageDisplay from "@/views/ecw/order/components/imageDisplay.vue";
 import FeeDetail from "@/views/ecw/order/components/FeeDetail.vue";
+import PackHistory from './components/PackHistory';
+import PackHistoryDetail from './components/PackHistoryDetail';
+
 export default {
   name: "detail",
   components: {
     ImageDisplay,
     OperateLogDetail,
     PrintWarehouseReceipt, PrintLadingBill, WarehouseDetail, WarehouseAreaSelect,DeclarationDocuments,
-    FeeDetail
+    FeeDetail,PackHistory,PackHistoryDetail
   },
   filters: {
     customsTypeFilter(e, customsTypeList) {
@@ -506,6 +514,9 @@ export default {
       showLogDetailId: null, // 显示日志详情的ID,
       showDeclaration:false, //显示报关资料
       showFeeSummary: false, // 是否显示费用汇总
+      shopPackId:null,//显示打包历史的ID
+      packAfterData:null,//显示打包历史详情
+
     }
   },
   computed:{
@@ -738,7 +749,16 @@ export default {
     parseLogNote(note){
       if(!note) return []
       return JSON.parse(note)
-    }
+    },
+      //查看打包历史
+      openPackHistory(){
+
+        this.shopPackId = this.showWarehouseInItemId
+      },
+      //查看打包历史详情
+      showPackDetail(packAfterData){
+        this.packAfterData = packAfterData
+      },
   }
 };
 </script>