添加经营报表功能

src/components/Tooltip/index.vue

@@ -0,0 +1,37 @@
+<template>
+    <el-tooltip effect="dark" placement="top">
+        <div slot="content" style="max-width: 200px">{{ content }}</div>
+        <span class="content-tooltip">{{ content }}</span>
+    </el-tooltip>
+</template>
+
+<script>
+const padding = 15 // tag's padding
+
+export default {
+  name: 'scrollPane',
+  props: {
+      content: {
+          required: true,
+          type: String
+      },
+
+  },
+  data () {
+    return {
+    }
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.content-tooltip {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    max-width: 100%;
+    display: inline-block;
+}
+</style>

src/views/businessManager/shopManager/shopList.vue

@@ -64,15 +64,19 @@
           </el-table-column>
           <el-table-column align='center'
                            prop="marketPrice"
-                           label="商品价格">
+                           label="商品价格(元)">
           </el-table-column>
           <el-table-column align='center'
                            prop="groupPurchasePrice"
-                           label="商品团购价">
+                           label="商品团购价(元)">
           </el-table-column>
           <el-table-column align='center'
                            prop="discountPrice"
-                           label="商品采购价">
+                           label="商品采购价1(元)">
+          </el-table-column>
+          <el-table-column align='center'
+                           prop="agreeCostPrice"
+                           label="商品采购价2(元)">
           </el-table-column>
           <el-table-column align='center'
                            cell-style="padding: 0"
@@ -87,9 +91,10 @@
           <el-table-column align='center'
                            label="商品明细">
             <template slot-scope="scope">
-              <div class="shopDesc">
+              <!-- <div class="shopDesc">
                 {{ scope.row.desc }}
-              </div>
+              </div> -->
+              <Tooltip :content="scope.row.desc" />
             </template>
           </el-table-column>
           <el-table-column align='center'
@@ -128,8 +133,9 @@
 import pagination from '@/components/Pagination/index'
 import { goodsQuery, goodsUpdate, goodsDelete } from '@/api/businessManager'
 import store from '@/store'
+import Tooltip from '@/components/Tooltip/index'
 export default {
-  components: { pagination },
+  components: { pagination, Tooltip },
   name: 'shopList',
   data () {
     return {

src/views/businessManager/shopManager/shopOperation.vue

@@ -61,12 +61,18 @@
                     @mousewheel.native.prevent
                     v-model.trim="form.groupPurchasePrice"></el-input>
         </el-form-item>
-        <el-form-item label="商品采购价"
+        <el-form-item label="商品采购价1"
                       prop="discountPrice">
           <el-input type="number"
                     @mousewheel.native.prevent
                     v-model.trim="form.discountPrice"></el-input>
         </el-form-item>
+        <el-form-item label="商品采购价2"
+                      prop="agreeCostPrice">
+          <el-input type="number"
+                    @mousewheel.native.prevent
+                    v-model.trim="form.agreeCostPrice"></el-input>
+        </el-form-item>
         <el-form-item label="商品图片"
                       prop="image">
           <el-upload class="avatar-uploader"
@@ -112,6 +118,17 @@ let validPrice = (rule, value, callback) => {
     callback()
   }
 }
+let validPrice2 = (rule, value, callback) => {
+  if (typeof value == 'string') {
+    callback(new Error('请输入金额'))
+  } else if (value < 0) {
+    callback(new Error('输入金额必须大于或等于0'))
+  } else if (value >= 100000) {
+    callback(new Error('输入金额必须小于100000'))
+  } else {
+    callback()
+  }
+}
 export default {
   name: 'shopOperation',
   data () {
@@ -140,6 +157,7 @@ export default {
         marketPrice: null,
         groupPurchasePrice: null,
         discountPrice: null,
+        agreeCostPrice: null,
         image: null,
         desc: null
       },
@@ -155,6 +173,7 @@ export default {
         marketPrice: [{ required: true, validator: validPrice, trigger: 'blur' }],
         groupPurchasePrice: [{ required: true, validator: validPrice, trigger: 'blur' }],
         discountPrice: [{ required: true, validator: validPrice, trigger: 'blur' }],
+        agreeCostPrice: [{ validator: validPrice2, trigger: 'blur' }],
         // marketPrice: [{ required: true, message: '请输入商品价格', trigger: 'blur' }],
         // groupPurchasePrice: [{ required: true, message: '请输入商品团购价', trigger: 'blur' }],
         // discountPrice: [{ required: true, message: '请输入商品采购价', trigger: 'blur' }],
@@ -269,6 +288,7 @@ export default {
               marketPrice: result.marketPrice,
               groupPurchasePrice: result.groupPurchasePrice,
               discountPrice: result.discountPrice,
+              agreeCostPrice: result.agreeCostPrice,
               image: result.image,
               desc: result.desc
             }