Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUE_New

llj

2025-11-11 6108e3d49712b6ded5cf3c3e735ec40f13e35971

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUE_New

 README.md

@@ -1,7 +1,7 @@
## 开发

```bash
# 克隆项目
# 克隆项目 
git clone https://gitee.com/y_project/RuoYi-Vue

# 进入项目目录

 src/components/Pagination/index.vue

@@ -36,7 +36,7 @@
    pageSizes: {
      type: Array,
      default() {
        return [10, 20, 30, 50]
        return [50, 100, 500, 5000, 50000]
      }
    },
    // 移动端页码按钮的数量端默认值5

 src/layout/components/Sidebar/MenuItemRecursive.vue

File was deleted

 src/layout/components/Sidebar/index.vue

@@ -7,23 +7,12 @@
                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
                :unique-opened="true" :active-text-color="settings.theme" :collapse-transition="false" mode="vertical">
                <!-- <el-submenu index="1">
                    <template slot="title">
                        <i class="el-icon-location"></i>
                        <span>导航一</span>
                    </template>
<el-menu-item-group>
    <el-menu-item index="1-1">选项1</el-menu-item>
    <el-menu-item index="1-2">选项2</el-menu-item>
</el-menu-item-group>
</el-submenu> -->
                <sidebar-item
                    v-for="(route, index) in sidebarRouters"
                    :key="route.path  + index"
                    :item="route"
                    :base-path="route.path"
                />
                <!-- <menu-item-recursive :menu-list="menuData" /> -->
            </el-menu>
        </el-scrollbar>
    </div>
@@ -34,9 +23,8 @@
import Logo from "./Logo"
import SidebarItem from "./SidebarItem"
import variables from "@/assets/styles/variables.scss"
import MenuItemRecursive from './MenuItemRecursive.vue'  // 导入递归组件
export default {
    components: { SidebarItem, Logo, MenuItemRecursive },
    components: { SidebarItem, Logo },
    computed: {
        ...mapState(["settings"]),
        ...mapGetters(["sidebarRouters", "sidebar"]),

 src/router/index.js

@@ -41,26 +41,31 @@
      },
    ],
  },
  {
    path: "/login",
    component: () => import("@/views/login"),
    hidden: true,
  },
  {
    path: "/register",
    component: () => import("@/views/register"),
    hidden: true,
  },
  //404
  {
    path: "/404",
    component: () => import("@/views/error/404"),
    hidden: true,
  },
  //401
  {
    path: "/401",
    component: () => import("@/views/error/401"),
    hidden: true,
  },
  //登录
  {
    path: "/login",
    component: () => import("@/views/login"),
    hidden: true,
  },
  //注册
  {
    path: "/register",
    component: () => import("@/views/register"),
    hidden: true,
  },
  //首页
  {
    path: "",
    component: Layout,
@@ -74,6 +79,7 @@
      },
    ],
  },
  //个人中心
  {
    path: "/user",
    component: Layout,
@@ -88,83 +94,62 @@
      },
    ],
  },
  // //登录跳转页
  // {
  //   path: "/indexPage",
  //   component: () => import("@/views/indexPage"),
  //   hidden: true,
  // },
  //销售出库单
  // {
  //   path: "/sales/salesOUt/sellOutBill",
  //   component: () => import("@/views/sellOutBill/index"),
  //   hidden: true,
  // },
  {
    path: "/sales/salesOUt/sellOutBill",
    path: "/sell/sellOut/sellOutBill",
    component: Layout,
    hidden: true,
    // permissions: ["system:goods:add"],
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/sales/salesOUt", // 当路由设置了该属性，则会高亮相对应的侧边栏。
      activeMenu: "/sell/sellOut/sellOutBill", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/sales/salesOUt/sellOutBill",
        component: () => import("@/views/sell/sellOutBill"),
        path: "/sell/sellOut/sellOutBill",
        component: () => import("@/views/sell/sellOut/sellOutBill.vue"),
        name: "SellOutBill",
        meta: { title: "销售出库单", activeMenu: "sales/salesOUt" },
        meta: { title: "销售出库单", activeMenu: "sell/sellOUt/sellOutBill" },
      },
    ],
  },
  //销售出库单编辑页面
  // {
  //   path: "/sellOutBillEdit",
  //   component: () => import("@/views/sales/salesOUt/sellOutBill/edit/index"),
  //   hidden: true,
  // },
  //销售出库单编辑
  {
    path: "/sales/salesOUt/sellOutBillEdit",
    path: "/sell/sellOut/sellOutBillEdit",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/sales/salesOUt/sellOutBillEdit", // 当路由设置了该属性，则会高亮相对应的侧边栏。
      activeMenu: "/sell/sellOut/sellOutBillEdit", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/sales/salesOUt/sellOutBillEdit",
        component: () => import("@/views/sell/sellOutBill/edit"),
        path: "/sell/sellOut/sellOutBillEdit",
        component: () => import("@/views/sell/sellOut/sellOutBillEdit.vue"),
        name: "SellOutBillEdit",
        meta: { title: "销售出库单编辑", activeMenu: "sales/salesOUt" },
        meta: { title: "销售出库单编辑", activeMenu: "/sell/sellOut/sellOutBillEdit" },
      },
    ],
  },
  //销售单
  // {
  //   path: "/sellBill",
  //   component: () => import("@/views/sellBill/index"),
  //   hidden: true,
  // },
  //生产资源
  //采购入库单
  {
    path: "/basic/gy/gySource",
    path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
    component: Layout,
    hidden: true,
    // permissions: ["system:goods:add"],
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/gy/gySource", // 当路由设置了该属性，则会高亮相对应的侧边栏。
      activeMenu: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/gy/gySource",
        component: () => import("@/views/basic/gySource"),
        name: "GySource",
        meta: { title: "生产资源列表", activeMenu: "basic/gy" },
        path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList"),
        name: "Kf_POStockInBillList",
        meta: { title: "采购入库单", activeMenu: "/CaiGouGuanLi/CaiGouRuKu" },
      },
    ],
  },
@@ -179,6 +164,25 @@
    component: () => import("@/views/component/printList/hBarPlanPrint"),
    hidden: true,
  },
  //生产资源
  {
    path: "/basic/production/gySource",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/basic/production/gySource", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/basic/production/gySource",
        component: () => import("@/views/basic/production/gySource.vue"),
        name: "GySource",
        meta: { title: "生产资源列表", activeMenu: "basic/production" },
      },
    ],
  },
  // 仓库
  {
    path: "/gyWarehouse",

 src/store/modules/permission.js

@@ -44,8 +44,8 @@
              title: "销售管理",
            },
            hidden: false,
            name: "Sales",
            path: "/sales",
            name: "Sell",
            path: "/sell",
            redirect: "noRedirect",
            children: [
              {
@@ -56,8 +56,8 @@
                  title: "销售出库单",
                },
                hidden: false,
                name: "SalesOUt",
                path: "salesOUt",
                name: "SellOut",
                path: "sellOut",
                redirect: "noRedirect",
                component: "Layout",
                children: [
@@ -68,8 +68,7 @@
                      noCache: false,
                      title: "销售出库单维护",
                    },
                    component: () =>
                      import("@/views/sell/sellOutBill/index.vue"),
                    component: () =>import("@/views/sell/sellOut/sellOutBill.vue"),
                    hidden: false,
                    name: "SellOutBill",
                    path: "sellOutBill",
@@ -81,7 +80,7 @@
                      noCache: false,
                      title: "销售出库单",
                    },
                    component: () => import('@/views/sell/sellOutBill/edit/index.vue'),
                    component: () => import('@/views/sell/sellOut/sellOutBillEdit.vue'),
                    hidden: false,
                    name: "SellOutBillEdit",
                    path: "sellOutBillEdit",
@@ -112,8 +111,8 @@
                  title: "生产资料",
                },
                hidden: false,
                name: "Gy",
                path: "gy",
                name: "Production",
                path: "production",
                redirect: "noRedirect",
                component: "Layout",
                children: [
@@ -125,7 +124,7 @@
                      title: "生产资料列表",
                    },
                    component: () =>
                      import("@/views/basic/gySource/index.vue"),
                      import("@/views/basic/production/gySource.vue"),
                    hidden: false,
                    name: "GySource",
                    path: "gySource",
@@ -172,6 +171,7 @@
          },
          
        ];
        console.log(data)
        const sdata = JSON.parse(JSON.stringify(data));
        const rdata = JSON.parse(JSON.stringify(data));
        const sidebarRoutes = filterAsyncRouter(sdata);

 src/views/basic/gyWarehouse/edit/index.vue

File was deleted

 src/views/basic/gyWarehouse/index.vue

File was deleted

 src/views/basic/production/gySource.vue

File was renamed from src/views/basic/gySource/index.vue
@@ -214,7 +214,7 @@
<script>
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
import Edit from '@/views/basic/gySource/edit'
import Edit from '@/views/basic/production/gySourceEdit.vue'

export default {
  name: 'GySource',
@@ -294,7 +294,7 @@
      titleData: ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"],//不需要显示的字段 可扩展
      pageSizes: [50, 100, 500, 5000, 50000],
      page: 1,
      pageSize: 50,
      pageSize: 0,
      total: 0,
      // 表单参数
      form: {},
@@ -381,6 +381,7 @@
    },
    //列表数据
    getList() {
      this.pageSize = 50
      this.tableShow = false
      this.loading = true
      if (this.pageSize == 0) {

 src/views/basic/production/gySourceEdit.vue

 src/views/gyEmployee/index.vue

@@ -506,12 +506,10 @@
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/gyEmployee/edit";
import gySource from "@/views/basic/gySource";
import { env } from "echarts";

export default {
  name: "GySource",
  components: { RowSettings, Edit, gySource },
  components: { RowSettings, Edit },
  props: {
    openPage: { type: String },
  },

 src/views/sell/sellOut/sellOutBill.vue

File was renamed from src/views/sell/sellOutBill/index.vue
@@ -1,12 +1,16 @@
<template>
  <div style="padding: 10px;">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
      <el-form-item label="日期" style="margin-left: 100px;">
        <el-date-picker v-model="dateRange" value-format="yyyy-MM-dd" type="daterange" range-separator="-"
          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
      <el-form-item label="开始日期" style="margin-left: 100px;">
        <el-date-picker v-model="sTime" type="date" placeholder="开始日期" style="width: 150px;">
        </el-date-picker>
      </el-form-item>
      <el-form-item label="结束日期">
        <el-date-picker v-model="eTime" type="date" placeholder="结束日期" style="width: 150px;">
        </el-date-picker>
      </el-form-item>
      <el-form-item label="日期间隔">
        <el-select v-model="queryParams.HInitTimeCycle" placeholder="请选择" @change="riqiChange">
        <el-select v-model="queryParams.HInitTimeCycle" placeholder="请选择" @change="riqiChange" style="width: 150px;">
          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
          </el-option>
        </el-select>
@@ -166,15 +170,13 @@
          </el-table-column>
        </template>
      </el-table>
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
        @pagination="getList" />
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="getList" />
      <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
        <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose"
          v-if="rowHideShow" />
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog title="编辑销售出库单" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
        @close="close">
      <el-dialog title="编辑销售出库单" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
        <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
          :copyType="copyType" @editClose="editClose" v-if="editShow" />
      </el-dialog>
@@ -190,8 +192,9 @@
<script>
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
import Edit from '@/views/sell/sellOutBill/edit'
import Edit from '@/views/sell/sellOut/sellOutBillEdit'
import PrintList from '@/views/component/printList'
import moment from 'moment';

export default {
  name: 'SellOutBill',
@@ -246,13 +249,11 @@
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
      selectedRow: null, // 当前选中的行
      rowForm: {},  
      rowForm: {},
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 日期范围
      dateRange: [],
      // 查询参数
      queryParams: {
        HBillNo: '',
@@ -285,9 +286,8 @@
      tableData: [],//销售出库列表(分页显示)
      dataList: [],
      titleData: ["hmainid", "hsupid", "HEmpID", "hmanagerid", "hsecmanagerid", "发货人", "hkeeperid", "保管员", "HDeptID", "销售方式", "hsubid", "hmaterid", "hunitid", "HWHID"],//不需要显示的字段 可扩展
      pageSizes: [50, 100, 500, 5000, 50000],
      page: 1,
      pageSize: 50,
      pageSize: 0,
      total: 0,
    };
  },
@@ -352,14 +352,15 @@
      const ddE = String(end.getDate()).padStart(2, '0');
      this.sTime = yyyyS + '-' + mmS + '-' + ddS
      this.eTime = yyyyE + '-' + mmE + '-' + ddE
      this.dateRange = [this.sTime, this.eTime]
    },
    getList() {
      console.log(this.$store.state)
      this.pageSize = 50
      this.tableShow = false
      this.loading = true
      if (this.dateRange.length > 0) {
        this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.dateRange[0] + "'"
        this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.dateRange[1] + "'"
      if (this.sTime) {
        this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.sTime + "'"
        this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'"
      }
      if (this.pageSize == 0) {
        this.pageSize = 50
@@ -378,7 +379,6 @@
        let data1 = response.data
        let option = []
        if (data1.code == 1) {
          console.log(data1)
          this.btResList = data1.list//销售出库单接口表头数据
          this.total = data1.count;
          var data = [];//列字段数据
@@ -669,8 +669,11 @@
        }
        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
      }
      if (this.dateRange.length > 0) {
        this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.dateRange[0] + "'" + " and CONVERT(varchar(100),日期, 23) <= '" + this.dateRange[1] + "'";
      if (this.sTime) {
        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
        console.log(this.sTime, this.eTime)
        this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'";
      }
      if (this.queryParams.HBillNo) {
        this.sWhere += " and 单据号 like '%" + this.queryParams.HBillNo + "%'";
@@ -691,7 +694,6 @@
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.dateRange = []
      this.sWhere = ''
      this.queryParams = {
        HBillNo: '',
@@ -720,7 +722,7 @@
      // this.reset()
      this.tableShow = true
      this.openEdit = false
      this.editShow= false
      this.editShow = false
      this.getList()
    },
    //打开新增组件弹窗
@@ -731,7 +733,7 @@
    },
    //打开修改组件弹窗
    handleEdit(row) {
      this.rowForm=row
      this.rowForm = row
      this.editShow = true
      this.openEdit = true
    },
@@ -815,7 +817,7 @@
      }
      //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
    },
    

    //#region 获取公司名，根据公司进行定制化开发
    defaintOperationByCompanyName() {
      var result = false;

 src/views/sell/sellOut/sellOutBillEdit.vue

 src/views/sell/sellOutBill/component/btnSettings/index.vue

File was deleted

 src/views/sell/sellOutBill/component/dept/index.vue

File was deleted

 src/views/sell/sellOutBill/component/material/index.vue

File was deleted

 src/views/sell/sellOutBill/component/rowSettings/index.vue

File was deleted

 src/views/sell/sellOutBill/component/warehouse/index.vue

File was deleted