Merge tag 'Hotfix-zh-173' into develop

Finish Hotfix-zh-173

src/views/supply/policy/components/retail_form.vue

@@ -244,9 +244,9 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{
-              ((scope.row.price - scope.row.discAmount)*((scope.row.rebateRate * scope.row.qty) * 100)/100 || 0 ) | numToFixed
-            }}
+            
+            {{((scope.row.price - scope.row.discAmount) * scope.row.qty * ((scope.row.rebateRate || 0) * 100)) / 100}}
+            
           </template>
         </el-table-column>
         <el-table-column
@@ -331,12 +331,15 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <template v-if="scope.row.rebateRate">
-              {{ (((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100) | numToFixed }}
+            <!-- v-if="scope.row.rebateRate" -->
+            <template >
+              <!-- {{ (((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100) | numToFixed }} -->
+              {{((scope.row.price * scope.row.qty) * 100 - ((scope.row.price * scope.row.qty * ((scope.row.rebateRate||0) * 100)) / 100) * 100 - ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) / 100}}
+
             </template>
-            <template v-else>
+            <!-- <template v-else>
               {{ (scope.row.price*scope.row.qty ) | numToFixed }}
-            </template>
+            </template> -->
           </template>
         </el-table-column>
         <el-table-column