钱惠东 1 Minggu lalu
induk
melakukan
6bfd3040b9

+ 1 - 1
ruoyi-ui-vue2/src/views/quotation/quotation.vue

@@ -12,7 +12,7 @@
         <el-button v-hasPermi="['bt:business:quotation:export']" icon="el-icon-download" plain size="mini"
                    @click="() => handleExport(false)">{{ $t('quotation.exportQuotation') }}
         </el-button>
-        <el-button v-hasPermi="['bt:business:quotation:export']" icon="el-icon-view" plain size="mini"
+        <el-button v-hasPermi="['bt:business:quotation:preview']" icon="el-icon-view" plain size="mini"
                    @click="() => handleExport(true)">{{ $t('quotation.previewQuotation') }}
         </el-button>
         <el-button v-hasPermi="['bt:business:quotation:copy']" icon="el-icon-plus" plain size="mini" :disabled="!ids || ids.length === 0"

+ 1 - 1
ruoyi-ui-vue2/src/views/quotation/sysQuotation.vue

@@ -202,7 +202,7 @@ export default {
         let basicPrice = 0
         let optionalPrice = 0
         response.rows.forEach(({ total, defaultRate = 100, discountFlag = false }, index) => {
-          this.discountRate = defaultRate
+          this.discountRate = defaultRate || this.discountRate
           this.discountFlag = discountFlag
           if (index === 0) {
             originalBasicPrice += total