Merge branch 'master' of http://18.167.157.193:1026/guanli/ngds into feature/1540-theo-auto-mesure-up

frontendEle/src/views/shop/index.vue

@@ -33,6 +33,19 @@
                               <span>{{ Math.round(scope.row.PRICE_PV * 100) / 100 }}</span>
                           </template>
                       </el-table-column>
+
+                      <el-table-column label="税率" prop="TAX_RATE"><!--税率-->
+                          <template slot-scope="scope">
+                              <span>{{ Math.round(scope.row.TAX_RATE * 100) / 100 }}</span>
+                          </template>
+                      </el-table-column>
+
+                      <el-table-column label="税额"><!--税额-->
+                          <template slot-scope="scope">
+                              <span>{{ Math.round((scope.row.SELL_PRICE - scope.row.SELL_PRICE / (1 + scope.row.TAX_RATE / 100)) * 100) / 100 }}</span>
+                          </template>
+                      </el-table-column>
+
                       <el-table-column label="Inventory" prop="STORE_NUMS"><!--库存-->
                       </el-table-column>
 

frontendEle/src/views/shop/order.vue

@@ -27,6 +27,17 @@
                             <span>{{ Math.round(scope.row.member_pv * 100) / 100 }}</span>
                         </template>
                     </el-table-column>
+                    <el-table-column label="税率" prop="TAX_RATE"><!--税率-->
+                        <template slot-scope="scope">
+                            <span>{{ Math.round(scope.row.TAX_RATE * 100) / 100 }}</span>
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="税额" prop="tax_amount_plus"><!--税额-->
+                      <template slot-scope="scope">
+                        <span>{{ Math.round(scope.row.tax_amount_plus * 100) / 100 }}</span>
+                      </template>
+                    </el-table-column>
 <!--                    <el-table-column label="库存" prop="STORE_NUMS">-->
 <!--                    </el-table-column>-->
 
@@ -252,6 +263,8 @@
                             pageData.member_pv = Math.round(pageData.PRICE_PV * discount * 100) / 100;
                             pageData.member_pv_plus = Math.round(pageData.PRICE_PV * Number(pageData.chose_num) * discount * 100) / 100;
 
+                            pageData.tax_amount_plus = Math.round((pageData.member_price - pageData.member_price / (1 + pageData.TAX_RATE / 100)) * pageData.chose_num * 100) / 100;
+
                             this.goods.push(pageData)
                         }
                     })
@@ -288,7 +301,7 @@
                   return;
                 }
                 const values = data.map(item => Number(item[column.property]));
-                if ((!values.every(value => isNaN(value))) && [4, 5, 6].includes(index)) {
+                if ((!values.every(value => isNaN(value))) && [5, 6, 7, 8].includes(index)) {
                   sums[index] = values.reduce((prev, curr) => {
                     const value = Number(curr);
                     if (!isNaN(value)) {

frontendEle/src/views/user/dec.vue

@@ -1,7 +1,7 @@
 <template>
     <div v-loading="loading">
         <div class="white-box">
-            <el-form ref="form"  label-width="250px" class="form-page">
+            <el-form ref="form"  label-width="150px" class="form-page">
                 <div class="hr-tip"><span>Account Information<!--账号信息--></span></div>
 
                 <el-form-item label="New member code"><!--会员编号-->
@@ -25,7 +25,7 @@
                     <template slot="label">
                       Select Welcome Pack<!--报单方式二选一-->
                     </template>
-                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 1000px;">
+                    <el-tabs type="border-card" v-model="decWay" style="position: relative;width: 1200px;">
                         <el-tab-pane name="1">
                             <span slot="label">Welcome Pack</span><!--报单级别套餐-->
                             <el-table class="table-box" :data="_tableData" stripe style="width: 100%;" highlight-current-row @current-change="handleCurrentChange">
@@ -42,26 +42,26 @@
                                       </span>
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Package Name" prop="PACKAGE_NAME"><!-- 套餐名称 -->
+                                <el-table-column label="Package Name" prop="PACKAGE_NAME" width="300"><!-- 套餐名称 -->
 
                                 </el-table-column>
-                                <el-table-column label="Price" prop="AMOUNT"><!-- 套餐金额 -->
+                                <el-table-column label="Price" prop="AMOUNT" width="100"><!-- 套餐金额 -->
 
                                 </el-table-column>
 
-                                <el-table-column label="BV" prop="PV"><!-- 套餐PV -->
+                                <el-table-column label="BV" prop="PV" width="100"><!-- 套餐PV -->
 
                                     <template>
 
                                     </template>
                                 </el-table-column>
 
-                                <el-table-column label="Entry level" prop="LEVEL_NAME"><!-- 所属报单级别 -->
+                                <el-table-column label="Entry level" prop="LEVEL_NAME" width="100"><!-- 所属报单级别 -->
                                     <template>
 
                                     </template>
                                 </el-table-column>
-                                <el-table-column label="Details" prop="PACKAGE_CONTENT"><!-- 套餐内容 -->
+                                <el-table-column label="Details" prop="PACKAGE_CONTENT" width=""><!-- 套餐内容 -->
                                     <template >
 
                                     </template>
@@ -79,17 +79,17 @@
                                         width="55">
                                 </el-table-column>
 
-                                <el-table-column label="Product Name" prop="GOODS_NAME"><!-- 商品名称 -->
+                                <el-table-column label="Product Name" prop="GOODS_NAME" width="300"><!-- 商品名称 -->
 
                                 </el-table-column>
-                                <el-table-column label="Product code" prop="GOODS_NO"><!-- 商品编号 -->
+                                <el-table-column label="Product code" prop="GOODS_NO" width="120"><!-- 商品编号 -->
 
                                 </el-table-column>
-                                <el-table-column label="Product price" prop="SELL_PRICE"><!-- 卖价 -->
+                                <el-table-column label="Product price" prop="SELL_PRICE" width="120"><!-- 卖价 -->
 
                                 </el-table-column>
 
-                                <el-table-column label="Product BV" prop="PRICE_PV"><!-- BV价格 -->
+                                <el-table-column label="Product BV" prop="PRICE_PV" width="100"><!-- BV价格 -->
 
                                 </el-table-column>
                                 <el-table-column label="Quantity" width="150"><!-- 数量 -->