1

src/assets/js/btnList.js

@@ -82,7 +82,7 @@ const btnList = [
   { code: "081", name: "添加发货申请" },
   { code: "082", name: "添加工差" },
   { code: "083", name: "设置退货仓库" },
-  // { code: "082", name: "发货申请" },
+  { code: "084", name: "BOSS审批" },
 
 ];
 export default btnList;

src/views/goodStore/goodsCost/components/baseForm.vue

@@ -1575,7 +1575,7 @@ export default {
     },
     count_fee(e) {
       const {
-        noble_price, //贵金属实时金价
+        cgd_gold_price, //供应商采购金价
         is_gold_price, //是否启用实时金价
         noble_weight, //贵金属重量
       } = this.ruleForm;
@@ -1594,10 +1594,10 @@ export default {
         XC = this.add_sum(mark_fee, other_fee),
         XD = 0;
       let total = this.add_sum(this.add_sum(XA, XB), XC);
-      console.log(total);
+      // console.log(total);
       if (this.is_noble && is_gold_price === "1") {
         XD = this.add_sum(
-          this.accMul(noble_price, noble_weight),
+          this.accMul(cgd_gold_price, noble_weight),
           this.accMul(noble_weight, cost_fee)
         );
         total = this.add_sum(total, XD);

src/views/goodStore/goodsOnline/components/fixed-price-form.vue

@@ -111,7 +111,7 @@
           prop="sale_price"
           label="售价"
           show-overflow-tooltip
-          v-if="sitem && sitem.is_gold_price !== '1'"
+          v-if="!(sitem && sitem.is_gold_price === '1'&&is_noble)"
         >
           <template slot-scope="scope">
             <el-form-item
@@ -142,7 +142,7 @@
         <el-table-column
           prop="new_cost_fee"
           show-overflow-
-          v-if="sitem && sitem.is_gold_price === '1'"
+          v-if="sitem && sitem.is_gold_price === '1'&&is_noble"
           label="系统工艺费"
         >
           <template slot-scope="scope">
@@ -169,7 +169,7 @@
           prop="cost_fee"
           label="工艺费"
           show-overflow-tooltip
-          v-if="sitem && sitem.is_gold_price === '1'"
+          v-if="sitem && sitem.is_gold_price === '1'&&is_noble"
         >
           <template slot-scope="scope">
             <el-form-item
@@ -536,6 +536,7 @@ export default {
     return {
       loading: false,
       showVoucher: false,
+      is_noble: false,
       video_url: "",
       img_url: "",
       other_url: "",
@@ -796,6 +797,7 @@ export default {
     },
 
     async resetForm() {
+      this.is_noble = false;
       // 重置
       await this.$nextTick(async () => {
         if (this.$refs.ruleForm && this.$refs.addrForm) {
@@ -803,7 +805,14 @@ export default {
           this.$refs.ruleForm.clearValidate();
           this.$refs.addrForm.resetFields();
           this.$refs.addrForm.clearValidate();
-          let { proof, ladderlist } = this.sitem;
+          let { proof, ladderlist, cat_info } = this.sitem;
+          if (cat_info && cat_info.length > 0) {
+            cat_info.forEach((e) => {
+              if (e.id === "6") {
+                this.is_noble = true;
+              }
+            });
+          }
           ladderlist.map((a) => {
             a.search_loading = false;
             a.new_sale_price = "0";

src/views/goodStore/goodsOnline/detail.vue

@@ -229,6 +229,7 @@
                   >
                     <el-table-column prop="min_num" label="起订量(>=)" />
                     <el-table-column prop="sale_price" label="售价" />
+                    <el-table-column prop="cost_fee" label="工艺费" />
                     <el-table-column prop="market_price" label="市场价" />
                     <el-table-column prop="market_platform" label="对比平台" />
                     <el-table-column prop="status" label="状态">

src/views/goodStore/sort/addEditRate.vue

@@ -128,8 +128,8 @@
                 :append="'%'"
                 @reschange="rate_change($event, 'lower_rate')"
               />
-            </el-form-item>
-          </el-form> -->
+            </el-form-item> -->
+          </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
           <el-button