打印收款单bug

src/views/ecw/financial/printVoucher.vue

@@ -35,7 +35,7 @@
           </tr>
           <tr v-for="(item, index) in list" :key="index">
             <td>{{ index + 1 }}</td>
-            <td>{{ item.receiptNo||''}}</td>
+            <td>{{ orderData.tidanNo||''}}</td>
             <td>{{ item.orderNo }}</td>
             <td>{{ item.titleZh }}</td>
             <td><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
@@ -64,7 +64,7 @@
             <p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.platformAccountNo}}</p>
           </div>
           <div style="padding:6px 0;width: 87.5%;text-align: center;">
-            <p style="margin: 0;">应收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.receivableAmount}}¥</p>
+            <p style="margin: 0;">实收<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{getRecep(bankTiem.currencyId)}}¥</p>
             <!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
           </div>
         </div>
@@ -107,7 +107,7 @@
         loadings: false,
         form:{},
         title:'收款单',
-         creatorData:[],
+         // creatorData:[],
          list:[],
          fileList:[],
          bankData:[],
@@ -119,14 +119,14 @@
          deptData:[],
          deptArr:[],
          id:0,
-         orderData:[],
+         orderData:{},
          detailed:[]
       }
     },
     async created() {
       let that = this
-      listSimpleUsers().then(res =>that.creatorData = res.data)
-      getBankAccountPage(that.params).then(res =>that.bankData = res.data.list)
+      // listSimpleUsers().then(res =>that.creatorData = res.data)
+      // getBankAccountPage(that.params).then(res =>that.bankData = res.data.list)
       await listSimpleDepts().then(res =>{
         res.data.forEach((item)=>{
           if(item.parentId==0){
@@ -205,15 +205,8 @@
     methods: {
       getList() {
         getReceivableItem({ id: this.id }).then(res => {
-          this.detailed = res.data.map(v => ({
-            ...v,
-            amountDate: this.parseTime(v.amountDate, '{y}-{m}-{d}'),
-            accountNo: +v.accountNo,
-            rate:parseFloat(v.rate).toFixed(6),
-            attr: v.attr ? v.attr.split(',').map(t => ({ name: t.slice(t.lastIndexOf('/') + 1), url: t })) : []
-          }))
-          this.calculation()
-        })
+          this.detailed = res.data
+          })
       },
       getCollectionData(){
         let that = this
@@ -222,6 +215,16 @@
           that.form.departmentName = that.deptData.find(v => v.id == that.form.departmentId).name
         })
       },
+      getRecep(id){
+        var total = 0
+        if(id){
+          var data = this.detailed.filter(item=>item.currencyId==id)
+            data.forEach(item => {
+            total = NP.plus(total, item.writeOffAmount)
+          })
+        }
+        return total
+      },
       handleAddReceiptItem() {
         let recepted = []
         this.detailed.forEach(item => {
@@ -351,7 +354,7 @@
           }
         }
         if(chineseStr == ''){
-          chineseStr += cnNums[0] + cnIntLast + cnInteger;
+          chineseStr = cnNums[0] + cnIntLast + cnInteger
         }else if(decimalNum == ''){
           chineseStr += cnInteger;
         }

src/views/ecw/order/prepayDeal.vue

@@ -232,7 +232,7 @@
             </el-col>
         </el-row>
         <el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_doc_exception'">
-          <el-form-item :label="$t('报关资料')+':'" size="medium">
+          <el-form-item :label="$t('报关资料')+':'" size="medium" :require="true">
             <file-upload v-model="handlerParams.fileList" :value="orderExceptionData.file" ></file-upload>
           </el-form-item>
         </el-row>
@@ -470,6 +470,12 @@
             this.$modal.msgError(this.$t('请选择处理结果'));
             return
           }
+          if(this.orderExceptionData.orderExceptionType=='order_doc_exception'){
+            if(!this.handlerParams.fileList||this.handlerParams.fileList.length==0){
+              this.$modal.msgError(this.$t('请上传报关资料'));
+              return
+            }
+          }
           handlerExceptionByExceptionId(this.handlerParams).then(res=>{
               this.$modal.msgSuccess(this.$t('提交成功'));
               this.$redirect('/order/pending?id=' + this.orderData.orderId)