Bladeren bron

Merge branch 'master' into sit

xiaodai2022 2 jaren geleden
bovenliggende
commit
6db798fbc5

File diff suppressed because it is too large
+ 3 - 1
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/chunk-17ebc1d8.187be0dd.css


BIN
dist/static/css/chunk-17ebc1d8.187be0dd.css.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.9cb11c13.js


BIN
dist/static/js/app.9cb11c13.js.gz


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-17ebc1d8.8ce26dbc.js


BIN
dist/static/js/chunk-17ebc1d8.8ce26dbc.js.gz


+ 2 - 4
src/views/purchaseIn/workbench/index.vue

@@ -57,7 +57,7 @@
                 <li class="fl item-li">
                   <span class="label">商品预算:</span>
                   <span class="label-main">
-                    {{ item.budget_price }}元/{{ item.num }}{{ unit }}</span
+                    {{ item.original_price }}元/{{ item.num }}{{ unit }}</span
                   >
                 </li>
               </ul>
@@ -109,9 +109,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "workbench"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "workbench") || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {

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