pangqijun 2 years ago
parent
commit
7e8085a073

File diff suppressed because it is too large
+ 10 - 769
package-lock.json


+ 0 - 120
src/components/nav-box/main.vue

@@ -1,120 +0,0 @@
-<template>
-  <div class="k-nav-box" v-loading="loading">
-    <div class="box-one">
-      <el-scrollbar>
-        <div class="ite" :class="{active: i == active}" v-for="(ite, i) in list1" :key="i" @click="secondInit(ite.id, i)">{{ ite.title }}</div>
-      </el-scrollbar>
-    </div>
-    <div class="box-tow">
-      <el-scrollbar>
-        <div class="ite" v-for="(ite, i) in list2" :key="i">
-          <div class="tit">{{ ite.title }}></div>
-          <div class="chil-li">
-            <span class="chil-it" v-for="(chil, l) in ite.children" @click="getDetails(ite.id, chil.id)">{{ chil.title }}</span>
-          </div>
-        </div>
-      </el-scrollbar>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {getLazyList, getCategoryTree, getDetail, add, update, remove, updateBatch, getByParentId} from "@/api/redenvelopemall/categoryinfo";
-  export default {
-    name: 'nav-box',
-    props: {
-      rootNodeId: {
-        type: String,
-        default: ''
-      }
-    },
-    data() {
-      return {
-        loading: false,
-        list1: [],
-        list2: [],
-        active: ''
-      }
-    },
-    async created() {
-       this.list1 = await this.initData(this.rootNodeId);
-       await this.secondInit(this.list1[0].id)
-       this.active = 0
-       this.$emit('change', `${this.list1[this.active].id}-${this.list2[0].id}-${this.list2[0].children[0].id}`)
-    },
-    methods: {
-      async initData(param, loa = true) {
-        if(loa) this.loading = true;
-        let res = await getByParentId(param);
-        if(loa) this.loading = false;
-        return res.data.data
-      },
-      async secondInit(param, index) {
-        this.active = index
-        this.loading = true
-        let tow = await this.initData(param, false)
-        for (let i = 0; i < tow.length; i++) {
-          tow[i].children = await this.initData(tow[i].id, false)
-        }
-        this.loading = false
-        this.list2 = tow
-      },
-      getDetails(id1, id2) {
-        this.$emit('change', `${this.list1[this.active].id}-${id1}-${id2}`)
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-.k-nav-box {
-  height: 320px;
-  display: flex;
-  align-items: center;
-}
-.el-scrollbar {
-  height: 320px;
-}
-.box-one {
-  width: 300px;
-  height: 100%;
-  .ite {
-    margin: 0px 6px;
-    height: 24px;
-    line-height: 24px;
-    padding: 5px 10px;
-    font-weight: bold;
-    border-radius: 8px;
-    &:hover {
-      background-color: #ededed5e;
-      cursor: pointer;
-    }
-  }
-  .active {
-    background-color: #ededed5e;
-    cursor: pointer;
-  }
-}
-.box-tow {
-  height: 100%;
-  // flex: 1;
-  width: 100%;
-  .ite {
-    padding: 5px 10px;
-    display: flex;
-    min-height: 24px;
-    .tit {
-      width: 15%;
-      font-weight: bold;
-    }
-    .chil-li {
-      width: 94%;
-      .chil-it {
-        color: #82848a;
-        margin-right: 12px;
-        cursor: pointer;
-      }
-    }
-  }
-}
-</style>

+ 0 - 1177
src/views/finance/order.vue

@@ -1,1177 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.order_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-receiving"
-                   plain
-                   @click="handleExport">导 出
-        </el-button>
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-receiving"
-                   plain
-                   @click="handleBind">绑定物流单号
-        </el-button>
-      </template>
-
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          size="small"
-          @click="viewDialogShow(scope.row)"
-        >详 情
-        </el-button>
-        <el-button
-          v-if="scope.row.payFlag == 6 || scope.row.payFlag == 6"
-          type="text"
-          size="small"
-          @click="refund(scope.row)"
-        >退款
-        </el-button>
-      </template>
-    </avue-crud>
-
-    <el-dialog title="详情"
-               append-to-body
-               :visible.sync="viewDetail"
-               :before-close="handleClose"
-               width="800px"
-               heigh="40%">
-      <!-- 订单信息 -->
-      <el-row>
-        <el-col :span="24"><div class="d_title">订单信息</div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <span class="d_context">订单号:</span>
-          <span>{{form.outTradeNo}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">下单时间:</span>
-          <span>{{form.createTime}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">订单类型:</span>
-          <span>{{form.orderTypeDisplayName}}</span>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <span class="d_context">订单状态:</span>
-          <span>{{form.payFlagDisplayName}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">下单人:</span>
-          <span>{{form.userName}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">到账类型:</span>
-          <span>{{form.settleTypeDisplayName}}</span>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8" v-if="form.payFlag > 1">
-          <span class="d_context">支付时间:</span>
-          <span>{{form.payTime}}</span>
-        </el-col>
-        <el-col :span="8" v-if="form.payFlag == 6 || form.payFlag == 7">
-          <span class="d_context">申请退款时间:</span>
-          <span>{{form.refundApplyTime}}</span>
-        </el-col>
-        <el-col :span="8" v-if="form.payFlag == 7">
-          <span class="d_context">退款时间:</span>
-          <span>{{form.refundTime}}</span>
-        </el-col>
-        <el-col :span="8" v-if="form.payFlag == 4">
-          <span class="d_context">确认收货时间:</span>
-          <span>{{form.recordTime}}</span>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <!-- 商品信息 -->
-      <el-row>
-        <el-col :span="24"><div class="d_title">商品信息</div></el-col>
-        <el-col :span="5">
-          <el-image
-            style="width: 90px; height: 90px"
-            :src="form.goodsInfo.goodsCover"
-            fit="cover"></el-image>
-        </el-col>
-        <el-col :span="19">
-          <el-col :span="12">
-            <span class="d_context">商品名称:</span>
-            <span>{{form.goodsInfo.goodsName}}</span>
-          </el-col>
-          <el-col :span="12">
-            <span class="d_context">规格:</span>
-            <span>{{form.goodsSpec.spceName}}</span>
-          </el-col>
-          <el-col :span="12">
-            <span class="d_context">价格:</span>
-            <span>{{form.orderGood.goodsPrice}}</span>
-          </el-col>
-          <el-col :span="12">
-            <span class="d_context">数量:</span>
-            <span>{{form.orderGood.goodsNum}}</span>
-          </el-col>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <!-- 费用信息 -->
-      <el-row>
-        <el-col :span="24"><div class="d_title">费用信息</div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <span class="d_context">支付总价:</span>
-          <span>{{form.payFee}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">商品总购买价:</span>
-          <span>{{form.totalFee}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">邮费:</span>
-          <span>{{form.wlPrice}}</span>
-        </el-col>
-        <el-col :span="8" v-if="form.payFlag == 7">
-          <span class="d_context">退款金额:</span>
-          <span>{{form.refundAmount}}</span>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <!-- 积分信息 -->
-      <el-row>
-        <el-col :span="24"><div class="d_title">积分信息</div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <span class="d_context">获得积分:</span>
-          <span>{{form.totalTicket}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">抵扣积分:</span>
-          <span v-if="form.needIntegral == -1">暂无</span>
-          <span v-else>{{form.needIntegral}}</span>
-        </el-col>
-        <el-col :span="8" v-if="form.payFlag == 7">
-          <span class="d_context">退款扣除:</span>
-          <span>{{form.deductIntegral}}</span>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <!-- 收货人信息 -->
-      <el-row>
-        <el-col :span="24"><div class="d_title">收货人信息</div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <span class="d_context">收件人:</span>
-          <span>{{form.receivingName}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">收件人电话:</span>
-          <span>{{form.telPhone}}</span>
-        </el-col>
-        <el-col :span="8">
-          <span class="d_context">收货地址:</span>
-          <span>{{form.userAddress}}</span>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <!-- 物流信息 -->
-      <el-row>
-        <el-col :span="24"><div class="d_title">物流信息</div></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-row>
-            <el-col :span="24">
-              <span class="d_context">配送方式:</span>
-              <span v-if="form.distributeModeDisplayName == ''">暂无</span>
-              <span v-else>{{form.distributeModeDisplayName}}</span>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <span class="d_context">快递公司:</span>
-              <span v-if="form.wlName == ''">暂无</span>
-              <span v-else>{{form.wlName}}</span>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24">
-              <span class="d_context">物流单号:</span>
-              <span v-if="form.wlName == ''">暂无</span>
-              <span v-else>{{form.wlNum}}</span>
-            </el-col>
-          </el-row>
-        </el-col>
-        <el-col :span="16">
-          <avue-empty desc="暂无物流信息" v-if="logisticList.length == 0"></avue-empty>
-          <div style="height: 270px; display: flex" class="cab" v-else>
-            <el-scrollbar style="height:100%">
-              <el-timeline>
-                <el-timeline-item
-                  v-for="(activity, index) in logisticList"
-                  :key="index"
-                  :timestamp="activity.time" color="#0bbd87">
-                  {{activity.message}}
-                </el-timeline-item>
-              </el-timeline>
-            </el-scrollbar>
-          </div>
-
-        </el-col>
-      </el-row>
-
-
-    </el-dialog>
-
-    <el-dialog title="绑定物流单号" @close="refreshChange"
-               append-to-body
-               :visible.sync="bindBox"
-               :before-close="handleClose"
-               width="500px"
-               heigh="40%">
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="物流公司:" placeholder="请选择物流公司">
-          <el-select v-model="wlCompany" filterable placeholder="请选择物流公司">
-            <el-option
-              v-for="item in WL_COMPANY"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="物流单号:">
-          <el-input v-model="wlNo" autocomplete="off" placeholder="请输入物流单号"></el-input>
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="bindLogisticsInfo">确 定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="共富1580订单录入" @close="refreshChange"
-               append-to-body
-               :visible.sync="orderLinkedBox"
-               :before-close="handleClose"
-               width="30%"
-               heigh="40%">
-      <el-form label-position='top' :model="orderLinkedForm" :rules="orderLinkedRule" ref="ruleForm" label-width="80px">
-        <el-form-item label="手机号:" prop="phone">
-          <el-input v-model="orderLinkedForm.phone" autocomplete="off" placeholder="请输入手机号"></el-input>
-        </el-form-item>
-
-        <el-form-item label="姓名:" prop="username">
-          <el-input v-model="orderLinkedForm.username" autocomplete="off" placeholder="请输入姓名"></el-input>
-        </el-form-item>
-
-        <el-form-item label="推荐人手机号:" prop="recommendPhone">
-          <el-input v-model="orderLinkedForm.recommendPhone" autocomplete="off" placeholder="请输入推荐人手机号"></el-input>
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">取 消</el-button>
-        <el-button type="primary" @click="addLinkedOrder">确 定</el-button>
-      </div>
-    </el-dialog>
-  </basic-container>
-</template>
-
-<script>
-import log from "../redpacket/log";
-
-var DIC = {
-  INTEGRAL_TYPE: [{
-    label: '红色积分',
-    value: '1'
-  }, {
-    label: '绿色积分',
-    value: '2'
-  }],
-  PAY_YES_NO: [{
-    label: '已支付',
-    value: '1'
-  }, {
-    label: '未支付',
-    value: '2'
-  }],
-}
-
-  /* update*/
-  import {getDetail, add, deliver, remove, getGoodsOrder, exportData, bindLogisticsInfo, refundCart, linkedOrderAdd} from "@/api/finance/order";
-  import {mapGetters} from "vuex";
-import {remove as removeSpec} from "../../api/redenvelopemall/goodsspec";
-
-  export default {
-    data() {
-      return {
-        orderLinkedForm: {
-          recommendPhone: '',
-          phone: '',
-          username: ''
-        },
-        orderLinkedRule: {
-          phone: [
-            { required: true, message: '请输入手机号', trigger: 'blur' },
-          ],
-          username: [
-            { required: true, message: '请输入姓名', trigger: 'blur' },
-          ],
-        },
-        orderLinkedBox: false,
-        WL_COMPANY: [{
-          label: '圆通速递',
-          value: 'yuantong'
-        }, {
-          label: '韵达快递',
-          value: 'yunda'
-        },{
-          label: '申通快递',
-          value: 'shentong'
-        },{
-          label: '中通快递',
-          value: 'zhongtong'
-        },{
-          label: '极兔速递',
-          value: 'jtexpress'
-        },{
-          label: '邮政快递包裹',
-          value: 'youzhengguonei'
-        },{
-          label: '顺丰速运',
-          value: 'shunfeng'
-        },{
-          label: '京东物流',
-          value: 'jd'
-        },{
-          label: '百世快递',
-          value: 'huitongkuaidi'
-        },{
-          label: '德邦快递',
-          value: 'debangkuaidi'
-        },{
-          label: '邮政标准快递',
-          value: 'youzhengbk'
-        }],
-        activities: [{
-          content: '活动按期开始',
-          timestamp: '2018-04-15'
-        }, {
-          content: '通过审核',
-          timestamp: '2018-04-13'
-        }, {
-          content: '创建成功',
-          timestamp: '2018-04-11'
-        }],
-        wlCompany: '',
-        wlNo: '',
-        viewDetail: false,
-        bindBox: false,
-        form: {
-          goodsInfo: {
-            goodsCover : ''
-          },
-          goodsSpec: {},
-          orderGood: {}
-        },
-        logisticList: [],
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0,
-          pageSizes: [10, 30, 50, 100, 200, 400]
-        },
-        selectionList: [],
-        option: {
-          searchIcon: true,
-          searchIndex: 3,
-          height:'auto',
-          calcHeight: 30,
-          // searchShow: true,
-          // searchMenuSpan: 6,
-          border: true,
-          viewBtn: false,
-          editBtn: false,
-          delBtn: false,
-          menuWidth: 100,
-          selection: true,
-          dialogClickModal: false,
-          labelWidth: 120,
-          excelBtn:true,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "用户ID",
-              prop: "userId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "订单号",
-              prop: "outTradeNo",
-              overHidden: true,
-              display: false,
-              search: true,
-              width: 170,
-            },
-            {
-              label: "收款方",
-              prop: "settlementAccount",
-              overHidden: true,
-              display: false,
-              formatter:(val,value,label)=>{
-                if (value == '2088441218763712') {
-                  return "正道乾";
-                } else if (value == '2088341967443472'){
-                  return "中宏科技"
-                } else if (value == '1633748877' || value == '2088541242921565'){
-                  return "中宏咨询"
-                } else {
-                  return "暂无";
-                }
-              },
-            },
-            {
-              label: "商品名称",
-              prop: "goodsName",
-              display: false,
-              width: 200,
-              search: true
-            },
-            {
-              label: "规格名称",
-              prop: "specName",
-              display: false,
-              width: 100,
-              search: true
-            },
-            {
-              label: "商品来源",
-              prop: "source",
-              display: false,
-              search: true,
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=third_source",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              // formatter:(val,value,label)=>{
-              //   if (value == '1') {
-              //     return "胜天半子";
-              //   } else if (value == '2'){
-              //     return "唯品尚"
-              //   } else {
-              //     return "中宏";
-              //   }
-              // },
-            },
-            {
-              label: "订单类型",
-              prop: "orderType",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=goods_order_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "订单类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "下单人",
-              prop: "userName",
-              search: true,
-              display: false,
-              overHidden: true,
-              width: 65,
-              hide: true
-            },
-            {
-              label: "支付方式",
-              prop: "payCodeDesc",
-              display: false,
-            },
-            {
-              label: "支付总价",
-              prop: "payFee",
-              display: false,
-            },
-            {
-              label: "商品总购买价",
-              prop: "totalFee",
-              display: false,
-              formatter:(val,value,label)=>{
-                return Number(value).toFixed(2);
-              },
-            },
-            {
-              label: "数量",
-              prop: "goodsNum",
-              display: false,
-            },
-            {
-              label: "邮费",
-              prop: "wlPrice",
-              display: false,
-              width: 60,
-            },
-            {
-              label: "协议价",
-              prop: "agreementPrice",
-              display: false,
-              formatter:(val,value,label)=>{
-                return Number(value).toFixed(2);
-              },
-            },
-            {
-              label: "商品售价",
-              prop: "salePrice",
-              display: false,
-              formatter:(val,value,label)=>{
-                return Number(value).toFixed(2);
-              },
-            },
-
-            {
-              label: "抵扣积分",
-              prop: "needIntegral",
-              display: false,
-              formatter:(val,value,label)=>{
-                return Number(value).toFixed(2);
-              },
-            },
-            {
-              label: "订单状态",
-              prop: "payFlag",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=pay_flag",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              // hide: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "订单状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "付款状态",
-              prop: "orderState",
-              type: "select",
-              hide: true,
-              search: true,
-              display: false,
-              dicData: DIC.PAY_YES_NO
-            },
-            {
-              label: "配送方式",
-              prop: "distributeModeDisplayName",
-              display: false,
-              hide: true
-            },
-            {
-              label: "配送信息",
-              prop: "deliveryStaff",
-              display: false,
-              hide: true,
-            },
-            // {
-            //   label: "支付方式",
-            //   prop: "payCode",
-            //   display: false,
-            // },
-            {
-              label: "收件人",
-              prop: "receivingName",
-              search: true,
-              display: false,
-            },
-            {
-              label: "电  话",
-              prop: "telPhone",
-              display: false,
-              search: true,
-              span: 8,
-              width: 110,
-            },
-            {
-              label: "收货地址",
-              prop: "userAddress",
-              overHidden: true,
-              span: 24,
-              display: false,
-              width: 160,
-            },
-            {
-              label: "是否退款",
-              prop: "isRefundDisplayName",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "物流公司名称",
-              prop: "wlName",
-              span: 24,
-              display: false,
-              hide: true,
-            },
-            {
-              label: "物流公司",
-              hide: true,
-              prop: "wlCode",
-              type: "select",
-              dicUrl: "/api/platform/express/selectList",
-              props: {
-                label: "expressName",
-                value: "expressCode"
-              },
-              dataType: "text",
-              viewDisplay: false,
-              rules: [{
-                required: true,
-                message: "请选择物流公司",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "物流单号",
-              prop: "wlNum",
-              overHidden: true,
-              viewDisplay: false,
-              hide: true,
-              search: true
-            },
-            {
-              label: "下单时间",
-              prop: "createTime",
-              display: false,
-              width: 150,
-            },
-            {
-              label: "支付时间",
-              prop: "payTime",
-              width: 140,
-              display: false,
-              hide: true
-            },
-            {
-              label: "发货时间",
-              prop: "sendTime",
-              hide: true,
-              width: 140,
-              display: false,
-            },
-            {
-              label: "收货时间",
-              prop: "recordTime",
-              width: 140,
-              display: false,
-              hide: true,
-            },
-            {
-              label: "更新时间",
-              prop: "updateTime",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "备注",
-              prop: "remark",
-              span: 24,
-              hide: true,
-              display: false,
-            },
-            {
-              label: "积分类型",
-              display: false,
-              hide: true,
-              search: true,
-              prop: "integralType",
-              type: "select",
-              dicData: DIC.INTEGRAL_TYPE
-            },
-            {
-              label: "下单时间",
-              display: false,
-              hide: true,
-              search: true,
-              type: 'datetimerange',
-              prop:'orderTimeRange',
-              searchRange:true,
-              defaultTime:['00:00:00', '23:59:59'],
-              format:'yyyy-MM-dd HH:mm:ss',
-              valueFormat:'yyyy-MM-dd HH:mm:ss',
-              startPlaceholder: '开始时间',
-              endPlaceholder: '结束时间',
-            }
-          ],
-
-          group: [
-            {
-              label: '订单信息',
-              prop: 'orderInfo',
-              column: [
-                {
-                  label: '订单号',
-                  prop: 'outTradeNo',
-                  span: 12
-                },
-                {
-                  label: '下单时间',
-                  prop: 'createTime',
-                  span: 12
-                },
-                {
-                  label: '订单类型',
-                  prop: 'orderTypeDisplayName',
-                  span: 12
-                },
-                {
-                  label: '订单状态',
-                  prop: 'payFlagDisplayName',
-                  span: 12
-                },
-                {
-                  label: '下单人',
-                  prop: 'userName',
-                  span: 12
-                },
-                {
-                  label: '到账类型',
-                  prop: 'settleTypeDisplayName',
-                  span: 12
-                },
-              ]
-            },
-            {
-              label: '费用信息',
-              prop: 'amountInfo',
-              column: [
-                {
-                  label: '支付总价',
-                  prop: 'payFee',
-                  span: 12
-                },
-                {
-                  label: '商品总购买价',
-                  prop: 'totalFee',
-                  span: 12
-                },
-              ]
-            },
-            {
-              label: '积分信息',
-              prop: 'integralInfo',
-              column: [
-                {
-                  label: '获得积分',
-                  prop: 'totalTicket',
-                  span: 12
-                },
-                {
-                  label: '抵扣积分',
-                  prop: 'needIntegral',
-                  span: 12
-                },
-              ]
-            },
-            {
-              label: '收货人信息',
-              prop: 'receivingInfo',
-              editDisplay: false,
-              column: [
-                {
-                  label: "收件人",
-                  prop: "receivingName",
-                  span: 12
-                },
-                {
-                  label: "收件人电话",
-                  prop: "telPhone",
-                  span: 12
-                },
-                {
-                  label: "收货地址",
-                  prop: "userAddress",
-                  span: 24
-                }
-              ],
-            },
-            {
-              label: '物流信息',
-              prop: 'wlInfo',
-              editDisplay: false,
-              column: [
-                {
-                  label: "物流公司名称",
-                  prop: "wlName",
-                  span: 12,
-                },
-                {
-                  label: "物流单号",
-                  prop: "wlNum",
-                  span: 12,
-                },
-              ],
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.order_add, false),
-          viewBtn: this.vaildData(this.permission.order_view, false),
-          delBtn: this.vaildData(this.permission.order_delete, false),
-          editBtn: this.vaildData(this.permission.order_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        deliver(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        const orderTimeRange = this.query.orderTimeRange;
-        if (orderTimeRange) {
-          this.query.orderStartTime = orderTimeRange[0];
-          this.query.orderEndTime = orderTimeRange[1];
-        }
-        this.loading = true;
-        getGoodsOrder(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      handleExport() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        const loading = this.$loading({
-          lock: true,
-          text: '导出中,请稍等...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        exportData(this.selectionList, this.query.orderStartTime, this.query.orderEndTime).then(res => {
-          loading.close();
-          this.selectionClear();
-          var filename = "订单数据.xlsx";
-          var blob = new Blob([res.data])
-          var downloadElement = document.createElement('a');
-          var href = window.URL.createObjectURL(blob); //创建下载的链接
-          downloadElement.href = href;
-          downloadElement.download = filename
-          //此处也可以将filename写死 "filename.xlsx"
-          document.body.appendChild(downloadElement);
-          downloadElement.click(); //点击下载
-          document.body.removeChild(downloadElement); //下载完成移除元素
-          window.URL.revokeObjectURL(href); //释放掉blob对象
-
-          // window.open(`/api/blade-system/region/export-region?${this.website.tokenHeader}=${getToken()}`);
-        }).catch(() => {
-          loading.close();
-        });
-      },
-      handleBind() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择一条数据");
-          return;
-        }
-        if (this.selectionList.length > 1) {
-          this.$message.warning("只能选择一条数据");
-          return;
-        }
-        if (this.selectionList[0].businessType != 1) {
-          this.$message.warning("非自营类型不支持绑定");
-          return;
-        }
-        this.bindBox = true;
-      },
-      handleClose() {
-        this.bindBox = false;
-        this.wlNo = '';
-        this.wlCompany = '';
-        this.viewDetail = false;
-        this.form = {
-          goodsInfo: {
-            goodsCover : ''
-          },
-          goodsSpec: {},
-          orderGood: {}
-        };
-        this.orderLinkedBox = false;
-        this.orderLinkedForm = {phone: "",username: ""}
-      },
-      bindLogisticsInfo() {
-        let wlCompanyName = '';
-        this.WL_COMPANY.map(e => {
-          if (this.wlCompany == e.value) {
-            wlCompanyName = e.label;
-          }
-        })
-        const loading = this.$loading({
-          lock: true,
-          text: '绑定中,请稍等...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        bindLogisticsInfo(this.selectionList[0].outTradeNo, this.wlNo, wlCompanyName, this.wlCompany).then(res => {
-          loading.close();
-          this.selectionClear();
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          this.handleClose();
-        }).catch(() => {
-          loading.close();
-        });
-      },
-      addLinkedOrder() {
-        this.$refs["ruleForm"].validate((valid) => {
-          if (valid) {
-            const loading = this.$loading({
-              lock: true,
-              text: '录入中,请稍等...',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            });
-            linkedOrderAdd(this.orderLinkedForm.phone, this.orderLinkedForm.username, this.orderLinkedForm.recommendPhone).then(res => {
-              loading.close();
-              this.$message({
-                type: "success",
-                message: "录入成功!"
-              });
-              this.handleClose();
-            }).catch(() => {
-              loading.close();
-            });
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
-      },
-      viewDialogShow(row) {
-        const loading = this.$loading({
-          lock: true,
-          text: '加载中...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        getDetail(row.id).then(res => {
-          this.form = res.data.data;
-          this.logisticList = res.data.data.logisticList
-          loading.close();
-          this.viewDetail = true;
-        }).catch(() => {
-          loading.close();
-        });
-      },
-      refund(row) {
-        this.$confirm("确定退款?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            const loading = this.$loading({
-              lock: true,
-              text: '退款中...',
-              spinner: 'el-icon-loading',
-              background: 'rgba(0, 0, 0, 0.7)'
-            });
-            refundCart(row.outTradeNo, row.payFee, row.totalTicket).then(res => {
-              loading.close();
-              this.$message({
-                type: "success",
-                message: "退款成功!"
-              });
-              this.refreshChange();
-            }).catch(() => {
-              loading.close();
-            });
-          });
-      }
-    }
-  };
-</script>
-
-<style>
-.d_title {
-  font-size: 16px;
-  font-weight: 700;
-  margin-bottom: 10px;
-}
-.d_context {
-  margin-right: 10px;
-}
-.el-col {
-  margin-bottom: 12px;
-}
-</style>

+ 0 - 379
src/views/finance/orderconsign.vue

@@ -1,379 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/orderconsign";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          labelWidth: 200,
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          searchLabelWidth: 100,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "商品ID",
-              prop: "goodsId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "进货开始时间",
-              prop: "startTime",
-              search: true,
-              type: 'datetime',
-              width: 120,
-              format:'yyyy-MM-dd HH:mm:ss',
-              valueFormat:'yyyy-MM-dd HH:mm:ss',
-              hide: true,
-            },
-            {
-              label: "进货结束时间",
-              prop: "endTime",
-              search: true,
-              width: 120,
-              type: 'datetime',
-              format:'yyyy-MM-dd HH:mm:ss',
-              valueFormat:'yyyy-MM-dd HH:mm:ss',
-              hide: true,
-            },
-
-            {
-              label: "商品名称",
-              prop: "goodsName",
-              overHidden: true,
-            },
-            {
-              label: "总价格",
-              prop: "totalPrice",
-            },
-            {
-              label: "寄售用户ID",
-              prop: "consignUserId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "支付用户ID",
-              prop: "payUserId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "寄售用户",
-              prop: "consignRealName",
-              display: false,
-              width: 120,
-              search: true
-            },
-            {
-              label: "支付用户",
-              prop: "payRealName",
-              display: false,
-              width: 120,
-              search: true
-            },
-            {
-              label: "打款状态",
-              prop: "isConfirmDisplayName",
-              display: false,
-              width: 90,
-            },
-            {
-              label: "打款状态",
-              prop: "isConfirmDisplay",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=is_confirm",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "打款状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "寄售类型",
-              prop: "consignTypeDisplayName",
-              display: false,
-            },
-            {
-              label: "寄售类型",
-              prop: "consignTypeDisplay",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=consign_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "寄售类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "抢购价",
-              prop: "consignPrice",
-            },
-            {
-              label: "寄售天数",
-              prop: "consignDays",
-              width: 70,
-            },
-            {
-              label: "数量",
-              prop: "totalNum",
-              width: 70,
-            },
-            {
-              label: "寄售类型",
-              prop: "consignType",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=consign_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请选择寄售类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "寄售类型",
-              prop: "isConfirm",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=is_confirm",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请选择寄售类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "打款时间",
-              prop: "confirmTime",
-              width: 140,
-              rules: [{
-                required: true,
-                message: "请输入确认时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "进货时间",
-              prop: "createTime",
-              width: 140,
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.orderconsign_add, false),
-          viewBtn: this.vaildData(this.permission.orderconsign_view, false),
-          // delBtn: this.vaildData(this.permission.orderconsign_delete, false),
-          editBtn: this.vaildData(this.permission.orderconsign_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      // rowDel(row) {
-      //   this.$confirm("确定将选择数据删除?", {
-      //     confirmButtonText: "确定",
-      //     cancelButtonText: "取消",
-      //     type: "warning"
-      //   })
-      //     .then(() => {
-      //       return remove(row.id);
-      //     })
-      //     .then(() => {
-      //       this.onLoad(this.page);
-      //       this.$message({
-      //         type: "success",
-      //         message: "操作成功!"
-      //       });
-      //     });
-      // },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 297
src/views/finance/orderexception.vue

@@ -1,297 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-
-      </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          size="small"
-          @click="viewErrorMsg(scope.row)"
-        >查看错误信息
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
-          @click="refund(scope.row)"
-        >退款
-        </el-button>
-        <el-button
-          type="text"
-          size="small"
-          @click="refund(scope.row)"
-        >补单
-        </el-button>
-      </template>
-    </avue-crud>
-
-    <el-dialog title="错误信息" @close="refreshChange"
-               append-to-body
-               :visible.sync="messageBox"
-               :before-close="messageBox == false"
-               width="60%"
-               heigh="40%">
-          <el-input  v-model="errorMsg" autocomplete="off" :rows="30" type="textarea"></el-input>
-<!--        <span>{{errorMsg}}</span>-->
-    </el-dialog>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/orderexception";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        errorMsg: '',
-        messageBox: false,
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "订单id",
-              prop: "orderId",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入订单id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "订单编号",
-              prop: "orderNo",
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入订单id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "支付方式",
-              prop: "payCodeDesc",
-            },
-            {
-              label: "错误类型",
-              prop: "errorTypeDesc",
-            },
-            {
-              label: "错误信息",
-              prop: "errorMessage",
-              hide: true,
-            },
-            {
-              label: "错误类型 0-其他 1-余额不足 2-订单已取消 3-地区不发货",
-              prop: "errorType",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入错误类型 0-其他 1-余额不足 2-订单已取消 3-地区不发货",
-                trigger: "blur"
-              }]
-            },
-
-            {
-              label: "处理状态",
-              prop: "isProcess",
-              search: true,
-              hide: true,
-              type: 'select',
-              dicData: [{
-                label: '未处理',
-                value: 0
-              }, {
-                label: '已处理',
-                value: 1
-              }]
-            },
-            {
-              label: "处理状态",
-              prop: "processDesc",
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-            },
-            {
-              label: "处理时间",
-              prop: "processTime",
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.orderexception_add, false),
-          viewBtn: this.vaildData(this.permission.orderexception_view, false),
-          delBtn: this.vaildData(this.permission.orderexception_delete, false),
-          editBtn: this.vaildData(this.permission.orderexception_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      viewErrorMsg(row) {
-        this.errorMsg = row.errorMessage;
-        this.messageBox = true;
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 281
src/views/finance/orderexpress.vue

@@ -1,281 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.orderexpress_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/orderexpress";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入主键ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              rules: [{
-                required: true,
-                message: "请输入订单ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "订单商品ID列表",
-              prop: "orderGoodsId",
-              rules: [{
-                required: true,
-                message: "请输入订单商品ID列表",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "发货时间",
-              prop: "deliveryTime",
-              rules: [{
-                required: true,
-                message: "请输入发货时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "发货方式,1:使用物流 0:未用物流",
-              prop: "isExpress",
-              rules: [{
-                required: true,
-                message: "请输入发货方式,1:使用物流 0:未用物流",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "快递商ID",
-              prop: "expressId",
-              rules: [{
-                required: true,
-                message: "请输入快递商ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "快递号",
-              prop: "expressNo",
-              rules: [{
-                required: true,
-                message: "请输入快递号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "发货类型标志,0:手工发货 1:导入excel发货",
-              prop: "deliverType",
-              rules: [{
-                required: true,
-                message: "请输入发货类型标志,0:手工发货 1:导入excel发货",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.orderexpress_add, false),
-          viewBtn: this.vaildData(this.permission.orderexpress_view, false),
-          delBtn: this.vaildData(this.permission.orderexpress_delete, false),
-          editBtn: this.vaildData(this.permission.orderexpress_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 299
src/views/finance/ordergoods.vue

@@ -1,299 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.ordergoods_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/ordergoods";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              rules: [{
-                required: true,
-                message: "请输入订单ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "订单号",
-              prop: "outTradeNo",
-              rules: [{
-                required: true,
-                message: "请输入订单号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品数量",
-              prop: "goodsNum",
-              rules: [{
-                required: true,
-                message: "请输入商品数量",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品价格",
-              prop: "goodsPrice",
-              rules: [{
-                required: true,
-                message: "请输入商品价格",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品规格ID",
-              prop: "goodsSpacId",
-              rules: [{
-                required: true,
-                message: "请输入商品规格ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品规格名",
-              prop: "goodsSpacNames",
-              rules: [{
-                required: true,
-                message: "请输入商品规格名",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品名称",
-              prop: "goodsName",
-              rules: [{
-                required: true,
-                message: "请输入商品名称",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品图片",
-              prop: "goodsImg",
-              rules: [{
-                required: true,
-                message: "请输入商品图片",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商品类型",
-              prop: "goodsType",
-              rules: [{
-                required: true,
-                message: "请输入商品类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "票值",
-              prop: "ticketVal",
-              rules: [{
-                required: true,
-                message: "请输入票值",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.ordergoods_add, false),
-          viewBtn: this.vaildData(this.permission.ordergoods_view, false),
-          delBtn: this.vaildData(this.permission.ordergoods_delete, false),
-          editBtn: this.vaildData(this.permission.ordergoods_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 285
src/views/finance/ordergrant.vue

@@ -1,285 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.ordergrant_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/ordergrant";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-            },
-            {
-              label: "用户ID",
-              prop: "userId",
-              hide: true,
-            },
-            {
-              label: "批次ID",
-              prop: "batNo",
-              width: 144,
-              hide: true,
-            },
-            {
-              label: "授权号",
-              prop: "authNo",
-              width: 144,
-            },
-            {
-              label: "账号",
-              prop: "account",
-              width: 120,
-            },
-            {
-              label: "用户姓名",
-              prop: "realName",
-              width: 100,
-            },
-            {
-              label: "授权状态",
-              prop: "statusDisplayName",
-            },
-            {
-              label: "授权状态",
-              prop: "status",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=auth_state",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "授权状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "金额",
-              prop: "price",
-              width: 60,
-            },
-            {
-              label: "数量",
-              prop: "num",
-              width: 60,
-            },
-            {
-              label: "剩余数量",
-              prop: "nowNum",
-              width: 80,
-            },
-            {
-              label: "冻结时间",
-              prop: "freezeTime",
-              width: 140,
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              width: 140,
-            },
-            {
-              label: "解冻时间",
-              prop: "unfreezeTime",
-              width: 140,
-            },
-
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.ordergrant_add, false),
-          viewBtn: this.vaildData(this.permission.ordergrant_view, false),
-          delBtn: this.vaildData(this.permission.ordergrant_delete, false),
-          editBtn: this.vaildData(this.permission.ordergrant_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 344
src/views/finance/orderrefund.vue

@@ -1,344 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.orderrefund_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/orderrefund";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "退款ID",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入退款ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              rules: [{
-                required: true,
-                message: "请输入订单ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "用户ID",
-              prop: "userId",
-              rules: [{
-                required: true,
-                message: "请输入用户ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款状态",
-              prop: "refundState",
-              rules: [{
-                required: true,
-                message: "请输入退款状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款原因",
-              prop: "reason",
-              rules: [{
-                required: true,
-                message: "请输入退款原因",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款凭证(图片)",
-              prop: "rimgs",
-              rules: [{
-                required: true,
-                message: "请输入退款凭证(图片)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款备注",
-              prop: "remark",
-              rules: [{
-                required: true,
-                message: "请输入退款备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "拒绝原因",
-              prop: "refuseReason",
-              rules: [{
-                required: true,
-                message: "请输入拒绝原因",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款类型  0--只退款,1--退货退款",
-              prop: "refundType",
-              rules: [{
-                required: true,
-                message: "请输入退款类型  0--只退款,1--退货退款",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款物流公司",
-              prop: "wlName",
-              rules: [{
-                required: true,
-                message: "请输入退款物流公司",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "物流单号",
-              prop: "wlNum",
-              rules: [{
-                required: true,
-                message: "请输入物流单号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款地址",
-              prop: "shopAddress",
-              rules: [{
-                required: true,
-                message: "请输入退款地址",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "申请时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入申请时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "同意/拒绝时间",
-              prop: "agreeTime",
-              rules: [{
-                required: true,
-                message: "请输入同意/拒绝时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "退款时间",
-              prop: "refundTime",
-              rules: [{
-                required: true,
-                message: "请输入退款时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "删除标识   0正常  1逻辑删除",
-              prop: "isDeleted",
-              rules: [{
-                required: true,
-                message: "请输入删除标识   0正常  1逻辑删除",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.orderrefund_add, false),
-          viewBtn: this.vaildData(this.permission.orderrefund_view, false),
-          delBtn: this.vaildData(this.permission.orderrefund_delete, false),
-          editBtn: this.vaildData(this.permission.orderrefund_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 263
src/views/finance/platformauthorization.vue

@@ -1,263 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.platformauthorization_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/platformauthorization";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-            },
-            {
-              label: "订单号",
-              prop: "orderNo",
-              overHidden: true,
-            },
-            {
-              label: "授权数量",
-              prop: "totalNum",
-              width: 80,
-            },
-            {
-              label: "批次号",
-              prop: "consignConfigId",
-              overHidden: true,
-            },
-            {
-              label: "授权号",
-              prop: "authNo",
-              overHidden: true,
-              width: 144,
-            },
-            {
-              label: "授权金额",
-              prop: "authPrice",
-            },
-            {
-              label: "授权状态",
-              prop: "stateDisplayName",
-            },
-            {
-              label: "授权状态",
-              prop: "state",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=auth_state",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "授权状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "结束时间",
-              prop: "endTime",
-              width: 144,
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              width: 144,
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.platformauthorization_add, false),
-          viewBtn: this.vaildData(this.permission.platformauthorization_view, false),
-          delBtn: this.vaildData(this.permission.platformauthorization_delete, false),
-          editBtn: this.vaildData(this.permission.platformauthorization_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 317
src/views/finance/usertrade.vue

@@ -1,317 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.usertrade_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/finance/usertrade";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "",
-              prop: "id",
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "用户ID",
-              prop: "userId",
-              rules: [{
-                required: true,
-                message: "请输入用户ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "提现渠道,1,微信,2,支付(默认)",
-              prop: "type",
-              rules: [{
-                required: true,
-                message: "请输入提现渠道,1,微信,2,支付(默认)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "提现账号,支付宝账户、微信账户",
-              prop: "account",
-              rules: [{
-                required: true,
-                message: "请输入提现账号,支付宝账户、微信账户",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "账户姓名",
-              prop: "accountName",
-              rules: [{
-                required: true,
-                message: "请输入账户姓名",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "可提现金额(打款金额)",
-              prop: "money",
-              rules: [{
-                required: true,
-                message: "请输入可提现金额(打款金额)",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "提现来源,1,红包(默认),2:用户钱包,3:企业钱包,4,基金",
-              prop: "cashFrom",
-              rules: [{
-                required: true,
-                message: "请输入提现来源,1,红包(默认),2:用户钱包,3:企业钱包,4,基金",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "有效状态,0:提现中,1:已到账,2:支付失败",
-              prop: "status",
-              rules: [{
-                required: true,
-                message: "请输入有效状态,0:提现中,1:已到账,2:支付失败",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "支付成功时间",
-              prop: "updateTime",
-              rules: [{
-                required: true,
-                message: "请输入支付成功时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "支付返回body",
-              prop: "body",
-              rules: [{
-                required: true,
-                message: "请输入支付返回body",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "支付宝/微信用户Id",
-              prop: "payId",
-              rules: [{
-                required: true,
-                message: "请输入支付宝/微信用户Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "支付宝/微信订单号",
-              prop: "outTradeNo",
-              rules: [{
-                required: true,
-                message: "请输入支付宝/微信订单号",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.usertrade_add, false),
-          viewBtn: this.vaildData(this.permission.usertrade_view, false),
-          delBtn: this.vaildData(this.permission.usertrade_delete, false),
-          editBtn: this.vaildData(this.permission.usertrade_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 158
src/views/platform/costBreakdownInfo.vue

@@ -1,158 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               v-model="form"
-               ref="crud1"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-import {costBreakdownPage} from "../../api/redenvelopemall/finance";
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      option: {
-        menu: false,
-        // calcHeight: 30,
-        // tip: false,
-        // searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        addBtn: false,
-        selection: true,
-        excelBtn: true,
-        column: [
-          {
-            label: "时间",
-            prop: "createTime",
-            type:'datetime',
-            format:'yyyy-MM-dd HH:mm:ss',
-            valueFormat:'yyyy-MM-dd HH:mm:ss',
-            searchRange:true,
-            search:true,
-          },
-          {
-            hide:true,
-            searchLabelWidth:120,
-            label: "供应商类型",
-            prop: "source",
-            props: {
-              label: 'name',
-              value: 'value'
-            },
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=GoodsSourceEnum",
-            search: true,
-            rules: [{
-              required: true,
-              message: "供应商类型",
-              trigger: "blur"
-            }]
-          },{
-            label: "供应商名称",
-            prop: "sourceName",
-            width: 120
-          },
-          {
-            label: "合同号",
-
-          },
-          {
-            label: "商品名称",
-            prop: "goodsName",
-            hide:true,
-            search: true
-          },
-          {
-            label: "商品名称",
-            prop: "nameStr",
-          },
-          {
-            label: "协议单价",
-            prop: "agreementPrice",
-          },
-          {
-            label: "数量",
-            prop: "num",
-          },
-          {
-            label: "协议价总额",
-            prop: "totalAgreementPrice",
-          }
-        ]
-      },
-      data: [],
-      selectionList: [],
-    }
-  },
-  created() {
-    // this.type = this.option.column[0];
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab.name, tab.label);
-      this.activeName = tab.name;
-      this.onLoad(this.page);
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      if (params.createTime &&params.createTime.length>0){
-        params.startTime=params.createTime[0]
-        params.endTime=params.createTime[1]
-      }
-      console.log('time',params)
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      costBreakdownPage(page.currentPage, page.pageSize,Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
-}
-</script>

+ 0 - 156
src/views/platform/costBreakdownStatisticsInfo.vue

@@ -1,156 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               v-model="form"
-               ref="crud1"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-import {costBreakdownStatistics} from "../../api/redenvelopemall/finance";
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      option: {
-        menu: false,
-        // calcHeight: 30,
-        // tip: false,
-        // searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        addBtn: false,
-        selection: true,
-        excelBtn: true,
-        column: [
-          {
-            label: "时间",
-            prop: "createTime",
-          },
-          {
-            hide:true,
-            searchLabelWidth:120,
-            label: "供应商类型",
-            prop: "source",
-            props: {
-              label: 'label',
-              value: 'value'
-            },
-            type: "select",
-            dicData:[{
-              label:'中宏',
-              value:0,
-            },{
-              label:'胜天半子',
-              value:1,
-            },{
-              label:'唯品尚',
-              value:2,
-            }],
-            search: true,
-            rules: [{
-              required: true,
-              message: "供应商类型",
-              trigger: "blur"
-            }]
-          },{
-            label: "供应商名称",
-            prop: "sourceName",
-            width: 120
-          },
-          {
-            label: "合同号",
-
-          },
-          {
-            label: "商品名称",
-            prop: "goodsName",
-            hide:true,
-          },
-          {
-            label: "商品名称",
-            prop: "nameStr",
-          },
-          {
-            label: "协议单价",
-            prop: "",
-          },
-          {
-            label: "数量",
-            prop: "sale",
-          },
-          {
-            label: "协议价总额",
-            prop: "totalAgreementPrice",
-          }
-        ]
-      },
-      data: [],
-      selectionList: [],
-    }
-  },
-  created() {
-    // this.type = this.option.column[0];
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab.name, tab.label);
-      this.activeName = tab.name;
-      this.onLoad(this.page);
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      costBreakdownStatistics(page.currentPage, page.pageSize,Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
-}
-</script>

+ 0 - 131
src/views/platform/grossProfitStatisticsInfo.vue

@@ -1,131 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               v-model="form"
-               ref="crud1"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-import {grossProfitStatistics} from "../../api/redenvelopemall/finance";
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      option: {
-        menu: false,
-        // calcHeight: 30,
-        // tip: false,
-        // searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        addBtn: false,
-        selection: true,
-        excelBtn: true,
-        column: [
-          {
-            searchLabelWidth:120,
-            label: "供应商类型",
-            prop: "source",
-            props: {
-              label: 'name',
-              value: 'value'
-            },
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=GoodsSourceEnum",
-          },
-          {
-            label: "实收金额",
-            prop: "totalPaidInAmount",
-          },
-          {
-            label: "协议金额",
-            prop: "totalAgreementPrice",
-          },
-          {
-            label: "毛利",
-            prop: "grossProfit",
-          },
-          {
-            label: "毛利率",
-            prop: "rateOfGrossProfit",
-          },
-          {
-            label: "占比",
-            prop: "totalAgreementPrice",
-          }
-        ]
-      },
-      data: [],
-      selectionList: [],
-    }
-  },
-  created() {
-    // this.type = this.option.column[0];
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab.name, tab.label);
-      this.activeName = tab.name;
-      this.onLoad(this.page);
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      if (params.createTime &&params.createTime.length>0){
-        params.startTime=params.createTime[0]
-        params.endTime=params.createTime[1]
-      }
-      console.log('time',params)
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    onLoad() {
-      this.loading = true;
-      grossProfitStatistics().then(res => {
-        const data = res.data.data;
-        this.data = data;
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
-}
-</script>

+ 0 - 169
src/views/platform/saleOfDayInfo.vue

@@ -1,169 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               v-model="form"
-               ref="crud1"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-import {salesOfTheDay} from "../../api/redenvelopemall/finance";
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      option: {
-        menu: false,
-        // calcHeight: 30,
-        // tip: false,
-        // searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        addBtn: false,
-        selection: true,
-        excelBtn: true,
-        column: [
-          {
-            label: "时间",
-            prop: "time",
-            type:'date',
-            format:'yyyy-MM-dd',
-            valueFormat:'yyyy-MM-dd HH:mm:ss',
-            search:true,
-          },
-          {
-            hide:true,
-            searchLabelWidth:120,
-            label: "供应商类型",
-            prop: "source",
-            props: {
-              label: 'name',
-              value: 'value'
-            },
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=GoodsSourceEnum",
-            search: true,
-            rules: [{
-              required: true,
-              message: "供应商类型",
-              trigger: "blur"
-            }]
-          },{
-            label: "供应商名称",
-            prop: "sourceName",
-            width: 120
-          },
-          {
-            label: "订单号",
-          },
-          {
-            label: "商品名称",
-            prop: "nameStr",
-          },
-          {
-            label: "销售单价",
-            prop: "salePrice",
-          },
-          {
-            label: "销售数量",
-            prop: "totalNum",
-          },
-          {
-            label: "应收金额",
-            prop: "receivableAmount",
-          },
-          {
-            label: "折扣金额",
-            prop: "deductionAmount",
-          },
-          {
-            label: "实收金额",
-            prop: "paidInAmount",
-          },
-          {
-            label: "折扣类型",
-            prop: "zoneType",
-            search: true,
-            props: {
-              label: 'name',
-              value: 'value'
-            },
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=ZoneTypeEnum",
-            rules: [{
-              required: true,
-              message: "折扣类型",
-              trigger: "blur"
-            }]
-          }
-        ]
-      },
-      data: [],
-      selectionList: [],
-    }
-  },
-  created() {
-    // this.type = this.option.column[0];
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab.name, tab.label);
-      this.activeName = tab.name;
-      this.onLoad(this.page);
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      salesOfTheDay(page.currentPage, page.pageSize,Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
-}
-</script>

+ 0 - 153
src/views/platform/saleOfDayStatisticsInfo.vue

@@ -1,153 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               v-model="form"
-               ref="crud1"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-import {salesOfTheDayStatistics} from "../../api/redenvelopemall/finance";
-
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      option: {
-        menu: false,
-        // calcHeight: 30,
-        // tip: false,
-        // searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        addBtn: false,
-        selection: true,
-        excelBtn: true,
-        column: [
-          {
-            label: "时间",
-            prop: "time",
-            type:'date',
-            format:'yyyy-MM-dd',
-            valueFormat:'yyyy-MM-dd HH:mm:ss',
-            search:true,
-          },
-          {
-            hide:true,
-            searchLabelWidth:120,
-            label: "供应商类型",
-            prop: "source",
-            props: {
-              label: 'name',
-              value: 'value'
-            },
-            type: "select",
-            dicUrl: "/api/blade-system/dict-biz/getEnumDict?enumName=GoodsSourceEnum",
-            search: true,
-            rules: [{
-              required: true,
-              message: "供应商类型",
-              trigger: "blur"
-            }]
-          },{
-            label: "供应商名称",
-            prop: "sourceName",
-            width: 120
-          },
-          {
-            label: "订单号",
-          },
-          {
-            label: "商品名称",
-            prop: "nameStr",
-          },
-          {
-            label: "销售单价",
-            prop: "salePrice",
-          },
-          {
-            label: "销售数量",
-            prop: "totalNum",
-          },
-          {
-            label: "应收金额",
-            prop: "receivableAmount",
-          },
-          {
-            label: "折扣金额",
-            prop: "deductionAmount",
-          },
-          {
-            label: "实收金额",
-            prop: "paidInAmount",
-          }
-        ]
-      },
-      data: [],
-      selectionList: [],
-    }
-  },
-  created() {
-    // this.type = this.option.column[0];
-  },
-  methods: {
-    handleClick(tab, event) {
-      console.log(tab.name, tab.label);
-      this.activeName = tab.name;
-      this.onLoad(this.page);
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      salesOfTheDayStatistics(page.currentPage, page.pageSize,Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    }
-  }
-}
-</script>

+ 0 - 302
src/views/polymerize/choice.vue

@@ -1,302 +0,0 @@
-<template>
-  <div class="choice-b" ref="choiceB">
-    <basic-container>
-      <!-- 在线选品 -->
-      <avue-form :option="option" v-model="form" @submit="submit" ref="avueForm">
-        <template slot-scope="{disabled,size}" slot="group_id">
-          <el-button type="text" v-for="(ite, k) in activityList" :key="k">{{ite.name}}</el-button>
-        </template>
-        <template slot-scope="scope" slot="gross_profit_rate">
-          <k-form-item ref="gross_profit_rateFormItem" :scope="scope" end-str="%"/>
-        </template>
-        <template slot-scope="scope" slot="promote_rate">
-          <k-form-item ref="promote_rateFormItem" :scope="scope" end-str="%"/>
-        </template>
-        <template slot-scope="scope" slot="agreement_price">
-          <k-form-item ref="agreement_priceFormItem" :scope="scope" />
-        </template>
-        <template slot-scope="scope" slot="discount">
-          <k-form-item ref="discountFormItem" :scope="scope" end-str="折"/>
-        </template>
-      </avue-form>
-
-      <div class="good-li" v-loading="loading" v-if="goodList.length > 0">
-        <goods-choice v-for="(item, l) in goodList" :key="l" :item="item" @checkChange="checkChange"></goods-choice>
-      </div>
-      <avue-empty v-else/>
-      <div style="height: 100px;"></div>
-    </basic-container>
-    <div class="operation" :style="'width: '+ bodyWidth + 'px;'">
-      <basic-container>
-        <avue-form :option="imOption" v-model="importForm" ref="importForm">
-          <template slot-scope="scope" slot="a165750701340472520">
-             <el-button type="primary" @click="importSubmit" >导入商品({{selectGood.length}})</el-button>
-             <el-button type="warning" @click="selectGood = []">清空选择</el-button>
-             <!-- <el-button type="primary">导入全部筛选商品({{total}})</el-button> -->
-          </template>
-          <template slot-scope="scope" slot="a165750701570373941">
-             <div class="paging">
-               <el-pagination
-                 background
-                 layout="total, sizes, prev, pager, next, jumper"
-                 :page-sizes="[20, 30, 50, 80, 100]"
-                 :total="total"
-                 :page-size="form.limit"
-                 :page-count="form.page"
-                 @current-change="currentChange"
-                 @size-change="sizeChange"></el-pagination>
-             </div>
-          </template>
-        </avue-form>
-      </basic-container>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {getGoodsStorageList} from "@/api/redenvelopemall/supplyChain";
-  // import {getLazyList, getCategoryTree, getDetail, add, update, remove, updateBatch, getByParentId} from "@/api/redenvelopemall/categoryinfo";
-  import kFormItem from './kFormItem'
-  import { getList, getActivityLists, getByParentId, importGoods} from '../../api/polymerize/choice'
-  import goodsChoice from '../../components/goods-choice/main'
-  let dicFormatter = data => {
-    data.data.push({ dictKey: "k-k", dictValue: "自定义区间"})
-    return data.data
-  }
-  export default {
-    components: {
-      kFormItem,
-      goodsChoice
-    },
-    data() {
-      let self = this;
-      return {
-        form: {
-          source: '1',
-          page: 1,
-          limit: 20,
-        },
-        option: {
-          column: [
-            {type: 'select',label: '平台来源',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=goods_source",
-              change(param) {
-                self.sourceChange(param.value)
-              },
-              span: 12, display: true, props: {label: "dictValue",value: "dictKey"}, prop: 'source'},
-            {type: 'cascader', label: '类目', span: 12, display: true, cascaderIndex: 1, showAllLevels: true, props: {label: 'title', value: 'id'}, prop: 'category_id',
-              lazy: true,
-              checkStrictly: true,
-              lazyLoad(node, resolve) {
-                let level = node.level;
-                let param = 0;
-                if(level == 0) param = 0;
-                else param = node.data.id;
-                self.loadinit(param, resolve);
-              }
-            },
-            {type: 'select',label: '毛利率',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=gross_profit_rate", dicFormatter,
-              span: 6,display: true, props: {label: "dictValue",value: "dictKey" },prop: 'gross_profit_rate'},
-            {type: 'select',label: '利润率',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=gross_profit_rate", dicFormatter,
-              span: 6,display: true,props: {label: "dictValue",value: "dictKey"},prop: 'promote_rate'},
-            {type: 'select',label: '协议价',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=propose_price", dicFormatter,
-              span: 6,display: true,props: {label: "dictValue",value: "dictKey"}, prop: 'agreement_price'},
-            {type: 'select',label: '指导价',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=propose_price",
-              span: 6, display: true, props: {label: "dictValue",value: "dictKey"}, prop: 'guide_price'},
-            {type: 'select',label: '营销价',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=propose_price",
-              span: 6, display: true, props: {label: "dictValue", value: "dictKey"}, prop: 'activity_price'},
-            {type: 'select',label: '折扣',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=discount_range", dicFormatter,
-              span: 6,display: true,props: {label: "dictValue", value: "dictKey"}, prop: 'discount'},
-            {type: 'select',label: '是否包邮',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=free_postage",
-              span: 6,display: true,props: {label: "dictValue",value: "dictKey"},prop: 'is_free_shipping', dataType: "number"},
-
-            {type: 'input',label: '营销活动',span: 12,display: true, prop: 'group_id'},
-            {type: 'input',label: '关键词',span: 12,display: true, prop: 'search_words'}
-          ],
-          labelPosition: 'right',
-          labelSuffix: ':',
-          labelWidth: 90,
-          gutter: 0,
-          menuBtn: true,
-          submitBtn: true,
-          submitText: '查询',
-          emptyBtn: true,
-          emptyText: '清空',
-          menuPosition: 'center',
-          loading: false
-        },
-        total: 0,
-        goodList: [],
-        activityList: [],
-        bodyWidth: 0,
-        selectGood: [],
-        importForm: {},
-        imOption: {
-          column: [
-            {type: 'input', label: '毛利率',span: 8, display: true, prop: 'grossRate',
-              rules: [{ required: true, message: "请输入毛利率",trigger: "blur"}]
-            },
-            {type: 'cascader', label: '类目', span: 8, display: true, cascaderIndex: 1, showAllLevels: true, props: {label: 'title', value: 'id'}, prop: 'categoryIds',
-              lazy: true,
-              checkStrictly: true,
-              lazyLoad(node, resolve) {
-                let level = node.level;
-                let param = 0;
-                if(level == 0) param = 0;
-                else param = node.data.id;
-                self.loadinit(param, resolve);
-              },
-              rules: [{ required: true, message: "请选择类目",trigger: "blur"}]
-            },
-            {type: 'select',label: '专区类型',
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=zone_type",
-              span: 8, display: true, props: {label: "dictValue",value: "dictKey" },prop: 'zoneType',
-              rules: [{ required: true, message: "请选择专区类型",trigger: "blur"}]
-            },
-            {type: 'input', label: '', span: 11,display: true,prop: 'a165750701340472520', labelWidth:1},
-            {type: 'input', label: '', span: 12,display: true,prop: 'a165750701570373941', labelWidth:1}
-          ],
-          submitBtn: false,
-          emptyBtn: false,
-          menuSpan: 1,
-          labelPosition: 'left',
-        },
-      }
-    },
-    created() {
-      this.init()
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.bodyWidth = this.$refs.choiceB.offsetWidth -20;
-      });
-    },
-    methods: {
-      init() {
-        getActivityLists().then(res => {
-          this.activityList = res.data.data;
-        });
-      },
-      checkChange(val, id) {
-        if(val) {
-          this.selectGood.push(id);
-        }
-        else {
-          let index = this.selectGood.findIndex(ele => ele == id);
-          if(index >= 0) this.selectGood.splice(index, 1);
-        }
-      },
-      importSubmit() {
-        this.$refs.importForm.validate((valid, done, msg) => {
-          if(!valid) return;
-          if(this.selectGood.length < 1) return this.$message.warning("您尚未勾选商品");
-          const loading = this.$loading({
-            lock: true,
-            text: '导入中,请稍等...',
-            spinner: 'el-icon-loading',
-            background: 'rgba(0, 0, 0, 0.7)'
-          });
-          importGoods(this.selectGood.join(','), this.importForm.grossRate, this.importForm.categoryIds.join('-'), this.importForm.zoneType).then(res => {
-            done();
-            loading.close();
-            this.selectGood = [];
-            this.$refs.importForm.resetForm();
-            this.$message({type: "success", message: "操作成功!"});
-          })
-          .catch(err => {
-            done();
-            loading.close();
-            this.$message({type: "error", message: err.msg || err.message ||"操作失败!"});
-          });
-        })
-      },
-      changeData(form) {
-        let data = JSON.parse(JSON.stringify(form));
-        for (let k in data) {
-          if(k.startsWith('$')) delete data[k];
-          else {
-            if(this.$refs[k + 'FormItem']) {
-              let obj = this.$refs[k + 'FormItem'].getParam();
-              data[k] = obj.show ? obj.value : `${obj.val1}-${obj.val2}`;
-            }
-            if(!data[k]) data[k] = undefined;
-            else if(typeof data[k] == 'string' && data[k].includes('-')){
-              let val = data[k].split('-');
-              data[k] = { from: val[0], to: val[1]};
-            }
-            else if(Array.isArray(data[k])) data[k] = data[k][data[k].length - 1];
-          }
-        }
-        return data;
-      },
-      submit(form, done) {
-        this.loading = true;
-        getList(this.changeData(form)).then(res => {
-           let param = res.data.data;
-           this.goodList = param.records;
-           this.total = param.total;
-           this.loading = false;
-           done();
-        })
-        .catch(err => {
-          console.log(err);
-          this.loading = false;
-          done();
-        });
-      },
-      loadinit(parentId, resolve) {
-        getByParentId({source: this.form.source, parentId}).then(res => {
-          resolve(res.data.data);
-        });
-      },
-      sourceChange(val) {
-        getByParentId({source: val, parentId: 0}).then(res => {
-          this.$refs.avueForm.updateDic('category_id', res.data.data);
-        });
-      },
-      sizeChange(pageSize){
-        this.form.limit = pageSize;
-        this.submit(this.form, () => {});
-      },
-      currentChange(currentPage){
-        this.form.page = currentPage;
-        this.submit(this.form, () => {});
-      },
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .good-li {
-    display: flex;
-    flex-wrap: wrap;
-    .goods-item {
-      margin-right: 20px;
-    }
-  }
-  .choice-b {
-    position: relative;
-    width: 100%;
-    .operation {
-      position: fixed;
-      bottom: 0px;
-      .basic-container {
-        padding: 0;
-        margin: 0;
-      }
-      .paging {
-        display: flex;
-        align-items: center;
-        justify-content: flex-end;
-      }
-    }
-  }
-
-</style>

+ 0 - 90
src/views/polymerize/kFormItem.vue

@@ -1,90 +0,0 @@
-<template>
-  <el-select
-    v-model="formItem.value"
-    :placeholder="placeholders[0]"
-    @change="seleChange($event)"
-    v-if="formItem.show"
-    :disabled="scope.disabled" :size="scope.size">
-    <el-option v-for="(item, i) in scope.dic" :key="i" :label="item[scope.column.props.label]" :value="item[scope.column.props.value]"></el-option>
-  </el-select>
-  <div v-else class="fen-input">
-    <el-row :gutter="0">
-      <el-col :span="11">
-        <el-input
-          :type="inputType"
-          v-model="formItem.val1"
-          :placeholder="placeholders[1]"
-          :disabled="scope.disabled"
-          :size="scope.size" min="0"/>
-      </el-col>
-      <el-col :span="1"><div style="text-align: center;">-</div></el-col>
-      <el-col :span="12">
-       <el-input
-        :type="inputType"
-        v-model="formItem.val2"
-        :placeholder="placeholders[2]"
-        :disabled="scope.disabled"
-        :size="scope.size" min="0">
-         <template slot="append">{{ endStr }}</template>
-       </el-input>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-  export default {
-    props: {
-      scope: {
-        type: Object,
-        default: () => { return {}}
-      },
-      endStr: {
-        type: String,
-        default: '元'
-      },
-      cipher: {
-        type: String,
-        default: 'k-k'
-      },
-      placeholders: {
-        type: Array,
-        default: ['请选择', '请输入内容', '请输入内容']
-      },
-      inputType: {
-        type: String,
-        default: 'number'
-      }
-    },
-    data() {
-      return {
-        formItem: {
-          show: true,
-          val1: '',
-          val2: '',
-          value: ''
-        }
-      }
-    },
-    methods: {
-      seleChange(val) {
-        if(val == this.cipher) this.formItem.show = !this.formItem.show
-      },
-      getParam() {
-        return this.formItem
-      },
-      clean() {
-        this.formItem.val1 = ''
-        this.formItem.val2 = ''
-        this.formItem.value = ''
-        this.formItem.show = true
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-  .fen-input .el-col {
-    margin-bottom: 0px;
-  }
-</style>

+ 0 - 240
src/views/redpacket/log.vue

@@ -1,240 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.redenvelopereceivelog_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/redpacket/redenvelopereceivelog";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          menu:false,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "用户名",
-              prop: "userName",
-              search:true,
-            },
-            {
-              label: "账号",
-              prop: "account",
-              search:true,
-            },
-            {
-              label: "红包类型",
-              prop: "type",
-              dicData:[{
-                label:'随机红包',
-                value:0,
-              },{
-                label:'专属红包',
-                value:1,
-              }],
-            },
-            {
-              label: "金额",
-              prop: "amount",
-            },
-            {
-              label: "领取时间",
-              prop: "createTime",
-              type:'datetime',
-              format:'yyyy-MM-dd HH:mm:ss',
-              valueFormat:'yyyy-MM-dd HH:mm:ss',
-              searchRange:true,
-              search:true,
-            }
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.redenvelopereceivelog_add, false),
-          viewBtn: this.vaildData(this.permission.redenvelopereceivelog_view, false),
-          delBtn: this.vaildData(this.permission.redenvelopereceivelog_delete, false),
-          editBtn: this.vaildData(this.permission.redenvelopereceivelog_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        if (params.createTime &&params.createTime.length>0){
-          params.startTime=params.createTime[0]
-          params.endTime=params.createTime[1]
-        }
-        console.log("pa",params)
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 310
src/views/redpacket/page.vue

@@ -1,310 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               :search.sync="search"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-<!--      <template slot-scope="{row,index}" slot="menu">-->
-<!--        <el-button type="success"-->
-<!--                   size="small"-->
-<!--                   @click="handleCheck(row.id)">查看</el-button>-->
-<!--      </template>-->
-    </avue-crud>
-    <el-dialog  append-to-body
-                :visible.sync="dialogFormVisible" width="60%" height="50%">
-      <avue-crud :search.sync="itemSearch"
-                 :data="itemData"
-                 :option="itemOption"
-                 :table-loading="itemLoading"
-                 :page.sync="itemPage"
-                 @search-change="itemSearchChange"
-                 @search-reset="itemSearchReset"
-                 @selection-change="itemSelectionChange"
-                 @current-change="itemCurrentChange"
-                 @size-change="itemSizeChange"
-                 @refresh-change="itemRefreshChange"
-                 @on-load="itemOnLoad">
-      </avue-crud>
-    </el-dialog>
-  </basic-container>
-</template>
-
-<script>
-import {getList, getDetail} from "@/api/redpacket/redenvelopeManager";
-import {mapGetters} from "vuex";
-
-export default {
-  data() {
-    return {
-      dialogFormVisible: false,
-      form: {},
-      query: {},
-      itemQuery: {},
-      loading: true,
-      itemLoading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      itemPage: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      selectionList: [],
-      itemSelectionList: [],
-      itemSearch:{
-        redEnvelopeId:'',
-        userName:''
-      },
-      itemOption: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        selection: true,
-        dialogClickModal: false,
-        addBtn:false,
-        menu:false,
-        column: [
-          {
-            label: "用户名",
-            prop: "userName",
-            search:true,
-          },
-          {
-            label: "金额",
-            prop: "amount",
-          },
-          {
-            label: "时间",
-            prop: "createTime",
-          }]
-      },
-      search:{
-        title:''
-      },
-      option: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: true,
-        editBtn:false,
-        delBtn:false,
-        selection: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "标题",
-            prop: "title",
-            search:true,
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "归属",
-            prop: "belong",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "总金额",
-            prop: "totalAmount",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "个数",
-            prop: "num",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "类型",
-            prop: "type",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "最大金额",
-            prop: "maxAmount",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "最小金额",
-            prop: "minAmount",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "创建时间",
-            prop: "createTime",
-            rules: [{
-              required: true,
-              message: "请输入",
-              trigger: "blur"
-            }]
-          },
-        ]
-      },
-      data: [],
-      itemData: [],
-    };
-  },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: false,
-        viewBtn: true,
-        delBtn: false,
-        editBtn: false
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
-  },
-  methods: {
-    handleCheck(id){
-      this.dialogFormVisible=true
-      this.itemSearch.redEnvelopeId=id,
-      this.itemOnLoad(this.itemPage,this.itemSearch)
-    },
-    beforeOpen(done, type) {
-      this.dialogFormVisible=true
-      if (["edit", "view"].includes(type)) {
-        this.handleCheck(this.form.id)
-        // getDetail(1, 10, this.form.id).then(res => {
-        //   this.form = res.data.data;
-        // });
-      }
-     // done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      console.log("执行的是1");
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-    itemSearchReset() {
-      this.itemQuery = {};
-      this.itemOnLoad(this.itemPage);
-    },
-    itemSearchChange(params, done) {
-      this.itemQuery = params;
-      this.itemPage.currentPage = 1;
-      this.itemOnLoad(this.itemPage, params);
-      done();
-    },
-    itemSelectionChange(list) {
-      this.itemSelectionList = list;
-    },
-    itemSelectionClear() {
-      this.itemSelectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    itemCurrentChange(currentPage) {
-      this.itemPage.currentPage = currentPage;
-    },
-    itemSizeChange(pageSize) {
-      this.itemPage.pageSize = pageSize;
-    },
-    itemRefreshChange() {
-      this.itemLoading(this.itemPage, this.itemQuery);
-    },
-    itemOnLoad(page,itemParams= {}) {
-      this.itemLoading = true;
-      itemParams.redEnvelopeId = this.form.id
-      getDetail(page.currentPage, page.pageSize,  Object.assign(itemParams, this.itemQuery)).then(res => {
-        const data = res.data.data;
-        this.itemPage.total = data.total;
-        this.itemData = data.records;
-        console.log("itemData",this.itemData)
-        this.itemLoading = false;
-        this.itemSelectionClear();
-      });
-    }
-  }
-};
-</script>
-
-<style>
-</style>

+ 0 - 183
src/views/redpacket/setting.vue

@@ -1,183 +0,0 @@
-<template>
-  <basic-container>
-
-    <avue-form ref="form" v-model="form" :option="option" @reset-change="emptytChange" @submit="submit">
-      <template slot-scope="scope" slot="menuForm">
-        <el-button @click="create">生成红包</el-button>
-      </template>
-    </avue-form>
-  </basic-container>
-</template>
-
-<script>
-import {getOne, add,create} from "@/api/redpacket/setting";
-import {mapGetters} from "vuex";
-
-var DIC = {
-  TYPE: [{
-    label: '拼手气红包',
-    value: 0
-  }, {
-    label: '普通红包',
-    value: 1
-  }]
-}
-export default {
-  data() {
-    return {
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      selectionList: [],
-      option: {
-        lazy: true,
-        tip: false,
-        simplePage: true,
-        searchShow: true,
-        searchMenuSpan: 6,
-        dialogWidth: "60%",
-        tree: true,
-        border: true,
-        index: true,
-        selection: true,
-        viewBtn: true,
-        menuWidth: 300,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "标题",
-            prop: "title",
-            span: 24,
-            suffixIcon: 'el-icon-tickets',
-            prefixIcon: 'el-icon-tickets',
-            rules: [{
-              required: true,
-              message: "请输入标题",
-              trigger: "blur"
-            }],
-
-          },
-          {
-            label: "类型",
-            prop: "type",
-            span: 24,
-            type: "radio",
-            dicData: DIC.TYPE,
-            mock: {
-              type: 'dic'
-            }
-          },
-          {
-            label: "金额",
-            prop: "totalAmount",
-            rules: [{
-              required: false,
-              message: "请输入金额",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "个数",
-            prop: "num",
-            rules: [{
-              required: true,
-              message: "请输入红包个数",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "最小金额",
-            prop: "minAmount",
-            rules: [{
-              required: true,
-              message: "请输入最小金额",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "最大金额",
-            prop: "maxAmount",
-            rules: [{
-              required: true,
-              message: "请输入最大金额",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "随机红包比例",
-            prop: "proportion",
-            rules: [{
-              required: true,
-              message: "请输入随机红包比例,默认为1,即100%",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "加速(专属)红包比例",
-            prop: "belongProportion",
-            rules: [{
-              required: true,
-              message: "请输入加速(专属)红包比例,默认为1,即100%",
-              trigger: "blur"
-            }]
-          },
-        ]
-      },
-      data: []
-    };
-  },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: this.vaildData(this.permission.category_add, false),
-        viewBtn: this.vaildData(this.permission.category_view, false),
-        delBtn: this.vaildData(this.permission.category_delete, false),
-        editBtn: this.vaildData(this.permission.category_edit, false)
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
-  },
-  created() {
-    this.initData();
-  },
-  methods: {
-    initData() {
-      getOne().then(res => {
-        this.form = res.data.data
-        console.log(this.form)
-      })
-    },
-    submit(form,done) {
-      add(this.form).then(res=>{
-        if (res.data.code===200){
-          this.$message.success("设置成功!")
-          done()
-
-        }
-      })
-    },
-    create(){
-      create().then(res=>{
-        if (res.data.code===200){
-          this.$message.success("生成成功!")
-        }
-      })
-    }
-  }
-};
-</script>
-
-<style>
-</style>

+ 0 - 134
src/views/redpacket/statistics.vue

@@ -1,134 +0,0 @@
-<template>
-  <div>
-    <avue-data-tabs :option="option" ></avue-data-tabs>
-  </div>
-</template>
-
-<script>
-import {mapGetters} from "vuex";
-import request from "@/router/axios";
-
-export default {
-  name: "wel",
-  data() {
-    return {
-      option: {
-        span: 6,
-        data: [
-          {
-            click: function (item) {
-              console.log(JSON.stringify(item));
-            },
-            title: '今日红包总数',
-            subtitle: "",
-            count: 0,
-            // allcount: 5213,
-            // text: '当前用户总数',
-            color: 'rgb(27, 201, 142)',
-            key: "总"
-          },
-          {
-            click: function (item) {
-              console.log(JSON.stringify(item));
-            },
-            title: '今日红包总金额',
-            subtitle: '',
-            decimals:2,
-            count: 0,
-            color: 'rgb(230, 71, 88)',
-            key: '金'
-          },
-          {
-            click: function (item) {
-              console.log(JSON.stringify(item));
-            },
-            title: '已领总数',
-            count: 4,
-            color: 'rgb(178, 159, 255)',
-            key: '领'
-          },
-          {
-            click: function (item) {
-              console.log(JSON.stringify(item));
-            },
-            title: '已领总金额',
-            decimals:2,
-            subtitle: '',
-            count: 0,
-            color: 'rgb(145, 200, 30)',
-            key: '领'
-          },
-          {
-            click: function (item) {
-              console.log(JSON.stringify(item));
-            },
-            title: '未领总数',
-            count: 0,
-            color: 'rgb(178, 159, 255)',
-            key: '未'
-          },
-          {
-            click: function (item) {
-              console.log(JSON.stringify(item));
-            },
-            title: '未领总金额',
-            subtitle: '',
-            decimals:2,
-            count: 0,
-            color: 'rgb(145, 200, 30)',
-            key: '未'
-          }
-        ]
-      }
-    };
-  },
-  computed: {
-    ...mapGetters(["userInfo"]),
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    handleChange(val) {
-      window.console.log(val);
-    },
-    init() {
-      request({
-        url: '/api/re/manager/todayStatistics',
-        method: 'get'
-      }).then(res => {
-        const data = res.data.data;
-        this.option.data.forEach(e => {
-
-          if ('今日红包总数' === e.title) {
-            e.count = data.redEnvelopeItemCount;
-          }
-          if ('今日红包总金额' === e.title) {
-            e.count = data.totalRedEnvelopeAmount;
-          }
-          if ('已领总数' === e.title) {
-            e.count = data.receiveItemCount;
-          }
-          if ('已领总金额' === e.title) {
-            e.count = data.totalReceivedRedEnvelopeAmount;
-          }
-          if ('未领总数' === e.title) {
-            e.count = data.remainItemCount;
-          }
-          if ('未领总金额' === e.title) {
-            e.count = data.totalRemainItemAmount;
-          }
-        })
-      })
-
-
-    }
-  },
-};
-</script>
-
-<style>
-.el-font-size {
-  font-size: 14px;
-}
-</style>

+ 0 - 352
src/views/redpacket/withdrawallog.vue

@@ -1,352 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/redpacket/withdrawallog";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          menu:false,
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: false,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "",
-              prop: "id",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "姓名",
-              prop: "userName",
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "手机号",
-              prop: "phone",
-              search: true,
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "",
-              prop: "createUserId",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "接收人Id",
-              prop: "receiverUserId",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入接收人Id",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "账户",
-              prop: "receiverAccount",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入账户",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "提取金额",
-              prop: "amount",
-              rules: [{
-                required: true,
-                message: "请输入金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "接收人账户类型:0 支付宝 ",
-              hide: true,
-              prop: "receiverType",
-              rules: [{
-                required: true,
-                message: "请输入接收人账户类型:0 支付宝 ",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "备注",
-              prop: "remarks",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否成功 0 失败 1 成功",
-              prop: "isSuccess",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入是否成功 0 失败 1 成功",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "失败原因",
-              prop: "failureReason",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入失败原因",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "实际到账金额",
-              prop: "realAmount",
-              rules: [{
-                required: true,
-                message: "请输入实际金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "之前的金额",
-              prop: "beforeAmount",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入之前的金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "之后的金额",
-              prop: "afterAmount",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入之后的金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "提取时间",
-              prop: "createTime",
-            },
-            {
-              label: "提取时间",
-              prop: "timeRange",
-              search: true,
-              searchRange: true,
-              hide: true,
-              type: 'datetimerange',
-              defaultTime:['00:00:00', '23:59:59'],
-              format:'yyyy-MM-dd HH:mm:ss',
-              valueFormat:'yyyy-MM-dd HH:mm:ss',
-              startPlaceholder: '开始时间',
-              endPlaceholder: '结束时间',
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.bladepaylog_add, false),
-          viewBtn: this.vaildData(this.permission.bladepaylog_view, false),
-          delBtn: this.vaildData(this.permission.bladepaylog_delete, false),
-          editBtn: this.vaildData(this.permission.bladepaylog_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        console.log(this.query)
-        if (this.query.timeRange) {
-          this.query.startTime = this.query.timeRange[0];
-          this.query.endTime = this.query.timeRange[1];
-        }
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 518
src/views/regulation/orderconsign.vue

@@ -1,518 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="info"
-                   size="small"
-                   plain
-                   icon="el-icon-setting"
-                   @click="handlePlatform">选择用户
-        </el-button>
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.orderconsign_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-    <el-dialog title="用户列表"
-               append-to-body
-               :visible.sync="platformBox">
-      <avue-crud :option="platformOption"
-                 :table-loading="platformLoading"
-                 :data="platformData"
-                 ref="platformCrud"
-                 v-model="platformForm"
-                 :before-open="platformBeforeOpen"
-                 :page.sync="platformPage"
-                 :permission="platformPermissionList"
-                 @search-change="platformSearchChange"
-                 @search-reset="platformSearchReset"
-                 @selection-change="platformSelectionChange"
-                 @current-change="platformCurrentChange"
-                 @size-change="platformSizeChange"
-                 @refresh-change="platformRefreshChange"
-                 @on-load="platformOnLoad">
-        <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-add"
-                   :loading="butLoading"
-                   @click="handleRemit">打款
-        </el-button>
-        </template>
-      </avue-crud>
-
-    </el-dialog>
-  </basic-container>
-</template>
-
-<script>
-import {getList, getDetail, add, update, remove, getUserAppList, payment} from "@/api/finance/orderconsign";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        butLoading: false,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        platformBox: false,
-        platformLoading: false,
-        platformPage: {
-          pageSize: 5,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          selectable:(row,index)=>{
-            return row.isRemittance !== 1
-          },
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "商品ID",
-              prop: "goodsId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "商品编号",
-              prop: "productNo",
-              search: true,
-              width: 110,
-            },
-            {
-              label: "商品名称",
-              prop: "goodsName",
-              overHidden: true,
-            },
-            {
-              label: "支付价格",
-              prop: "totalPrice",
-            },
-            {
-              label: "寄售用户ID",
-              prop: "consignUserId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "支付用户ID",
-              prop: "payUserId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "寄售用户",
-              prop: "consignRealName",
-              display: false,
-              width: 120,
-            },
-            {
-              label: "支付用户",
-              prop: "payRealName",
-              display: false,
-              width: 120,
-            },
-            {
-              label: "打款状态",
-              prop: "isConfirmDisplayName",
-              display: false,
-            },
-            {
-              label: "寄售类型",
-              prop: "consignTypeDisplayName",
-              display: false,
-            },
-            {
-              label: "抢购价",
-              prop: "consignPrice",
-            },
-            {
-              label: "是否打款",
-              prop: "isRemittanceDisplayName",
-            },
-            {
-              label: "寄售天数",
-              prop: "consignDays",
-              width: 70,
-            },
-            {
-              label: "数量",
-              prop: "totalNum",
-              width: 70,
-            },
-            {
-              label: "寄售类型",
-              prop: "consignType",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=consign_type",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请选择寄售类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "寄售类型",
-              prop: "isConfirm",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=is_confirm",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请选择寄售类型",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "打款时间",
-              prop: "confirmTime",
-              width: 140,
-              rules: [{
-                required: true,
-                message: "请输入确认时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "进货时间",
-              prop: "createTime",
-              width: 140,
-            },
-          ]
-        },
-        data: [],
-        platformQuery: {},
-        platformSelectionList: [],
-        platformData: [],
-        platformForm: {},
-        platformOption: {
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          viewBtn: true,
-          dialogClickModal: false,
-          menuWidth: 120,
-          editBtnText: '配置',
-          column: [
-            {
-              label: "用户姓名",
-              prop: "realName",
-              search: true,
-              display: false
-            },
-            {
-              label: "手机号",
-              prop: "phone",
-              search: true,
-              display: false
-            },
-            {
-              label: "特殊权限",
-              prop: "enableAuthDisplayName",
-              addDisplay: false,
-              editDisplay: false,
-            },
-            {
-              label: "特殊权限",
-              prop: "enableAuth",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              search: true,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请选择特殊权限",
-                trigger: "blur"
-              }]
-            },
-          ],
-        },
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.orderconsign_add, false),
-          viewBtn: this.vaildData(this.permission.orderconsign_view, false),
-          delBtn: this.vaildData(this.permission.orderconsign_delete, false),
-          editBtn: this.vaildData(this.permission.orderconsign_edit, false)
-        };
-      },
-      platformPermissionList() {
-        return {
-          addBtn: false,
-          viewBtn: false,
-          delBtn: false,
-          editBtn: false,
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handlePlatform() {
-        this.platformBox = true;
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        params.consignUserId = 0;//平台单
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      },
-      platformSearchReset() {
-        this.platformQuery = {};
-        this.platformOnLoad(this.platformPage);
-      },
-      platformSearchChange(params, done) {
-        this.platformQuery = params;
-        this.platformPage.currentPage = 1;
-        this.platformOnLoad(this.platformPage, params);
-        done();
-      },
-      platformSelectionChange(list) {
-        this.platformSelectionList = list;
-      },
-      platformSelectionClear() {
-        this.platformSelectionList = [];
-        this.$refs.platformCrud.toggleSelection();
-      },
-      platformCurrentChange(currentPage) {
-        this.platformPage.currentPage = currentPage;
-      },
-      platformSizeChange(pageSize) {
-        this.platformPage.pageSize = pageSize;
-      },
-      platformRefreshChange() {
-        this.platformOnLoad(this.platformPage, this.platformQuery);
-      },
-      platformOnLoad(page, params = {}) {
-        this.platformLoading = true;
-        getUserAppList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
-          const data = res.data.data;
-          this.platformPage.total = data.total;
-          this.platformData = data.records;
-          this.platformLoading = false;
-          this.platformSelectionClear();
-        });
-      },
-      handleRemit() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请至少选择一条订单数据");
-          return;
-        }
-        if (this.platformSelectionList.length === 0) {
-          this.$message.warning("请选择一个用户");
-          return;
-        }
-        if (this.platformSelectionList.length > 1) {
-          this.$message.warning("只能选择一个用户");
-          return;
-        }
-        let orderConsignIds = [];
-        this.selectionList.forEach(ele => {
-          orderConsignIds.push(ele.id);
-        });
-        let param = {"orderConsignIds": orderConsignIds, "paymentUserId": this.platformSelectionList[0].userId};
-        this.butLoading = true;
-        const loading = this.$loading({
-          lock: true,
-          text: '打款中,请稍等...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        payment(param).then(res => {
-          this.$message.success("打款成功");
-          loading.close();
-          this.butLoading = false;
-          this.platformBox = false;
-          this.platformSelectionList = [];
-          this.platformSelectionClear();
-          this.onLoad(this.page, this.query);
-        })
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 294
src/views/regulation/platconsignconfig.vue

@@ -1,294 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.consignconfig_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/shopping/consignconfig";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              addDisplay: false,
-              editDisabled: true,
-              rules: [{
-                required: true,
-                message: "请输入主键ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "标题",
-              prop: "title",
-              span: 24,
-              rules: [{
-                required: true,
-                message: "请输入标题",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "开始时间",
-              prop: "startTime",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              rules: [{
-                required: true,
-                message: "请输入开始时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "结束时间",
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              rules: [{
-                required: true,
-                message: "请输入结束时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否启用",
-              prop: "isEnabledDisplayName",
-              display: false,
-            },
-            {
-              label: "是否启用",
-              prop: "isEnabled",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请选择是否启用",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否最新",
-              prop: "isNowDisplayName",
-              display: false,
-            },
-            {
-              label: "是否最新",
-              prop: "isNow",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请选择是否最新",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.consignconfig_add, false),
-          viewBtn: this.vaildData(this.permission.consignconfig_view, false),
-          delBtn: this.vaildData(this.permission.consignconfig_delete, false),
-          editBtn: this.vaildData(this.permission.consignconfig_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 738
src/views/regulation/platformconsign.vue

@@ -1,738 +0,0 @@
-<template>
-  <basic-container >
-    <div v-if="!dialogble">
-      <avue-data-display :option="optionblock"></avue-data-display>
-      <avue-crud :option="option"
-        :table-loading="loading"
-        :data="data"
-        :page.sync="page"
-        :permission="permissionList"
-        v-model="form"
-        ref="crud"
-        @row-update="rowUpdate"
-        @row-save="rowSave"
-        @row-del="rowDel"
-        @search-change="searchChange"
-        @search-reset="searchReset"
-        @selection-change="selectionChange"
-        @current-change="currentChange"
-        @size-change="sizeChange"
-        @refresh-change="refreshChange"
-        @on-load="onLoad"
-      >
-        <template slot="menuLeft">
-          <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.platformconsign_delete"
-            @click="handleDelete">删 除
-          </el-button>
-          <!-- <el-button type="success" size="small" icon="el-icon-circle-plus-outline" plain
-            v-if="permission.platformconsign_pay" @click="handleBatchPay">付款
-          </el-button> -->
-        </template>
-        <template slot-scope="scope" slot="menu">
-          <el-button type="text" icon="el-icon-view" size="small"
-            @click.stop="beforeOpen(scope.row,scope.index)" v-if="permission.platformconsign_pay">查看
-          </el-button>
-          <el-button type="text" size="small"
-                     @click.stop="allPay(scope.row,scope.index)" v-if="permission.platformconsign_pay">一键打款
-          </el-button>
-        </template>
-      </avue-crud>
-    </div>
-
-   <div v-else style="height: 100%;">
-     <avue-crud :option="option2"
-                :table-loading="loading"
-                :data="data2"
-                :permission="permissionList"
-                :search="myQuery"
-                ref="crud2"
-                @search-change="searchChange2"
-                @selection-change="consignList = $event" >
-       <template slot="menuLeft">
-         <el-button size="small" icon="el-icon-arrow-left" plain
-           @click.stop="back">返回
-         </el-button>
-         <el-button type="primary" size="small" icon="el-icon-upload2" plain
-         @click.stop="payMoney"
-         :loading="butLoading"
-          >线上打款
-         </el-button>
-         <el-button type="primary" size="small" icon="el-icon-download" plain
-         @click.stop="payMoneyOffline"
-         :loading="butLoading"
-          >线下打款
-         </el-button>
-       </template>
-     </avue-crud>
-
-
-     <el-dialog title="线下打款" :visible.sync="offlinePayShow" width="70%" append-to-body>
-       <avue-crud :option="offlinePayOption" :table-loading="offlineLoading" :data="offlinePayList" :permission="permissionList"></avue-crud>
-       <span slot="footer" class="dialog-footer">
-         <el-button type="primary" @click="offlinePayConfirm" >确 定</el-button>
-         <el-button @click="offlinePayShow = false">取 消</el-button>
-       </span>
-     </el-dialog>
-   </div>
-  </basic-container>
-</template>
-
-<script>
-  import {getPlatformList,getDetail,add,update,remove,payMoneyApi, getStatistics, payMoneyOfflineApi, payMoneyOfflineConfirmApi} from "../../api/shopping/consign";
-  import {
-    mapGetters
-  } from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height: 'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: false,
-          selection: true,
-          dialogClickModal: false,
-          labelWidth: 120,
-          column: [{
-              label: "批次ID",
-              prop: "consignConfigId",
-              // width: 100,
-              span: 24,
-              overHidden: true,
-            },
-            {
-              label: "授权订单数",
-              prop: "orderNum",
-              // width: 100,
-              span: 24,
-              overHidden: true,
-            },
-            {
-              label: "订单单价",
-              prop: "orderPrice",
-              // width: 100,
-              span: 24,
-              overHidden: true,
-            },
-            {
-              label: "结束时间",
-              prop: "endTime",
-              // width: 100,
-              span: 24,
-              overHidden: true,
-            },
-            // {
-            //   label: "主键ID",
-            //   prop: "id",
-            //   hide: true,
-            //   display: false,
-            // },
-            // {
-            //   label: "订单ID",
-            //   prop: "orderId",
-            //   hide: true,
-            //   display: false,
-            // },
-            // {
-            //   label: "商品ID",
-            //   prop: "goodsId",
-            //   hide: true,
-            //   display: false,
-            // },
-            // {
-            //   label: "标题",
-            //   prop: "title",
-            //   width: 100,
-            //   span: 24,
-            //   overHidden: true,
-            // },
-            // {
-            //   label: "商品名称",
-            //   prop: "goodsName",
-            //   display: false,
-            //   width: 120,
-            //   span: 24,
-            // },
-            // {
-            //   label: "货号",
-            //   prop: "productNo",
-            //   width: 100,
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入货号",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "场次标题",
-            //   prop: "consignConfigDisplayName",
-            //   width: 100,
-            // },
-            // {
-            //   label: "寄售场次",
-            //   prop: "consignConfigId",
-            //   type: "select",
-            //   width: 150,
-            //   dicUrl: "/api/shopping/consignconfig/getList",
-            //   props: {
-            //     label: "title",
-            //     value: "id"
-            //   },
-            //   hide: true,
-            //   display: false,
-            //   search: true,
-            // },
-            // {
-            //   label: "寄售用户ID",
-            //   prop: "consignUserId",
-            //   hide: true,
-            //   display: false,
-            // },
-            // {
-            //   label: "寄售人",
-            //   prop: "consignUserIdDisplayName",
-            //   display: false,
-            //   width: 120,
-            // },
-            // {
-            //   label: "取得价",
-            //   prop: "obtainPrice",
-            // },
-            // {
-            //   label: "抢购价",
-            //   prop: "consignPrice",
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入抢购价",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "状态",
-            //   prop: "consignStateDisplayName",
-            //   display: false,
-            // },
-            // {
-            //   label: "寄售状态",
-            //   prop: "consignState",
-            //   type: "select",
-            //   dicUrl: "/api/blade-system/dict-biz/dictionary?code=consign_state",
-            //   props: {
-            //     label: "dictValue",
-            //     value: "dictKey"
-            //   },
-            //   dataType: "number",
-            //   hide: true,
-            //   display: false,
-            //   rules: [{
-            //     required: true,
-            //     message: "请选择寄售状态",
-            //     trigger: "blur"
-            //   }]
-            // },
-            // {
-            //   label: "创建时间",
-            //   prop: "createTime",
-            //   display: false,
-            //   width: 140,
-            //   rules: [{
-            //     required: true,
-            //     message: "请输入创建时间",
-            //     trigger: "blur"
-            //   }]
-            // },
-          ]
-        },
-        data: [],
-        dialogble: '',
-        isAll: 0,
-        myQuery: {
-          isSearchAll: 0,
-        },
-        option2: {
-          height: 'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          selection: true,
-          dialogClickModal: false,
-          labelWidth: 120,
-          menu:false,
-          column: [
-            {
-              label: "是否全部",
-              prop: "isSearchAll",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_or_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              change: ({row, value}) => {
-                this.myQuery.isSearchAll = value;
-              }
-            },
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "商品ID",
-              prop: "goodsId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "批次ID",
-              prop: "consignConfigId",
-              width: 200,
-              span: 24,
-              overHidden: true,
-            },
-            {
-              label: "标题",
-              prop: "title",
-              width: 100,
-              span: 24,
-              overHidden: true,
-            },
-            {
-              label: "商品名称",
-              prop: "goodsName",
-              display: false,
-              width: 120,
-              span: 24,
-            },
-            {
-              label: "数量",
-              prop: "totalNum",
-              width: 100,
-            },
-            {
-              label: "取得价",
-              prop: "obtainPrice",
-            },
-            {
-              label: "抢购价",
-              prop: "consignPrice",
-              display: false,
-            },
-            {
-              label: "寄售用户名称",
-              prop: "consignUserName",
-            },
-            {
-              label: "寄售用户手机号",
-              prop: "consignUserPhone",
-            },
-            {
-              label: "开始时间",
-              prop: "startTime",
-            },
-            {
-              label: "结束时间",
-              prop: "endTime",
-            }
-          ]
-        },
-        data2: [],
-        consignList: [],
-        dialogVisible: false,
-        optionblock: {
-          span: 6,
-          data: [
-            {
-              // click: function (item) {
-              //   alert(JSON.stringify(item));
-              // },
-              count: 0,
-              title: '当前需付款数',
-            },
-            {
-              count: 0,
-              decimals: 2,
-              title: '进货金额',
-            },
-            {
-              count: 0,
-              decimals: 2,
-              title: '税收金额',
-            },
-            {
-              count: 0,
-              decimals: 2,
-              title: '应付金额',
-            }
-          ]
-        },
-        butLoading:false,
-        offlinePayShow:false,
-        offlinePayList:[],
-        offlineLoading: false,
-        offlinePayOption: {
-          height: '450',
-          calcHeight: 30,
-          border: true,
-          menu: false,
-          // tip: false,
-          searchShow: false,
-          // searchMenuSpan: 6,
-          // selection: true,
-          // dialogClickModal: false,
-          // labelWidth: 120,
-          column: [
-            {
-              label: "寄售用户ID",
-              prop: "consignUserId",
-              width: 200,
-            },
-            {
-              label: "寄售用户名称",
-              prop: "consignUserName",
-              width: 150,
-            },
-            {
-              label: "寄售用户手机号",
-              prop: "consignUserPhone",
-              width: 200,
-            },
-            {
-              label: "单数",
-              prop: "count",
-            },
-            {
-              label: "进货总金额",
-              prop: "obtainPrice",
-            },
-            {
-              label: "寄售总金额",
-              prop: "consignPrice",
-            },
-            {
-              label: "手续费",
-              prop: "procedurePrice",
-            },
-            {
-              label: "打款金额",
-              prop: "remitPrice",
-            },
-            {
-              label: "税收金额",
-              prop: "taxPrice",
-            }
-          ]
-        }
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.platformconsign_add, false),
-          viewBtn: this.vaildData(this.permission.platformconsign_view, false),
-          delBtn: this.vaildData(this.permission.platformconsign_delete, false),
-          editBtn: this.vaildData(this.permission.platformconsign_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    created() {
-      getStatistics().then(
-        res => {
-          this.optionblock.data[0].count = res.data.data.allCount
-          this.optionblock.data[1].count = res.data.data.obtainAmount
-          this.optionblock.data[2].count = res.data.data.revenueAmount
-          this.optionblock.data[3].count = res.data.data.copeAmount
-        });
-    },
-    methods: {
-      offlinePayConfirm() {
-        if(this.consignList.length < 1) {
-          this.$message.error('请先勾选寄售账单');
-          return;
-        }
-        let loading = this.$loading({
-          lock: true,
-          text: '加载中,请稍等...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        this.offlineLoading = true;
-        let close = () => {
-          this.offlinePayShow = false;
-          this.offlineLoading = false;
-          loading.close();
-          this.beforeOpen({consignConfigId: this.dialogble});
-        }
-        let new_arr = this.consignList.map(ele => ele.id);
-        payMoneyOfflineConfirmApi(new_arr).then(res => {
-          close();
-          if(res.data.code != 200) return this.$message.error(res.msg || res.message || '操作失败');
-          this.$message.success(res.msg || res.message || '操作成功')
-        }).catch(err => {
-          close();
-          this.$message.error(err.msg || err.message || '操作失败');
-        })
-      },
-      payMoneyOffline() {
-        if(this.consignList.length < 1) {
-          this.$message.error('请先勾选寄售账单');
-          return;
-        }
-        let loading = this.$loading({
-          lock: true,
-          text: '加载中,请稍等...',
-          spinner: 'el-icon-loading',
-          background: 'rgba(0, 0, 0, 0.7)'
-        });
-        let new_arr = this.consignList.map(ele => ele.id);
-        payMoneyOfflineApi(new_arr).then(res => {
-          this.offlinePayList = res.data.data;
-          this.offlinePayShow = true;
-          loading.close();
-        });
-      },
-      back() {
-        this.dialogble = '';
-        this.myQuery.isSearchAll = 0;
-      },
-      payMoney() {
-        if(this.consignList.length < 1) {
-          this.$message.error('请先勾选寄售账单');
-          return;
-        }
-        this.$alert('此操作将确认打款, 请选择对应的付款途径', '选择付款方式', {
-          showCancelButton: false,
-          confirmButtonText: '确认付款',
-          cancelButtonText: '特殊账号付款',
-          callback: action => {
-            this.loading = true;
-            this.butLoading = true;
-            if (action == 'cancel') {
-              this.loading = false;
-              this.butLoading = false;
-              return;
-            }
-            let ids = this.consignList.map(ele => ele.id)
-            let orderConsignIds = this.consignList;
-            // let orderConsignIds = this.consignList.map(ele => ele.orderConsignId)
-            let payType = action == 'confirm'? '0': '1'
-            payMoneyApi(this.dialogble, ids, payType, orderConsignIds).then(res => {
-              if(res.data.code != 200) this.$message.error(res.data.msg)
-              else this.$message.success(res.data.msg)
-
-              this.$refs.crud2.toggleSelection()
-              setTimeout(() => {
-                this.loading = false;
-                this.butLoading = false;
-                this.dialogble = ''
-              }, 500)
-            });
-          }
-        });
-      },
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      handlePay(row) {
-        this.parentId = row.id;
-        const column = this.findObject(this.option.column, "parentId");
-        column.value = row.id;
-        column.addDisabled = true;
-        this.$refs.crud.rowAdd();
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(row) {
-        this.loading = true;
-        this.myQuery.isSearchAll = 0;
-        getDetail(row.consignConfigId, this.myQuery.isSearchAll == 1).then(res => {
-          this.data2 = res.data.data;
-          this.dialogble = row.consignConfigId;
-          setTimeout(() => {
-            this.loading = false;
-          }, 400)
-        });
-        // if (["edit", "view"].includes(type)) {
-        // }
-        // done();
-      },
-      allPay(row) {
-        this.loading = true;
-        let ids = this.consignList.map(ele => ele.id);
-        let orderConsignIds = this.consignList;
-        // let orderConsignIds = this.consignList.map(ele => ele.orderConsignId)
-        let payType = '1'
-        // return
-        payMoneyApi(row.consignConfigId, ids, payType, orderConsignIds).then(res => {
-          if(res.data.code != 200) this.$message.error(res.data.msg)
-          else this.$message.success(res.data.msg)
-          setTimeout(() => {
-            this.loading = false;
-            this.butLoading = false;
-            this.dialogble = ''
-          }, 500)
-          this.onLoad(this.page);
-        });
-      },
-      searchChange2(params, done) {
-        this.loading = true;
-        getDetail(this.dialogble, this.myQuery.isSearchAll == 1).then(res => {
-          this.data2 = res.data.data;
-          setTimeout(() => {
-            this.loading = false;
-          }, 400)
-        });
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getPlatformList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          // this.page.total = data.total;
-          // this.data = data.records;
-          this.data = data;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-  /* .avue-data-display{
-    height: 100%;
-  } */
-  .avue-data-display .item {
-    margin: 0px;
-  }
-  .avue-data-display .count {
-    margin: 0px;
-    font-size: 22px;
-  }
-  .avue-data-display .title {
-    font-size: 14px;
-    margin-bottom: 0px;
-  }
-</style>

+ 0 - 463
src/views/rush/consign.vue

@@ -1,463 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.consign_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/shopping/consign";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          // searchShow: true,
-          // searchMenuSpan: 6,
-          border: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          labelWidth: 120,
-          searchMenuPosition: "center",
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "订单ID",
-              prop: "orderId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "商品ID",
-              prop: "goodsId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "标题",
-              prop: "title",
-              width: 130,
-              span: 24,
-            },
-            {
-              label: "商品名称",
-              prop: "goodsName",
-              display: false,
-              width: 120,
-              span: 24,
-            },
-            {
-              label: "货号",
-              prop: "productNo",
-              width: 100,
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请输入货号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "寄售场次",
-              prop: "consignConfigId",
-              type: "select",
-              width: 150,
-              dicUrl: "/api/shopping/consignconfig/selectList",
-              props: {
-                label: "title",
-                value: "id"
-              },
-              search: true,
-            },
-            {
-              label: "寄售用户ID",
-              prop: "consignUserId",
-              hide: true,
-              display: false,
-            },
-            {
-              label: "寄售人",
-              prop: "consignUserName",
-              display: false,
-              search: true
-            },
-            {
-              label: "寄售人电话",
-              prop: "consignUserPhone",
-              display: false,
-              search: true,
-              searchLabelWidth: 100,
-              width: 100,
-            },
-            {
-              label: "来源",
-              prop: "consignForDisplayName",
-              display: false,
-            },
-            {
-              label: "寄售来源",
-              prop: "consignFor",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=consign_for",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              display: false,
-              search: true,
-              rules: [{
-                required: true,
-                message: "请选择寄售来源",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "寄售天数",
-              prop: "consignDays",
-              display: false,
-            },
-            {
-              label: "在售天数",
-              prop: "saleDays",
-              display: false,
-            },
-            {
-              label: "取得价",
-              prop: "obtainPrice",
-              rules: [{
-                required: true,
-                message: "请输入取得价",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "抢购价",
-              prop: "consignPrice",
-              rules: [{
-                required: true,
-                message: "请输入抢购价",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "交割价",
-              prop: "deliveryPrice",
-              rules: [{
-                required: true,
-                message: "请输入交割价",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否交割",
-              prop: "isDeliveryDisplayName",
-              display: false,
-            },
-            {
-              label: "是否交割",
-              prop: "isDelivery",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              display: false,
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请选择是否交割",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否上架",
-              prop: "isSaleDisplayName",
-              display: false,
-            },
-            {
-              label: "是否上架",
-              prop: "isSale",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              rules: [{
-                required: true,
-                message: "请选择是否上架",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "状态",
-              prop: "consignStateDisplayName",
-              display: false,
-            },
-            {
-              label: "寄售状态",
-              prop: "consignState",
-              type: "select",
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=consign_state",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              hide: true,
-              display: false,
-              rules: [{
-                required: true,
-                message: "请选择寄售状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "数量",
-              prop: "totalNum",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入数量",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "剩余数量",
-              prop: "nowStock",
-              type: "number",
-              rules: [{
-                required: true,
-                message: "请输入剩余数量",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "开始时间",
-              prop: "startTime",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat:"yyyy-MM-dd HH:mm:ss",
-              width: 150,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请输入开始时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "结束时间",
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat:"yyyy-MM-dd HH:mm:ss",
-              width: 150,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请输入结束时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "创建时间",
-              prop: "createTime",
-              display: false,
-              width: 150,
-              rules: [{
-                required: true,
-                message: "请输入创建时间",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.consign_add, false),
-          viewBtn: this.vaildData(this.permission.consign_view, false),
-          delBtn: this.vaildData(this.permission.consign_delete, false),
-          editBtn: this.vaildData(this.permission.consign_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 294
src/views/rush/consignconfig.vue

@@ -1,294 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @row-update="rowUpdate"
-               @row-save="rowSave"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot="menuLeft">
-        <el-button type="danger"
-                   size="small"
-                   icon="el-icon-delete"
-                   plain
-                   v-if="permission.consignconfig_delete"
-                   @click="handleDelete">删 除
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
-</template>
-
-<script>
-  import {getList, getDetail, add, update, remove} from "@/api/shopping/consignconfig";
-  import {mapGetters} from "vuex";
-
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0
-        },
-        selectionList: [],
-        option: {
-          height:'auto',
-          calcHeight: 30,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: true,
-          index: true,
-          viewBtn: true,
-          selection: true,
-          dialogClickModal: false,
-          column: [
-            {
-              label: "主键ID",
-              prop: "id",
-              hide: true,
-              addDisplay: false,
-              editDisabled: true,
-              rules: [{
-                required: true,
-                message: "请输入主键ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "标题",
-              prop: "title",
-              span: 24,
-              rules: [{
-                required: true,
-                message: "请输入标题",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "开始时间",
-              prop: "startTime",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              rules: [{
-                required: true,
-                message: "请输入开始时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "结束时间",
-              prop: "endTime",
-              type: "datetime",
-              format: "yyyy-MM-dd HH:mm:ss",
-              valueFormat: "yyyy-MM-dd HH:mm:ss",
-              rules: [{
-                required: true,
-                message: "请输入结束时间",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否启用",
-              prop: "isEnabledDisplayName",
-              display: false,
-            },
-            {
-              label: "是否启用",
-              prop: "isEnabled",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请选择是否启用",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "是否最新",
-              prop: "isNowDisplayName",
-              display: false,
-            },
-            {
-              label: "是否最新",
-              prop: "isNow",
-              type: "select",
-              dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-              props: {
-                label: "dictValue",
-                value: "dictKey"
-              },
-              dataType: "number",
-              search: true,
-              hide: true,
-              addDisplay: false,
-              rules: [{
-                required: true,
-                message: "请选择是否最新",
-                trigger: "blur"
-              }]
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.consignconfig_add, false),
-          viewBtn: this.vaildData(this.permission.consignconfig_view, false),
-          delBtn: this.vaildData(this.permission.consignconfig_delete, false),
-          editBtn: this.vaildData(this.permission.consignconfig_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-      rowSave(row, done, loading) {
-        add(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
-        });
-      },
-      rowUpdate(row, index, done, loading) {
-        update(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
-        });
-      },
-      rowDel(row) {
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(row.id);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-          });
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-        this.$confirm("确定将选择数据删除?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getDetail(this.form.id).then(res => {
-            this.form = res.data.data;
-          });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage){
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize){
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
-        });
-      }
-    }
-  };
-</script>
-
-<style>
-</style>

+ 0 - 463
src/views/rush/delivery.vue

@@ -1,463 +0,0 @@
-<template>
-  <basic-container>
-    <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               :page.sync="page"
-               :permission="permissionList"
-               :before-open="beforeOpen"
-               v-model="form"
-               ref="crud"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
-      <template slot-scope="scope" slot="menuLeft">
-        <el-button type="primary"
-                   icon="el-icon-bottom"
-                   size="small"
-                   @click="exportExcelDelivery()">导出
-        </el-button>
-      </template>
-    </avue-crud>
-    <el-dialog :title="`【`+form.realName+`】未交割数据`"
-               append-to-body
-               style="margin-top: 20px"
-               :visible.sync="dialogFormVisible"
-               width="60%"
-               height="50%">
-      <avue-crud :search.sync="itemSearch"
-                 :data="itemData"
-                 :option="itemOption"
-                 :table-loading="itemLoading"
-                 :page.sync="itemPage"
-                 @search-change="itemSearchChange"
-                 @search-reset="itemSearchReset"
-                 @selection-change="itemSelectionChange"
-                 @current-change="itemCurrentChange"
-                 @size-change="itemSizeChange"
-                 @refresh-change="itemRefreshChange"
-                 @on-load="itemOnLoad">
-        <template slot-scope="scope" slot="menuLeft">
-          <el-button type="danger"
-                     icon="el-icon-plus"
-                     size="small"
-                     @click="handleDelivery()">交割
-          </el-button>
-        </template>
-      </avue-crud>
-    </el-dialog>
-  </basic-container>
-</template>
-
-<script>
-import {getDeliveryPage, getNoDeliveryPageByUserId, batchDelivery,expExcelDelivery} from "@/api/shopping/consign";
-import {mapGetters} from "vuex";
-
-export default {
-  data() {
-    return {
-      dialogFormVisible: false,
-      itemLoading: true,
-      itemPage: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      itemSelectionList: [],
-      itemSearch: {
-        consignUserId: ''
-      },
-      itemData: [],
-      itemOption: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        selection: true,
-        dialogClickModal: false,
-        addBtn: false,
-        menu: false,
-        column: [
-          {
-            label: "主键ID",
-            prop: "id",
-            hide: true,
-            display: false,
-          },
-          {
-            label: "订单ID",
-            prop: "orderId",
-            width: 150,
-          },
-          {
-            label: "商品ID",
-            prop: "goodsId",
-            hide: true,
-            display: false,
-          },
-          {
-            label: "标题",
-            prop: "title",
-            width: 130,
-            span: 24,
-          },
-          {
-            label: "商品名称",
-            prop: "goodsName",
-            display: false,
-            width: 120,
-            span: 24,
-          },
-          {
-            label: "货号",
-            prop: "productNo",
-            width: 100,
-            hide: true,
-            rules: [{
-              required: true,
-              message: "请输入货号",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "寄售场次",
-            prop: "consignConfigId",
-            width: 150,
-          },
-          {
-            label: "取得价",
-            prop: "obtainPrice",
-            rules: [{
-              required: true,
-              message: "请输入取得价",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "抢购价",
-            prop: "consignPrice",
-            rules: [{
-              required: true,
-              message: "请输入抢购价",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "交割价",
-            prop: "deliveryPrice",
-            rules: [{
-              required: true,
-              message: "请输入交割价",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "是否交割",
-            prop: "isDeliveryDisplayName",
-            display: false,
-          },
-          {
-            label: "是否交割",
-            prop: "isDelivery",
-            type: "select",
-            dicUrl: "/api/blade-system/dict/dictionary?code=yes_no",
-            props: {
-              label: "dictValue",
-              value: "dictKey"
-            },
-            dataType: "number",
-            display: false,
-            hide: true,
-            rules: [{
-              required: true,
-              message: "请选择是否交割",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "数量",
-            prop: "totalNum",
-            type: "number",
-            rules: [{
-              required: true,
-              message: "请输入数量",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "剩余数量",
-            prop: "nowStock",
-            type: "number",
-            rules: [{
-              required: true,
-              message: "请输入剩余数量",
-              trigger: "blur"
-            }]
-          },
-          {
-            label: "创建时间",
-            prop: "createTime",
-            display: false,
-            width: 150,
-            rules: [{
-              required: true,
-              message: "请输入创建时间",
-              trigger: "blur"
-            }]
-          },
-        ]
-      },
-      form: {},
-      query: {},
-      loading: true,
-      page: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0
-      },
-      selectionList: [],
-      option: {
-        height: 'auto',
-        calcHeight: 30,
-        tip: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        border: true,
-        index: true,
-        viewBtn: true,
-        selection: true,
-        dialogClickModal: false,
-        column: [
-          {
-            label: "寄售用户ID",
-            prop: "consignUserId",
-            hide: true,
-            display: false,
-          },
-          {
-            label: "名字",
-            prop: "realName",
-            search: true
-          },
-          {
-            label: "账号",
-            prop: "account",
-            display: false,
-            search: true
-          }, {
-            label: "当前余额",
-            prop: "nowMoney",
-            display: false,
-          }, {
-            label: "未付款金额",
-            prop: "totalNoDeliveryPrice",
-            display: false,
-          },
-          {
-            label: "总订单数",
-            prop: "totalOrderNum",
-            display: false,
-
-          },
-          {
-            label: "总收益",
-            prop: "totalIncome",
-            display: false,
-
-          },
-          {
-            label: "完结金额",
-            prop: "totalDeliveryPrice",
-            display: false,
-
-          },
-          {
-            label: "完结单数",
-            prop: "totalDeliveryNum",
-            display: false,
-
-          },
-          {
-            label: "是否完结",
-            prop: "deliveryStateName",
-            display: false,
-          }
-        ]
-      },
-      data: []
-    };
-  },
-  computed: {
-    ...mapGetters(["permission"]),
-    permissionList() {
-      return {
-        addBtn: false,
-        viewBtn: this.vaildData(this.permission.delivery_view, false),
-        delBtn: false,
-        editBtn: false,
-      };
-    },
-    ids() {
-      let ids = [];
-      this.itemSelectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
-  },
-  methods: {
-    beforeOpen(done, type) {
-      if (["edit", "view"].includes(type)) {
-        this.dialogFormVisible = true
-        this.itemOnLoad(this.itemPage, this.itemSearch)
-      }
-      // done();
-    },
-    searchReset() {
-      this.query = {};
-      this.onLoad(this.page);
-    },
-    searchChange(params, done) {
-      this.query = params;
-      this.page.currentPage = 1;
-      this.onLoad(this.page, params);
-      done();
-    },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    currentChange(currentPage) {
-      this.page.currentPage = currentPage;
-    },
-    sizeChange(pageSize) {
-      this.page.pageSize = pageSize;
-    },
-    refreshChange() {
-      this.onLoad(this.page, this.query);
-    },
-    onLoad(page, params = {}) {
-      this.loading = true;
-      getDeliveryPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        const data = res.data.data;
-        this.page.total = data.total;
-        this.data = data.records;
-        this.loading = false;
-        this.selectionClear();
-      });
-    },
-    itemSearchReset() {
-      this.itemQuery = {};
-      this.itemOnLoad(this.itemPage);
-    },
-    itemSearchChange(params, done) {
-      this.itemQuery = params;
-      this.itemPage.currentPage = 1;
-      this.itemOnLoad(this.itemPage, params);
-      done();
-    },
-    itemSelectionChange(list) {
-      this.itemSelectionList = list;
-    },
-    itemSelectionClear() {
-      this.itemSelectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    itemCurrentChange(currentPage) {
-      this.itemPage.currentPage = currentPage;
-    },
-    itemSizeChange(pageSize) {
-      this.itemPage.pageSize = pageSize;
-    },
-    itemRefreshChange() {
-      this.itemOnLoad(this.itemPage, this.itemQuery);
-    },
-    itemOnLoad(page, itemParams = {}) {
-      this.itemLoading = true;
-      itemParams.consignUserId = this.form.consignUserId
-      getNoDeliveryPageByUserId(page.currentPage, page.pageSize, Object.assign(itemParams, this.itemQuery)).then(res => {
-        const data = res.data.data;
-        this.itemPage.total = data.total;
-        this.itemData = data.records;
-        console.log("itemData", this.itemData)
-        this.itemLoading = false;
-        this.itemSelectionClear();
-      });
-    },
-    handleDelivery() {
-      if (this.itemSelectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
-        return;
-      }
-      //交割金额就是抢购价
-      let deliveryMoney = 0;
-      let deliveryIds = [];
-      this.itemSelectionList.forEach(ele => {
-        deliveryMoney = deliveryMoney + ele.consignPrice,
-          deliveryIds.push(ele.id)
-      });
-      console.log('deliveryMoney', this.itemSelectionList, '=====', 'totalIncome', this.form.totalIncome)
-      let data = ((deliveryMoney / this.form.totalIncome) * 100).toFixed(2) + '%'
-      this.$confirm("当前选中交割金额为" + deliveryMoney + "元,交割比例为" + data + ",确定将割?", "交割", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        batchDelivery(deliveryIds).then(()=>{
-          this.itemSelectionClear()
-          this.itemSearchReset();
-          this.$message({
-            type: "success",
-            message: "交割成功!"
-          });
-        })
-      }).catch(() => {
-        this.itemSelectionClear()
-        this.$message({
-          type: 'info',
-          message: '已取消'
-        });
-      });
-    },
-    exportExcelDelivery(){
-      expExcelDelivery().then(res => {
-        if (res.status===200){
-          let url = window.URL.createObjectURL(new Blob([res.data]));
-          let a = document.createElement('a');
-          a.style.display = 'none';
-          a.href = url;
-          // 下面两行是自己项目需要的处理,总之就是得到下载的文件名(加后缀)即可
-          var fileName = '交割数据.xlsx';
-          a.setAttribute('download',fileName);
-          document.body.appendChild(a);
-          a.click();
-          document.body.removeChild(a);
-          window.URL.revokeObjectURL(url);
-          this.userExportLoading = false;
-          this.userExportShow = false;
-          this.$message.success("文件下载成功");
-        }else {
-          this.$message.error("文件下载失败");
-        }
-      })
-        .catch(err => {
-          this.userExportLoading = false;
-          this.$message.error(err.msg || err.message || '操作失败');
-        });
-    }
-  }
-};
-</script>
-
-<style>
-</style>

+ 0 - 31
src/views/wel/index.vue

@@ -37,18 +37,6 @@
               color: 'rgb(230, 71, 88)',
               key: '订'
             },
-            // {
-            //   click: function (item) {
-            //     console.log(JSON.stringify(item));
-            //   },
-            //   title: '商品统计',
-            //   subtitle: '更新时间:2022-03-31 16:26:56',
-            //   count: 4,
-            //   allcount: 6,
-            //   text: '当前上线商品总数',
-            //   color: 'rgb(178, 159, 255)',
-            //   key: ''
-            // },
             {
               click: function (item) {
                 console.log(JSON.stringify(item));
@@ -74,25 +62,6 @@
         window.console.log(val);
       },
       init() {
-        request({
-          url: '/api/home/statistical',
-          method: 'get'
-        }).then(res => {
-          const data = res.data.data;
-          this.option.data.forEach(e => {
-            e.subtitle = '更新时间:' + data.currTime;
-            if ('用户统计' === e.title) {
-              e.count = data.userTotal;
-            }
-            if ('订单统计' === e.title) {
-              e.count = data.orderTotal;
-            }
-            if ('抢购场次' === e.title) {
-              e.count = data.snapTotal;
-            }
-          })
-        })
-
 
       }
     },

Some files were not shown because too many files changed in this diff