Merge branch 'master' of http://94.191.59.107:3000/wukai/warehouse-ui

# Conflicts:
#	src/store/modules/settings.js

index.html

@@ -210,7 +210,7 @@
     </div>
   </div>
   <script type="module" src="/src/main.js"></script>
-  <script type="module" src="./jessibuca.js"></script>
+  <script type="module" src="/jessibuca.js"></script>
 </body>
 
 </html>

src/api/biz/fc.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询流程管理列表
+export function listFc(query) {
+    return request({
+        url: '/biz/fc/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询流程管理详细
+export function getFc(flowsId) {
+    return request({
+        url: '/biz/fc/' + flowsId,
+        method: 'get'
+    })
+}
+
+// 新增流程管理
+export function addFc(data) {
+    return request({
+        url: '/biz/fc',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改流程管理
+export function updateFc(data) {
+    return request({
+        url: '/biz/fc',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除流程管理
+export function delFc(flowsId) {
+    return request({
+        url: '/biz/fc/' + flowsId,
+        method: 'delete'
+    })
+}

src/api/biz/fr.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询流程记录列表
+export function listFr(query) {
+    return request({
+        url: '/biz/fr/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询流程记录详细
+export function getFr(recordId) {
+    return request({
+        url: '/biz/fr/' + recordId,
+        method: 'get'
+    })
+}
+
+// 新增流程记录
+export function addFr(data) {
+    return request({
+        url: '/biz/fr',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改流程记录
+export function updateFr(data) {
+    return request({
+        url: '/biz/fr',
+        method: 'put',
+        data: data
+    })
+}
+
+// 删除流程记录
+export function delFr(recordId) {
+    return request({
+        url: '/biz/fr/' + recordId,
+        method: 'delete'
+    })
+}

src/layout/components/Navbar.vue

@@ -111,7 +111,6 @@ function toggleTheme() {
   settingsStore.toggleTheme()
 }
 
-toggleTheme();
 </script>
 
 <style lang='scss' scoped>

src/store/modules/settings.js

@@ -3,14 +3,12 @@ import { useDark, useToggle } from '@vueuse/core'
 import { useDynamicTitle } from '@/utils/dynamicTitle'
 
 const isDark =  useDark()
-
 if(isDark.value) isDark.value=false; //固定为深色模式
 const toggleDark = useToggle(isDark)
 
 const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
-
 const useSettingsStore = defineStore(
   'settings',
   {
@@ -42,7 +40,7 @@ const useSettingsStore = defineStore(
       // 切换暗黑模式
       toggleTheme() {
         if(this.isDark.value) return //深色模式时不切换，保持深色模式
-        this.isDark = !this.isDark        
+        this.isDark = !this.isDark 
         toggleDark()
       }
     }

src/views/biz/fc/index.vue

@@ -0,0 +1,286 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="流程ID" prop="flowsId">
+        <el-input
+          v-model="queryParams.flowsId"
+          placeholder="请输入流程ID"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="流程名称" prop="flowsName">
+        <el-input
+          v-model="queryParams.flowsName"
+          placeholder="请输入流程名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称标识" prop="houseId">
+        <el-input
+          v-model="queryParams.houseId"
+          placeholder="请输入仓库名称标识"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域/位置标识" prop="areaId">
+        <el-input
+          v-model="queryParams.areaId"
+          placeholder="请输入区域/位置标识"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['biz:fc:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biz:fc:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biz:fc:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['biz:fc:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="fcList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="流程ID" align="center" prop="flowsId" />
+      <el-table-column label="流程名称" align="center" prop="flowsName" />
+      <el-table-column label="仓库名称标识" align="center" prop="houseId" />
+      <el-table-column label="区域/位置标识" align="center" prop="areaId" />
+      <el-table-column label="上次同步时间" align="center" prop="updateTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biz:fc:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biz:fc:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改流程管理对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="fcRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="流程名称" prop="flowsName">
+          <el-input v-model="form.flowsName" placeholder="请输入流程名称" />
+        </el-form-item>
+        <el-form-item label="仓库名称标识" prop="houseId">
+          <el-input v-model="form.houseId" placeholder="请输入仓库名称标识" />
+        </el-form-item>
+        <el-form-item label="区域/位置标识" prop="areaId">
+          <el-input v-model="form.areaId" placeholder="请输入区域/位置标识" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Fc">
+import { listFc, getFc, delFc, addFc, updateFc } from "@/api/biz/fc";
+
+const { proxy } = getCurrentInstance();
+
+const fcList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    flowsId: null,
+    flowsName: null,
+    houseId: null,
+    areaId: null,
+  },
+  rules: {
+    flowsId: [
+      { required: true, message: "流程ID不能为空", trigger: "blur" }
+    ],
+    flowsName: [
+      { required: true, message: "流程名称不能为空", trigger: "blur" }
+    ],
+    houseId: [
+      { required: true, message: "仓库名称标识不能为空", trigger: "blur" }
+    ],
+    areaId: [
+      { required: true, message: "区域/位置标识不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询流程管理列表 */
+function getList() {
+  loading.value = true;
+  listFc(queryParams.value).then(response => {
+    fcList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    flowsId: null,
+    flowsName: null,
+    houseId: null,
+    areaId: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null
+  };
+  proxy.resetForm("fcRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.flowsId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加流程管理";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _flowsId = row.flowsId || ids.value
+  getFc(_flowsId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改流程管理";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["fcRef"].validate(valid => {
+    if (valid) {
+      if (form.value.flowsId != null) {
+        updateFc(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addFc(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _flowsIds = row.flowsId || ids.value;
+  proxy.$modal.confirm('是否确认删除流程管理编号为"' + _flowsIds + '"的数据项？').then(function() {
+    return delFc(_flowsIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biz/fc/export', {
+    ...queryParams.value
+  }, `fc_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>

src/views/biz/fr/index.vue

@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="流程名称" prop="flowsName">
+        <el-input
+          v-model="queryParams.flowsName"
+          placeholder="请输入流程名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="house">
+        <el-input
+          v-model="queryParams.house"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="区域位置" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入区域位置"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="跳转链接" prop="journeyUrl">
+        <el-input
+          v-model="queryParams.journeyUrl"
+          placeholder="请输入跳转链接"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['biz:fr:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['biz:fr:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['biz:fr:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['biz:fr:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="frList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="记录ID" align="center" prop="recordId" />
+      <el-table-column label="流程名称" align="center" prop="flowsName" />
+      <el-table-column label="仓库名称" align="center" prop="house" />
+      <el-table-column label="区域位置" align="center" prop="area" />
+      <el-table-column label="状态" align="center" prop="status" />
+      <el-table-column label="跳转链接" align="center" prop="journeyUrl" />
+      <el-table-column label="发起人" align="center" prop="createBy" />
+      <el-table-column label="发起时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['biz:fr:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['biz:fr:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改流程记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="frRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="流程名称" prop="flowsName">
+          <el-input v-model="form.flowsName" placeholder="请输入流程名称" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="house">
+          <el-input v-model="form.house" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="区域位置" prop="area">
+          <el-input v-model="form.area" placeholder="请输入区域位置" />
+        </el-form-item>
+        <el-form-item label="跳转链接" prop="journeyUrl">
+          <el-input v-model="form.journeyUrl" placeholder="请输入跳转链接" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Fr">
+import { listFr, getFr, delFr, addFr, updateFr } from "@/api/biz/fr";
+
+const { proxy } = getCurrentInstance();
+
+const frList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    flowsName: null,
+    house: null,
+    area: null,
+    status: null,
+    journeyUrl: null,
+  },
+  rules: {
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询流程记录列表 */
+function getList() {
+  loading.value = true;
+  listFr(queryParams.value).then(response => {
+    frList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false;
+  reset();
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    recordId: null,
+    flowsName: null,
+    house: null,
+    area: null,
+    status: null,
+    journeyUrl: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    remark: null
+  };
+  proxy.resetForm("frRef");
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.recordId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加流程记录";
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const _recordId = row.recordId || ids.value
+  getFr(_recordId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改流程记录";
+  });
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["frRef"].validate(valid => {
+    if (valid) {
+      if (form.value.recordId != null) {
+        updateFr(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addFr(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _recordIds = row.recordId || ids.value;
+  proxy.$modal.confirm('是否确认删除流程记录编号为"' + _recordIds + '"的数据项？').then(function() {
+    return delFr(_recordIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('biz/fr/export', {
+    ...queryParams.value
+  }, `fr_${new Date().getTime()}.xlsx`)
+}
+
+getList();
+</script>