feat(workflow): 重构商务审批页面实现分页和组件化

api/BusinessApproval.js

@@ -0,0 +1,472 @@
+import request from '@/utils/request'
+
+
+// 获取当前商业用户票扣列表
+// 相当于补差/bussiness/salemain/piAoKouLiSt
+export function salemainpiAoKouList(data) {
+    return request({
+        url: '/bussiness/salemain/piAoKouLiSt',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+
+
+// 点击新增的时候先调用检查质保协议
+export function salemaincheckQa(data) {
+    return request({
+        url: '/bussiness/salemain/checkQa',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+
+// 查询订单列表--商业用户
+export function listsalemain(data,query) {
+    return request({
+        url: '/bussiness/salemain/list',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+// 查询订单列表内部用户
+export function listsalemainNB(data,query) {
+    return request({
+        url: '/bussiness/salemain/sysOrderList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 查询详细
+export function salemainDetail(salemainId) {
+    return request({
+        url: '/bussiness/salemain/info?id=' + salemainId,
+        method: 'get',
+        isEncrypt: false
+    })
+}
+
+// 新增
+export function addsalemain(data) {
+    return request({
+        url: '/bussiness/salemain/add',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+
+// 修改
+export function updatesalemain(data) {
+    return request({
+        url: '/bussiness/salemain/edit',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+
+// 删除
+export function delsalemain(id) {
+    return request({
+        url: '/bussiness/salemain/remove?ids=' +id,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 查询商务审批列表
+export function mangerList(data,query) {
+    return request({
+        url: '/bussiness/salemain/mangerList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 查询商务审批列表-张梦洁
+export function specialMangerList(data,query) {
+    return request({
+        url: '/bussiness/salemain/specialMangerList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 查询商务审批-商务经理额度
+export function getManagerCreditLine(query) {
+    return request({
+        url: '/bussiness/salemain/getManagerCreditLine',
+        method: 'post',
+        params: query,
+        isEncrypt: false
+    })
+}
+// 查询商务审批-商务经理额度
+export function getAreaCreditLine(query) {
+    return request({
+        url: '/bussiness/salemain/getAreaCreditLine',
+        method: 'post',
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 商务经理审批时获取详情，下面的商品列表
+export function businessManagerReviewGoodsList(salemainId) {
+    return request({
+        url: '/bussiness/businessgoods/businessManagerReviewGoodsList?saleId=' + salemainId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 审批时获取详情-分开获取数据。分上面订单数据和下面商品数据。此接口为上面的订单数据
+export function salemainDetailSWJL(query) {
+    return request({
+        url: '/bussiness/salemain/detail?id=' + query.salemainId + '&isThisMonth=' + query.isThisMonth,
+        method: 'get',
+        isEncrypt: false
+    })
+}
+
+// 商务审批-审核
+export function managerConfirm(data) {
+    return request({
+        url: '/bussiness/salemain/managerConfirm?saleIds=' + data.saleIds + '&actionType=' + data.actionType,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+
+
+
+// 商务审批-回退
+export function managerRefuse(data) {
+    return request({
+        url: '/bussiness/salemain/managerRefuse?saleIds=' + data.saleIds + '&actionType=' + data.actionType,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+
+// 查询财务审批列表
+export function financeList(data,query) {
+    return request({
+        url: '/bussiness/salemain/financeList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+
+// 财务审批-审核
+export function financeConfirm(data) {
+    return request({
+        url: '/bussiness/salemain/financeConfirm?saleIds=' + data.saleIds,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 财务审批-回退
+export function financeConfirmRefuse(data) {
+    return request({
+        url: '/bussiness/salemain/financeConfirmRefuse?saleIds=' + data.saleIds,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 订单审核-列表
+export function orderList(data,query) {
+    return request({
+        url: '/bussiness/salemain/orderList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 订单审核-推送至OA-----state表示是否强制推送至OA，1是强制，0是不强制。
+export function orderReviewSendOa(data) {
+    return request({
+        url: '/bussiness/salemain/orderReviewSendOa?saleIds=' + data.saleIds + '&companyId=' + data.companyId + '&state=0',
+        method: 'post',
+        isEncrypt: false
+    })
+}
+// 订单审核-强制推送至OA
+export function orderReviewSendOaQZ(data) {
+    return request({
+        url: '/bussiness/salemain/orderReviewSendOa?saleIds=' + data.saleIds + '&companyId=' + data.companyId + '&state=1'+ '&psw=' + data.psw,
+        method: 'post',
+        isEncrypt: false,
+        
+    })
+}
+
+// 订单审核-强制推送至分配
+export function orderReviewForceOaToFenPei(data) {
+    return request({
+        // url: '/bussiness/salemain/orderReviewForceOa',
+        // 上面这个接口是参数用body里面传递的
+        url: '/bussiness/salemain/orderReviewForceOa?id=' + data.saleIds + '&psw=' + data.psw,
+        method: 'post',
+        // data:data,
+        // isEncrypt: true
+    })
+}
+
+// 订单审核-审核
+export function orderReview(saleIds) {
+    return request({
+        url: '/bussiness/salemain/orderReview?ids=' + saleIds,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 订单审核-回退
+export function orderReviewBack(saleIds) {
+    return request({
+        url: '/bussiness/salemain/orderReviewBack?id=' + saleIds ,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 账期审核
+export function periodAudit(data) {
+    return request({
+        url: '/bussiness/salemain/periodAudit?ids=' + data,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 额度审核
+export function creditReview(data) {
+    return request({
+        url: '/bussiness/salemain/creditReview?ids=' + data,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 更换仓库列表
+export function changeWarehouseList(data) {
+    return request({
+        url: '/bussiness/salemain/changeWarehouseList?id='  + data ,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 更换仓库
+export function changeWarehouse(data) {
+    return request({
+        url: '/bussiness/salemain/changeWarehouse?ids='  + data.ids + '&wareHouseId=' + data.wareHouseId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+
+// 销售订单操作日志
+export function salemainlogList(data,query) {
+    return request({
+        url: '/bussiness/salemainlog/list',
+        method: 'post',
+        data:data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 查询订单分配列表
+export function disOrderListsalemain(data,query) {
+    return request({
+        url: '/bussiness/salemain/disOrderList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 订单分配-推送牛力(待推送分配状态推送至牛力状态)
+export function SendNiuLi(id) {
+    return request({
+        url: '/bussiness/salemain/SendNiuLi?id=' + id,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 订单分配-数量查询
+export function disOrderGetDataNiuLi(data,query) {
+    return request({
+        url: '/bussiness/salemain/disOrderGetDataNiuLi',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 查询订单分配详细--上面部分
+export function disOrderDetail(salemainId) {
+    return request({
+        url: '/bussiness/salemain/disOrderDetail?id=' + salemainId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 查询订单分配列表--下面部分
+export function disOrderDisDetailList(salemainId) {
+    return request({
+        url: '/bussiness/salemain/disOrderDisDetailList?saleId=' + salemainId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 查询订单分配库存列表--双击后的列表
+export function disOrderStockList(data) {
+    return request({
+        url: '/bussiness/salemain/disOrderStockList?saleId=' + data.saleId + '&goodsId=' + data.goodsId + '&warehouseId=' + data.warehouseId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+//订单分配--添加
+export function disOrderSave(data) {
+    return request({
+        url: '/bussiness/salemain/disOrderSave',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+//订单分配--提交
+export function disOrderSubmit(data) {
+    return request({
+        url: '/bussiness/salemain/disOrderSubmit',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+
+//订单分配--回退
+export function disOrderReturn(data) {
+    return request({
+        url: '/bussiness/salemain/disOrderReturn',
+        method: 'post',
+        data: data,
+        isEncrypt: false
+    })
+}
+
+
+// 发货管理-工厂列表
+export function factoryList(data,query) {
+    return request({
+        url: '/bussiness/salemain/factoryList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 发货管理-三方列表
+export function thirdList(data,query) {
+    return request({
+        url: '/bussiness/salemain/thirdList',
+        method: 'post',
+        data: data,
+        params: query,
+        isEncrypt: false
+    })
+}
+
+// 发货管理-数量查询
+export function factoryGroupList(saleIds) {
+    return request({
+        url: '/bussiness/salemain/factoryGroupList?saleIds=' + saleIds,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 发货管理-获取页面详情-上面部分
+export function DeliverDetail(saleId) {
+    return request({
+        url: '/bussiness/salemain/DeliverDetail?saleId=' + saleId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+
+// 发货管理-获取页面列表-下面
+export function DeliverDetailList(saleId) {
+    return request({
+        url: '/bussiness/salemain/DeliverDetailList?saleId=' + saleId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 发货管理-回退
+export function DeliverBack(saleId) {
+    return request({
+        url: '/bussiness/salemain/DeliverBack?saleId=' + saleId,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+// 发货管理-确认发货
+export function DeliverSubmit(data) {
+    return request({
+        url: '/bussiness/salemain/DeliverSubmit?saleId=' + data.saleid + '&ckexecdate=' + data.ckexecdate,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+
+// 发货管理-实际发货清单
+export function getSaleDisDetail(saleid) {
+    return request({
+        url: '/bussiness/salemain/getSaleDisDetail?saleId=' + saleid,
+        method: 'post',
+        isEncrypt: false
+    })
+}
+// 发货管理-发票单
+export function getInvoiceList(saleid) {
+    return request({
+        url: '/bussiness/salemain/getInvoiceList?saleId=' + saleid,
+        method: 'post',
+        isEncrypt: false
+    })
+}

package.json

@@ -1,5 +1,6 @@
 {
     "dependencies": {
-        "pinia-plugin-persistedstate": "^4.5.0"
+        "pinia-plugin-persistedstate": "^4.5.0",
+        "radash": "^12.1.1"
     }
 }

pages/work/BusinessApproval/ListItem.vue

@@ -0,0 +1,58 @@
+<template>
+    <uni-card
+        v-for="(item,index) in items"
+        :key="item.saleid"
+        :class="index % 2 === 0 ? 'card-even' : 'card-odd'"
+        :extra="item.contractcode"
+        :title="item.usernames"
+    >
+        <view class="context">
+            <view class="label">
+                <text>状态:</text>
+                <text>{{ item.stateText }}</text>
+            </view>
+            <view class="label">
+                <text>制单日期:</text>
+                <text>{{ formatDate(item.adddate) }}</text>
+            </view>
+            <view class="label">
+                <text>订单金额:</text>
+                <text>{{ item.contractmoney.toFixed(2) }}</text>
+            </view>
+            <view class="label">
+                <text>区域:</text>
+                <text>{{ item.areaName }}</text>
+            </view>
+        </view>
+
+    </uni-card>
+</template>
+
+<script setup>
+import {defineOptions, defineProps} from 'vue'
+import UniCard from "../../../uni_modules/uni-card/components/uni-card/uni-card.vue";
+import {formatDate} from "../../../uni_modules/uni-dateformat/components/uni-dateformat/date-format";
+
+defineOptions({
+    name: 'ListItem'
+})
+
+const props = defineProps(['items'])
+</script>
+
+<style lang="scss" scoped>
+.context {
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: 10px;
+    font-size: 12px;
+    line-height: 20px;
+
+    .label {
+        display: flex;
+        gap: 6px;
+        font-size: 12px;
+        line-height: 20px;
+    }
+}
+</style>

pages/work/BusinessApproval/index.vue

@@ -1,73 +1,113 @@
 <template>
     <view class="container">
-        <view class="example">
+        <MBCard>
-            <uni-forms ref="baseForm" :modelValue="baseFormData" label-width="20vw">
+            <uni-forms ref="baseForm" :modelValue="queryParams">
                 <uni-forms-item label="支付方式">
-                    <uni-data-select
+                    <DictSelect v-model="queryParams.isPayNow" dict="dazhong_paytype" @change="handleQuery"/>
-                        v-model="paymentValue"
-                        :localdata="paymentOptions"
-                        @change="filterContracts"
-                    ></uni-data-select>
                 </uni-forms-item>
                 <uni-forms-item label="生产单位">
-                    <uni-data-select
+                    <ProductionUnit v-model="queryParams.companyId" @change="handleQuery"/>
-                        v-model="companyValue"
-                        :localdata="companyOptions"
-                        @change="filterContracts"
-                    ></uni-data-select>
                 </uni-forms-item>
             </uni-forms>
-        </view>
+        </MBCard>
-
-        <view v-if="filteredContracts.length === 0" class="no-data">
-            <text>暂无匹配的合同数据</text>
-        </view>
 
+        <MBLoading v-if="loading"/>
         <view v-else>
-            <uni-card
+            <ListItem :items="tableData"/>
-                v-for="(contract, index) in filteredContracts"
+            <MBPagination
-                :key="contract.saleid"
+                v-if="total > 0"
-                :class="index % 2 === 0 ? 'card-even' : 'card-odd'"
+                v-model:limit="paging.pageSize"
-                :title="contract.usernames"
+                v-model:page="paging.pageNum"
-                @click="gotoDetail(contract)"
+                :total="total"
-            >
+                @pagination="handleQuery"
-                <uni-row class="demo-uni-row">
+            />
-                    <uni-col :span="12">
-                        <view class="demo-uni-col dark">生产单位: {{ contract.companyName }}</view>
-                    </uni-col>
-                    <uni-col :span="12">
-                        <view class="demo-uni-col light">合同编号: {{ contract.contractcode }}</view>
-                    </uni-col>
-                </uni-row>
-                <uni-row class="demo-uni-row">
-                    <uni-col :span="12">
-                        <view class="demo-uni-col dark">制单日期: {{ formatDate(contract.adddate) }}</view>
-                    </uni-col>
-                    <uni-col :span="12">
-                        <view class="demo-uni-col light">订单金额: {{ contract.contractmoney.toFixed(2) }}</view>
-                    </uni-col>
-                </uni-row>
-                <uni-row class="demo-uni-row">
-                    <uni-col :span="12">
-                        <view class="demo-uni-col dark">状态: {{ contract.stateText }}</view>
-                    </uni-col>
-                    <uni-col :span="12">
-                        <view class="demo-uni-col light">区域: {{ contract.areaName }}</view>
-                    </uni-col>
-                </uni-row>
-            </uni-card>
         </view>
+        <!--        <uni-card-->
+        <!--            v-for="(contract, index) in filteredContracts"-->
+        <!--            :key="contract.saleid"-->
+        <!--            :class="index % 2 === 0 ? 'card-even' : 'card-odd'"-->
+        <!--            :title="contract.usernames"-->
+        <!--            @click="gotoDetail(contract)"-->
+        <!--        >-->
+        <!--            <uni-row class="demo-uni-row">-->
+        <!--                <uni-col :span="12">-->
+        <!--                    <view class="demo-uni-col dark">生产单位: {{ contract.companyName }}</view>-->
+        <!--                </uni-col>-->
+        <!--                <uni-col :span="12">-->
+        <!--                    <view class="demo-uni-col light">合同编号: {{ contract.contractcode }}</view>-->
+        <!--                </uni-col>-->
+        <!--            </uni-row>-->
+        <!--            <uni-row class="demo-uni-row">-->
+        <!--                <uni-col :span="12">-->
+        <!--                    <view class="demo-uni-col dark">制单日期: {{ formatDate(contract.adddate) }}</view>-->
+        <!--                </uni-col>-->
+        <!--                <uni-col :span="12">-->
+        <!--                    <view class="demo-uni-col light">订单金额: {{ contract.contractmoney.toFixed(2) }}</view>-->
+        <!--                </uni-col>-->
+        <!--            </uni-row>-->
+        <!--            <uni-row class="demo-uni-row">-->
+        <!--                <uni-col :span="12">-->
+        <!--                    <view class="demo-uni-col dark">状态: {{ contract.stateText }}</view>-->
+        <!--                </uni-col>-->
+        <!--                <uni-col :span="12">-->
+        <!--                    <view class="demo-uni-col light">区域: {{ contract.areaName }}</view>-->
+        <!--                </uni-col>-->
+        <!--            </uni-row>-->
+        <!--        </uni-card>-->
+        <!--        </view>-->
     </view>
 </template>
 
 <script setup>
 
 import {computed, getCurrentInstance, onMounted, ref} from "vue"
-import {contractData} from "./data.js" // 根据实际路径调整
+import {contractData} from "./data.js"
+import UniForms from "../../../uni_modules/uni-forms/components/uni-forms/uni-forms.vue";
+import UniFormsItem from "../../../uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.vue";
+import DictSelect from "../../../components/DictSelect/DictSelect.vue";
+import ProductionUnit from "../../../components/ProductionUnit/ProductionUnit.vue";
+import MBCard from "../../../components/MB/MBCard.vue";
+import {mangerList} from "../../../api/BusinessApproval";
+import MBPagination from "../../../components/MB/MBPagination.vue";
+import MBLoading from "../../../components/MB/MBLoading.vue";
+import ListItem from "./ListItem.vue";
+
 const {proxy} = getCurrentInstance()
+
+
+const queryParams = ref({
+    state: '1',
+    isPayNow: '',
+    companyId: ''
+})
+const loading = ref(true)
+const total = ref(0)
+const paging = ref({
+    pageNum: 1,
+    pageSize: 10,
+    isAsc: 'descending',
+    orderByColumn: 'adddate'
+})
+const tableData = ref([])
+
+const handleQuery = async () => {
+    loading.value = true
+    const data = await mangerList(queryParams.value, paging.value)
+    total.value = data.total
+    tableData.value = data.rows
+    loading.value = false
+}
+
+onMounted(async () => {
+    await handleQuery()
+})
+
+
+// ===========================================================================================
+
 // 表单数据
 const baseFormData = ref({})
-const paymentValue = ref(0)
+const paymentValue = ref('')
 const companyValue = ref(0)
 
 // 筛选选项

static/scss/colorui.css

@@ -5140,3 +5140,12 @@ scroll-view.cu-steps .cu-item {
  .cuIcon-btn:before {
  	content: "\e601";
  }
+
+
+.card-even {
+    border-left: 4px solid #2979ff !important;
+}
+
+.card-odd {
+    border-left: 4px solid #19be6b !important;
+}