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

src/App.vue

@@ -131,4 +131,13 @@ export default {
     }
   }
 }
+
+.image-slot {
+  width: 100%;
+  height: 100%;
+  background-color: #efefef;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 </style>

src/router/routers.js

@@ -51,7 +51,7 @@ export const constantRouterMap = [
         path: 'data_forms',
         component: (resolve) => require(['@/views/home/data_forms'], resolve),
         name: 'data_forms',
-        meta: { title: '数据报表' }
+        meta: { title: '销量统计' }
       },
       {
         path: 'data_tables',

src/views/home/data_forms.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="orderType" @tab-click="getTableData">
+    <!-- <el-tabs v-model="orderType" @tab-click="getTableData">
       <el-tab-pane label="收款" name="1"></el-tab-pane>
       <el-tab-pane label="销量" name="2"></el-tab-pane>
-    </el-tabs>
+    </el-tabs> -->
     <div class="head-container">
       <el-form :model="query" inline label-position="left">
         <template v-if="orderType == 2">
@@ -109,22 +109,22 @@
         </el-table-column>
       </el-table>
       <el-table :data="tableData.data" v-loading="tableData.loading" v-if="orderType == 2">
-        <el-table-column label="商品名称" prop="productName"></el-table-column>
-        <el-table-column label="商品分类" prop="cateName"></el-table-column>
+        <!-- <el-table-column label="商品分类" prop="cateName"></el-table-column>
         <el-table-column label="商品描述" prop="productSkuName"></el-table-column>
-        <el-table-column label="单价" prop="price"></el-table-column>
+        <el-table-column label="单价" prop="price"></el-table-column> -->
+        <el-table-column label="商品名称" prop="name"></el-table-column>
         <el-table-column label="销量" prop="salesNum"></el-table-column>
         <el-table-column label="退单量" prop="refNum"></el-table-column>
-        <el-table-column label="销售金额" prop="salesAmount">
-          <template v-slot="scope">
-            ￥{{ scope.row.salesAmount }}
-          </template>
-        </el-table-column>
         <el-table-column label="退款金额" prop="refAmount">
           <template v-slot="scope">
             ￥{{ scope.row.refAmount }}
           </template>
         </el-table-column>
+        <el-table-column label="销售金额" prop="salesAmount">
+          <template v-slot="scope">
+            ￥{{ scope.row.salesAmount }}
+          </template>
+        </el-table-column>
       </el-table>
     </div>
     <div class="head-container">
@@ -146,7 +146,7 @@ export default {
     return {
       timeValue: "",
       resetQuery: null,
-      orderType: "1",
+      orderType: "2",
       categorys: [],
       query: {
         createdAt: [],
@@ -169,7 +169,7 @@ export default {
     timeFilter(time) {
       return dayjs(time).format("YYYY-MM-DD HH:mm:ss");
     },
-    totalfilter(item,d) {
+    totalfilter(item, d) {
       let num = item + d
       return num.toFixed(2)
     }
@@ -362,9 +362,27 @@ export default {
 .collect_wrap {
   display: flex;
   gap: 14px;
+  justify-content: space-between;
+
+  .item:nth-child(1) {
+    background-image: url(../../assets/images/home/data_forms4.png);
+  }
+
+  .item:nth-child(2) {
+    background-image: url(../../assets/images/home/data_forms3.png);
+  }
+
+  .item:nth-child(3) {
+    background-image: url(../../assets/images/home/data_forms2.png);
+  }
+
+  .item:nth-child(4) {
+    background-image: url(../../assets/images/home/data_forms1.png);
+  }
 
   .item {
-    flex: 1;
+    background-size: 100% 100%;
+    width: 255px;
     display: flex;
     align-items: center;
     background-color: #f5f5f5;

src/views/home/home.vue

@@ -236,7 +236,7 @@
             <el-table-column label="金额" prop="salesAmount"></el-table-column>
           </el-table>
           <div class="head-container" style="padding-top: 20px;display: flex;justify-content: flex-end;">
-            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage"
+            <el-pagination :total="saleTableTotal" :page-size="saleTableSize" :current-page="saleTablePage + 1"
               @current-change="paginationChange" layout="total, prev, pager, next, jumper"></el-pagination>
           </div>
         </div>
@@ -767,7 +767,7 @@ export default {
       }
     },
     paginationChange(e) {
-      this.saleTablePage = e;
+      this.saleTablePage = e - 1;
       this.dateProduct();
     },
     // 获取销售额排行表格数据

src/views/invoicing/consumable/information.vue

@@ -50,7 +50,7 @@
         <div class="row">
           <el-select clearable v-model="query.sort" @change="getTableData" placeholder="排序">
             <el-option label="创建时间" value="createTime,desc" />
-            <el-option label="数量由低到高" value="balance,desc" />
+            <el-option label="数量由低到高" value="balance,asc" />
           </el-select>
         </div>
       </div>
@@ -151,16 +151,31 @@
     <el-dialog :title="variabilitytitle" :visible.sync="variabilityshow">
       <div class="head-container">
         <el-table ref="table" :data="stockData.data" v-loading="stockData.loading" row-key="id" height="450">
+          <!-- 共存前面 -->
           <el-table-column label="耗材名称" prop="conName" />
-          <el-table-column label="变动库存" prop="amount">
+          <el-table-column label="原有库存" prop="balance">
+            <template v-slot="scope">
+              <span>{{ scope.row.balance > 0 ? (scope.row.balance + (scope.row.bizType == '-' ?
+                scope.row.amount : -scope.row.amount)) : Number(scope.row.balance) + Number(scope.row.amount) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="变动后库存" prop="balance"></el-table-column>
+          <el-table-column label="库存变动数量" prop="amount">
             <template v-slot="scope">
               <span :class="{ red: scope.row.bizType == '-' }">{{ scope.row.bizType }}{{ scope.row.amount }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="现有库存" prop="balance" />
+          <el-table-column label="操作" prop="bizName" />
+          <!-- 减少数量 -->
+          <el-table-column v-if="variabilitytitle == '报损'" label="图片" prop="coverImg" />
+          <!-- 尾巴 -->
+          <el-table-column v-if="variabilitytitle != '消耗'" label="操作人" prop="operator" />
+          <el-table-column v-if="variabilitytitle != '消耗'" label="备注" prop="remark" />
+          <el-table-column label="操作时间" prop="createTime"></el-table-column>
+
+          <!-- <el-table-column label="现有库存" prop="balance" />
           <el-table-column label="业务说明" prop="bizName" />
-          <!-- <el-table-column label="商品信息" prop="productName"></el-table-column> -->
-          <el-table-column label="创建时间" prop="createTime"></el-table-column>
+          <el-table-column label="创建时间" prop="createTime"></el-table-column> -->
         </el-table>
       </div>
       <div class="head-container">
@@ -183,25 +198,31 @@
       <el-table ref="table" :data="tableData.data" v-loading="tableData.loading" row-key="id">
         <el-table-column label="耗材名称" prop="conName" style="width: 100px;">
           <template v-slot="scope">
-            <div v-if="scope.row.editNYD == 1">
-              <el-input v-model="scope.row.conName" placeholder="请输入内容" @blur="conNameClick(scope.row)"></el-input>
-            </div>
-            <span v-else>
+            <!-- <div v-if="scope.row.editNYD == 1">
+              <el-input v-model="scope.row.conName" placeholder="请输入内容"
+                @blur="conNameClick(scope.row)"></el-input>
+            </div> -->
+            <span>
               {{ scope.row.conName }}
             </span>
-            <i class="el-icon-edit" @click="scope.row.editNYD = 1"></i>
+            <!-- <i class="el-icon-edit" @click="scope.row.editNYD = 1"></i> -->
+            <i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
           </template>
         </el-table-column>
         <!-- <el-table-column label="分类名称" prop="conTypeName"></el-table-column> -->
         <el-table-column label="单位" prop="conUnit">
           <template v-slot="scope">
-            <div v-if="scope.row.editNYD == 2">
+            <!-- <div v-if="scope.row.editNYD == 2">
               <el-input v-model="scope.row.conUnit" placeholder="请输入内容" @blur="conNameClick(scope.row)"></el-input>
             </div>
             <span v-else>
               {{ scope.row.conUnit }}
             </span>
-            <i class="el-icon-edit" @click="scope.row.editNYD = 2"></i>
+            <i class="el-icon-edit" @click="scope.row.editNYD = 2"></i> -->
+            <span>
+              {{ scope.row.conUnit }}
+            </span>
+            <i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
           </template>
 
         </el-table-column>
@@ -250,13 +271,18 @@
         </el-table-column>
         <el-table-column label="预警值" prop="conWarning">
           <template v-slot="scope">
-            <div v-if="scope.row.editNYD == 3">
+            <!-- <div v-if="scope.row.editNYD == 3">
               <el-input v-model="scope.row.conWarning" placeholder="请输入内容" @blur="conNameClick(scope.row)"></el-input>
             </div>
             <span v-else>
               {{ scope.row.conWarning }}
             </span>
-            <i class="el-icon-edit" @click="scope.row.editNYD = 3"></i>
+            <i class="el-icon-edit" @click="scope.row.editNYD = 3"></i> -->
+            <span>
+              {{ scope.row.conWarning }}
+            </span>
+            <i class="el-icon-edit" @click="editorHandle(scope.row)"></i>
+
           </template>
         </el-table-column>
         <el-table-column label="状态" prop="status">
@@ -269,7 +295,7 @@
         <el-table-column label="操作" width="250" fixed="right">
           <template v-slot="scope">
             <el-button type="text" @click="editorHandle(scope.row)">编辑</el-button>
-            <el-button type="text" @click="clicksee(scope.row)" style="margin-left: 10px !important">耗材记录</el-button>
+            <!-- <el-button type="text" @click="clicksee(scope.row)" style="margin-left: 10px !important">耗材记录</el-button> -->
             <el-button type="text" size="mini" style="margin-left: 10px !important"
               @click="$refs.AddConsTakin.show(scope.row)">耗材盘点</el-button>
             <!-- <el-button style="margin-left: 10px !important" type="text" @click="lookDetail(scope.row)">查看详情</el-button> -->
@@ -414,9 +440,9 @@
             placeholder="请输入耗材信息代码"
           ></el-input>
         </el-form-item> -->
-          <el-form-item label="耗材价格">
+          <!-- <el-form-item label="耗材价格">
             <el-input v-model="ruleForm.price" placeholder="请输入耗材价格"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="预警值">
             <el-input v-model="ruleForm.conWarning" placeholder="请输入耗材预警值"></el-input>
           </el-form-item>
@@ -1104,7 +1130,7 @@ export default {
           // consId: this.consRecordItem.consId,
           // conName: this.consRecordItem.conName,
           shopId: localStorage.getItem("shopId"),
-          sort:'createTime,desc'
+          sort: 'createTime,desc'
         });
         this.clickseetableData.loading = false;
         this.clickseetableData.data = res.content;

src/views/invoicing/operation_in.vue

@@ -2,7 +2,7 @@
     <div class="app-container">
         <div class="head-container">
             <el-form ref="queryForm" :model="queryForm" :rules="queryRules" label-position="left" label-width="80px">
-                <el-form-item label="入库内容">
+                <!-- <el-form-item label="入库内容">
                     <div class="shop_type_box">
                         <div class="item" v-for="item in inTabs" :key="item.value"
                             :class="{ active: inTabValue == item.value }" @click="tabChange(item.value, item.type)">
@@ -12,7 +12,7 @@
                             </div>
                         </div>
                     </div>
-                </el-form-item>
+                </el-form-item> -->
                 <!-- <el-form-item label="入库类型" v-if="inTabValue == 'goods'">
                     <div class="shop_type_box">
                         <div class="item" v-for="(item, index) in shopTypes" :key="index"
@@ -233,7 +233,7 @@ export default {
     data() {
         return {
             formatDecimal,
-            inTabValue: 'goods',
+            inTabValue: 'consumable',
             inTabs: [
                 {
                     label: '商品入库',
@@ -246,7 +246,7 @@ export default {
                     type: 'in'
                 }
             ],
-            shopTypesActive: 1,
+            shopTypesActive: 0,
             shopTypes: [
                 {
                     label: '供应商入库',
@@ -382,6 +382,7 @@ export default {
         },
         // 切换入库内容
         tabChange(value, type) {
+        console.log(value,type)
             this.shopTypesActive = type == 'in' ? 0 : 1
             this.inTabValue = value
             this.resetHandle()

src/views/product/add_shop.vue

@@ -734,6 +734,11 @@ export default {
             specInfo[index].suit = item.suit;
             specInfo[index].stockNumber = item.stockNumber;
             specInfo[index].isGrounding = item.isGrounding;
+            specInfo[index].salePrice = item.salePrice;
+            specInfo[index].memberPrice = item.memberPrice;
+            specInfo[index].costPrice = item.costPrice;
+            specInfo[index].originPrice = item.originPrice;
+            specInfo[index].firstShared = item.firstShared;
             return specInfo[index];
           });
           console.log(this.form.skuList);

src/views/product/components/stockHistory.vue

@@ -2,32 +2,189 @@
 <template>
     <el-dialog width="80%" :title="`${keysList[key]}统计`" :visible.sync="dialogVisible" @close="reset">
         <div class="head-container">
-            <el-table :data="tableData.data" v-loading="tableData.loading" height="400px">
-                <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
-                <el-table-column label="变动后库存">
-                    <template v-slot="scope">
-                        {{ scope.row.leftNumber }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="原有库存" prop="">
-                    <template v-slot="scope">
-                        {{ scope.row.leftNumber + scope.row.stockNumber }}
-                    </template>
-                </el-table-column>
-                <el-table-column label="操作描述" prop="type"></el-table-column>
-                <el-table-column :label="`${keysList[key]}`" prop="">
-                    <template v-slot="scope">
-                        {{ scope.row.stockNumber }}
-                    </template>
-                </el-table-column>
-                <!-- <el-table-column label="报损" prop=""></el-table-column> -->
-                <el-table-column label="操作人" prop="operator"></el-table-column>
-                <el-table-column label="备注" prop="remark"></el-table-column>
-                <el-table-column label="操作时间" prop="updatedAt">
-                    <template v-slot="scope">
-                        {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
-                    </template>
-                </el-table-column>
+            <el-table ref="table" :data="tableData.data" v-loading="tableData.loading" height="400px"
+                v-if="dialogVisible">
+                <!-- 销量统计 -->
+                <template v-if="key == 'saleNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="原库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ scope.row.leftNumber + scope.row.stockNumber }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="销量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="订单编号" prop="orderNo">
+                        <template v-slot="scope">
+                            <router-link
+                                :to="{ path: '/order_manage/order_list', query: { orderNo: scope.row.orderNo } }">
+                                <el-link type="primary">{{ scope.row.orderNo }}</el-link>
+                            </router-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 减少数量统计 -->
+                <template v-if="key == 'subCountNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber + scope.row.stockNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="原有库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
+                    <el-table-column label="操作人" prop="operator"></el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 手动减少统计 -->
+                <template v-if="key == 'subNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber + scope.row.stockNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="原有库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
+                    <el-table-column label="操作人" prop="operator"></el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 报损统计 -->
+                <template v-if="key == 'lossNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="原库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber + scope.row.stockNumber}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="报损数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="报损人" prop="operator"></el-table-column>
+                    <el-table-column label="图片" prop="coverImg">
+                        <template v-slot="scope">
+                            <el-image :src="scope.row.coverImg" style="width: 40px;height: 40px;">
+                                <div slot="error" class="image-slot">
+                                    <i class="el-icon-picture-outline"></i>
+                                </div>
+                            </el-image>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 增加数量统计 -->
+                <template v-if="key == 'addCountNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber + scope.row.stockNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="原库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
+                    <el-table-column label="操作人" prop="operator"></el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 手动增加统计 -->
+                <template v-if="key == 'addNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber + scope.row.stockNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="原库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="变动数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="类型" prop="type"></el-table-column>
+                    <el-table-column label="操作人" prop="operator"></el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
+                <!-- 退货统计 -->
+                <template v-if="key == 'refundNumber'">
+                    <el-table-column label="商品名称/规格名称" prop="productName"></el-table-column>
+                    <el-table-column label="变动后库存">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber + scope.row.stockNumber}${scope.row.unitName}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="原库存" prop="leftNumber">
+                        <template v-slot="scope">
+                            {{ `${scope.row.leftNumber}` }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="退货数量" prop="stockNumber"></el-table-column>
+                    <el-table-column label="订单编号" prop="orderNo">
+                        <template v-slot="scope">
+                            <router-link
+                                :to="{ path: '/order_manage/order_list', query: { orderNo: scope.row.orderNo } }">
+                                <el-link type="primary">{{ scope.row.orderNo }}</el-link>
+                            </router-link>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作人" prop="operator"></el-table-column>
+                    <el-table-column label="备注" prop="remark"></el-table-column>
+                    <el-table-column label="操作时间" prop="updatedAt">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.updatedAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </template>
             </el-table>
         </div>
         <div class="head-container">
@@ -52,7 +209,7 @@ export default {
         return {
             dayjs,
             dialogVisible: false,
-            key: 'stockNumber',
+            key: 'saleNumber',
             keysList: {
                 stockNumber: '现有数量',
                 addCountNumber: '增加数量',
@@ -60,7 +217,7 @@ export default {
                 refundNumber: '退货',
                 subCountNumber: '减少数量',
                 subNumber: '手动减少',
-                saleNumber: '销售量',
+                saleNumber: '销量',
                 lossNumber: '报损',
             },
             productId: '',

src/views/product/index.vue

@@ -37,8 +37,9 @@
           </div>
           <div class="info">
             <div class="row">
-              <span>现有数量</span>
-              <span class="link" @click="showStockHistory('stockNumber')">{{ countInfo.stockNumber || 0 }}</span>
+              <span>商品种数</span>
+              <!-- @click="showStockHistory('stockNumber')" -->
+              <span>{{ tableData.total || 0 }}</span>
             </div>
           </div>
         </div>

src/views/product/unit.vue

@@ -23,9 +23,11 @@
                 <el-table-column label="操作" width="200">
                     <template v-slot="scope">
                         <el-button type="text" size="mini" round icon="el-icon-edit"
+                            :disabled="ShopId == scope.row.shopId ? false : true"
                             @click="$refs.addUnitRef.show(scope.row)">编辑</el-button>
                         <el-popconfirm title="确定删除吗？" @confirm="delHandle([scope.row.id])">
-                            <el-button type="text" size="mini" round icon="el-icon-delete" slot="reference">删除</el-button>
+                            <el-button :disabled="ShopId == scope.row.shopId ? false : true" type="text" size="mini"
+                                round icon="el-icon-delete" slot="reference">删除</el-button>
                         </el-popconfirm>
                     </template>
                 </el-table-column>
@@ -33,7 +35,12 @@
         </div>
         <div class="head-container">
             <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
-                @current-change="paginationChange" layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+                @current-change="paginationChange" @size-change="(e) => {
+                    tableData.size = e;
+                    tableData.page = 0;
+                    paginationChange();
+                }
+                    " layout="total, sizes, prev, pager, next, jumper"></el-pagination>
         </div>
     </div>
 </template>
@@ -47,6 +54,7 @@ export default {
     },
     data() {
         return {
+            ShopId: localStorage.getItem('shopId'),
             query: {
                 blurry: ''
             },

src/views/shop/components/fitment.vue

@@ -1,13 +1,8 @@
 <template>
     <div class="app-container">
-        <!-- <el-radio-group v-model="tableActive" @change="selectItemChange">
-            <el-radio-button :label="item.autokey" v-for="item in tableData" :key="item.autokey">
-                {{ item.title }}
-            </el-radio-button>
-        </el-radio-group> -->
         <div class="btn_wraps">
             <div class="btn" :class="{ active: tableActive == item.autokey }" v-for="item in tableData"
-                :key="item.autokey" @click="tableActive = item.autokey">
+                :key="item.autokey" @click="selectItemChange(item.autokey)">
                 {{ item.title }}
             </div>
         </div>
@@ -223,6 +218,7 @@ export default {
         },
         // 切换类型
         selectItemChange(key) {
+            this.tableActive = key
             this.selectItem = { ...this.tableData.find(item => item.autokey == key) }
         },
         // 获取装修数据

src/views/shop/notifications/index.vue

@@ -22,11 +22,14 @@
         </div> -->
 
         <!-- 查看图片 -->
-        <el-button v-if="url" type="primary" @click="dialogVisible = true" style="margin-bottom: 28px;">查看图片</el-button>
+        <el-button v-if="url" type="primary" @click="dialogVisible = true" style="margin-bottom: 28px;">订阅消息</el-button>
         <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
             <div style="width: 100%;text-align: center;">
                 <el-image style="width: 200px; height: 200px;" :src="url"></el-image>
             </div>
+            <div style="text-align: center;">
+                使用微信扫描二维码绑定订阅消息
+            </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
                 <el-button type="primary" @click="downloadUrl">下载</el-button>

src/views/table/table_list.vue

@@ -373,6 +373,8 @@ export default {
           tableId: this.selTable.tableId,
           useType: this.selTable.useType,
           maxCapacity:this.selTable.maxCapacity,
+          masterId:this.selTable.masterId,
+          orderId:this.selTable.orderId,
           ...query,
         },
       });

src/views/tool/Instead/components/scan-pay.vue

@@ -7,7 +7,7 @@
           @click="changeKey('paysSel', index)"
           v-for="(item, index) in pays"
           :key="index"
-          :type="paysSel == index ? 'success' : ''"
+          :type="paysSel == index ? 'primary' : ''"
           >{{ item.text }}</el-button
         >
       </div>
@@ -155,6 +155,7 @@ export default {
     async getOrderDetail() {
       const res = await tbOrderInfoDetail(this.order.id);
       if (res.status == "closed") {
+        this.clear()
         this.$emit("paySuccess");
       }
     },
@@ -189,10 +190,12 @@ export default {
     open() {
       this.show = true;
       this.form.money = Number(this.price).toFixed(2);
-      $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
-        console.log(res);
-        this.paymentQrcode = res;
-      });
+      if (this.openSwitch) {
+        $getOrderPayUrl({ orderId: this.order.id }).then((res) => {
+          console.log(res);
+          this.paymentQrcode = res;
+        });
+      }
       this.$nextTick(() => {
         this.$refs.refInputCode.focus();
       });

src/views/tool/Instead/index.vue

@@ -2112,6 +2112,7 @@ export default {
       if (this.table.tableId) {
         return $getMasterId({
           tableId: this.table.tableId,
+          orderId:this.table.orderId,
           vipUserId: this.vipUser.id,
           useType: this.useTypes.sel == "takeout" ? "takeout" : "",
         });
@@ -2944,6 +2945,8 @@ export default {
           tableId: params.tableId,
           useType: params.useType,
           maxCapacity: params.maxCapacity * 1,
+          masterId:params.masterId,
+          orderId:params.orderId,
         },
         key = params.key,
         perpoleNumber = params.num;
@@ -2959,6 +2962,7 @@ export default {
       this.isCreateOrder = this.key == "isPayOrder" ? true : false;
       this.perpole = perpoleNumber;
       this.table = item;
+      this.masterId = item.masterId;
     },
     close() {
       if (this.table.tableId) {