xiaodai2022 2 years ago
parent
commit
d14b7c1d42

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


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


+ 2 - 2
src/views/login/index.vue

@@ -87,11 +87,11 @@
               <i class="el-icon-info" slot="reference"></i>
             </el-popover>
           </div>
-          <router-link to="/forget-password">
+          <!-- <router-link to="/forget-password">
             <div class="tips" style="float: right">
               <span>忘记密码</span>
             </div>
-          </router-link>
+          </router-link> -->
         </div>
       </el-form>
     </div>

+ 2 - 0
src/views/sellOut/sellOutOrder/columns.js

@@ -180,11 +180,13 @@ const showColumns = [
   {
     prop: "sale_price",
     label: "商品单价",
+    _slot_:"sale_price",
     span: 6
   },
   {
     prop: "total_price",
     label: "发货申请单总价",
+    _slot_:"total_price",
     span: 6
   },
   {

+ 24 - 1
src/views/sellOut/sellOutOrder/detail.vue

@@ -5,7 +5,10 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <!-- <p>{{ status }}---{{ powers }}</p> -->
-      <div class="detail-page-title">
+      <div
+        v-if="status === '2' && powers.some((item) => item == '049')"
+        class="detail-page-title"
+      >
         <span>发货申请单编号:</span
         ><span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
@@ -54,6 +57,24 @@
                     sitem.status === "1" ? "发货申请单" : "咨询发货申请单"
                   }}</el-tag>
                 </template>
+                <template slot="sale_price">
+                  <span>{{
+                    private_field &&
+                    private_field.length > 0 &&
+                    private_field.some((item) => item == "2")
+                      ? sitem.sale_price
+                      : "***"
+                  }}</span>
+                </template>
+                <template slot="total_price">
+                  <span>{{
+                    private_field &&
+                    private_field.length > 0 &&
+                    private_field.some((item) => item == "2")
+                      ? sitem.total_price
+                      : "***"
+                  }}</span>
+                </template>
               </show-data-table>
             </el-collapse-item>
             <el-collapse-item title="商品信息" name="2">
@@ -271,6 +292,7 @@ import { showColumns } from "./columns";
 import { sellshowColumns } from "@/views/sellOut/sellAfterApply/columns";
 import returnExpress from "./components/returnExpress";
 import wantDeliver from "./components/want-deliver.vue";
+import { mapGetters } from "vuex";
 export default {
   name: "sellOutOrderDetail",
   mixins: [mixinPage, resToken],
@@ -281,6 +303,7 @@ export default {
     returnExpress,
   },
   computed: {
+    ...mapGetters(["private_field"]),
     powers() {
       let tran =
         this.$store.getters.btnList.find(

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