bug修复

src/views/ecw/financial/creatCollection.vue

@@ -109,7 +109,7 @@
           <el-table-column label="唛头" align="center" prop="marks" />
           <el-table-column label="品名" align="center" prop="title">
             <template slot-scope="scope">
-              {{ scope.row.titleZh + "(" + scope.row.titleEn + ")" }}
+             {{ scope.row.titleZh?(scope.row.titleZh + "(" + scope.row.titleEn + ")"): ''}}
             </template>
           </el-table-column>
           <el-table-column label="箱数" align="center" prop="num" />
@@ -347,11 +347,11 @@
           </el-table-column>
           <el-table-column label="收款金额" align="center" prop="collectionAmount">
             <template slot-scope="scope">
-              <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
+              <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount.toFixed(6) }}</span>
               <div v-else>
-                <div v-if="scope.row.collectionAmount[0]">美元: {{ scope.row.collectionAmount[0] }}</div>
-                <div v-if="scope.row.collectionAmount[1]">人民币: {{ scope.row.collectionAmount[1] }}</div>
-                <div v-if="scope.row.collectionAmount[2]">奈拉: {{ scope.row.collectionAmount[2] }}</div>
+                <div v-if="scope.row.collectionAmount[0]">美元: {{ scope.row.collectionAmount[0].toFixed(6) }}</div>
+                <div v-if="scope.row.collectionAmount[1]">人民币: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
+                <div v-if="scope.row.collectionAmount[2]">奈拉: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
               </div>
               <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
@@ -377,9 +377,9 @@
       </el-card>
     </el-form>
     <div slot="footer" style="margin: 20px 0">
-      <el-button v-if="id==0" type="primary" :loading="saveBtnLoading" @click="submitForm(1)">保 存</el-button>
+      <el-button v-if="id==0||form.state==0" type="primary" :loading="saveBtnLoading" @click="submitForm(1)">保 存</el-button>
       <el-button v-else type="primary" :loading="saveBtnLoading" @click="$store.dispatch('tagsView/delCurrentView')">返 回</el-button>
-      <el-button type="primary" :loading="saveBtnLoading" @click="submitForm(0)">{{ id ? '修 改' : '新 增' }}</el-button>
+      <el-button type="primary" :loading="saveBtnLoading" @click="submitForm(0)">{{ id&&form.state!=0 ? '修 改' : '新 增' }}</el-button>
     </div>
     <el-dialog
       :visible.sync="open"
@@ -505,7 +505,7 @@
           <el-table-column label="唛头" align="center" prop="marks" />
           <el-table-column label="品名" align="center" prop="title">
             <template slot-scope="scope">
-              {{ scope.row.titleZh + "(" + scope.row.titleEn + ")" }}
+              {{ scope.row.titleZh?(scope.row.titleZh + "(" + scope.row.titleEn + ")"): ''}}
             </template>
           </el-table-column>
           <el-table-column label="箱数" align="center" prop="num" />
@@ -566,7 +566,7 @@
           <el-table-column label="唛头" align="center" prop="marks" />
           <el-table-column label="品名" align="center" prop="title">
             <template slot-scope="scope">
-              {{ scope.row.titleZh + "(" + scope.row.titleEn + ")" }}
+              {{ scope.row.titleZh?(scope.row.titleZh + "(" + scope.row.titleEn + ")"): ''}}
             </template>
           </el-table-column>
           <el-table-column label="箱数" align="center" prop="num" />
@@ -971,22 +971,22 @@ export default {
       }
     },
     RMBtoUS() {
-      return NP.divide(100, this.currencyList.find(v => v.titleEn === 'USD').huilv)
+      return NP.divide(100, this.currencyList.find(v => v.titleEn === 'USD').huilv).toFixed(6)
     },
     NANtoUS() {
-      return NP.times(this.RMBtoUS(), this.NANtoRMB())
+      return NP.times(this.RMBtoUS(), this.NANtoRMB()).toFixed(6)
     },
     UStoRMB() {
-      return NP.divide(this.currencyList.find(v => v.titleEn === 'USD').huilv, 100)
+      return NP.divide(this.currencyList.find(v => v.titleEn === 'USD').huilv, 100).toFixed(6)
     },
     UStoNAN() {
-      return NP.times(this.RMBtoNAN(), this.UStoRMB())
+      return NP.times(this.RMBtoNAN(), this.UStoRMB()).toFixed(6)
     },
     RMBtoNAN() {
-      return NP.divide(100, this.currencyList.find(v => v.titleEn === 'NGN').huilv)
+      return NP.divide(100, this.currencyList.find(v => v.titleEn === 'NGN').huilv).toFixed(6)
     },
     NANtoRMB() {
-      return NP.divide(this.currencyList.find(v => v.titleEn === 'NGN').huilv, 100)
+      return NP.divide(this.currencyList.find(v => v.titleEn === 'NGN').huilv, 100).toFixed(6)
     },
     customerChange(value) {
       this.form.customerName = value.name