Browse Source

台账详情————对于每一个价格节点都为其增加了权限

lucky 2 years ago
parent
commit
7eb4ab5b22

+ 2 - 0
src/views/standingBook/components/detail10/columns.js

@@ -89,12 +89,14 @@ const columns = [
   {
     prop: "sale_price",
     label: "售价",
+    _slot_:"sale_price",
     append: '元',
     span: 6,
   },
   {
     prop: "total_price",
     label: "总金额",
+    _slot_:"total_price",
     append: '元',
     span: 6,
   },

+ 25 - 0
src/views/standingBook/components/detail10/main.vue

@@ -111,6 +111,31 @@
             : "--"
         }}</el-tag>
       </template>
+
+      <template slot="sale_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.sale_price }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="total_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.total_price }}元</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
   </div>
 </template>

+ 2 - 2
src/views/standingBook/components/detail11/main.vue

@@ -27,7 +27,7 @@
           private_field.length > 0 &&
           private_field.some((item) => item == "2")
             ? sitem.sale_price
-            : "***"
+            : "******"
         }}</span>
       </template>
       <template slot="total_price">
@@ -36,7 +36,7 @@
           private_field.length > 0 &&
           private_field.some((item) => item == "2")
             ? sitem.total_price
-            : "***"
+            : "******"
         }}</span>
       </template>
     </detailDatatable>

+ 4 - 1
src/views/standingBook/components/detail16/main.vue

@@ -256,12 +256,15 @@ export default {
     async initData() {
       this.loading = true;
       const { code, message, data } = await asyncRequest.detail({
-        id: this.queryId,
+        code: this.queryId,
       });
       this.loading = false;
       if (code === 0) {
         this.sitem = JSON.parse(JSON.stringify(data));
+
         const { status } = this.sitem;
+
+        this.sitem.prove_img = this.sitem.prove_img.split(",")
         this.status = status;
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {

+ 1 - 1
src/views/standingBook/components/detail17/main.vue

@@ -72,7 +72,7 @@ export default {
       this.newTime = new Date().valueOf();
     },
     async initData() {
-      const res = await asyncRequest.detail({ id: this.queryId });
+      const res = await asyncRequest.detail({ companyNo: this.queryId });
       if (res && res.code === 0 && res.data) {
         this.sitem= res.data;
         this.getNewTime()

+ 1 - 1
src/views/standingBook/components/detail18/main.vue

@@ -112,7 +112,7 @@ export default {
       this.newTime = new Date().valueOf();
     },
     async initData() {
-      let res = await asyncRequest.qdetail({ id: this.queryId })
+      let res = await asyncRequest.qdetail({ companyNo: this.queryId })
       if (res.code === 0) {
         this.sitem = res.data;
         this.getNewTime()

+ 4 - 0
src/views/standingBook/components/detail2/columns.js

@@ -44,11 +44,15 @@ const columns = [
   {
     prop: "total_fee",
     label: "采购总成本",
+    flag:1,
+    _slot_:"total_fee",
     span: 6
   },
   {
     prop: "good_price",
     label: "采购单价",
+    _slot_:"good_price",
+    flag:2,
     span: 6
   },
   {

+ 40 - 14
src/views/standingBook/components/detail2/main.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    
     <detailDatatable
       :newTime="newTime"
       v-if="newTime !== '' && sitem"
@@ -99,7 +98,10 @@
           v-if="
             sitem.status == '0' &&
             sitem.can[0].id == '6' &&
-            cost_detailArr.is_gold_price == '1'
+            cost_detailArr.is_gold_price == '1' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
           "
         >
           {{ sitem.gold_price }}
@@ -156,12 +158,37 @@
           </el-table-column>
         </el-table>
       </template>
+
+      <template slot="total_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.total_fee }}</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="good_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.good_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
   </div>
 </template>
 
 <script>
-import {columns, statusOptions,} from "./columns";
+import { columns, statusOptions } from "./columns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -171,7 +198,6 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseOrder";
 import { mapGetters } from "vuex";
 import detailDatatable from "../detail-data-table";
 
-
 export default {
   computed: {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "private_field"]),
@@ -187,11 +213,11 @@ export default {
       }
     },
   },
-  components:{
-    detailDatatable
+  components: {
+    detailDatatable,
   },
   mixins: [mixinPage, resToken],
-  props:["queryId"],
+  props: ["queryId"],
   data() {
     return {
       cg_order_type_options,
@@ -201,14 +227,14 @@ export default {
       //——————————————————————
       columns,
       newTime: "",
-      sitem:null,
-      loading:false,
+      sitem: null,
+      loading: false,
     };
   },
-  mounted(){
-    this.initData()
+  mounted() {
+    this.initData();
   },
-  methods:{
+  methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
@@ -238,7 +264,7 @@ export default {
     async goldPrice() {
       let res = {};
       let { order_type } = this.sitem;
-      if (order_type == "1" || order_type == "2" ) {
+      if (order_type == "1" || order_type == "2") {
         res = await asyncRequest.cost_detail({ spuCode: this.sitem.spuCode });
       } else {
         res = await asyncRequest.cove_detail({ spuCode: this.sitem.spuCode });
@@ -251,7 +277,7 @@ export default {
         this.$message.warning(res.message);
       }
     },
-  }
+  },
 };
 </script>
 

+ 2 - 0
src/views/standingBook/components/detail3/columns.js

@@ -40,6 +40,8 @@ const columns = [
   {
     prop: "good_price",
     label: "采购单价",
+    _slot_:"good_price",
+
     span: 4
   },
   {

+ 12 - 0
src/views/standingBook/components/detail3/main.vue

@@ -62,6 +62,18 @@
             : "--"
         }}</span></template
       >
+      <template slot="good_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.good_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
   </div>
 </template>

+ 2 - 0
src/views/standingBook/components/detail4/columns.js

@@ -34,11 +34,13 @@ const columns = [
   {
     prop: "good_price",
     label: "采购单价",
+    _slot_:"good_price",
     span: 6
   },
   {
     prop: "return_price",
     label: "退货总金额",
+    _slot_:"return_price",
     span: 6
   },
   {

+ 49 - 32
src/views/standingBook/components/detail4/main.vue

@@ -1,33 +1,52 @@
 <template>
   <div>
-    
-
-
     <detailDatatable
-                :newTime="newTime"
+      :newTime="newTime"
       v-if="newTime !== '' && sitem"
       :sitem="sitem"
       :columns="columns"
-              >
-                <template slot="status">
-                  <el-tag
-                    :size="'mini'"
-                    :type="sitem.status == '0' ? 'warning' : ''"
-                    v-text="
-                      (
-                        statusOptions.find(
-                          (item) => item.value == sitem.status
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag>
-                </template>
-              </detailDatatable>
+    >
+      <template slot="status">
+        <el-tag
+          :size="'mini'"
+          :type="sitem.status == '0' ? 'warning' : ''"
+          v-text="
+            (statusOptions.find((item) => item.value == sitem.status) || {})
+              .label || '--'
+          "
+        ></el-tag>
+      </template>
+      <template slot="good_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.good_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
+
+      <template slot="return_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.return_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
+    </detailDatatable>
   </div>
 </template>
 
 <script>
-import {columns, statusOptions,} from "./columns";
+import { columns, statusOptions } from "./columns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -37,7 +56,6 @@ import asyncRequest from "@/apis/service/purchaseIn/purchaseReturn";
 import { mapGetters } from "vuex";
 import detailDatatable from "../detail-data-table";
 
-
 export default {
   mixins: [mixinPage, resToken],
   computed: {
@@ -54,28 +72,28 @@ export default {
       }
     },
   },
-  components:{
-    detailDatatable
+  components: {
+    detailDatatable,
   },
-  props:["queryId"],
+  props: ["queryId"],
   data() {
     return {
       cg_order_type_options,
       statusOptions,
-      status:"",
+      status: "",
       orderCode: "",
 
       //——————————————————————
       columns,
       newTime: "",
-      sitem:null,
-      loading:false,
+      sitem: null,
+      loading: false,
     };
   },
-  mounted(){
-    this.initData()
+  mounted() {
+    this.initData();
   },
-  methods:{
+  methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
@@ -102,8 +120,7 @@ export default {
       }
       this.loading = false;
     },
-
-  }
+  },
 };
 </script>
 

+ 2 - 0
src/views/standingBook/components/detail5/columns.js

@@ -33,12 +33,14 @@ const columns = [
   },
   {
     prop: "diff_price",
+    _slot_:"diff_price",
     label: "金额差价",
     span: 6
   },
   {
     prop: "gold_price",
     label: "实时金价",
+    _slot_:"gold_price",
     span: 6
   },
   {

+ 24 - 0
src/views/standingBook/components/detail5/main.vue

@@ -55,6 +55,30 @@
         ></el-tag>
         <el-tag :size="'mini'" v-else v-text="'--'"></el-tag>
       </template>
+      <template slot="diff_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.diff_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="gold_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.gold_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
   </div>
 </template>

+ 1 - 1
src/views/standingBook/components/detail6/columns.js

@@ -37,7 +37,7 @@ const columns = [
   {
     prop: "budget_total",
     label: "项目总预算(元)",
-    // _slot_: "order_type",
+    _slot_: "budget_total",
     span: 12
   },
  

+ 242 - 217
src/views/standingBook/components/detail6/main.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    
     <detailDatatable
       :newTime="newTime"
       v-if="newTime !== '' && sitem"
@@ -32,60 +31,64 @@
 
       <template slot="ladder">
         <el-table
-                :data="sitem.ladder"
+          :data="sitem.ladder"
+          :size="'mini'"
+          border
+          stripe
+          style="width: 100%"
+        >
+          <el-table-column label="商品阶梯" width="70px">
+            <template slot-scope="scope"> {{ scope.$index + 1 }}</template>
+          </el-table-column>
+          <el-table-column prop="good_type" label="商品类型" width="80px">
+            <template slot-scope="scope">
+              <el-tag
                 :size="'mini'"
-                border
-                stripe
-                style="width: 100%"
+                v-text="
+                  (
+                    statusOptions.find(
+                      (item) => item.value == scope.row.good_type
+                    ) || {}
+                  ).label || '--'
+                "
+              ></el-tag
+            ></template>
+          </el-table-column>
+          <el-table-column prop="budget_price" label="预算单价" width="110">
+            <template slot-scope="scope">
+              <span
+                v-if="
+                  newTime !== '' &&
+                  private_field &&
+                  private_field.length > 0 &&
+                  private_field.some((item) => item == '2')
+                "
+                >{{ scope.row.budget_price }}</span
               >
-                <el-table-column label="商品阶梯" width="70px">
-                  <template slot-scope="scope">
-                    {{ scope.$index + 1 }}</template
-                  >
-                </el-table-column>
-                <el-table-column prop="good_type" label="商品类型" width="80px">
-                  <template slot-scope="scope">
-                    <el-tag
-                      :size="'mini'"
-                      v-text="
-                        (
-                          statusOptions.find(
-                            (item) => item.value == scope.row.good_type
-                          ) || {}
-                        ).label || '--'
-                      "
-                    ></el-tag
-                  ></template>
-                </el-table-column>
-                <el-table-column
-                  prop="budget_price"
-                  label="预算单价"
-                  width="110"
+              <span v-else>******</span></template
+            >
+          </el-table-column>
+          <el-table-column prop="num" label="购买数量" width="110" />
+          <el-table-column prop="cat_name" label="商品分类" />
+          <el-table-column prop="good_img" label="图片" width="50">
+            <template slot-scope="scope">
+              <div
+                v-if="scope.row.good_img"
+                style="width: 20px; height: 20px"
+                class="hover"
+                v-viewer
+              >
+                <img
+                  :src="scope.row.good_img"
+                  style="display: inline-block; width: 100%; height: 100%"
+                  alt=""
                 />
-                <el-table-column prop="num" label="购买数量" width="110" />
-                <el-table-column prop="cat_name" label="商品分类" />
-                <el-table-column prop="good_img" label="图片" width="50">
-                  <template slot-scope="scope">
-                    <div
-                      v-if="scope.row.good_img"
-                      style="width: 20px; height: 20px"
-                      class="hover"
-                      v-viewer
-                    >
-                      <img
-                        :src="scope.row.good_img"
-                        style="display: inline-block; width: 100%; height: 100%"
-                        alt=""
-                      />
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="good_name" label="商品名称" />
-
-             
-              </el-table>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="good_name" label="商品名称" />
+        </el-table>
       </template>
-   
 
       <template slot="wsm">
         <span>{{ sitem.wsm_supplier }}/{{ sitem.wsm_name }}</span>
@@ -101,153 +104,177 @@
           <i class="el-icon-warning-outline fr" slot="reference"></i>
         </el-popover>
       </template>
-
-     
+      <template slot="budget_total">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.budget_total }}</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
     <div class="project-setPlan-title">
-        销售业务项目方案
+      销售业务项目方案
+      <span
+        style="margin: 0 0 0 50px; font-size: 13px; color: #e4393c"
+        v-if="total !== 0 && table_type === 'list'"
+        >{{ plan_show.status === "1" ? "已选定" : "" }}
         <span
-          style="margin: 0 0 0 50px; font-size: 13px; color: #e4393c"
-          v-if="total !== 0 && table_type === 'list'"
-          >{{ plan_show.status === "1" ? "已选定" : "" }}方案总金额:{{
-            plan_show.sale_total
-          }}元</span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
         >
-      
-      </div>
+          方案总金额:{{ plan_show.sale_total }}元
+        </span>
+        <span v-else>方案总金额:******</span>
+      </span>
+    </div>
     <div class="project-setPlan-backGood-table">
-        <el-table
-          :data="plan_show.feedback"
-          :size="'mini'"
-          border
-          stripe
-          :ref="'multipleTable' + index"
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="pgNo"
-            label="要求编码"
-            width="155px"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="origin_sale_price"
-            label="系统售价单价"
-            width="110"
-            show-overflow-tooltip
-          />
+      <el-table
+        :data="plan_show.feedback"
+        :size="'mini'"
+        border
+        stripe
+        :ref="'multipleTable' + index"
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="pgNo"
+          label="要求编码"
+          width="155px"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="origin_sale_price"
+          label="系统售价单价"
+          width="110"
+          show-overflow-tooltip
+          ><template slot-scope="scope">
+            <span
+              v-if="
+                newTime !== '' &&
+                private_field &&
+                private_field.length > 0 &&
+                private_field.some((item) => item == '2')
+              "
+              >{{ scope.row.origin_sale_price }}</span
+            >
+            <span v-else>******</span></template
+          >
+        </el-table-column>
 
-          <el-table-column
-            prop="new_sale_price"
-            label="当前销售单价"
-            width="110"
-            show-overflow-tooltip
+        <el-table-column
+          prop="new_sale_price"
+          label="当前销售单价"
+          width="110"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span
+              v-if="
+                newTime !== '' &&
+                private_field &&
+                private_field.length > 0 &&
+                private_field.some((item) => item == '2')
+              "
+              >{{ scope.row.new_sale_price }}</span
+            >
+            <span v-else>******</span></template
           >
-            <template slot-scope="scope">
-              <digital-input
-                v-if="table_type === 'add'"
-                :values="scope.row.new_sale_price"
-                :placeholder="'售价'"
-                :min="scope.row.new_sale_price"
-                :max="100000000000"
-                :position="'right'"
-                :precision="2"
-                :size="'mini'"
-                :controls="false"
-                :append="''"
-                @reschange="
-                  moq_num_change($event, scope.$index, 'new_sale_price')
+        </el-table-column>
+        <el-table-column
+          prop="origin_num"
+          label="竞价数量"
+          width="110"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="num"
+          label="购买数量"
+          width="110"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <digital-input
+              v-if="table_type === 'add'"
+              :values="scope.row.origin_num"
+              :placeholder="'购买数量'"
+              :min="scope.row.origin_num"
+              :max="100000000000"
+              :position="'right'"
+              :precision="0"
+              :size="'mini'"
+              :controls="false"
+              :append="''"
+              @reschange="moq_num_change($event, scope.$index, 'num')"
+            />
+            <span v-else>{{ scope.row.num }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="data_source" label="商品来源" width="85">
+          <template slot-scope="scope">
+            <el-tag
+              :size="'mini'"
+              :type="scope.row.data_source === '1' ? 'success' : ''"
+              >{{
+                scope.row.data_source === "1" ? "平台商品" : "采反商品"
+              }}</el-tag
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="good_img"
+          label="商品图片"
+          min-width="242px"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <div v-if="scope.row.good_img && scope.row.good_img.length > 0">
+              <img
+                v-for="(si, sii) in scope.row.good_img"
+                :key="si + sii"
+                :src="si"
+                class="hover fl"
+                style="
+                  display: inline-block;
+                  width: 20px;
+                  height: 20px;
+                  margin: 0 2px 0 0;
                 "
+                alt=""
+                v-viewer
               />
-              <span v-else>{{ scope.row.sale_price }}元</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="origin_num"
-            label="竞价数量"
-            width="110"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="num"
-            label="购买数量"
-            width="110"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <digital-input
-                v-if="table_type === 'add'"
-                :values="scope.row.origin_num"
-                :placeholder="'购买数量'"
-                :min="scope.row.origin_num"
-                :max="100000000000"
-                :position="'right'"
-                :precision="0"
-                :size="'mini'"
-                :controls="false"
-                :append="''"
-                @reschange="moq_num_change($event, scope.$index, 'num')"
-              />
-              <span v-else>{{ scope.row.num }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="data_source" label="商品来源" width="85">
-            <template slot-scope="scope">
-              <el-tag
-                :size="'mini'"
-                :type="scope.row.data_source === '1' ? 'success' : ''"
-                >{{
-                  scope.row.data_source === "1" ? "平台商品" : "采反商品"
-                }}</el-tag
-              >
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="good_img"
-            label="商品图片"
-            min-width="242px"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div v-if="scope.row.good_img && scope.row.good_img.length > 0">
-                <img
-                  v-for="(si, sii) in scope.row.good_img"
-                  :key="si + sii"
-                  :src="si"
-                  class="hover fl"
-                  style="
-                    display: inline-block;
-                    width: 20px;
-                    height: 20px;
-                    margin: 0 2px 0 0;
-                  "
-                  alt=""
-                  v-viewer
-                />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="good_name"
-            label="商品名称"
-            min-width="120"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <span>{{ scope.row.good_name }}</span>
-              <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
-                {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
-                  si.spec_value_name
-                }}]
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="class_cat"
-            label="商品分类"
-            show-overflow-tooltip
-          />
-          <!-- <el-table-column
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="good_name"
+          label="商品名称"
+          min-width="120"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.good_name }}</span>
+            <span v-for="(si, sii) in scope.row.specinfo" :key="si.id + sii">
+              {{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{
+                si.spec_value_name
+              }}]
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="class_cat"
+          label="商品分类"
+          show-overflow-tooltip
+        />
+        <!-- <el-table-column
             prop="expiry_day"
             label="信息有效期"
             width="85"
@@ -265,13 +292,13 @@
             width="70"
             show-overflow-tooltip
           /> -->
-        </el-table>
-      </div>
+      </el-table>
+    </div>
   </div>
 </template>
 
 <script>
-import {columns, statusOptions,} from "./columns";
+import { columns, statusOptions } from "./columns";
 import { cg_order_type_options } from "@/assets/js/statusList";
 
 //————————————————
@@ -281,10 +308,9 @@ import asyncRequest from "@/apis/service/sellOut/project";
 import { mapGetters } from "vuex";
 import detailDatatable from "../detail-data-table";
 
-
 export default {
-  components:{
-    detailDatatable
+  components: {
+    detailDatatable,
   },
   mixins: [mixinPage, resToken],
   computed: {
@@ -301,7 +327,7 @@ export default {
       }
     },
   },
-  props:["queryId"],
+  props: ["queryId"],
   data() {
     return {
       cg_order_type_options,
@@ -323,15 +349,15 @@ export default {
       //——————————————————————
       columns,
       newTime: "",
-      sitem:null,
-      loading:false,
+      sitem: null,
+      loading: false,
     };
   },
-  mounted(){
-    this.initData()
-    this.get_plan("1")
+  mounted() {
+    this.initData();
+    this.get_plan("1");
   },
-  methods:{
+  methods: {
     getNewTime() {
       this.newTime = new Date().valueOf();
     },
@@ -348,14 +374,14 @@ export default {
         this.status = status;
 
         this.sitem.ladder.forEach((e) => {
-            e.cat_name = "";
-            const { cat_info } = e;
-            if (cat_info && cat_info.length > 0) {
-              cat_info.forEach((b, bi) => {
-                e.cat_name += bi !== 0 ? "_" + b.name : b.name;
-              });
-            }
-          });
+          e.cat_name = "";
+          const { cat_info } = e;
+          if (cat_info && cat_info.length > 0) {
+            cat_info.forEach((b, bi) => {
+              e.cat_name += bi !== 0 ? "_" + b.name : b.name;
+            });
+          }
+        });
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {
         await this.logout();
@@ -426,19 +452,18 @@ export default {
         return v;
       });
 
-    
       for (let i = 0; i < this.plan_show.feedback.length; i++) {
         this.$set(this.plan_show.feedback[i], i, this.plan_show.feedback[i]);
       }
     },
-  }
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-  .project-setPlan-title{
-    // margin:20px 0 !important;
-    padding:20px 50px !important;
-    background: #f3f3f3;
-  } 
+.project-setPlan-title {
+  // margin:20px 0 !important;
+  padding: 20px 50px !important;
+  background: #f3f3f3;
+}
 </style>

+ 2 - 0
src/views/standingBook/components/detail7/columns.js

@@ -64,6 +64,7 @@ const columns = [
   {
     prop: "budget_price",
     label: "预算单价",
+    _slot_:"budget_price",
     span: 6
   },
   {
@@ -147,6 +148,7 @@ const columns = [
   {
     prop: "gold_price",
     label: "当前金价",
+    _slot_:"gold_price",
     span: 6
   },
   {

+ 25 - 0
src/views/standingBook/components/detail7/main.vue

@@ -103,6 +103,31 @@
               <el-table-column prop="spec_value_name" label="规格值" />
         </el-table>
       </template>
+
+      <template slot="budget_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.budget_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="gold_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.gold_price }}</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
   </div>
 </template>

+ 70 - 0
src/views/standingBook/components/detail8/columns.js

@@ -76,12 +76,14 @@ const columns = [
   {
     prop: "sale_price",
     label: "议价前售价",
+    _slot_:"sale_price",
     append: '元',
     span: 6
   },
   {
     prop: "after_price",
     label: "议价后售价",
+    _slot_:"after_price",
     append: '元',
     span: 6
   },
@@ -89,6 +91,7 @@ const columns = [
   {
     prop: "cost_before_price",
     label: "议价前工艺费",
+    _slot_:"cost_before_price",
     append: '元',
     span: 6
   },
@@ -96,6 +99,7 @@ const columns = [
   {
     prop: "cost_after_price",
     label: "议价后工艺费",
+    _slot_:"cost_after_price",
     append: '元',
     span: 6
   },
@@ -103,15 +107,81 @@ const columns = [
   {
     prop: "before_rate",
     label: "议价前毛利率",
+    _slot_:"before_rate",
     append: '%',
     span: 12
   },
   {
     prop: "after_rate",
     label: "议价后毛利率",
+    _slot_:"after_rate",
     append: '%',
     span: 12
   },
+  {
+    prop: "cert_fee",
+    label: "成本证书费",
+    _slot_:"cert_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "pakge_fee",
+    label: "成本包装费",
+    _slot_:"pakge_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "cost_fee",
+    label: "成本工艺费",
+    _slot_:"cost_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "mark_fee",
+    label: "成本加标费",
+    _slot_:"mark_fee",
+    append: '元',
+    span: 6
+  },
+
+  {
+    prop: "demo_fee",
+    label: "成本打样费",
+    _slot_:"demo_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "open_fee",
+    label: "成本开模费",
+    _slot_:"open_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "delivery_fee",
+    label: "成本物流费",
+    _slot_:"delivery_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "nake_fee",
+    label: "成本裸价",
+    _slot_:"nake_fee",
+    append: '元',
+    span: 6
+  },
+  {
+    prop: "total_fee",
+    label: "采购成本合计",
+    _slot_:"total_fee",
+    append: '元',
+    span: 24
+  },
 
 ]
 

+ 185 - 0
src/views/standingBook/components/detail8/main.vue

@@ -55,6 +55,191 @@
           "
         ></el-tag>
       </template>
+
+
+
+      <!-- 议价价格1/2/3权限 -->
+
+      <template slot="sale_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.sale_price }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="after_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.after_price }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="cost_before_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.cost_before_price }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="cost_after_price">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '2')
+          "
+          >{{ sitem.cost_after_price }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="before_rate">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '3')
+          "
+          >{{ sitem.before_rate }}%</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="after_rate">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '3')
+          "
+          >{{ sitem.after_rate }}%</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="cert_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.cert_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="pakge_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.pakge_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="cost_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.cost_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="mark_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.mark_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="demo_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.demo_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="open_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.open_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="delivery_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.delivery_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="nake_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.nake_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
+      <template slot="total_fee">
+        <span
+          v-if="
+            newTime !== '' &&
+            private_field &&
+            private_field.length > 0 &&
+            private_field.some((item) => item == '1')
+          "
+          >{{ sitem.total_fee }}元</span
+        >
+        <span v-else>******</span>
+      </template>
     </detailDatatable>
   </div>
 </template>

+ 2 - 1
src/views/standingBook/detail.vue

@@ -348,7 +348,8 @@ export default {
       } = obj;
       (order_type ?? "") != ""
         ? arr.push({ tar: "#detail1", title: "商品信息" })
-        : (flag = false)(cgdNo ?? "") != ""
+        : (flag = false);
+      (cgdNo ?? "") != ""
         ? arr.push({ tar: "#detail2", title: "采购——采购单" })
         : (flag = false);
       (wsm_in_code ?? "") != ""