aliyun0758874076 1 gadu atpakaļ
vecāks
revīzija
3933db2004
2 mainītis faili ar 54 papildinājumiem un 6 dzēšanām
  1. 52 4
      src/views/commodity/commoditySystem/addComponent.vue
  2. 2 2
      vue.config.js

+ 52 - 4
src/views/commodity/commoditySystem/addComponent.vue

@@ -84,7 +84,7 @@
           </el-table-column>
           <el-table-column label="赠送代金券">
             <template slot-scope="scope">
-             <el-input-number
+              <el-input-number
                 v-model="scope.row.presenterVoucher" :controls="false" :max="scope.row.price" :min="0"
                 :precision="2"
                 :step="0.01" style="width: auto;"
@@ -157,7 +157,11 @@
         <el-table :data="skuList" style="width: 100%" :header-cell-style="{ background: '#EEF3FF', color: '#333333' }">
           <el-table-column v-for="(skuAttr, index) in skuAttrName" :key="index" :label="skuAttr.skuName">
             <template slot-scope="scope">
-              {{ scope.row.skuAttrCodeDTOList && scope.row.skuAttrCodeDTOList[index] | attrValueFilter(form.skuAttrList) }}
+              <el-tooltip class="item" effect="dark" :content="scope.row.skuAttrCodeDTOList && scope.row.skuAttrCodeDTOList[index] | attrValueFilter(form.skuAttrList)" placement="top-start">
+                <div class="tipsView">
+                  {{ scope.row.skuAttrCodeDTOList && scope.row.skuAttrCodeDTOList[index] | attrValueFilter(form.skuAttrList) }}
+                </div>
+              </el-tooltip>
             </template>
           </el-table-column>
           <el-table-column label="售价">
@@ -177,6 +181,42 @@
               />
             </template>
           </el-table-column>
+          <el-table-column label="厂家底价">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.manufacturerBasePrice" :controls="false" :max="999999999" :min="0"
+                :precision="2"
+                :step="0.01" style="width: auto;"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="厂家指导价">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.manufacturerGuidePrice" :controls="false" :max="999999999" :min="0"
+                :precision="2"
+                :step="0.01" style="width: auto;"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="平台底价">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.platformBasePrice" :controls="false" :max="999999999" :min="0"
+                :precision="2"
+                :step="0.01" style="width: auto;"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="平台指导价">
+            <template slot-scope="scope">
+              <el-input-number
+                v-model="scope.row.platformGuidePrice" :controls="false" :max="999999999" :min="0"
+                :precision="2"
+                :step="0.01" style="width: auto;"
+              />
+            </template>
+          </el-table-column>
           <el-table-column label="库存">
             <template slot-scope="scope">
               <el-input-number
@@ -325,7 +365,7 @@ export default {
       },
       fileList: [],
       //  记录当前是哪里增加或者删除的
-      idx:null
+      idx: null
     }
   },
   computed: {
@@ -599,7 +639,15 @@ export default {
 
 <style lang="scss" scoped>
 @import url("../../../styles/elDialog.scss");
-
+.tipsView {
+  width: 110px;
+  height: 46px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /*行数*/
+}
 .style-information-component {
 	width: 100%;
 	min-height: 300px;

+ 2 - 2
vue.config.js

@@ -40,8 +40,8 @@ module.exports = {
     },
     proxy: {
       '/businessapi': {
-        // target: 'http://192.168.0.91:9104',
-        target: 'https://nsbusinessapi.tuanfengkeji.cn',
+        target: 'http://192.168.0.91:9104',
+        // target: 'https://nsbusinessapi.tuanfengkeji.cn',
         changeOrigin: true,
         pathRewrite: {
           '^/businessapi': ''