Browse Source

处理bug

yangg 1 year ago
parent
commit
9ff1adfafb
23 changed files with 38 additions and 15 deletions
  1. 1 1
      manager-admin/dist/index.html
  2. 0 0
      manager-admin/dist/static/js/11.718ca8996be66c70db05.js
  3. BIN
      manager-admin/dist/static/js/11.718ca8996be66c70db05.js.gz
  4. 0 0
      manager-admin/dist/static/js/11.c6d1edc00d4afd934ec2.js
  5. BIN
      manager-admin/dist/static/js/11.c6d1edc00d4afd934ec2.js.gz
  6. 0 0
      manager-admin/dist/static/js/50.298d57b8612d68e596f6.js
  7. BIN
      manager-admin/dist/static/js/50.298d57b8612d68e596f6.js.gz
  8. 0 0
      manager-admin/dist/static/js/50.98fbc24dc7a7240b0b09.js
  9. BIN
      manager-admin/dist/static/js/50.98fbc24dc7a7240b0b09.js.gz
  10. 0 0
      manager-admin/dist/static/js/7.decc4e7dd515e2605066.js
  11. BIN
      manager-admin/dist/static/js/7.decc4e7dd515e2605066.js.gz
  12. 0 0
      manager-admin/dist/static/js/8.0577d155a45bfb43d8f8.js
  13. BIN
      manager-admin/dist/static/js/8.0577d155a45bfb43d8f8.js.gz
  14. 0 0
      manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js
  15. BIN
      manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js.gz
  16. 0 0
      manager-admin/dist/static/js/9.d7ba72d2341886bbe5e3.js
  17. BIN
      manager-admin/dist/static/js/9.d7ba72d2341886bbe5e3.js.gz
  18. 0 0
      manager-admin/dist/static/js/app.f6d9fe2258cef4b0c7b7.js
  19. BIN
      manager-admin/dist/static/js/app.f6d9fe2258cef4b0c7b7.js.gz
  20. 0 0
      manager-admin/dist/static/js/manifest.e6de561f900eb74c3fe8.js
  21. 2 8
      manager-admin/src/components/SkuEditor/src/main.vue
  22. 5 0
      manager-admin/src/views/stock/orderAdd.vue
  23. 30 6
      manager-admin/src/views/stock/orderCheck.vue

+ 1 - 1
manager-admin/dist/index.html

@@ -1,3 +1,3 @@
 <!DOCTYPE html><html><head><meta charset=utf-8><script>var ua = window.navigator.userAgent
     var isIe = /MSIE|Trident/.test(ua)
-    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.ee0de0cd79f09d93dbc5.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.504a6cccfdfc8bce0289.js></script></body></html>
+    // if (isIe) window.location.href = 'http://support.dmeng.net/upgrade-your-browser.html?referrer=' + encodeURIComponent(window.location.href)</script><script src=/static/js/envs.js></script><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>erp</title><link rel="shortcut icon" href=/favicon.ico><link href=/static/css/app.2504f4a014a0e06a9efabe33f1571f70.css rel=stylesheet></head><body><div id=app><div style="display: flex;width: 100vw;height: 100vh;justify-content:center;align-items:center"><img src=/static/img/index.ripple-radio-preloader.gif alt=""></div></div><script src=/static/js/jquery.min.js></script><script src=/static/js/xlsx.full.min.js></script><script src=/static/js/echarts.min.js></script><script src=/static/js/base64.min.js></script><script src=/static/js/psl.min.js></script><script src=/static/UE/ueditor.config.js></script><script src=/static/UE/ueditor.all.js></script><script src=/static/UE/lang/zh-cn/zh-cn.js></script><script src=/static/UE/ueditor.parse.js></script><script src="//webapi.amap.com/maps?v=2.0&key=a4553619077791eb0a6df2f450b9a03b&plugin=AMap.CircleEditor"></script><script src=//webapi.amap.com/ui/1.1/main.js></script><script type=text/javascript src=/static/js/manifest.e6de561f900eb74c3fe8.js></script><script type=text/javascript src=/static/js/vendor.4b8436f4db68c4fe04db.js></script><script type=text/javascript src=/static/js/app.f6d9fe2258cef4b0c7b7.js></script></body></html>

File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/11.718ca8996be66c70db05.js


BIN
manager-admin/dist/static/js/11.718ca8996be66c70db05.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/11.c6d1edc00d4afd934ec2.js


BIN
manager-admin/dist/static/js/11.c6d1edc00d4afd934ec2.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/50.298d57b8612d68e596f6.js


BIN
manager-admin/dist/static/js/50.298d57b8612d68e596f6.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/50.98fbc24dc7a7240b0b09.js


BIN
manager-admin/dist/static/js/50.98fbc24dc7a7240b0b09.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/7.decc4e7dd515e2605066.js


BIN
manager-admin/dist/static/js/7.decc4e7dd515e2605066.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/8.0577d155a45bfb43d8f8.js


BIN
manager-admin/dist/static/js/7.d62ac25830eb485d6408.js.gz → manager-admin/dist/static/js/8.0577d155a45bfb43d8f8.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js


BIN
manager-admin/dist/static/js/8.595ae593b34020f76494.js.gz → manager-admin/dist/static/js/9.76ae5363256dbe69ad14.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/9.d7ba72d2341886bbe5e3.js


BIN
manager-admin/dist/static/js/9.d7ba72d2341886bbe5e3.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/app.f6d9fe2258cef4b0c7b7.js


BIN
manager-admin/dist/static/js/app.504a6cccfdfc8bce0289.js.gz → manager-admin/dist/static/js/app.f6d9fe2258cef4b0c7b7.js.gz


File diff suppressed because it is too large
+ 0 - 0
manager-admin/dist/static/js/manifest.e6de561f900eb74c3fe8.js


+ 2 - 8
manager-admin/src/components/SkuEditor/src/main.vue

@@ -258,7 +258,6 @@ export default {
   },
   methods: {
     preventChineseInput(row, event) {
-      console.log(row, event);
       return event = event.replace(/[\u4e00-\u9fa5]/g, '');
 
     },
@@ -273,11 +272,9 @@ export default {
       try {
         this.loading = true;
         const goodsInfo = this.goodsInfo;
-        console.log('goodsInfo', this.goodsInfo);
         // 获取规格列表
         this.getSpecList();
         if (goodsInfo.product_list) {
-
           this.skuForm.skuList = Helper.cloneJson(goodsInfo.product_list);
           this.rawSkuList = Helper.cloneJson(goodsInfo.product_list);
           // 初始化商品SKU中已选择的规格信息
@@ -299,11 +296,11 @@ export default {
       });
     },
     // 获取商品sku信息
-    async getSkuList() {
+  /*   async getSkuList() {
       // const skuList = await Helper.getGoodsSkus(this.goodsId)
       this.skuForm.skuList = Helper.cloneJson(skuList);
       this.rawSkuList = Helper.cloneJson(skuList);
-    },
+    }, */
     // 生成表格表单
     makeTableForm() {
       const specs = Helper.getSelectedSpecsFormSpecList(
@@ -334,7 +331,6 @@ export default {
     // 获取规格下的规格值列表
     getSpecValueList(spec_id) {
       /*  return Helper.getSpecValues(spec_id).then(res => {
-         console.log(res);
          
          return res; // 确保这里返回的是一个数组
        }).catch(error => {
@@ -488,7 +484,6 @@ export default {
           this.$set(sku, param.key, val || "");
         });
       } catch (e) {
-        // console.log('e: ', e)
       }
     },
     // 保存
@@ -509,7 +504,6 @@ export default {
           })
           
           const skus = Helper.cloneJson(this.skuForm.skuList);
-          console.log(skus);
           resolve(skus);
           // try {
           //   await Helper.saveGoodsSkus(this.goodsId, skus)

+ 5 - 0
manager-admin/src/views/stock/orderAdd.vue

@@ -1601,6 +1601,11 @@ export default {
           totalItemMoney += item.item_money;
         });
         this.OrderForm.real_price = totalItemMoney;
+        if (this.OrderForm.tax_rate !== 0) {
+          this.totalAmount = this.TO_Cmoney + this.OrderForm.real_price * (1 + this.OrderForm.tax_rate / 100)
+        } else {
+          this.totalAmount = this.TO_Cmoney + this.OrderForm.real_price
+        }
       },
     },
     /* "OrderForm.payment_list": {

+ 30 - 6
manager-admin/src/views/stock/orderCheck.vue

@@ -93,6 +93,17 @@
                         </el-radio-group>
                     </el-form-item>
                 </el-col> -->
+                    <el-col :span="10">
+                        <el-form-item label="税点:" prop="tax_rate" :rules="rules.tax_rate">
+                            {{ OrderForm.tax_rate }}
+                            <!-- <el-select v-model="OrderForm.tax_rate" clearable :disabled="type == 'pone'">
+                                <el-option label="0" :value="0" />
+                                <el-option label="1%" :value="1" />
+                                <el-option label="6%" :value="6" />
+                                <el-option label="13%" :value="13" />
+                            </el-select> -->
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                         <div class="redClass">
                             <el-form-item label="备注:" prop="remark">
@@ -135,7 +146,7 @@
                                 </el-popover>
                             </template>
                         </el-table-column>
-                       <!--  <el-table-column label="商品编号">
+                        <!--  <el-table-column label="商品编号">
                             <template slot-scope="scope">
                                 {{ scope.row.goods_vo.sn }}
                             </template>
@@ -174,7 +185,7 @@
                                 {{ scope.row.num }}
                             </template>
                         </el-table-column>
-                       <!--  <el-table-column label="库存数量">
+                        <!--  <el-table-column label="库存数量">
                             <template slot-scope="scope">
                                 {{ scope.row.usable_stock }}
                             </template>
@@ -196,7 +207,7 @@
                         </el-table-column>
                         <el-table-column label="折扣">
                             <template slot-scope="scope">
-                              {{  scope.row.reduction}}
+                                {{ scope.row.reduction }}
                             </template>
                         </el-table-column>
                         <el-table-column label="总价" v-if="OrderForm.type == 'TO_C'">
@@ -1339,7 +1350,7 @@ export default {
                         moneyToc += el.money
                     })
                     this.TO_Cmoney = moneyToc
-                    this.totalAmount = moneyToc + response.real_price
+                    //this.totalAmount = moneyToc + response.real_price
                 }
                 this.OrderForm = response;
                 if (response.type == "TO_C") {
@@ -1430,8 +1441,21 @@ export default {
         "OrderForm.product_list": {
             deep: true,
             handler(newVal) {
-                newVal.forEach((item) => {
-                });
+                /* let totalItemMoney = 0;
+                newVal.forEach(item => {
+                    if (this.OrderForm.type == "TO_C") {
+                        item.item_money = item.product_vo.day_price * item.num * item.day_num * (item.reduction / 10);
+                    } else {
+                        item.item_money = item.product_vo.price * item.num * (item.reduction / 10);
+                    }
+                    totalItemMoney += item.item_money;
+                }); 
+                //this.OrderForm.real_price = totalItemMoney;*/
+                if (this.OrderForm.tax_rate !== 0) {
+                    this.totalAmount = this.TO_Cmoney + this.OrderForm.real_price * (1 + this.OrderForm.tax_rate / 100)
+                } else {
+                    this.totalAmount = this.TO_Cmoney + this.OrderForm.real_price
+                }
             },
         },
         $route: {

Some files were not shown because too many files changed in this diff