Merge branch 'test' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into test

src/components/Breadcrumb/index.vue

@@ -1,8 +1,10 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
+      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
-        <span v-if="item.redirect==='noredirect'||index==levelList.length-1" class="no-redirect">{{ item.meta.title }}</span>
+        <span v-if="item.redirect === 'noredirect' || index == levelList.length - 1" class="no-redirect">{{
+          item.meta.title
+        }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
@@ -37,7 +39,7 @@ export default {
       const first = matched[0]
 
       if (!this.isDashboard(first)) {
-        matched = [{ path: '/data_statistics', meta: { title: '首页' }}].concat(matched)
+        matched = [{ path: '/', meta: { title: '首页' } }].concat(matched)
       }
 
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
@@ -73,6 +75,7 @@ export default {
   font-size: 14px;
   line-height: 50px;
   margin-left: 8px;
+
   .no-redirect {
     color: #97a8be;
     cursor: text;

src/views/home/home.vue

@@ -91,7 +91,7 @@
               <div class="line_item">
                 <div class="line_item_top">
                   <div>销售金额（元）</div>
-                  <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div>
+                  <!-- <div class="t">{{ formatDecimal(tradeSale.totalSaleAmount || 0) }}</div> -->
                 </div>
                 <div class="line_gropress">
                   <div class="gropress l"
@@ -112,7 +112,7 @@
               <div class="line_item">
                 <div class="line_item_top">
                   <div>充值金额（元）</div>
-                  <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div>
+                  <!-- <div class="t">{{ formatDecimal(tradeSale.totalVipAmount || 0) }}</div> -->
                 </div>
                 <div class="line_gropress">
                   <div class="gropress l"
@@ -1118,7 +1118,6 @@ export default {
             width: 200px;
             color: #333;
             display: flex;
-            justify-content: space-between;
 
             &:not(:first-child) {
               margin-top: 20px;
@@ -1251,6 +1250,7 @@ export default {
           display: flex;
           align-items: center;
           color: #333;
+          font-size: 14px;
 
           .icon {
             font-size: 12px;

src/views/invoicing/components/addConsTakin.vue

@@ -133,10 +133,13 @@ export default {
                         this.form.lpNum = this.profitNumber
                         this.form.balance = this.form.stockNumber
                         this.loading = true
+                        this.form.conInfoId = this.form.id
+                        delete this.form['id'];
+                        console.log(this.form)
                         let res = await tbConCheck(this.form)
                         console.log(this.form);
                         this.$emit('success', res)
-                        // this.dialogVisible = false
+                        this.dialogVisible = false
                         this.loading = false
                         this.$notify({
                             title: '注意',
@@ -153,7 +156,7 @@ export default {
         },
         async show(obj) {
             let res = await hasPermission('允许耗材盘点');
-            if ( !res) { return; }
+            if (!res) { return; }
             this.form.remark = ''
             this.form.stocktakinNum = 0
             this.form.lpNum = 0
@@ -162,9 +165,9 @@ export default {
             this.form = Object.assign(this.form, obj)
             this.dialogVisible = true
             this.form.conInfoId = obj.consId
-            this.form.stockNumber = obj.balance * 1
+            this.form.stockNumber = obj.stockNumber
+            this.form.balance = obj.stockNumber
             this.form.price == null ? 0 : this.form.price
-
             this.searhForm.skuId = obj.productId
             this.searhForm.productId = obj.consId
             this.getTableData()