修复一些已知问题

代码调整

vue/src/api/doc/baseUrl.js

@@ -0,0 +1 @@
+export default '/doc'

vue/src/api/doc/history.js

@@ -0,0 +1,8 @@
+import request from "@/config/request"
+import BASE from './baseUrl'
+
+export const baseUrl = `${BASE}/history`
+
+export function searchHistory(data) {
+    return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)
+}

vue/src/api/doc/purchase/inbound.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from '../baseUrl'
 
-export const baseUrl = '/document/purchase/inbound'
+export const baseUrl = `${BASE}/purchase/inbound`
 
 export function getById(id) {
     return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)

vue/src/api/doc/purchase/order.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from '../baseUrl'
 
-export const baseUrl = `/document/sell/order`
+export const baseUrl = `${BASE}/purchase/order`
 
 export function getById(id) {
     return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)

vue/src/api/doc/sell/order.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from '../baseUrl'
 
-export const baseUrl = '/document/purchase/order'
+export const baseUrl = `${BASE}/sell/order`
 
 export function getById(id) {
     return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)

vue/src/api/doc/sell/outbound.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from '../baseUrl'
 
-export const baseUrl = `/document/sell/outbound`
+export const baseUrl = `${BASE}/sell/outbound`
 
 export function getById(id) {
     return request.get(`${baseUrl}/getById?id=${id}`).then(({data}) => data.data)

vue/src/api/documentHistory.js

@@ -1,7 +0,0 @@
-import request from "@/config/request"
-
-export const baseUrl = '/document/history'
-
-export function getDocumentHistoryByPid(pid) {
-    return request.get(`${baseUrl}/get?pid=${pid}`).then(({data}) => data.data)
-}

vue/src/api/message/baseUrl.js

@@ -0,0 +1 @@
+export default '/message'

vue/src/api/message/manage.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-const baseUrl = '/message/manage'
+const baseUrl = `${BASE}/manage`
 
 export function search(data) {
     return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)

vue/src/api/message/user.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = '/message/user'
+export const baseUrl = `${BASE}/user`
 
 export function search(data) {
     return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)

vue/src/api/system/baseUrl.js

@@ -0,0 +1 @@
+export default '/system'

vue/src/api/system/category.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/category`
+export const baseUrl = `${BASE}/category`
 
 export function search(data) {
     return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)

vue/src/api/system/customer.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/customer`
+export const baseUrl = `${BASE}/customer`
 
 export function getLimitRegion() {
     return request.get(`${baseUrl}/getLimitRegion`).then(({data}) => data.data)

vue/src/api/system/department.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/department`
+export const baseUrl = `${BASE}/department`
 
 export function getDepartments(all = true) {
     return request.get(`${baseUrl}/get?all=${all}`).then(({data}) => data.data)

vue/src/api/system/resource.js

@@ -1,10 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/resource`
+export const baseUrl = `${BASE}/resource`
-
-export function getResources() {
-    return request.get(`${baseUrl}/get`).then(({data}) => data.data)
-}
 
 export function getAllResources() {
     return request.get(`${baseUrl}/getAll`).then(({data}) => data.data)

vue/src/api/system/role.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/role`
+export const baseUrl = `${BASE}/role`
 
 export function searchRoles(data) {
     return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)

vue/src/api/system/supplier.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/supplier`
+export const baseUrl = `${BASE}/supplier`
 
 export function getLimitRegion() {
     return request.get(`${baseUrl}/getLimitRegion`).then(({data}) => data.data)

vue/src/api/system/user.js

@@ -1,6 +1,7 @@
 import request from "@/config/request"
+import BASE from './baseUrl'
 
-export const baseUrl = `/system/user`
+export const baseUrl = `${BASE}/user`
 
 export function getUsers(data) {
     return request.post(`${baseUrl}/search`, data).then(({data}) => data.data)

vue/src/bizComponents/document/DocHistory.vue

@@ -1,65 +0,0 @@
-<template>
-    <collapse-card header="单据历史" style="margin-top: 16px">
-        <abstract-table v-loading="loading" :data="data" :highlight-current-row="false">
-            <el-table-column align="center" label="#" type="index" width="80"/>
-            <el-table-column align="center" label="操作人" prop="uname"/>
-            <el-table-column align="center" label="操作类型" prop="type"/>
-            <el-table-column align="center" label="时 间" prop="time"/>
-            <el-table-column align="center" label="备注" prop="info"/>
-        </abstract-table>
-    </collapse-card>
-</template>
-
-<script>
-    import AbstractTable from "@/components/AbstractTable"
-    import CollapseCard from '@/components/CollapseCard'
-    import {getDocumentHistoryByPid} from "@/api/documentHistory"
-    import {isEmpty, timeFormat} from "@/utils"
-
-    export default {
-        name: "DocHistory",
-
-        components: {AbstractTable, CollapseCard},
-
-        props: {id: String},
-
-        data() {
-            return {
-                loading: false,
-                data: []
-            }
-        },
-
-        watch: {
-            id: {
-                immediate: true,
-                handler(v) {
-                    if (isEmpty(v)) return
-                    getDocumentHistoryByPid(v)
-                        .then(history => {
-                            history.forEach(i => {
-                                i.time = timeFormat(null, new Date(i.time))
-                                let type = null
-                                switch (i.type) {
-                                    case 0:
-                                        type = '撤回'
-                                        break
-                                    case 1:
-                                        type = '提交'
-                                        break
-                                    case 2:
-                                        type = '通过'
-                                        break
-                                    case 3:
-                                        type = '驳回'
-                                        break
-                                }
-                                i.type = type
-                            })
-                            this.data = history
-                        })
-                }
-            }
-        }
-    }
-</script>

vue/src/bizComponents/document/DocSteps.vue

@@ -1,25 +0,0 @@
-<script type="text/jsx">
-    export default {
-        name: "DocSteps",
-
-        functional: true,
-
-        props: {
-            status: Number,
-            finish: Number
-        },
-
-        render(h, context) {
-            const {status, finish} = context.props
-            const active = status === 2 && (finish === undefined || finish === 2) ? 4 : status
-            return (
-                <el-steps align-center active={active}>
-                    <el-step title="填写单据"/>
-                    <el-step title="提交单据，等待审核"/>
-                    <el-step title="审核通过"/>
-                    <el-step title="单据完成"/>
-                </el-steps>
-            )
-        }
-    }
-</script>

vue/src/components/UploadFile/index.vue

@@ -49,25 +49,25 @@
 </template>
 
 <script>
-    /*
+/*
-    * 直传七牛云
+* 直传七牛云
-    * 传入fileList自动拼接七牛云外链前缀，并增加downloadUrl属性（图片类型的文件url与downloadUrl相同）
+* 传入fileList自动拼接七牛云外链前缀，并增加downloadUrl属性（图片类型的文件url与downloadUrl相同）
-    * 非图片类型的文件使用kkFileView预览
+* 非图片类型的文件使用kkFileView预览
-    * success、remove事件中的file.url均不带七牛云外链前缀
+* success、remove事件中的file.url均不带七牛云外链前缀
-    * */
+* */
-    import axios from 'axios'
+import axios from 'axios'
-    import {attachmentPrefix} from '@/config'
+import {attachmentPrefix} from '@/config'
-    import {debounce, isEmpty} from '@/utils'
+import {debounce, isEmpty} from '@/utils'
-    import {elError} from "@/utils/message"
+import {elError} from "@/utils/message"
-    import {isImage, isDoc, isPdf, isPpt, isRar, isXls, isTxt, isZip} from "@/utils/validate"
+import {isImage, isDoc, isPdf, isPpt, isRar, isXls, isTxt, isZip} from "@/utils/validate"
-    import {preview, deleteUpload, download, upload, autoCompleteUrl} from "@/utils/file"
+import {preview, deleteUpload, download, upload, autoCompleteUrl} from "@/utils/file"
-
+
-    const typeMapper = [
+const typeMapper = [
     {test: isImage}, {test: isDoc, type: 'doc'}, {test: isPdf, type: 'pdf'}, {test: isPpt, type: 'ppt'},
     {test: isRar, type: 'rar'}, {test: isXls, type: 'xls'}, {test: isTxt, type: 'txt'}, {test: isZip, type: 'zip'},
-    ]
+]
 
-    function parseMaxSize(maxSize) {
+function parseMaxSize(maxSize) {
     if (typeof maxSize === 'number') {
         return maxSize
     }
@@ -78,15 +78,15 @@
         unit = upper.replace(num, "")
 
     return parseInt(num) * (map[unit] || 1)
-    }
+}
 
-    function getCoverImage(url, fileType) {
+function getCoverImage(url, fileType) {
     const mapper = typeMapper.find(({test}) => test(fileType))
 
     return mapper && mapper.type ? `${process.env.BASE_URL}static/img/fileType/${mapper.type}.png` : url
-    }
+}
 
-    export default {
+export default {
     name: 'UploadFile',
 
     props: {
@@ -94,7 +94,7 @@
         multiple: {type: Boolean, default: true},
         fileList: {type: Array, default: () => []},
         limit: {type: Number, default: 10},
-            maxSize: {type: Number | String, default: '10MB'}
+        maxSize: {type: [Number, String], default: '10MB'}
     },
 
     data() {
@@ -235,7 +235,7 @@
     created() {
         this.activateTooltip = debounce(tooltip => tooltip.handleShowPopper(), 200)
     }
-    }
+}
 </script>
 
 <style lang="scss" src="./style.scss"></style>

vue/src/components/biz/doc/DocHistory.vue

@@ -0,0 +1,96 @@
+<template>
+    <collapse-card header="单据历史" style="margin-top: 16px">
+        <abstract-table v-loading="loading" :data="data" :highlight-current-row="false">
+            <el-table-column align="center" label="#" type="index" width="80"/>
+            <el-table-column align="center" label="操作人" prop="uname"/>
+            <el-table-column align="center" label="操作类型" prop="type"/>
+            <el-table-column align="center" label="时 间" prop="time"/>
+            <el-table-column align="center" label="备注" prop="info"/>
+        </abstract-table>
+
+        <el-pagination
+            background
+            :current-page="searchForm.page"
+            :page-size="searchForm.pageSize"
+            :total="searchForm.total"
+            hide-on-single-page
+            layout="total, prev, pager, next, jumper"
+            @current-change="pageChange"
+        />
+    </collapse-card>
+</template>
+
+<script>
+import AbstractTable from "@/components/AbstractTable"
+import CollapseCard from '@/components/CollapseCard'
+import {searchHistory} from "@/api/doc/history"
+import {isEmpty, timeFormat} from "@/utils"
+
+export default {
+    name: "DocHistory",
+
+    components: {AbstractTable, CollapseCard},
+
+    props: {id: String},
+
+    data() {
+        return {
+            loading: false,
+            searchForm: {
+                page: 1,
+                pageSize: 15,
+                total: 0
+            },
+            data: []
+        }
+    },
+
+    watch: {
+        id: {
+            immediate: true,
+            handler() {
+                this.search()
+            }
+        }
+    },
+
+    methods: {
+        search() {
+            if (isEmpty(this.id)) return
+            searchHistory({pid: this.id, ...this.searchForm})
+                .then(({total, list}) => {
+                    this.transformData(list)
+                    this.data = list
+                    this.total = total
+                })
+        },
+
+        pageChange(v) {
+            this.searchForm.page = v
+            this.search()
+        },
+
+        transformData(data) {
+            data.forEach(i => {
+                i.time = timeFormat(null, new Date(i.time))
+                let type = null
+                switch (i.type) {
+                    case 0:
+                        type = '撤回'
+                        break
+                    case 1:
+                        type = '提交'
+                        break
+                    case 2:
+                        type = '通过'
+                        break
+                    case 3:
+                        type = '驳回'
+                        break
+                }
+                i.type = type
+            })
+        }
+    }
+}
+</script>

vue/src/components/biz/doc/DocSteps.vue

@@ -0,0 +1,22 @@
+<script type="text/jsx">
+export default {
+    name: "DocSteps",
+
+    functional: true,
+
+    props: {status: Number, finish: Number},
+
+    render(h, context) {
+        const {status, finish} = context.props
+        const active = status === 2 && (finish === undefined || finish === 2) ? 4 : status
+        return (
+            <el-steps align-center active={active === 2 ? 3 : active}>
+                <el-step title="填写单据"/>
+                <el-step title="提交单据，等待审核"/>
+                <el-step title="审核通过"/>
+                <el-step title="单据完成"/>
+            </el-steps>
+        )
+    }
+}
+</script>

vue/src/mixins/docDetailMixin.js

@@ -2,12 +2,12 @@ import AbstractForm from '@/components/AbstractForm'
 import AbstractFormItem from "@/components/AbstractForm/AbstractFormItem"
 import AbstractTable from "@/components/AbstractTable"
 import CollapseCard from '@/components/CollapseCard'
-import DocDetailHeader from "@/bizComponents/document/DocDetailHeader"
+import DocDetailHeader from "@/components/biz/doc/DocDetailHeader"
-import DocDetailFooter from "@/bizComponents/document/DocDetailFooter"
+import DocDetailFooter from "@/components/biz/doc/DocDetailFooter"
-import DocHistory from '@/bizComponents/document/DocHistory'
+import DocHistory from '@/components/biz/doc/DocHistory'
-import DocSteps from '@/bizComponents/document/DocSteps'
+import DocSteps from '@/components/biz/doc/DocSteps'
 import UploadFile from '@/components/UploadFile'
-import {commonMethods} from "@/mixins/bizDocumentTableMixin"
+import {commonMethods} from "@/mixins/docTableMixin"
 import {isEmpty, mergeObj} from '@/utils'
 import {elAlert, elConfirm, elPrompt, elSuccess} from "@/utils/message"
 import {deleteUpload} from "@/utils/file"

vue/src/router/authority/modules/purchase.js

@@ -3,7 +3,7 @@ import Layout from '@/layout'
 import {lazyLoadView} from "@/router/util"
 
 const router = {
-    path: '/document/purchase',
+    path: '/doc/purchase',
     component: Layout,
     alwaysShow: true,
     meta: {title: '采购管理', icon: 'shopping'},
@@ -31,7 +31,7 @@ const router = {
                             return `查看采购订单${id}`
                     }
                 },
-                activeMenu: '/document/purchase/order',
+                activeMenu: '/doc/purchase/order',
                 isDetailPage: true
             }
         },
@@ -58,7 +58,7 @@ const router = {
                             return `查看采购入库单${id}`
                     }
                 },
-                activeMenu: '/document/purchase/inbound',
+                activeMenu: '/doc/purchase/inbound',
                 isDetailPage: true
             }
         }

vue/src/router/authority/modules/sell.js

@@ -3,7 +3,7 @@ import Layout from '@/layout'
 import {lazyLoadView} from "@/router/util"
 
 const router = {
-    path: '/document/sell',
+    path: '/doc/sell',
     component: Layout,
     alwaysShow: true,
     meta: {title: '销售管理', icon: 'sell'},
@@ -31,7 +31,7 @@ const router = {
                             return `查看销售订单${id}`
                     }
                 },
-                activeMenu: '/document/sell/order',
+                activeMenu: '/doc/sell/order',
                 isDetailPage: true
             }
         },
@@ -58,7 +58,7 @@ const router = {
                             return `查看销售出库单${id}`
                     }
                 },
-                activeMenu: '/document/outbound/order',
+                activeMenu: '/doc/sell/outbound',
                 isDetailPage: true
             }
         }

vue/src/views/message/manage/EditDialog.vue

@@ -56,7 +56,7 @@
     import AbstractFormItem from "@/components/AbstractForm/AbstractFormItem"
     import FormDialog from '@/components/FormDialog'
     import TinymceEditor from "@/components/TinymceEditor"
-    import {SimpleMultipleUserSelector as UserSelector} from '@/bizComponents/UserSelector'
+    import {SimpleMultipleUserSelector as UserSelector} from '@/components/biz/UserSelector'
     import dialogMixin from "@/mixins/dialogMixin"
     import {add, update, publish, withdraw} from "@/api/message/manage"
     import {isEmpty, mergeObj, resetObj} from '@/utils'

vue/src/views/purchase/inbound/components/OrderSelector.vue

@@ -69,7 +69,7 @@
     import LinerProgress from '@/components/LinerProgress'
     import dialogMixin from "@/mixins/dialogMixin"
     import tableMixin from '@/mixins/tablePageMixin'
-    import {getSubById, search} from "@/api/document/purchase/order"
+    import {getSubById, search} from "@/api/doc/purchase/order"
     import {elError} from "@/utils/message"
 
     export default {

vue/src/views/purchase/inbound/detail.vue

@@ -78,10 +78,10 @@
 </template>
 
 <script>
-    import bizDocDetailMixin from "@/mixins/bizDocDetailMixin"
+    import docDetailMixin from "@/mixins/docDetailMixin"
     import OrderSelector from './components/OrderSelector'
-    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/document/purchase/inbound"
+    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/doc/purchase/inbound"
-    import {getSubById as getParentSubById} from "@/api/document/purchase/order"
+    import {getSubById as getParentSubById} from "@/api/doc/purchase/order"
     import {isEmpty} from "@/utils"
     import {elAlert} from "@/utils/message"
     import {isInteger} from "@/utils/validate"
@@ -89,7 +89,7 @@
     export default {
         name: "purchaseInboundDetail",
 
-        mixins: [bizDocDetailMixin],
+        mixins: [docDetailMixin],
 
         components: {OrderSelector},
 

vue/src/views/purchase/inbound/index.vue

@@ -70,19 +70,20 @@
                 <el-table-column align="center" label="单 号" prop="id" width="160" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建人" prop="cname" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.ctime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.ctime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="审核人" prop="vname" show-overflow-tooltip/>
                 <el-table-column align="center" label="审核时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.vtime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.vtime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
                         <span :class="{primary:row.status===1,success:row.status===2}" class="dot"/>
-                        {{getStatus(row.status)}}
+                        {{ getStatus(row.status) }}
                     </template>
                 </el-table-column>
             </abstract-table>
+
             <el-pagination
                 background
                 :current-page="searchForm.page"
@@ -96,15 +97,15 @@
 </template>
 
 <script>
-    import SearchForm from '@/components/SearchForm'
+import docTableMixin from '@/mixins/docTableMixin'
-    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
+import SearchForm from '@/components/SearchForm'
-    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
+import SearchFormItem from "@/components/SearchForm/SearchFormItem"
-    import {baseUrl, del, getSubById, search} from "@/api/document/purchase/inbound"
+import {baseUrl, del, getSubById, search} from "@/api/doc/purchase/inbound"
 
-    export default {
+export default {
     name: "purchaseInbound",
 
-        mixins: [documentTableMixin],
+    mixins: [docTableMixin],
 
     components: {SearchForm, SearchFormItem},
 
@@ -142,5 +143,5 @@
             }
         }
     }
-    }
+}
 </script>

vue/src/views/purchase/order/components/SupplierSelector.vue

@@ -37,7 +37,7 @@
                 >
                     <el-table-column align="center" label="#" type="index" width="80"/>
                     <el-table-column align="center" label="供应商" prop="name" show-overflow-tooltip/>
-                    <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
+                    <el-table-column align="center" label="行政区域" prop="regionName" show-overflow-tooltip/>
                     <el-table-column align="center" label="地 址" prop="address" show-overflow-tooltip/>
                     <el-table-column align="center" label="联系人" prop="linkman" show-overflow-tooltip/>
                     <el-table-column align="center" label="联系电话" prop="linkphone" show-overflow-tooltip/>

vue/src/views/purchase/order/detail.vue

@@ -124,10 +124,10 @@
 </template>
 
 <script>
-    import bizDocDetailMixin from "@/mixins/bizDocDetailMixin"
+    import docDetailMixin from "@/mixins/docDetailMixin"
     import CategorySelector from './components/CategorySelector'
     import SupplierSelector from './components/SupplierSelector'
-    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/document/purchase/order"
+    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/doc/purchase/order"
     import {isEmpty} from "@/utils"
     import {mul, plus} from "@/utils/math"
     import {isInteger} from "@/utils/validate"
@@ -135,7 +135,7 @@
     export default {
         name: "purchaseOrderDetail",
 
-        mixins: [bizDocDetailMixin],
+        mixins: [docDetailMixin],
 
         components: {CategorySelector, SupplierSelector},
 

vue/src/views/purchase/order/index.vue

@@ -89,28 +89,29 @@
                 <el-table-column align="center" label="供应商" prop="sname" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建人" prop="cname" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.ctime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.ctime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="审核人" prop="vname" show-overflow-tooltip/>
                 <el-table-column align="center" label="审核时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.vtime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.vtime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
                         <span :class="{primary:row.status===1,success:row.status===2}" class="dot"/>
-                        {{getStatus(row.status)}}
+                        {{ getStatus(row.status) }}
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="完成情况" width="120">
                     <template v-slot="{row}">
                         <span :class="{primary:row.finish===1,success:row.finish===2}" class="dot"/>
-                        {{getFinish(row.finish)}}
+                        {{ getFinish(row.finish) }}
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="完成时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.ftime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.ftime | timestamp2Date }}</template>
                 </el-table-column>
             </abstract-table>
+
             <el-pagination
                 background
                 :current-page="searchForm.page"
@@ -124,15 +125,18 @@
 </template>
 
 <script>
-    import SearchForm from '@/components/SearchForm'
+import docTableMixin from '@/mixins/docTableMixin'
-    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
+import SearchForm from '@/components/SearchForm'
-    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
+import SearchFormItem from "@/components/SearchForm/SearchFormItem"
-    import {baseUrl, del, getSubById, search} from "@/api/document/purchase/order"
+import {baseUrl, del, getSubById, search} from "@/api/doc/purchase/order"
 
-    export default {
+export default {
     name: "purchaseOrder",
-        mixins: [documentTableMixin],
+
+    mixins: [docTableMixin],
+
     components: {SearchForm, SearchFormItem},
+
     data() {
         return {
             baseUrl,
@@ -160,6 +164,7 @@
             }
         }
     },
+
     methods: {
         mergeSearchForm() {
             return {
@@ -175,5 +180,5 @@
             }
         }
     }
-    }
+}
 </script>

vue/src/views/sell/order/components/CustomerSelector.vue

@@ -22,7 +22,7 @@
                 <abstract-table :data="tableData" @row-click="rowClick" @row-dblclick="dbclick">
                     <el-table-column align="center" label="#" type="index" width="80"/>
                     <el-table-column align="center" label="客 户" prop="name" show-overflow-tooltip/>
-                    <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
+                    <el-table-column align="center" label="行政区域" prop="regionName" show-overflow-tooltip/>
                     <el-table-column align="center" label="地 址" prop="address" show-overflow-tooltip/>
                     <el-table-column align="center" label="联系人" prop="linkman" show-overflow-tooltip/>
                     <el-table-column align="center" label="联系电话" prop="linkphone" show-overflow-tooltip/>

vue/src/views/sell/order/detail.vue

@@ -9,7 +9,7 @@
 
         <abstract-form :model="form" :rules="rules">
             <collapse-card header="流程进度">
-                <doc-steps :status="form.status" :type="type"/>
+                <doc-steps :status="form.status" :finish="form.finish" :type="type"/>
             </collapse-card>
 
             <collapse-card header="基础信息">
@@ -109,10 +109,10 @@
 </template>
 
 <script>
-    import bizDocDetailMixin from "@/mixins/bizDocDetailMixin"
+    import docDetailMixin from "@/mixins/docDetailMixin"
     import CustomerSelector from './components/CustomerSelector'
     import StockSelector from './components/StockSelector'
-    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/document/sell/order"
+    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/doc/sell/order"
     import {isEmpty} from "@/utils"
     import {mul, plus} from "@/utils/math"
     import {isInteger} from "@/utils/validate"
@@ -120,7 +120,7 @@
     export default {
         name: "sellOrderDetail",
 
-        mixins: [bizDocDetailMixin],
+        mixins: [docDetailMixin],
 
         components: {CustomerSelector, StockSelector},
 

vue/src/views/sell/order/index.vue

@@ -92,26 +92,26 @@
                 <el-table-column align="center" label="客 户" prop="customerName" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建人" prop="cname" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.ctime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.ctime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="审核人" prop="vname" show-overflow-tooltip/>
                 <el-table-column align="center" label="审核时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.vtime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.vtime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
                         <span :class="{primary:row.status===1,success:row.status===2}" class="dot"/>
-                        {{getStatus(row.status)}}
+                        {{ getStatus(row.status) }}
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="完成情况" width="120">
                     <template v-slot="{row}">
                         <span :class="{primary:row.finish===1,success:row.finish===2}" class="dot"/>
-                        {{getFinish(row.finish)}}
+                        {{ getFinish(row.finish) }}
                     </template>
                 </el-table-column>
                 <el-table-column align="center" label="完成时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.ftime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.ftime | timestamp2Date }}</template>
                 </el-table-column>
             </abstract-table>
 
@@ -128,15 +128,15 @@
 </template>
 
 <script>
-    import SearchForm from '@/components/SearchForm'
+import docTableMixin from '@/mixins/docTableMixin'
-    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
+import SearchForm from '@/components/SearchForm'
-    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
+import SearchFormItem from "@/components/SearchForm/SearchFormItem"
-    import {baseUrl, del, getSubById, search} from "@/api/document/sell/order"
+import {baseUrl, del, getSubById, search} from "@/api/doc/sell/order"
 
-    export default {
+export default {
     name: "sellOrder",
 
-        mixins: [documentTableMixin],
+    mixins: [docTableMixin],
 
     components: {SearchForm, SearchFormItem},
 
@@ -183,5 +183,5 @@
             }
         }
     }
-    }
+}
 </script>

vue/src/views/sell/outbound/components/OrderSelector.vue

@@ -42,7 +42,7 @@
                                         size="small"
                                         style="margin-top: 10px"
                                         type="primary"
-                                        @click="confirm(row)"
+                                        @click="() => confirm(row)"
                                 >
                                     确定
                                 </el-button>
@@ -69,7 +69,7 @@
     import LinerProgress from '@/components/LinerProgress'
     import dialogMixin from "@/mixins/dialogMixin"
     import tableMixin from '@/mixins/tablePageMixin'
-    import {getSubById, search} from "@/api/document/sell/order"
+    import {getSubById, search} from "@/api/doc/sell/order"
     import {elError} from "@/utils/message"
 
     export default {

vue/src/views/sell/outbound/detail.vue

@@ -9,7 +9,7 @@
 
         <abstract-form :model="form" :rules="rules">
             <collapse-card header="流程进度">
-                <doc-steps :status="form.status" :finish="form.finish" :type="type"/>
+                <doc-steps :status="form.status" :type="type"/>
             </collapse-card>
 
             <collapse-card header="基础信息">
@@ -17,12 +17,12 @@
                     <el-input v-if="canSave" :value="form.pid" readonly>
                         <el-button slot="append" @click="parentDialog=true">选择</el-button>
                     </el-input>
-                    <template v-else>{{form.pid}}</template>
+                    <template v-else>{{ form.pid }}</template>
                 </abstract-form-item>
             </collapse-card>
 
             <collapse-card header="出库商品">
-                <abstract-table :data="form.data" :highlight-current-row="false">
+                <abstract-table :data="displayTableData" :highlight-current-row="false">
                     <el-table-column align="center" type="expand">
                         <el-table slot-scope="{row}" :data="row.data" border show-summary
                                   :summary-method="summaryStock(row)">
@@ -42,7 +42,7 @@
                                         size="small"
                                         @change="(nv,ov)=>changeOutboundNum(nv,ov,d.row,row)"
                                     />
-                                    <span v-else>{{d.row.num}}</span>
+                                    <span v-else>{{ d.row.num }}</span>
                                 </template>
                             </el-table-column>
                             <el-table-column align="center" label="采购订单" prop="cgddid" show-overflow-tooltip/>
@@ -95,21 +95,21 @@
 </template>
 
 <script>
-    import bizDocDetailMixin from "@/mixins/bizDocDetailMixin"
+import docDetailMixin from "@/mixins/docDetailMixin"
-    import OrderSelector from "./components/OrderSelector"
+import OrderSelector from "./components/OrderSelector"
-    import StockSelector from "./components/StockSelector"
+import StockSelector from "./components/StockSelector"
-    import {getDetailById as getStockDetail} from "@/api/stock/current"
+import {getDetailById as getStockDetail} from "@/api/stock/current"
-    import {getSubById as getParentSubById} from "@/api/document/sell/order"
+import {getSubById as getParentSubById} from "@/api/doc/sell/order"
-    import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/document/sell/outbound"
+import {baseUrl, add, commit, getById, pass, reject, update, withdraw} from "@/api/doc/sell/outbound"
-    import {isEmpty} from "@/utils"
+import {isEmpty} from "@/utils"
-    import {plus, sub} from "@/utils/math"
+import {plus, sub} from "@/utils/math"
-    import {elAlert} from "@/utils/message"
+import {elAlert} from "@/utils/message"
-    import {isInteger} from "@/utils/validate"
+import {isInteger} from "@/utils/validate"
 
-    export default {
+export default {
     name: "sellOutboundDetail",
 
-        mixins: [bizDocDetailMixin],
+    mixins: [docDetailMixin],
 
     components: {OrderSelector, StockSelector},
 
@@ -153,7 +153,7 @@
     methods: {
         afterInit() {
             if (this.type === 'add') return
-                let ids = this.form.data.map(i => i.sid).join(',')
+            const ids = this.form.data.map(i => i.sid).join(',')
             return Promise.all([
                 getParentSubById(this.form.pid),
                 getStockDetail(ids)
@@ -164,7 +164,7 @@
         //根据销售订单的子表、销售出库的子表、对应的库存来构造展示列表
         buildDisplayTableData(orderSubList, stockList) {
             this.displayTableData = []
-                let group = {}
+            const group = {}
             this.form.data.forEach(i => {
                 if (group[i.cid] === undefined) group[i.cid] = []
                 let stock = stockList.find(j => j.id === i.sid)
@@ -172,7 +172,7 @@
                     ...i,
                     cgddid: stock ? stock.cgddid : null,
                     cgrkid: stock ? stock.cgrkid : null,
-                        max_num: stock ? stock.num : 0
+                    maxNum: stock ? stock.num : 0
                 })
             })
             orderSubList.forEach(i => {
@@ -210,7 +210,7 @@
                     ...stock,
                     sid: stock.id,
                     pid: this.form.id,
-                        max_num: stock.num,
+                    maxNum: stock.num,
                     num: stock.num > remainNum ? remainNum : stock.num
                 }
                 outboundNum = plus(outboundNum, item.num)
@@ -234,7 +234,7 @@
         },
 
         changeOutboundNum(nv, ov, row, displayTableRow) {
-                if (nv > row.max_num) {
+            if (nv > row.maxNum) {
                 return elAlert(`${row.cname}的出库数量超出库存数量`, () => row.num = ov)
             }
 
@@ -246,7 +246,7 @@
             if (outboundNum > displayTableRow.remainNum) {
                 let correctNum = sub(displayTableRow.remainNum, sub(outboundNum, nv))
                 if (correctNum < 0) correctNum = 0
-                    else if (correctNum > row.max_num) correctNum = row.max_num
+                else if (correctNum > row.maxNum) correctNum = row.maxNum
                 return elAlert(`${displayTableRow.cname}的出库数量超出销售数量`, () => row.num = ov)
             }
         },
@@ -270,5 +270,5 @@
             return null
         }
     }
-    }
+}
 </script>

vue/src/views/sell/outbound/index.vue

@@ -73,16 +73,16 @@
                 <el-table-column align="center" label="单 号" prop="id" width="160" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建人" prop="cname" show-overflow-tooltip/>
                 <el-table-column align="center" label="创建时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.ctime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.ctime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="审核人" prop="vname" show-overflow-tooltip/>
                 <el-table-column align="center" label="审核时间" width="150" show-overflow-tooltip>
-                    <template v-slot="{row}">{{row.vtime | timestamp2Date}}</template>
+                    <template v-slot="{row}">{{ row.vtime | timestamp2Date }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="状 态" width="120">
                     <template v-slot="{row}">
                         <span :class="{primary:row.status===1,success:row.status===2}" class="dot"/>
-                        {{getStatus(row.status)}}
+                        {{ getStatus(row.status) }}
                     </template>
                 </el-table-column>
             </abstract-table>
@@ -100,15 +100,15 @@
 </template>
 
 <script>
-    import SearchForm from '@/components/SearchForm'
+import docTableMixin from '@/mixins/docTableMixin'
-    import SearchFormItem from "@/components/SearchForm/SearchFormItem"
+import SearchForm from '@/components/SearchForm'
-    import documentTableMixin from '@/mixins/bizDocumentTableMixin'
+import SearchFormItem from "@/components/SearchForm/SearchFormItem"
-    import {baseUrl, del, getSubById, search} from "@/api/document/sell/outbound"
+import {baseUrl, del, getSubById, search} from "@/api/doc/sell/outbound"
 
-    export default {
+export default {
     name: "sellOutbound",
 
-        mixins: [documentTableMixin],
+    mixins: [docTableMixin],
 
     components: {SearchForm, SearchFormItem},
 
@@ -146,5 +146,5 @@
             }
         }
     }
-    }
+}
 </script>

vue/src/views/stock/current/index.vue

@@ -67,7 +67,7 @@
 </template>
 
 <script>
-    import CategoryTree from '@/bizComponents/CategoryTree'
+    import CategoryTree from '@/components/biz/CategoryTree'
     import DetailDialog from "./DetailDialog"
     import ExtraArea from '@/components/ExtraArea'
     import SearchForm from "@/components/SearchForm"

vue/src/views/system/category/components/List.vue

@@ -18,7 +18,7 @@
     import {del, getAll} from "@/api/system/category"
     import ContextMenu from "@/components/ContextMenu"
     import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem"
-    import CategoryTree from '@/bizComponents/CategoryTree'
+    import CategoryTree from '@/components/biz/CategoryTree'
 
     export default {
         components: {ContextMenuItem, ContextMenu, CategoryTree},

vue/src/views/system/customer/EditDialog.vue

@@ -11,9 +11,9 @@
             <el-form-item label="名 称：" prop="name">
                 <el-input v-model="form.name" :readonly="!canEdit" maxlength="20"/>
             </el-form-item>
-            <el-form-item label="行政区域：" prop="region_name">
+            <el-form-item label="行政区域：" prop="regionName">
                 <region-selector
-                        :value="form.region_name"
+                        :value="form.regionName"
                         :readonly="!canEdit"
                         @clear="clearRegion"
                         @select="selectRegion"
@@ -87,7 +87,7 @@
                     linkman: null,
                     linkphone: null,
                     region: null,
-                    region_name: null,
+                    regionName: null,
                     status: 1,
                     remark: null
                 },
@@ -97,7 +97,7 @@
                     linkman: [{required: true, message: '联系人不能为空', trigger: 'change'}],
                     linkphone: [{required: true, message: '联系电话不能为空', trigger: 'change'}],
                     status: [{required: true, message: '状态不能为空', trigger: 'change'}],
-                    region_name: [{required: true, message: '行政区域不能为空', trigger: 'change'}],
+                    regionName: [{required: true, message: '行政区域不能为空', trigger: 'change'}],
                 }
             }
         },
@@ -134,12 +134,12 @@
         methods: {
             clearRegion() {
                 this.form.region = null
-                this.form.region_name = null
+                this.form.regionName = null
             },
 
             selectRegion(obj) {
                 this.form.region = obj.id
-                this.form.region_name = obj.fullname
+                this.form.regionName = obj.fullname
             },
 
             open() {

vue/src/views/system/customer/index.vue

@@ -6,7 +6,7 @@
             </search-form-item>
             <search-form-item label="行政区域：">
                 <region-selector
-                        :value="temp.region_name"
+                        :value="temp.regionName"
                         limit
                         :limit-api="getLimitRegion"
                         get-children-on-select
@@ -51,7 +51,7 @@
             <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="客 户" prop="name" show-overflow-tooltip/>
-                <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
+                <el-table-column align="center" label="行政区域" prop="regionName" show-overflow-tooltip/>
                 <el-table-column align="center" label="地 址" prop="address" show-overflow-tooltip/>
                 <el-table-column align="center" label="联系人" prop="linkman" show-overflow-tooltip/>
                 <el-table-column align="center" label="联系电话" prop="linkphone" show-overflow-tooltip/>
@@ -65,6 +65,7 @@
                     </template>
                 </el-table-column>
             </abstract-table>
+
             <el-pagination
                     background
                     :current-page="searchForm.page"
@@ -110,7 +111,7 @@
                     status: null
                 },
                 temp: {
-                    region_name: null,
+                    regionName: null,
                     ctime: []
                 },
                 editDialog: false
@@ -138,12 +139,12 @@
 
             clearSidSearch() {
                 this.searchForm.region = null
-                this.temp.region_name = null
+                this.temp.regionName = null
             },
 
             selectRegion(obj, ids) {
                 this.searchForm.region = ids.join(',')
-                this.temp.region_name = obj.fullname
+                this.temp.regionName = obj.fullname
             },
 
             mergeSearchForm() {

vue/src/views/system/supplier/EditDialog.vue

@@ -11,9 +11,9 @@
             <el-form-item label="名 称：" prop="name">
                 <el-input v-model="form.name" :readonly="!canEdit" maxlength="20"/>
             </el-form-item>
-            <el-form-item label="行政区域：" prop="region_name">
+            <el-form-item label="行政区域：" prop="regionName">
                 <region-selector
-                        :value="form.region_name"
+                        :value="form.regionName"
                         :readonly="!canEdit"
                         @clear="clearRegion"
                         @select="selectRegion"
@@ -87,7 +87,7 @@
                     linkman: null,
                     linkphone: null,
                     region: null,
-                    region_name: null,
+                    regionName: null,
                     status: 1,
                     remark: null
                 },
@@ -97,7 +97,7 @@
                     linkman: [{required: true, message: '联系人不能为空', trigger: 'change'}],
                     linkphone: [{required: true, message: '联系电话不能为空', trigger: 'change'}],
                     status: [{required: true, message: '状态不能为空', trigger: 'change'}],
-                    region_name: [{required: true, message: '行政区域不能为空', trigger: 'change'}],
+                    regionName: [{required: true, message: '行政区域不能为空', trigger: 'change'}],
                 }
             }
         },
@@ -134,12 +134,12 @@
         methods: {
             clearRegion() {
                 this.form.region = null
-                this.form.region_name = null
+                this.form.regionName = null
             },
 
             selectRegion(obj) {
                 this.form.region = obj.id
-                this.form.region_name = obj.fullname
+                this.form.regionName = obj.fullname
             },
 
             open() {

vue/src/views/system/supplier/index.vue

@@ -6,7 +6,7 @@
             </search-form-item>
             <search-form-item label="行政区域：">
                 <region-selector
-                        :value="temp.region_name"
+                        :value="temp.regionName"
                         limit
                         :limit-api="getLimitRegion"
                         get-children-on-select
@@ -51,7 +51,7 @@
             <abstract-table :data="tableData" @row-click="rowClick">
                 <el-table-column align="center" label="#" type="index" width="80"/>
                 <el-table-column align="center" label="供应商" prop="name" show-overflow-tooltip/>
-                <el-table-column align="center" label="行政区域" prop="region_name" show-overflow-tooltip/>
+                <el-table-column align="center" label="行政区域" prop="regionName" show-overflow-tooltip/>
                 <el-table-column align="center" label="地 址" prop="address" show-overflow-tooltip/>
                 <el-table-column align="center" label="联系人" prop="linkman" show-overflow-tooltip/>
                 <el-table-column align="center" label="联系电话" prop="linkphone" show-overflow-tooltip/>
@@ -111,7 +111,7 @@
                     status: null
                 },
                 temp: {
-                    region_name: null,
+                    regionName: null,
                     ctime: []
                 },
                 editDialog: false
@@ -139,12 +139,12 @@
 
             clearSidSearch() {
                 this.searchForm.region = null
-                this.temp.region_name = null
+                this.temp.regionName = null
             },
 
             selectRegion(obj, ids) {
                 this.searchForm.region = ids.join(',')
-                this.temp.region_name = obj.fullname
+                this.temp.regionName = obj.fullname
             },
 
             mergeSearchForm() {