build

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -119,6 +119,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16" style="text-align: right">
+                <el-form-item label="京东链接" prop="market_url">
+                  <el-input
+                    :disabled="false"
+                    placeholder="京东比价链接"
+                    v-model="ruleForm.market_url"
+                  />
+                </el-form-item>
+
                 <el-form-item label="上线备注" prop="online_remark">
                   <el-input
                     type="textarea"
@@ -179,6 +187,13 @@ export default {
             trigger: "change"
           }
         ],
+        market_url:[
+          {
+            required: true,
+            message: '请输入京东链接',
+            trigger:'change'
+          }
+        ],
         platform_type: [
           {
             required: true,
@@ -299,10 +314,19 @@ export default {
             let model = JSON.parse(JSON.stringify(this.ruleForm));
             // model.platform = model.platform.toString();
             model.codes = [];
+
+            model.goodinfo = []
             let list = JSON.parse(JSON.stringify(this.sitem));
             list.forEach(e => {
-              model.codes.push(e.spuCode);
+              model.goodinfo.push({
+                spuCode:e.spuCode,
+                market_url:this.ruleForm.market_url
+              });
             });
+
+            delete model.market_url
+            delete model.codes
+
             let { code, data, message } = await asyncRequest.online_add(model);
             this.loading = false;
             if (code === 0) {

src/views/goodStore/dealGoodsPool/columns.js

@@ -59,12 +59,24 @@ const listCol = [
     prop: "brand_name",
     label: "品牌",
   },
+  {
+    prop: "is_basic",
+    label: "基础商品库订单状态",
+    _slot_: "is_basic",
+    width: "140px",
+  },
   {
     prop: "good_type",
     label: "是否定制",
     _slot_: "good_type",
     width: "70px",
   },
+  {
+    prop: "is_online",
+    label: "是否上线到商品库",
+    _slot_: "is_online",
+    width: "120px",
+  },
   {
     prop: "companyNo",
     label: "业务公司编号",
@@ -75,7 +87,15 @@ const listCol = [
     label: "业务公司名称",
     width: "110px",
   },
-
+  {
+    prop: 'order_creater',
+    label: '创建人'
+  },
+  {
+    prop: 'order_creater',
+    label: '创建人部门',
+    minWidth: "0px"
+  },
 
   {
     prop: "addtime",

src/views/goodStore/dealGoodsPool/index.vue

@@ -116,6 +116,30 @@ searchList();
           "></el-tag>
       </template>
 
+      <template #is_basic>
+        {{}}
+      </template>
+
+
+
+      <template #is_online="{ scope }">
+        <el-tag :size="tablebtnSize" :type="scope.row.is_online == '0' ? 'warning' : ''" v-text="(options1.find((item) => item.id == scope.row.is_online) || {})
+            .name || '--'
+          "></el-tag>
+      </template>
+
+      <template #is_basic="{ scope }">
+        <el-tag
+          :size="tablebtnSize"
+          :type="
+            (statusList.find((item) => item.code == scope.row.is_basic) || {}).type || '--'
+          "
+          v-text="
+            (statusList.find((item) => item.code == scope.row.is_basic) || {}).name || '未入商品库'
+          "
+        ></el-tag>
+      </template>
+
       <template #operation="{ scope }">
         <el-tooltip v-if="powers.some((i) => i == '007')" effect="dark" content="详情" placement="top">
           <i class="el-icon-view tb-icon" @click="show_view(scope.row)"></i>
@@ -187,7 +211,53 @@ export default {
           name: "成本修改待审核"
         }
       ],
-
+      statuses: [
+        {
+          code: "0",
+          name: "新建待审核",
+          type: ""
+        },
+        {
+          code: "1",
+          name: "审核通过",
+          type: "success"
+        },
+        {
+          code: "2",
+          name: "基础修改待审核",
+          type: ""
+        },
+        {
+          code: "3",
+          name: "成本修改待审核",
+          type: ""
+        },
+        {
+          code: "4",
+          name: "基础修改驳回",
+          type: "danger"
+        },
+        {
+          code: "5",
+          name: "成本修改驳回",
+          type: "danger"
+        },
+        {
+          code: "6",
+          name: "新建审核驳回",
+          type: "danger"
+        },
+        {
+          code: "7",
+          name: "复制商品待编辑",
+          type: "info"
+        },
+        {
+          code: "8",
+          name: "竞价商品待编辑",
+          type: "info"
+        }
+      ],
       options1: options1,
       loading: false,
       parmValue: {
@@ -241,7 +311,6 @@ export default {
 
       this.$confirm("是否确认将选中商品添加至商品成本").then(async () => {
         const codes = this.changeList.map(({ spuCode }) => spuCode);
-
         const { data, code, message } = await asyncRequest.goodupbaseiczx({ codes })
 
         if (code === 0) {

src/views/goodStore/goodsCost/columns.js

@@ -836,25 +836,31 @@ const ladderColumns = [
     prop: 'demo_fee',
     label: '打样费',
     _slot_: 'demo_fee',
-    span: 6
+    span: 5
   },
   {
     prop: 'open_fee',
     label: '开模费',
     _slot_: 'open_fee',
-    span: 6
+    span: 5
   },
   {
     prop: 'sample_fee',
     _slot_: 'sample_fee',
     label: '调样费',
-    span: 6
+    span: 5
   },
   {
     prop: 'market_price',
     _slot_: 'market_price',
     label: '市场价',
-    span: 6
+    span: 5
+  },
+  {
+    prop: 'cgd_price',
+    _slot_: 'cgd_price',
+    label: '采购价',
+    span: 4
   },
   {
     prop: 'data_table',

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

@@ -110,6 +110,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16" style="text-align: right">
+                <el-form-item label="京东链接" prop="market_url">
+                  <el-input
+                    v-model="ruleForm.market_url"
+                    :disabled="false"
+                    placeholder="京东比价链接"
+                    maxlength="200"
+                  />
+                </el-form-item>
+
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
                     v-model="ruleForm.online_reason"
@@ -158,6 +167,7 @@ export default {
       isYZPlatform: false,
       showModelThis: this.showModel,
       ruleForm: {
+        market_url:"",
         platform_type: "",
         platform: "", // string	平台id
         is_fixed: "", // string 定价模式
@@ -178,6 +188,11 @@ export default {
             trigger: "change"
           }
         ],
+        market_url:[{
+          required: true,
+          message: "请选择京东链接",
+          trigger: "change"
+      }],
         is_fixed: [
           {
             required: true,
@@ -256,6 +271,7 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
+            market_url:"",
             platform_type: "",
             platform: "", // string	平台id
             online_reason: "", // string	上线原因
@@ -284,9 +300,17 @@ export default {
             // model.platform = model.platform.toString();
             model.codes = [];
             const list = JSON.parse(JSON.stringify(this.sitem));
+            model.goodinfo = []
             list.forEach(e => {
-              model.codes.push(e.spuCode);
+              model.goodinfo.push({
+                spuCode: e.spuCode,
+                market_url: this.ruleForm.market_url
+              });
             });
+
+            delete model.market_url
+            delete model.codes;
+
             const { code, data, message } = await asyncRequest.online_add(
               model
             );

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

@@ -940,7 +940,7 @@
       </el-col>
       <el-col :span="23" class="dmain">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="打样费" prop="demo_fee" label-width="75px">
               <digital-input
                 :values="ruleForm.demo_fee"
@@ -958,7 +958,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="开模费" prop="open_fee" label-width="75px">
               <digital-input
                 :values="ruleForm.open_fee"
@@ -976,7 +976,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="调样费" prop="sample_fee" label-width="75px">
               <digital-input
                 :values="ruleForm.sample_fee"
@@ -994,7 +994,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <el-form-item label="市场价" prop="market_price" label-width="75px">
               <digital-input
                 :values="ruleForm.market_price"
@@ -1013,6 +1013,25 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="4">
+            <el-form-item label="采购价">
+              <digital-input
+                :values="sitem.cgd_price"
+                :placeholder="'采购价'"
+                :min="0"
+                :name="'sitem.cgd_price'"
+                :disabled="true"
+                :max="100000000000"
+                :position="'right'"
+                :precision="2"
+                :size="'mini'"
+                :controls="false"
+                :append="'元'"
+                @reschange="number_change($event, 'cgd_price')"
+              />
+            </el-form-item>
+          </el-col>
+
           <!-- <el-col :span="6">
             <el-form-item label="启用阶梯" prop="is_step">
               <el-select

src/views/goodStore/goodsCost/detail.vue

@@ -185,6 +185,7 @@
                   <template slot="open_fee">{{ sitem.open_fee }}元</template>
                   <template slot="sample_fee">{{ sitem.sample_fee }}元</template>
                   <template slot="market_price">{{ sitem.market_price }}元</template>
+                  <template slot="cgd_price">{{ sitem.cgd_price }}元</template>
                   <template slot="data_table">
                     <el-table size="mini" :data="sitem.nakelist">
                       <el-table-column prop="min_num" label="起订量(>=)" />

src/views/goodStore/goodsOnline/ShowDataTableColumns.js

@@ -220,7 +220,18 @@ const public_listCol = [
     prop: 'good_type',
     label: '是否定制',
     _slot_: 'good_type',
-    span: 24
+    span: 4
+  },
+  {
+    prop: 'sale_price',
+    label: '销售单价',
+    span: 4
+  },
+  {
+    prop: 'market_url',
+    label: '京东链接',
+    _slot_: 'market_url',
+    span: 16
   },
   {
     prop: 'after_sales',

src/views/goodStore/goodsOnline/add.vue

@@ -121,7 +121,14 @@
               />
               <el-table-column prop="companyNo" label="业务公司编号" width="110" show-overflow-tooltip />
               <el-table-column prop="company" label="业务公司名称" width="110" show-overflow-tooltip />
-              <el-table-column fixed="right">
+
+              <el-table-column label="京东链接" min-width="120px">
+                <template slot-scope="scope">
+                  <el-input size="mini" placeholder="京东比价链接" :value="tableData[scope.$index].market_url" @input="changeMarketUrlByIndex($event,scope.$index)" />
+                </template>
+              </el-table-column>
+
+              <el-table-column fixed="right" width="70px">
                 <template slot="header" slot-scope="scope">
                   <span>操作</span>
                   <el-tooltip class="item" effect="dark" content="添加上线商品" placement="top">
@@ -264,6 +271,14 @@ export default {
         this.isNoble = null;
       }
     },
+    changeMarketUrlByIndex(market_url,index){
+      console.log(market_url)
+
+      this.$set(this.tableData,index,{
+        ...this.tableData[index],
+        market_url
+      })
+    },
     resultList(e) {
       this.showModel = false;
       let list = JSON.parse(JSON.stringify(e));
@@ -274,14 +289,8 @@ export default {
         isGoldPrice: String(is_gold_price)
       }));
 
-      const nobleIds = categoryIds.filter(
-        ({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1"
-      );
-
-      console.log(nobleIds, categoryIds);
-
-      this.isNoble =
-        nobleIds.length > 0 && categoryIds.length === nobleIds.length;
+      const nobleIds = categoryIds.filter(({ id, isGoldPrice }) => id === "6" && isGoldPrice === "1");
+      this.isNoble = nobleIds.length > 0 && categoryIds.length === nobleIds.length;
 
       list.forEach((e, ei) => {
         let index = oldList.findIndex(a => {
@@ -290,7 +299,10 @@ export default {
 
         if (index === -1) {
           let item = JSON.parse(JSON.stringify(list[ei]));
-          this.tableData.push(item);
+          this.tableData.push({
+            ...item,
+            market_url:""
+          });
         }
       });
     },
@@ -298,6 +310,16 @@ export default {
       this.ruleForm.online_remark = replaceTextWrapAndSpace(
         this.ruleForm.online_remark
       );
+
+      if(this.tableData.length > 0){
+        for(const tableItem of this.tableData){
+          if(!tableItem.market_url){
+            this.$message.warning("请填写京东比价链接")
+            return
+          }
+        }
+      }
+
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {
@@ -312,11 +334,15 @@ export default {
 
             this.loading = true;
             let model = JSON.parse(JSON.stringify(this.ruleForm));
+            model.goodinfo = []
             let list = JSON.parse(JSON.stringify(this.tableData));
             list.forEach(e => {
-              model.codes.push(e.spuCode);
+              model.goodinfo.push({
+                spuCode: e.spuCode,
+                market_url: e.market_url
+              })
             });
-            // model.platform = model.platform.toString();
+            delete model.codes;
             const { code, data, message } = await asyncRequest.add(model);
             this.loading = false;
             if (code === 0) {

src/views/goodStore/goodsOnline/detail.vue

@@ -112,6 +112,10 @@
                   />
                 </template>
 
+                <template slot="market_url">
+                 <el-button type="text" size="mini" @click="openMarkletUrl"> {{sitem.market_url}}</el-button>
+                </template>
+
                 <template slot="good_info_img">
                   <img
                     class="fl"
@@ -339,15 +343,17 @@
 import asyncRequest from "@/apis/service/goodStore/goodsOnline";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-import {
-  public_listCol,
-  purchase_listCol,
-  sale_listCol
-} from "./ShowDataTableColumns";
 import processRemarkTimeLine from "./components/process-remark-time-line";
 import { isArray } from "@/utils/validate";
 import onlineForm from "./components/online-form";
 import FixedPriceForm from "./components/fixed-price-form.vue";
+import privateField from "@/mixins/privateField";
+
+import {
+  purchase_listCol,
+  public_listCol,
+  sale_listCol
+} from "./ShowDataTableColumns";
 
 import {
   options1,
@@ -359,7 +365,6 @@ import {
   options7,
   options8
 } from "./columns";
-import privateField from "@/mixins/privateField";
 export default {
   name: "goodsOnlineDetail",
   mixins: [resToken, privateField],
@@ -424,6 +429,9 @@ export default {
     this.initForm();
   },
   methods: {
+    openMarkletUrl(){
+      window.open(this.sitem.market_url)
+    },
     async initForm() {
       const { id, type } = this.$route.query;
       this.queryId = id;