Merge branch 'master' of http://git.cc-lotus.info/pointToNetwork/web-admin

src/views/platmanag/goods/index.vue

@@ -32,7 +32,13 @@
             @delete="toDelete"
             @spec="toSpec"
             @copy="toCopy"
-          ></data-table>
+          >
+            <template #source="{ row }">
+              <span style="color: blue" @click="toUrl(row.url)">
+                {{ row.source }}
+              </span>
+            </template>
+          </data-table>
         </el-col>
       </el-row>
     </span>
@@ -128,6 +134,7 @@ export default {
         { label: '商品分类', model: 'tags', format: (i) => this.getTags(i), showTip: false },
         { label: '活动标签', model: 'act_tags', format: (i) => this.getAct_tags(i) },
         { label: '商品状态', model: 'status', format: (i) => this.getStatus(i) },
+        { label: '供应商', model: 'source', custom: true },
         { label: '排序', model: 'sort' },
       ],
       opera: [
@@ -217,6 +224,10 @@ export default {
       }
       this.loadings = false;
     },
+    toUrl(url) {
+      if (url) window.open(url, '_blank');
+      else this.$message.error('该商品还未添加来源网址，无法跳转');
+    },
     // 去编辑
     async toEdit({ data }) {
       const res = await this.fetch(data._id);

src/views/platmanag/goods/parts/search-1.vue

@@ -42,6 +42,11 @@
               ></el-cascader>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="供应商" prop="source">
+              <el-input v-model="form.source" placeholder="请输入供应商" size="small"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" class="btn">
             <el-button type="primary" icon="el-icon-search" size="mini" @click="onSubmit('form')">搜索</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="toReset('form')">重置</el-button>

src/views/selfShop/goods/index.vue

@@ -38,7 +38,13 @@
             @delete="toDelete"
             @spec="toSpec"
             @copy="toCopy"
-          ></data-table>
+          >
+            <template #source="{ row }">
+              <span style="color: blue" @click="toUrl(row.url)">
+                {{ row.source }}
+              </span>
+            </template>
+          </data-table>
         </el-col>
       </el-row>
     </span>
@@ -122,6 +128,7 @@ export default {
         { label: '商品分类', model: 'tags', format: (i) => this.getTags(i) },
         { label: '活动标签', model: 'act_tags', format: (i) => this.getAct_tags(i) },
         { label: '商品状态', model: 'status', format: (i) => this.getStatus(i) },
+        { label: '供应商', model: 'source', custom: true },
         { label: '排序', model: 'sort' },
       ],
       opera: [
@@ -138,6 +145,7 @@ export default {
         { label: '规格名称', model: 'spec_name' },
         { label: '商品状态', model: 'status', type: 'select' },
         { label: '商品分类', model: 'tags', custom: true },
+        { label: '供应商', model: 'source' },
       ],
       searchInfo: {},
       list: [],
@@ -212,6 +220,10 @@ export default {
       }
       this.loadings = false;
     },
+    toUrl(url) {
+      if (url) window.open(url, '_blank');
+      else this.$message.error('该商品还未添加来源网址，无法跳转');
+    },
     // 去编辑
     async toEdit({ data }) {
       const res = await this.fetch(data._id);