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

2024-11-11 09:53:42 +08:00 · 2024-11-11 09:53:42 +08:00 · f5368fcf4f
parent af90b029df 835809910a
commit f5368fcf4f
6 changed files with 155 additions and 27 deletions
--- a/src/api/invoicing.js
+++ b/src/api/invoicing.js
@ -178,7 +178,7 @@ export function unittbConsInfo(params) {
  return request({
    url: `/api/tbConsInfo`,
    method: "put",
-    data:params
+    data: params
  });
 }
 /**
@ -411,3 +411,15 @@ export function tbConsInfoinputStock(file) {
    }
  });
 }
+
+/**
+ * 供应商出入库记录
+ * @returns
+ */
+export function tbProductStockOperatepage(data) {
+  return request({
+    url: `/api/tbProductStockOperate/page`,
+    method: "post",
+    data
+  });
+}
--- a/src/views/application/bwc.vue
+++ b/src/views/application/bwc.vue
@ -31,7 +31,7 @@
                        <el-radio label="仅本店使用"></el-radio>
                    </el-radio-group>
                </el-form-item> -->
-                <el-form-item label="使用方式">
+                <!-- <el-form-item label="使用方式">
                    <el-checkbox-group v-model="form.useTypeList">
                        <el-checkbox label="堂食" name="dine-in" value="dine-in"></el-checkbox>
                        <el-checkbox label="自取" name="takeout" value="takeout"></el-checkbox>
@ -45,9 +45,9 @@
                <el-form-item label="是否与积分共享">
                    <el-switch v-model="form.withPoints"></el-switch>
                </el-form-item>
-                <!-- <el-form-item label="不参与集章">
+                <el-form-item label="不参与集章">
                    <el-switch v-model="form.childShopIdList"></el-switch>
-                </el-form-item> -->
+                </el-form-item>  -->
                <el-form-item label="充值说明">
                    <el-input type="textarea" v-model="form.rechargeDesc"></el-input>
                </el-form-item>
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@ -40,11 +40,19 @@
            @change="validityChange"
          />
        </el-form-item>
+        <el-form-item label="有效期（天）" prop="validDays">
+          <el-input v-model="form.validDays" placeholder="" style="width: 200px;">
+            <template slot="append">天</template>
+          </el-input>
+        </el-form-item>
        <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect">
          <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
            <template slot="prepend">隔</template>
            <template slot="append">天生效</template>
          </el-input>
+          <el-tooltip class="item" effect="dark" content="领取后0天后0点0分" placement="top-start">
+            <i class="el-icon-question" />
+          </el-tooltip>
        </el-form-item> -->
        <el-form-item label="可用周期" prop="userDays">
          <el-checkbox-group v-model="form.userDays">
@ -72,6 +80,9 @@
        </el-form-item>
        <el-form-item label="发放数量" prop="number">
          <el-input v-model="form.number" type="number" placeholder="" style="width: 200px;" />
+          <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
+            <i class="el-icon-question" />
+          </el-tooltip>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
@ -85,8 +96,13 @@
        <el-form-item label="商品券券名" prop="title">
          <el-input v-model="form.title" placeholder="" style="width: 289px;" />
        </el-form-item>
+        <el-form-item />
+        <el-form-item />
        <el-form-item label="发放数量" prop="number">
          <el-input v-model="form.number" type="number" placeholder="" style="width: 289px;" />
+          <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
+            <i class="el-icon-question" />
+          </el-tooltip>
        </el-form-item>
        <el-form-item label="使用门槛">
          全额满<el-input v-model="form.fullAmount" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
@ -155,6 +171,7 @@ export default {
        validStartTime: '',
        validEndTime: '',
        userDays: [],
+        validDays: '',
        useTimeType: 'all',
        useStartTime: '',
        useEndTime: '',
@ -169,6 +186,20 @@ export default {
            trigger: 'blur'
          }
        ],
+        number: [
+          {
+            required: true,
+            message: '填写发放数量',
+            trigger: 'blur'
+          }
+        ],
+        validDays: [
+          {
+            required: true,
+            message: '填写有效天数',
+            trigger: 'blur'
+          }
+        ],
        daysToTakeEffect: [
          {
            required: true,
@ -203,13 +234,6 @@ export default {
            validator: validateProduct,
            trigger: 'change'
          }
-        ],
-        number: [
-          {
-            required: true,
-            message: '填写发放数量',
-            trigger: 'blur'
-          }
        ]
      },
      resetForm: ''
@ -228,7 +252,8 @@ export default {
     * @param item
     */
    tabClick(item) {
-      console.log(item)
+      console.log(this.form)
+      this.form.number = ''
      this.form.type = item.type
      this.$refs.form.resetFields()
    },
--- a/src/views/coupon_manage/components/coupon_details.vue
+++ b/src/views/coupon_manage/components/coupon_details.vue
@ -42,20 +42,38 @@
        <el-table v-loading="loading" :data="tableData.data">

          <el-table-column label="用户ID" prop="id" />
-          <el-table-column label="用户名" prop="name" />
+          <el-table-column label="用户名" prpo="name">
+            <template v-slot="scope">
+              <div>{{ scope.row.name ? scope.row.name : '-' }}</div>
+
+            </template>
+          </el-table-column>
          <el-table-column label="领取时间" prop="receiveTime" />
-          <el-table-column label="使用时间" prop="useTime" />
-          <el-table-column label="获得来源" prop="source" />
+          <el-table-column label="使用时间" prpo="useTime">
+            <template v-slot="scope">
+              <div>{{ scope.row.useTime ? scope.row.useTime : '-' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="获得来源" prpo="source">
+            <template v-slot="scope">
+              <div>{{ scope.row.source == 'activate' ? '充值活动' :
+                scope.row.source == 'invited' ? '好友分享' : '' }}</div>
+            </template>
+          </el-table-column>
          <el-table-column label="状态" align="status">
            <template v-slot="scope">
              <div style="display: flex;align-items: center;">
-                <div v-if="scope.row.overNum == scope.row.num" style="width: 30px;color: #FAAD14;">未使用</div>
+                <div v-if="scope.row.overNum == scope.row.num" style="color: #FAAD14;">未使用</div>
                <div v-if="scope.row.num!=0&&scope.row.overNum != scope.row.num">{{ scope.row.overNum }}/{{ scope.row.num }}</div>
                <div v-if="scope.row.overNum == 0" style="color: #52C41A;">已使用</div>
              </div>
            </template>
          </el-table-column>
-          <el-table-column label="使用门店" prop="tableName" />
+          <el-table-column label="使用门店" prpo="useTime">
+            <template v-slot="scope">
+              <div>{{ scope.row.tableName ? scope.row.tableName : '-' }}</div>
+            </template>
+          </el-table-column>
          <el-table-column label="操作" width="150">
            <template v-slot="scope">
              <el-popconfirm title="确定删除吗？" @confirm="delTableHandle([scope.row.id])">
@ -68,7 +86,6 @@
              </el-popconfirm>
            </template>
          </el-table-column>
-
        </el-table>
      </div>
      <div class="head-container">
--- a/src/views/coupon_manage/coupon_list.vue
+++ b/src/views/coupon_manage/coupon_list.vue
@ -22,11 +22,12 @@
            {{ `领券后${scope.row.validDays}天过期` }}
          </template>
        </el-table-column> -->
-        <el-table-column label="用户领取方式">
+        <!-- <el-table-column label="用户领取方式" prpo="source">
          <template v-slot="scope">
-            {{ `无` }}
+            <div>{{ scope.row.source == 'activate' ? '充值活动' :
+              scope.row.source == 'invited' ? '好友分享' : '' }}</div>
          </template>
-        </el-table-column>
+        </el-table-column> -->
        <el-table-column label="总发放数量" prop="number" />
        <el-table-column label="已领取" align="center">
          <template v-slot="scope">
@ -57,7 +58,7 @@
    <div class="head-container">
      <el-pagination
        :total="tableData.total"
-        :current-page="tableData.page + 1"
+        :current-page="tableData.page"
        :page-size="tableData.size"
        layout="total, sizes, prev, pager, next, jumper"
        @current-change="paginationChange"
@ -90,7 +91,7 @@ export default {
    return {
      tableData: {
        data: [],
-        page: 0,
+        page: 1,
        size: 10,
        loading: false,
        total: 0
@ -108,7 +109,7 @@ export default {
    },
    // 重置查询
    resetHandle() {
-      this.page = 0
+      this.page = 1
      this.getTableData()
    },
    // 分页大小改变
@ -118,7 +119,8 @@ export default {
    },
    // 分页回调
    paginationChange(e) {
-      this.tableData.page = e - 1
+      console.log(e)
+      this.tableData.page = e
      this.getTableData()
    },
    // 获取优惠券列表
--- a/src/views/invoicing/supplier_manage/purchase_detail.vue
+++ b/src/views/invoicing/supplier_manage/purchase_detail.vue
@ -126,6 +126,8 @@
                        <el-button type="text" size="mini" round @click="Uppop(scope.row.id)">付款</el-button>
                        <el-button type="text" size="mini"
                            @click="typedialogshowsumbit(scope.row.id)">账单付款记录</el-button>
+                            <el-button type="text" size="mini" @click="stockData.size = 10,
+                            stockData.page = 0, gettbConsInfoFlowstock(scope.row)">出入库记录</el-button>
                    </template>
                </el-table-column>
            </el-table>
@ -172,12 +174,44 @@
                </el-table-column>
            </el-table>
        </el-dialog>
+        <!--入库记录 -->
+        <el-dialog title="出入库记录" :visible.sync="variabilityshow" width="75%">
+            <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="type">
+                        <template v-slot="scope">
+                            {{ scope.row.type == 'reject' ? '退货出库' : '供应商入库' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="状态" prop="status">
+                        <template v-slot="scope">
+                            {{ scope.row.status == 'status' ? '正常 ' : '作废' }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="备注" prop="remark">
+                    </el-table-column>
+                    <el-table-column label="创建时间" prop="stockTime">
+                        <template v-slot="scope">
+                            {{ dayjs(scope.row.stockTime).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="head-container">
+                <el-pagination :total="stockData.total" :current-page="stockData.page + 1" :page-size="stockData.size"
+                    layout="total, sizes, prev, pager, next, jumper" @current-change="wstockChange" @size-change="(e) => {
+                        stockData.size = e;
+                        stockData.page = 0;
+                        gettbConsInfoFlowstock();
+                    }" />
+            </div>
+        </el-dialog>
    </div>
 </template>

 <script>
 import dayjs from 'dayjs'
-import { tbShopPurveyorTransactInfo, paidAmount, dictDetail, tbShopPurveyorTransactSum, tbShopPurveyorTransacttransactPayInfos } from '@/api/invoicing'
+import { tbShopPurveyorTransactInfo, paidAmount, dictDetail, tbShopPurveyorTransactSum, tbShopPurveyorTransacttransactPayInfos, tbProductStockOperatepage } from '@/api/invoicing'
 export default {
    data() {
        return {
@ -270,7 +304,17 @@ export default {
                total: 0,
                loading: false,
                list: []
-            }
+            },
+            variabilityshow: false,
+            variabilitytitle: '',
+            stockData: {
+                data: [],
+                page: 0,
+                size: 10,
+                loading: false,
+                total: 0,
+                id: ''
+            },
        }
    },
    filters: {
@ -415,6 +459,34 @@ export default {
                console.log(error)
            }
        },
+        wstockChange(e) {
+            this.stockData.page = e - 1;
+            this.gettbConsInfoFlowstock();
+        },
+        async gettbConsInfoFlowstock(item) {
+            if (item) {
+                this.stockData.id = item.id
+            }
+            this.variabilityshow = true
+            this.stockData.loading = true;
+            let arr = []
+            // if (this.query.createdAt.length) {
+            //     arr = [this.query.createdAt[0] + ' 00:00:00', this.query.createdAt[1] + ' 23:59:59']
+            // } else {
+            //     arr = []
+            // }
+            let res = await tbProductStockOperatepage({
+                page: this.stockData.page,
+                size: this.stockData.size,
+                shopId: localStorage.getItem("shopId"),
+                type: ["cons_in", "cons_out"],//预留耗材id
+                purveyorId: this.stockData.id,//列名
+                createdAt: arr//耗材id
+            })
+            this.stockData.loading = false;
+            this.stockData.data = res.content;
+            this.stockData.total = res.totalElements;
+        },
    }
 }
 </script>