Merge branch 'dev1.0' of http://192.168.0.200:3000/suf/factoring-trade-c-front-end into chang

src/views/myFinancing/financingMain.vue

@@ -32,6 +32,7 @@
       :columns="columns"
       :data="tableData"
       :count="count"
+      parentComponent="FinancingMain"
     />
   </div>
 </template>
@@ -40,6 +41,7 @@
 import { mapGetters } from 'vuex'
 import { getList } from '@/api/myFinancing'
 export default {
+  name: 'FinancingMain',
   data() {
     return {
       count: 0,
@@ -172,10 +174,10 @@ export default {
     this.$store.dispatch('getConstant', ['projectInitiationStatus'])
   },
   mounted() {
-    this.featchData()
+    this.fetchData()
   },
   methods: {
-    featchData(type) {
+    fetchData(type) {
       if (type === 'search') {
         this.page = 1
         this.size = 10

src/views/myTrade/salesContractManagement/components/ChangeSalesContractAddContent.vue

@@ -245,7 +245,7 @@ export default {
             this.goodsInfoList = []
             res.data.map(item => {
               item.quantity = fourMoney(item.quantity)
-              item.salesPrice = formatMoney(item.salesPrice)
+              item.salesPrice = item.salesPrice === '不明确' ? item.salesPrice : formatMoney(item.salesPrice)
               this.goodsInfoList.push(item)
             })
           }