拆单bug收款单bug

src/utils/dict.js

@@ -154,6 +154,7 @@ export const DICT_TYPE = {
   DISBURSEMENT_TYPE: 'disbursement_type',//垫付类型
   DRAWEE: 'drawee', // 付款人
   ORDER_STATUS: 'order_status',//订单状态
+  ORDER_ITEM_STATUS:'order_item_status',
   BEGINTIME_TYPE_ENDTIME: 'begintime_type_endtime',//订单日期筛选类别
   ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态

src/views/ecw/financial/creatPayment.vue

@@ -106,7 +106,7 @@
                   v-for="item in bankData"
                   :key="item.id"
                   :label="item.bankName + '(' + item.bankAccount+ ')'"
-                  :value="item.id"
+                  :value="item.bankAccount"
                 />
               </el-select>
             </el-form-item>
@@ -471,9 +471,10 @@ export default {
           ...res.data,
           latestPayAt: this.parseTime(res.data.latestPayAt, '{y}-{m}-{d}'),
           applicationAt: this.parseTime(res.data.applicationAt, '{y}-{m}-{d}'),
-          supplierBankAccount: Number(res.data.supplierBankAccount),
           invoiceStatus: String(res.data.invoiceStatus),
         }
+        this.$set(this.form,'supplierBankAccount',res.data.supplierBankAccount)
+        console.log(this.form)
       })
       getPaymentItem({ id: this.id }).then(res => {
         this.list = [...res.data]
@@ -613,7 +614,6 @@ export default {
     },
     selectChangeBank(val){
       this.$forceUpdate()
-      console.log(this.form.supplierBankAccount)
     },
     selectChange(val) {
       this.bankData = []
@@ -621,7 +621,8 @@ export default {
       if(val){
         getSupplier(val).then((res)=>{
           this.bankData = res.data.bankList
-          this.form.supplierBankAccount=''
+          var bank = this.bankData.find(item=>item.bankAccount==this.form.supplierBankAccount)
+          if(this.bankData.length==0||!bank) this.form.supplierBankAccount=''
         })
       }
 

src/views/ecw/financial/voucher.vue

@@ -115,7 +115,8 @@
       </el-table-column>
       <el-table-column label="收款单号" align="center" prop="receiptNo">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button>
+          <span>{{scope.row.receiptNo}}</span>
+          <!-- <el-button size="mini" type="text" @click="verificationCancelClick(scope.row)">{{ scope.row.receiptNo }}</el-button> -->
         </template>
       </el-table-column>
       <!-- <el-table-column label="自编号" align="center" prop="orderNo" /> -->
@@ -371,7 +372,7 @@ export default {
     },
     submitForm(type) {
       receiptExportExcel({ id: this.exportId, billType: type }).then((response) => {
-          this.$download.excel(response, `${type === 2 ? "国外账单" : "Debite_note"}.xls`);
+          this.$download.excel(response, `${type === 1 ? "国外账单" : "Debite_note"}.xls`);
           this.open = false;
         }
       );

src/views/ecw/order/prepayDeal.vue

@@ -229,7 +229,7 @@
                 </el-form-item>
               </el-row>
                <el-row >
-                <el-form-item :label="$t('赔付金额')+':'" size="medium" required v-if="handlerParams.orderExceptionStatus==2&&handlerParams.orderExceptionHandlerResult=='confirm_loss'">
+                <el-form-item :label="$t('赔付金额')+':'" size="medium" required v-if="handlerParams.orderExceptionStatus==2">
                   <el-input style="width: 100px;"  type="text" v-model="handlerParams.amount"  />
                   <el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable>
                   <el-option  v-for="dict in getDictDatas('shipping_price_unit') "

src/views/ecw/order/splitApply.vue

@@ -85,16 +85,16 @@
                 <span>{{$t('体积')}}：{{scope.row.volume||$t('未填')}}m³</span>
               </el-row>
               <el-row>
-                <span>{{$t('重量')}}：{{scope.row.weight||t('未填')}}kg</span>
+                <span>{{$t('重量')}}：{{scope.row.weight||$t('未填')}}kg</span>
               </el-row>
             </template>
         </el-table-column>
         <el-table-column :label="$t('入库货物属性')" align="center" width="400">
             <template slot-scope="scope">
-              <el-row>
+              <el-row v-if="scope.row.warehouseInInfoVO">
                 <span>{{$t('规格')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.boxGauge:0}}</span>
               </el-row>
-              <el-row>
+              <el-row v-if="scope.row.warehouseInInfoVO">
                 <span>{{$t('品牌')}}：
                   <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
                 </span>
@@ -102,6 +102,9 @@
                 <span style="margin-left: 10px;">{{$t('体积')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.volume}}m³</span>
                 <span style="margin-left: 10px;">{{$t('重量')}}：{{!scope.row.warehouseInInfoVO?0:scope.row.warehouseInInfoVO.weight}}kg</span>
               </el-row>
+              <el-row v-if="!scope.row.warehouseInInfoVO">
+                <span>{{$t('暂时没有入仓信息')}}</span>
+              </el-row>
             </template>
         </el-table-column>
         <el-table-column :label="$t('最后操作时间')" align="center">
@@ -111,8 +114,8 @@
         </el-table-column>
         <el-table-column :label="$t('状态')" align="center">
            <template slot-scope="scope">
-             {{orderData.abnormalState!=0?$t('异常'):$t('正常')}}
-               <!-- <dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="scope.row.status" /> -->
+             <!-- {{orderData.abnormalState!=0?$t('异常'):$t('正常')}} -->
+               <dict-tag :type="DICT_TYPE.ORDER_ITEM_STATUS" :value="scope.row.itemStatus" />
           </template>
         </el-table-column>
       </el-table>
@@ -134,7 +137,8 @@
           <div>
              <el-button v-if="index==0" disabled type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
                <el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
-              <el-button type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
+              <el-button v-if="index==0" disabled type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
+              <el-button v-if="index!=0" type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
           </div>
         </div>
         <el-table v-if="item.orderSplitItemBackVOList"  border :data="item.orderSplitItemBackVOList">