Merge pull request 'master' (#14) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/14

src/api/subsidiary/index.js

@@ -0,0 +1,16 @@
+import request from "@/utils/request.js";
+
+export const getSubCompanyList=(params)=>{
+    return request({
+        url:'/admin/mosr/sub/company',
+        method:'get',
+        params
+    })
+}
+export const getDepartmentList=(params)=>{
+    return request({
+        url:'/admin/mosr/department',
+        method:'get',
+        params
+    })
+}

src/views/department/index.vue

@@ -0,0 +1,68 @@
+<template>
+  <el-form :model="queryParams" inline class="query-form" ref="queryInstance">
+    <el-form-item label="部门编码" prop="departmentCode">
+      <el-input v-model="queryParams.departmentCode" placeholder="请输入部门编码" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="部门标志" prop="departmentMark">
+      <el-input v-model="queryParams.departmentMark" placeholder="请输入部门标志" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="部门名称" prop="departmentName">
+      <el-input v-model="queryParams.departmentName" placeholder="请输入部门名称" clearable></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+      <el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
+    </el-form-item>
+  </el-form>
+  <el-table
+      :data="list"
+      ref="tableTree"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      row-key="departmentId"
+      :lazy="true"
+      v-loading="loading"
+      @cell-click="cellClick"
+      v-tabh
+  >
+    <el-table-column prop="departmentMark" label="部门标志"/>
+    <el-table-column prop="departmentCode" label="部门编码"/>
+    <el-table-column prop="departmentName" label="部门名称"/>
+    <el-table-column prop="createTime" label="创建时间"/>
+  </el-table>
+</template>
+
+<script setup>
+import {Search, Refresh} from "@element-plus/icons-vue";
+import {getDepartmentList} from "@/api/subsidiary";
+const queryInstance = ref()
+const queryParams = reactive({
+  departmentCode: '',
+  departmentMark: '',
+  departmentName: ''
+})
+const loading = ref(true)
+const list = ref([])
+const tableTree = ref()
+const cellClick = (row,column) => {
+  // if ("operation" !== column.property){
+  //   tableTree.value.toggleRowExpansion(row)
+  // }
+}
+const handleReset = (instance) => {
+  if (!instance) return
+  instance.resetFields()
+  getList()
+}
+const getList =  () => {
+  loading.value = true
+  getDepartmentList(queryParams).then(res => {
+    list.value = res.data
+    loading.value = false
+  })
+}
+getList()
+</script>
+
+<style scoped>
+
+</style>

src/views/subsidiary/index.vue

@@ -0,0 +1,70 @@
+<template>
+  <el-form :model="queryParams" inline class="query-form" ref="queryInstance">
+    <el-form-item label="子公司编码" prop="companyCode">
+      <el-input v-model="queryParams.companyCode" placeholder="请输入子公司编码" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="子公司全称" prop="companyDesc">
+      <el-input v-model="queryParams.companyDesc" placeholder="请输入子公司全称" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="子公司简称" prop="companyName">
+      <el-input v-model="queryParams.companyName" placeholder="请输入子公司简称" clearable></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="getList" :icon="Search">搜索</el-button>
+      <el-button type="primary" @click="handleReset(queryInstance)" :icon="Refresh">重置</el-button>
+    </el-form-item>
+  </el-form>
+  <el-table
+      :data="list"
+      ref="tableTree"
+      :default-expand-all="isExpand"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      row-key="subCompanyId"
+      :lazy="true"
+      v-loading="loading"
+      @cell-click="cellClick"
+      v-tabh
+  >
+    <el-table-column prop="companyDesc" label="子公司全称"/>
+    <el-table-column prop="companyCode" label="子公司编码"/>
+    <el-table-column prop="companyName" label="	子公司简称"/>
+    <el-table-column prop="createTime" label="创建时间"/>
+  </el-table>
+</template>
+
+<script setup>
+import {Search, Refresh} from "@element-plus/icons-vue";
+import {getSubCompanyList} from "@/api/subsidiary";
+const queryInstance = ref()
+const queryParams = reactive({
+  companyCode: '',
+  companyDesc: '',
+  companyName: ''
+})
+const loading = ref(true)
+const list = ref([])
+const tableTree = ref()
+const isExpand = ref(true)
+const cellClick = (row,column) => {
+  if ("operation" !== column.property){
+    tableTree.value.toggleRowExpansion(row)
+  }
+}
+const handleReset = (instance) => {
+  if (!instance) return
+  instance.resetFields()
+  getList()
+}
+const getList =  () => {
+  loading.value = true
+  getSubCompanyList(queryParams).then(res => {
+    list.value = res.data
+    loading.value = false
+  })
+}
+getList()
+</script>
+
+<style scoped>
+
+</style>

src/views/system/user/index.vue

@@ -81,8 +81,8 @@
           <!--          <el-table-column prop="userId" label="用户编号" align="center"/>-->
           <el-table-column prop="userName" label="用户名称" align="center"/>
           <el-table-column prop="nickName" label="用户昵称" align="center"/>
-          <el-table-column prop="deptName" label="部门" align="center"/>
-          <el-table-column prop="phoneNumber" label="手机号码" align="center"/>
+          <el-table-column prop="departmentName" label="部门" align="center"/>
+          <el-table-column prop="mobile" label="手机号码" align="center"/>
           <el-table-column prop="state" label="状态" align="center">
             <template #default="scope">
               <tag dict-type="normal_disable" :value="scope.row.state"/>

src/views/workflow/process/ProcessDesign.vue

@@ -36,8 +36,8 @@
 </template>
 
 <script setup>
-import ProcessTree from './ProcessTree.vue'
-import NodeConfig from './config/NodeConfig.vue'
+import ProcessTree from '@/views/workflow/process/ProcessTree.vue'
+import NodeConfig from '@/views/workflow/process/config/NodeConfig.vue'
 import {computed, ref, defineExpose} from 'vue';
 import {useProcessStore} from '@/stores/processStore.js'
 

src/views/workflow/process/ProcessEdit.vue

@@ -53,15 +53,14 @@
 
 <script setup>
 import {getProcessDefinitionInfo, addProcessDefinition} from "@/api/workflow/process-definition.js";
-import ProcessDesign from './ProcessDesign.vue'
-import FormDesign from '../form/FormDesign.vue'
+import ProcessDesign from '@/views/workflow/process/ProcessDesign.vue'
+import FormDesign from '@/views/workflow/form/FormDesign.vue'
 import ProcessSetting from "./ProcessSetting.vue";
-import Ellipsis from './common/Ellipsis.vue'
+import Ellipsis from '@/views/workflow/process/common/Ellipsis.vue'
 import {getCurrentInstance} from '@vue/runtime-core';
 
 let {proxy} = getCurrentInstance();
 import {Loading, WarningFilled, CircleCheckFilled} from '@element-plus/icons-vue'
-import {ref, computed} from 'vue'
 
 const router = useRouter()
 const params = reactive(router.currentRoute.value.params)

vite.config.js

@@ -68,6 +68,12 @@ export default defineConfig({
     strictPort: false,
     open: true,
     proxy: {
+      '/api/admin': {
+        target: 'http://dev-mosr.frp.feashow.cn/',
+        // target: 'http://192.168.31.175:8000',
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/api/, '')
+      },
       '/api': {
         target: 'http://mosr.feashow.cn',
         changeOrigin: true,