Parcourir la source

Merge branch 'develop_yh43' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh43

chenrui il y a 11 mois
Parent
commit
8e38173b65

+ 0 - 2
src/views/expenseManagement/expenseReimbursement/add.vue

@@ -330,9 +330,7 @@ export default {
       this.$router.push({ name: 'expenseReimbursementList' })
     },
     pageInit () {
-      console.log(1)
       if (this.$route.params.sn) { //  编辑页
-        console.log(2)
         this.getDetail(false)
       }
     }

+ 2 - 2
src/views/financialManagement/financialCollection/edit.vue

@@ -124,7 +124,7 @@
         <a-alert type="info" style="margin-bottom:10px" v-if="detailGlData">
           <div slot="message">
             共 {{ detailGlData.total }} 条,
-            总售价:{{ toThousands(detailGlData.totalAmount||0) }}
+            总售价:{{ detailGlData.totalAmount }}
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -317,7 +317,7 @@ export default {
               totalAmount = totalAmount + Number(data[i].totalAmount)
             }
             this.detailGlData.total = data.length
-            this.detailGlData.totalAmount = totalAmount
+            this.detailGlData.totalAmount = Number(totalAmount).toFixed(2)
           }
           return data
         })

+ 1 - 1
src/views/supplierManagement/costSetting/list.vue

@@ -103,7 +103,7 @@
                 class="button-warning"
                 v-if="record.auditState=='WAIT'&&$hasPermissions('B_costSetting')"
                 @click="handleCostSet(record,editFlag = true)"
-              >编辑</a-button>
+              >编辑成本</a-button>
               <a-button
                 size="small"
                 type="link"

+ 1 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -50,7 +50,7 @@
               v-if="$hasPermissions('B_supplierInfo_relation')"
               class="button-warning"
               @click="handleRelated(record)"
-              id="supplierInfoList-related-btn">关联产品</a-button>
+              :id="'supplierInfoList-related-btn-'+record.id">关联产品</a-button>
             <a-button
               size="small"
               type="link"