build

src/views/goodStore/dealGoodsPool/addEdit.vue

@@ -17,7 +17,7 @@
       <el-row :gutter="10">
         <el-col :span="24" style="padding: 0 0 15px 0">
           <el-table
-            :data="sitem"
+            :data="list"
             stripe
             :size="'mini'"
             border
@@ -60,6 +60,11 @@
             <el-table-column prop="supplier_name" label="供应商名称" width="110" show-overflow-tooltip />
             <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 prop="market_url" label="京东链接" width="200" fixed="right" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="mini" placeholder="京东比价链接" :value="list[scope.$index].market_url" @input="changeMarketUrl($event,scope.$index)" />
+              </template>
+            </el-table-column>
           </el-table>
         </el-col>
         <el-col :span="24">
@@ -119,13 +124,13 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16" style="text-align: right">
-                <el-form-item label="京东链接" prop="market_url">
+                <!-- <el-form-item label="京东链接" prop="market_url">
                   <el-input
                     :disabled="false"
                     placeholder="京东比价链接"
                     v-model="ruleForm.market_url"
                   />
-                </el-form-item>
+                </el-form-item> -->
 
                 <el-form-item label="上线备注" prop="online_remark">
                   <el-input
@@ -163,6 +168,7 @@ export default {
   mixins: [resToken],
   data() {
     return {
+      list:[],
       loading: false,
       isYZPlatform:false,
       showModelThis: this.showModel,
@@ -235,6 +241,7 @@ export default {
       this.showModelThis = val;
       if (val) {
         this.initForm();
+        this.list = JSON.parse(JSON.stringify(this.sitem))
       }
     },
     showModelThis(val) {
@@ -259,6 +266,12 @@ export default {
     }
   },
   methods: {
+    changeMarketUrl(market_url,index){
+      this.$set(this.list,index,{
+        ...this.list[index],
+        market_url
+      })
+    },
     isFiexed() {
       return (
         !this.isYZPlatform &&
@@ -307,6 +320,15 @@ export default {
         return
       }
 
+      if(this.list.length > 0){
+        for(const item of this.list){
+          if(!item.market_url){
+            this.$message.warning("请填入京东比价链接")
+            return
+          }
+        }
+      }
+
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {
@@ -316,15 +338,14 @@ export default {
             model.codes = [];
 
             model.goodinfo = []
-            let list = JSON.parse(JSON.stringify(this.sitem));
+            let list = JSON.parse(JSON.stringify(this.list));
             list.forEach(e => {
               model.goodinfo.push({
                 spuCode:e.spuCode,
-                market_url:this.ruleForm.market_url
+                market_url:e.market_url
               });
             });
 
-            delete model.market_url
             delete model.codes
 
             let { code, data, message } = await asyncRequest.online_add(model);

src/views/goodStore/dealGoodsPool/columns.js

@@ -61,7 +61,7 @@ const listCol = [
   },
   {
     prop: "is_basic",
-    label: "基础商品库订单状态",
+    label: "商品成本管理状态",
     _slot_: "is_basic",
     width: "140px",
   },
@@ -79,22 +79,23 @@ const listCol = [
   },
   {
     prop: "companyNo",
-    label: "业务公司编号",
-    width: "110px",
-  },
-  {
-    prop: "companyName",
-    label: "业务公司名称",
-    width: "110px",
+    label: "业务公司",
+    width: "220px",
+    _slot_: 'company'
   },
+  // {
+  //   prop: "companyName",
+  //   label: "业务公司名称",
+  //   width: "110px",
+  // },
   {
     prop: 'order_creater',
     label: '创建人'
   },
   {
-    prop: 'order_creater',
+    prop: 'order_creater_depart',
     label: '创建人部门',
-    minWidth: "0px"
+    minWidth: "100px"
   },
 
   {

src/views/goodStore/dealGoodsPool/index.vue

@@ -131,15 +131,28 @@ searchList();
       <template #is_basic="{ scope }">
         <el-tag
           :size="tablebtnSize"
-          :type="
-            (statusList.find((item) => item.code == scope.row.is_basic) || {}).type || '--'
-          "
+          :type="scope.row.is_basic === null ? 'warning' : ''"
           v-text="
-            (statusList.find((item) => item.code == scope.row.is_basic) || {}).name || '未入商品库'
+            (statuses.find((item) => item.code == scope.row.is_basic) || {}).name || '未添加商品库'
           "
         ></el-tag>
       </template>
 
+      <template #company="{ scope }">
+        <div style="display:flex; align-items:center">
+          <el-tooltip
+            placement="top"
+            :content="'业务公司编号:' + scope.row.companyNo"
+          >
+            <i
+              class="el-icon-view"
+              style="cursor:pointer;margin-right:5px;font-size:16px"
+            />
+        </el-tooltip>
+          {{scope.row.companyName}}
+      </div>
+      </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>

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

@@ -17,7 +17,7 @@
       <el-row :gutter="10">
         <el-col :span="24" style="padding: 0 0 15px 0">
           <el-table
-            :data="sitem"
+            :data="list"
             stripe
             :size="'mini'"
             border
@@ -60,6 +60,11 @@
             <el-table-column prop="supplier_name" label="供应商名称" width="110" show-overflow-tooltip />
             <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 prop="market_url" label="京东链接" width="200" fixed="right" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-input size="mini" placeholder="京东比价链接" :value="list[scope.$index].market_url" @input="changeMarketUrl($event,scope.$index)" />
+              </template>
+            </el-table-column>
           </el-table>
         </el-col>
         <el-col :span="24">
@@ -110,14 +115,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="16" style="text-align: right">
-                <el-form-item label="京东链接" prop="market_url">
+                <!-- <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> -->
 
                 <el-form-item label="上线原因" prop="online_reason">
                   <el-input
@@ -167,7 +172,7 @@ export default {
       isYZPlatform: false,
       showModelThis: this.showModel,
       ruleForm: {
-        market_url:"",
+        list:[],
         platform_type: "",
         platform: "", // string	平台id
         is_fixed: "", // string 定价模式
@@ -188,11 +193,6 @@ export default {
             trigger: "change"
           }
         ],
-        market_url:[{
-          required: true,
-          message: "请选择京东链接",
-          trigger: "change"
-      }],
         is_fixed: [
           {
             required: true,
@@ -239,6 +239,9 @@ export default {
       ];
     }
   },
+  // mounted(){
+    
+  // },
   watch: {
     isFiexed() {
       if (this.ruleForm.is_fixed === "0") {
@@ -249,6 +252,7 @@ export default {
       this.showModelThis = val;
       if (val) {
         this.initForm();
+        this.list = JSON.parse(JSON.stringify(this.sitem));
       }
     },
     showModelThis(val) {
@@ -258,6 +262,12 @@ export default {
     }
   },
   methods: {
+    changeMarketUrl(market_url,index){
+      this.$set(this.list,index,{
+        ...this.list[index],
+        market_url
+      })
+    },
     async initForm() {
       this.loading = true;
       this.rulesThis = this.rules;
@@ -271,7 +281,6 @@ export default {
           this.$refs.ruleForm.resetFields();
           this.$refs.ruleForm.clearValidate();
           this.ruleForm = {
-            market_url:"",
             platform_type: "",
             platform: "", // string	平台id
             online_reason: "", // string	上线原因
@@ -291,6 +300,16 @@ export default {
       this.ruleForm.online_remark = replaceTextWrapAndSpace(
         this.ruleForm.online_remark
       );
+
+      if(this.list.length > 0){
+        for(const item of this.list){
+          if(!item.market_url){
+            this.$message.warning("请填入京东比价链接")
+            return
+          }
+        }
+      }
+
       await this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           if (!this.loading) {
@@ -299,16 +318,15 @@ export default {
 
             // model.platform = model.platform.toString();
             model.codes = [];
-            const list = JSON.parse(JSON.stringify(this.sitem));
+            const list = JSON.parse(JSON.stringify(this.list));
             model.goodinfo = []
             list.forEach(e => {
               model.goodinfo.push({
                 spuCode: e.spuCode,
-                market_url: this.ruleForm.market_url
+                market_url:e.market_url
               });
             });
 
-            delete model.market_url
             delete model.codes;
 
             const { code, data, message } = await asyncRequest.online_add(

src/views/goodStore/goodsCost/detail.vue

@@ -255,32 +255,33 @@
   </div>
 </template>
 <script>
+import ShowDataTable from "@/views/standingBook/components/detail-data-table.vue";
 import asyncRequest from "@/apis/service/goodStore/goodsCost";
+import ProductModal from "./components/productModal.vue";
+import privateField from "@/mixins/privateField";
+import costForm from "./components/costDetail";
+import baseForm from "./components/baseForm";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
-import baseForm from "./components/baseForm";
-import costForm from "./components/costDetail";
-import ShowDataTable from "@/views/standingBook/components/detail-data-table.vue";
+
 import {
-  basicColumns,
   packingColumns,
-  sendColumns,
-  imageColumns,
   ladderColumns,
+  basicColumns,
+  imageColumns,
+  sendColumns,
   options3,
   options6
 } from "./columns";
-import privateField from "@/mixins/privateField";
-import ProductModal from "./components/productModal.vue";
 
 export default {
   name: "goodsCostDetail",
   mixins: [resToken, privateField],
   components: {
     ShowDataTable,
+    ProductModal,
     baseForm,
-    costForm,
-    ProductModal
+    costForm
   },
   computed: {
     ...mapGetters([