feat✨: 修复1/14日禅道问题

src/utils/dict.js

@@ -284,7 +284,8 @@ export const DICT_TYPE = {
   INVOICEING_LINK: "invoicing_link", //开票环节
   RECEIPT_GENERATE_PATH: "receipt_generate_path", //收款单生成路径
   RECEIPT_LINK: "receipt_link", //应收款日志环节
-  ECW_INCOME_RELATION_SYMBOL: "income_relation_symbol" //银行收支明细查询关系符号
+  ECW_INCOME_RELATION_SYMBOL: "income_relation_symbol", //银行收支明细查询关系符号
+  LADING_BILL_STATUS_DATA: "lading_Bill_Status_Data"
 }
 
 /**

src/views/ecw/financial/batchGenerateReceipt/index.vue

@@ -48,7 +48,7 @@
         <el-table-column :label="$t('费用明细')">
           <template v-slot="{ row }">
             <div>
-              <router-link :to="`/financial/orderItemCostDetails/${row.orderId}`" class="link-type">
+              <router-link :to="`/financial/orderItemCostDetails/${row.orderId}/${row.drawee}`" class="link-type">
                 {{ $t("费用明细") }}
               </router-link>
             </div>
@@ -390,13 +390,13 @@ export default {
   },
   created() {
     getWarehouseList().then((res) => {
+      this.loadOrderDataList()
       this.warehouseList = res.data
     })
     getBankAccountPage({ pageNo: 1, pageSize: 1000 }).then((res) => {
       this.bankData = res.data.list
     })
     this.queryParams.orderIds = this.$route.params.id.split(",")
-    this.loadOrderDataList()
   },
   methods: {
     setWhetherToInvoice() {
@@ -414,6 +414,17 @@ export default {
         this.$modal.msgError(`请先选择需要批量处理的订单`)
         return
       }
+      const stringLabel = []
+      let multiple = this.multipleSelectedList.filter((item) => {
+        if (item.openInvoice == 0) {
+          stringLabel.push(item.tidanNo + "/" + item.orderNo)
+        }
+        return item.openInvoice == 0
+      })
+      if (multiple.length > 0) {
+        this.$modal.msgError(`订单/提单号:${stringLabel}状态为不开票，无需设置开票信息`)
+        return
+      }
       this.openBatchInvoiceInfo = true //批量设置信息
       this.$nextTick(() => {
         this.$refs["singlEditForm"].clearValidate()
@@ -430,19 +441,22 @@ export default {
             if (this.singlEditForm.platformAccountId) {
               this.changePlatformAccountId(this.singlEditForm.platformAccountId)
             }
-            // element.taxPoint= this.singlEditForm.
-            // element.platformAccountId= this.singlEditForm.
-            // element.platformAccountName= this.singlEditForm.
-            // element.rateValidateDate= this.singlEditForm.
-            // element.remark= this.singlEditForm.
-            // element.element = this.singlEditForm.element
+            if (this.singlEditForm.openInvoice == 0) {
+              element.invoice = null
+              element.taxpayer = null
+              element.accountBank = null
+              element.accountName = null
+              element.projectName = null
+              element.taxRate = null
+              element.addressPhone = null
+            }
+
             element = { ...element, ...this.singlEditForm }
           }
           this.$refs.multipleTable.toggleRowSelection(element, true)
           return element
         })
         this.$nextTick(() => {
-          console.log("999")
           this.list.forEach((element) => {
             const current = currentSelectRow.filter((item) => item.orderId == element.orderId)
             if (current.length > 0) {

src/views/ecw/financial/batchGenerateReceiptList/index.vue

@@ -99,7 +99,7 @@
       <el-table-column :label="$t('应收汇总')">
         <template slot-scope="{ row }">
           <div v-for="item in row.receivableAmount">
-            {{ getCurrencySymbol(item.countryId) }}
+            {{ getCurrencySymbol(item.currencyId) }}
             {{ item.amount }}
           </div>
         </template>

src/views/ecw/financial/voucher.vue

@@ -247,7 +247,7 @@
       <div v-html="continueUploadModal.msg"></div>
       <span slot="footer" class="dialog-footer-upload">
         <el-button @click="continueUploadModal.show = false">{{ $t("取 消") }}</el-button>
-        <el-button type="primary" @click="continueUpload">{{ $t("确 定") }}</el-button>
+        <el-button type="primary" :disabled="!fileCopy" @click="continueUpload">{{ $t("确 定") }}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -382,7 +382,9 @@ export default {
   },
   methods: {
     continueUpload() {
+      this.$message.success(this.$t("正在提交，请稍后。"))
       this.$refs.upload.handleStart(this.fileCopy.raw)
+      this.fileCopy = null
       this.$refs.upload.submit()
     },
     handleShowFileUploadDialog() {
@@ -410,6 +412,7 @@ export default {
     // 文件上传成功处理
     handleFileSuccess(response, file, fileList) {
       this.upload.isUploading = false
+      this.continueUploadModal.show = false
       // 错误
       if (response.code == "1004520042") {
         // this.$modal.msgError(response.msg)
@@ -438,7 +441,7 @@ export default {
         return
       }
       this.upload.open = false
-
+      this.fileCopy = null
       this.$refs.upload.clearFiles()
       // 拼接提示语
       // let data = response.data
@@ -459,7 +462,9 @@ export default {
     },
     // 提交上传文件
     submitFileForm() {
-      this.$refs.upload.submit()
+      if (!this.fileCopy) {
+        this.$refs.upload.submit()
+      }
     },
     //发票新增/编辑页面
     goInvoiceOperate({ id, key }) {