From 8f9d0decf5ff862eb1f9bde05ca28e62d8f227e4 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 13 Jun 2024 17:31:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BC=98=E5=8C=96=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D=E7=AD=89?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3API=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../employerLists/components/myTable.vue      |  31 ----
 src/views/employerLists/detail.vue            |  71 --------
 src/views/employerLists/edit.vue              | 166 ------------------
 src/views/employerLists/index.vue             | 151 ----------------
 src/views/workbench/earnings/index.vue        |  25 +--
 5 files changed, 15 insertions(+), 429 deletions(-)
 delete mode 100644 src/views/employerLists/components/myTable.vue
 delete mode 100644 src/views/employerLists/detail.vue
 delete mode 100644 src/views/employerLists/edit.vue
 delete mode 100644 src/views/employerLists/index.vue

diff --git a/src/views/employerLists/components/myTable.vue b/src/views/employerLists/components/myTable.vue
deleted file mode 100644
index f6bf4cc..0000000
--- a/src/views/employerLists/components/myTable.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-    <!-- <el-table :data="props.lists"> -->
-    <el-table :data="[{}]">
-        <el-table-column :label="item.label" :prop="item.prop" show-overflow-tooltip v-for="item in column" />
-    </el-table>
-    <div class="flex mt-4 justify-end">
-        <pagination v-model="pager" @change="getLists" />
-    </div>
-</template>
-
-<script lang="ts" setup name="manageProjectLists">
-import { ref, reactive, defineProps } from "vue"
-import { usePaging } from '@/hooks/usePaging'
-let props = defineProps({
-    fetchApi: {
-        type: Function
-    },
-    column: {
-        type: Array,
-
-    }
-})
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: props.fetchApi,
-})
-
-
-// getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/employerLists/detail.vue b/src/views/employerLists/detail.vue
deleted file mode 100644
index baf0e02..0000000
--- a/src/views/employerLists/detail.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-    <popup ref="popupRef" title="店员详情" :async="true" width="50vw" @close="close" :show-footer="false">
-        <div class="flex">
-            <el-avatar shape="circle" :size="70"
-                src="https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png" />
-            <el-row class="w-[100%]  ml-4">
-                <el-col :span="24">你干嘛</el-col>
-                <el-col :span="7">收银订单：￥200.00</el-col>
-                <el-col :span="7">核销订单：￥200.00</el-col>
-                <el-col :span="7">配送订单：￥200.00</el-col>
-            </el-row>
-        </div>
-        <el-tabs tab-position="left" style="height: 200px" class="demo-tabs mt-8">
-            <el-tab-pane label="收银订单">
-                <myTable :column="datas.moneyLists"></myTable>
-            </el-tab-pane>
-            <el-tab-pane label="配送订单">
-                <myTable :column="datas.moneyLists"></myTable>
-            </el-tab-pane>
-            <el-tab-pane label="核销订单">
-                <myTable :column="datas.moneyLists"></myTable>
-            </el-tab-pane>
-        </el-tabs>
-    </popup>
-</template>
-<script setup>
-import { ref, reactive } from 'vue'
-import myTable from './components/myTable.vue';
-
-
-const popupRef = ref(null)
-const emit = defineEmits(['close'])
-
-const open = () => {
-    popupRef.value?.open()
-}
-const close = () => {
-    emit('close')
-
-}
-
-
-const datas = reactive({
-    moneyLists: [
-        { label: '订单id', prop: 'orderid' },
-        { label: '收货人', prop: 'orderid' },
-        { label: '商品数量', prop: 'orderid' },
-        { label: '商品总价', prop: 'orderid' },
-        { label: '实付金额', prop: 'orderid' },
-        { label: '交易完成时间', prop: 'orderid' },
-    ],
-    sendLists: [
-        { label: '订单id', prop: 'orderid' },
-        { label: '收货人', prop: 'orderid' },
-        { label: '商品数量', prop: 'orderid' },
-        { label: '商品总价', prop: 'orderid' },
-        { label: '实付金额', prop: 'orderid' },
-        { label: '交易完成时间', prop: 'orderid' },
-    ],
-
-
-})
-
-
-
-
-
-defineExpose({
-    open,
-})
-</script>
\ No newline at end of file
diff --git a/src/views/employerLists/edit.vue b/src/views/employerLists/edit.vue
deleted file mode 100644
index 4428fa1..0000000
--- a/src/views/employerLists/edit.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<template>
-    <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <el-form-item label="店员名称" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入店员名称" />
-                </el-form-item>
-                <el-form-item label="头像" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入店员名称" />
-                </el-form-item>
-                <el-form-item label="店员账号" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入店员账号" />
-                </el-form-item>
-                <el-form-item label="店员密码" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入店员账号" type="password" />
-                </el-form-item>
-                <el-form-item label="确认密码" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请确认账号密码" />
-                </el-form-item>
-                <el-form-item label="手机号码" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入手机号码" />
-                </el-form-item>
-                <el-form-item label="店员身份" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入手机号码" />
-                </el-form-item>
-                <el-form-item label="状态" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入手机号码" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="oaPlanEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-// import { apiOaPlanAdd, apiOaPlanEdit, apiOaPlanDetail } from '@/api/oa_plan'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑日程安排' : '新增日程安排'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    title: '',
-    type: '',
-    start_time: '',
-    end_time: '',
-    remind_type: '',
-    remark: '',
-})
-
-const chekcDate = (rule: any, value: any, callback: any) => {
-    if (new Date(formData.end_time) < new Date(formData.start_time)) {
-        callback(new Error('结束时间不能早于开始时间'))
-    } else {
-        callback()
-    }
-}
-
-// 表单验证
-const formRules = reactive<any>({
-    title: [{
-        required: true,
-        message: '请输入工作安排主题',
-        trigger: ['blur']
-    }],
-    type: [{
-        required: true,
-        message: '请输入日程优先级',
-        trigger: ['blur']
-    }],
-    start_time: [{
-        required: true,
-        message: '请输入开始时间',
-        trigger: ['blur']
-    }],
-    end_time: [{
-        required: true,
-        message: '请输入结束时间',
-        trigger: ['blur']
-    },
-    {
-        validator: chekcDate,
-        trigger: ['blur']
-    }],
-    remind_type: [{
-        required: true,
-        message: '请输入提醒类型',
-        trigger: ['blur']
-    }],
-    remind_time: [{
-        required: true,
-        message: '请输入提醒时间',
-        trigger: ['blur']
-    }]
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-
-
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiOaPlanDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData, }
-    // mode.value == 'edit'
-    //     ? await apiOaPlanEdit(data)
-    //     : await apiOaPlanAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add', start_time = '') => {
-    mode.value = type
-    formData.start_time = start_time
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
diff --git a/src/views/employerLists/index.vue b/src/views/employerLists/index.vue
deleted file mode 100644
index 18ab91f..0000000
--- a/src/views/employerLists/index.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form class="mb-[-16px]" :model="queryParams" label-width="80px">
-                <el-row>
-                    <el-col :span="6">
-                        <el-form-item label="商品状态">
-                            <el-select class="flex-1" v-model="queryParams.status" clearable placeholder="请选择商品状态">
-                                <el-option label="销售中" :value="0" />
-                                <el-option label="仓库中" :value="0" />
-                                <el-option label="已售罄" :value="0" />
-                                <el-option label="库存预警" :value="0" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item label="商品搜索" prop="nature">
-                            <el-input v-model="queryParams.status" clearable placeholder="请输入商品名称" />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                        <el-form-item>
-                            <el-button type="primary" @click="resetPage">查询</el-button>
-                            <el-button @click="resetParams">重置</el-button>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['dept.dept/add']" type="primary" @click="handleAdd()">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column label="id" prop="progress" show-overflow-tooltip />
-                    <el-table-column label="头像" prop="build_area_text" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <!-- <el-image style="width: 50px; height: 50px" :src="url" /> -->
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="昵称" prop="project_level_text" show-overflow-tooltip />
-                    <el-table-column label="店员身份" prop="project_level_text" show-overflow-tooltip />
-                    <el-table-column label="手机号" prop="total_investment" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="engineering_status_text" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <el-switch v-model="row.status" :active-value="1" :inactive-value="0"
-                                @change="changeStatus(row)"></el-switch>
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="170" fixed="right">
-                        <template #default="{ row }">
-                            <el-button type="primary" link @click="handleEdit(row)">
-                                编辑
-                            </el-button>
-                            <el-button type="primary" link @click="handleDetail(row)">
-                                详情
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" @success="getLists" @close="showEdit = false" />
-        <DetailPopup v-if="showDetail" ref="detailRef" @close="showEdit = false" />
-
-    </div>
-</template>
-
-<script lang="ts" setup name="manageProjectLists">
-import { ref, reactive } from "vue"
-import { usePaging } from '@/hooks/usePaging'
-import { apiGoodsListLists, apiStatus, apiGoodsTypeLists } from '@/api/goodsList'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
-
-const detailRef = ref(null)
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-const showDetail = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    status: ""
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 上架&下架
-const changeStatus = (data: any) => {
-    apiStatus({
-        // id: data.id,
-        // account: data.account,
-        // name: data.name,
-        // role_id: data.role_id,
-        // disable: data.disable,
-        // org_id: data.org_id,
-        // dept_id: data.dept_id,
-        // job_id: data.job_id,
-        // multipoint_login: data.multipoint_login
-    }).finally(() => {
-        getLists()
-    })
-}
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiGoodsListLists,
-    params: queryParams
-})
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-// 新增
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-const handleDetail = () => {
-    showDetail.value = true
-    nextTick(() => {
-        detailRef.value?.open()
-    })
-}
-
-
-
-
-getLists()
-</script>
\ No newline at end of file
diff --git a/src/views/workbench/earnings/index.vue b/src/views/workbench/earnings/index.vue
index 1276d84..9e59f06 100644
--- a/src/views/workbench/earnings/index.vue
+++ b/src/views/workbench/earnings/index.vue
@@ -2,7 +2,7 @@
     <el-card :key="date">
         <template #header>今日</template>
         <el-row>
-            <el-col :span="6" class="flex" v-for="(item, index) in statisticLists" :key="index">
+            <el-col :span="5" class="flex" v-for="(item, index) in statisticLists" :key="index">
                 <img class="w-[50px] h-[50px] mr-2" :src="item.src" />
                 <div>
                     <el-statistic :title="item.title" :value="item.value()" />
@@ -14,7 +14,7 @@
     <el-card :key="date">
         <template #header>累计</template>
         <el-row>
-            <el-col :span="6" class='flex' v-for="(item, index) in statisticLists" :key="index">
+            <el-col :span="5" class='flex' v-for="(item, index) in statisticLists" :key="index">
                 <img class="w-[50px] h-[50px] mr-2" :src="item.src" />
                 <div>
                     <el-statistic :title="item.title" :value="item.value()" />
@@ -33,18 +33,11 @@
 </template>
 
 <script lang="ts" setup name="manageProjectLists">
-import { ref, reactive } from "vue"
+import { ref, reactive, onMounted } from "vue"
 // import { apiTradStatisApi } from '@/api/statistics'
 import vCharts from 'vue-echarts'
 
 const date = ref([])
-const queryParams = reactive({
-    start_time: "",
-    end_time: "",
-})
-
-
-
 
 const formData = ref({
     order_amount: 0,
@@ -77,6 +70,13 @@ const statisticLists = reactive([
             return String(formData.value.income_amount)
         }
     },
+    {
+        src: 'https://ceshi-engineering.lihaink.cn/uploads/files/20240604/20240604171701594ff8897.png',
+        title: "现金收银金额",
+        value: () => {
+            return String(formData.value.income_amount)
+        }
+    },
     {
         src: 'https://ceshi-engineering.lihaink.cn/uploads/files/20240604/202406041717018a22e1161.png',
         title: "保证金",
@@ -130,6 +130,11 @@ const visitorOption = reactive({
 
 
 const getData = async () => {
+
+
+
+
+
     // let res = await apiTradStatisApi(queryParams)
     // formData.value = res
     // visitorOption.xAxis.data = res.statistics.range