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

llj

2025-12-03 07a4451429c26d6d663fa777e5217b8e590a0985

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

 .env.development

@@ -6,8 +6,8 @@

# 智云迈思L-MOM管理系统/开发环境
# VUE_APP_BASE_API = 'http://localhost:81/API/'
#VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 .env.production

@@ -5,7 +5,7 @@
ENV = 'production'

# 智云迈思L-MOM管理系统/生产环境
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/' 
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 src/router/index.js

@@ -141,7 +141,10 @@
    children: [
      {
        path: "/sell/StockBillMainList/KfICStockBillMainList",
        component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
        component: () =>
          import(
            "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"
          ),
        name: "KfICStockBillMainList",
        meta: { title: "销售退货单", activeMenu: "sell/StockBillMainList" },
      },
@@ -160,7 +163,10 @@
    children: [
      {
        path: "/sell/StockBillMainList/KfICStockBillMainListEdit",
        component: () => import("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
        component: () =>
          import(
            "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"
          ),
        name: "KfICStockBillMainListEdit",
        meta: { title: "销售退货单编辑", activeMenu: "sell/StockBillMainList" },
      },
@@ -236,7 +242,8 @@
    children: [
      {
        path: "/purchase/POStockInBill/POStockInBillList",
        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
        component: () =>
          import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
        name: "POStockInBillList",
        meta: { title: "采购入库单", activeMenu: "purchase/POStockInBill" },
      },
@@ -255,7 +262,8 @@
    children: [
      {
        path: "/purchase/POStockInBill/POStockInBillEdit",
        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
        component: () =>
          import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
        name: "POStockInBillEdit",
        meta: {
          title: "采购入库单编辑",
@@ -386,7 +394,6 @@
        component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
        name: "XsSeOrderBill",
        meta: { title: "销售订单维护", activeMenu: "sell/seOrder" },

      },
      {
        path: "/sell/seOrder/xsSeOrderBillEdit",
@@ -548,7 +555,6 @@
  },
  // i节点页面
  {

    path: "/iframe",
    component: () => import("@/layout/emptyLayout"), // 使用空布局
    hidden: true, // 在侧边栏不显示
@@ -560,50 +566,51 @@
        meta: { title: "退货通知单", noCache: true, noLoading: true },
      },
      {

        path: "XsSeOutStockBillEdit",
        component: () => import("@/views/sell/XsSeOutStockBillEdit"), // 发货通知单
        name: "IframeXsSeOutStockBillEdit",
        meta: { title: "发货通知单", noCache: true, noLoading: true },
      },
      {
        path: 'XsSeOrderBillEdit',
        component: () => import('@/views/sell/xsSeOrderBill/xsSeOrderBillEdit'), // 销售订单
        name: 'IframeXsSeOrderBillEdit',
        meta: { title: '销售订单', noCache: true, noLoading: true }
        path: "XsSeOrderBillEdit",
        component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBillEdit"), // 销售订单
        name: "IframeXsSeOrderBillEdit",
        meta: { title: "销售订单", noCache: true, noLoading: true },
      },
      {
        path: 'ScICMOBillEdit',
        component: () => import('@/views/ICMO/ScICMOBillEdit'), // 生产订单
        name: 'IframeScICMOBillEdit',
        meta: { title: '生产订单', noCache: true, noLoading: true }
      },
       {
        path: 'CgPoOrderBillEdit',
        component: () => import('@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit'), // 采购订单
        name: 'IframeCgPoOrderBillEdit',
        meta: { title: '采购订单', noCache: true, noLoading: true }
      },
       {
        path: 'CgPoInStockBillEdit',
        component: () => import('@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit'), // 收料通知单
        name: 'IframeCgPoInStockBillEdit',
        meta: { title: '收料通知单', noCache: true, noLoading: true }
        path: "ScICMOBillEdit",
        component: () => import("@/views/ICMO/ScICMOBillEdit"), // 生产订单
        name: "IframeScICMOBillEdit",
        meta: { title: "生产订单", noCache: true, noLoading: true },
      },
      {
        path: 'GyWarehouse',
        path: "CgPoOrderBillEdit",
        component: () =>
          import("@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"), // 采购订单
        name: "IframeCgPoOrderBillEdit",
        meta: { title: "采购订单", noCache: true, noLoading: true },
      },
      {
        path: "CgPoInStockBillEdit",
        component: () =>
          import("@/views/purchase/cgPoInStockBill/cgPoInStockBillEdit"), // 收料通知单
        name: "IframeCgPoInStockBillEdit",
        meta: { title: "收料通知单", noCache: true, noLoading: true },
      },
      {
        path: "GyWarehouse",
        component: () => import("@/views/basic/gyWarehouse/gyWarehouse"), // 仓库
        name: 'IframeGyWarehouse',
        meta: { title: '仓库列表', noCache: true, noLoading: true }
        name: "IframeGyWarehouse",
        meta: { title: "仓库列表", noCache: true, noLoading: true },
      },
      {
        path: 'GyMaterial',
        path: "GyMaterial",
        component: () => import("@/views/gyMaterial/GyMaterial"), // 物料
        name: 'IframeGyMaterial',
        meta: { title: '物料列表', noCache: true, noLoading: true }
        name: "IframeGyMaterial",
        meta: { title: "物料列表", noCache: true, noLoading: true },
      },
    ]
  },    // 客户
    ],
  }, // 客户
  {
    path: "/GyCustomer",
    component: () => import("@/views/GyCustomer/index"),
@@ -714,7 +721,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldProdOutBillList",
        component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdOutBillList"),
        name: "Sc_MouldProdOutBillList",
        meta: { title: "器具领用出库单维护", activeMenu: "scMould/warehouse" },
      },
@@ -733,7 +741,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldProdOutBillEdit",
        component: () => import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdOutBillEdit"),
        name: "Sc_MouldProdOutBillEdit",
        meta: { title: "器具领用出库单编辑", activeMenu: "scMould/warehouse" },
      },
@@ -753,7 +762,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldProdBackBillList",
        component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdBackBillList"),
        name: "Sc_MouldProdBackBillList",
        meta: { title: "器具领用退库单维护", activeMenu: "scMould/warehouse" },
      },
@@ -772,7 +782,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldProdBackBillEdit",
        component: () => import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdBackBillEdit"),
        name: "Sc_MouldProdBackBillEdit",
        meta: { title: "器具领用退库单编辑", activeMenu: "scMould/warehouse" },
      },
@@ -792,7 +803,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldProdMoveBillList",
        component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdMoveBillList"),
        name: "Sc_MouldProdMoveBillList",
        meta: { title: "器具直接调拨单维护", activeMenu: "scMould/warehouse" },
      },
@@ -811,7 +823,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldProdMoveBillEdit",
        component: () => import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldProdMoveBillEdit"),
        name: "Sc_MouldProdMoveBillEdit",
        meta: { title: "器具直接调拨单编辑", activeMenu: "scMould/warehouse" },
      },
@@ -831,7 +844,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldInRequestBillList",
        component: () => import("@/views/scMould/warehouse/Sc_MouldInRequestBillList"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldInRequestBillList"),
        name: "Sc_MouldInRequestBillList",
        meta: { title: "器具入库申请单维护", activeMenu: "scMould/warehouse" },
      },
@@ -850,13 +864,14 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldInRequestBillEdit",
        component: () => import("@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldInRequestBillEdit"),
        name: "Sc_MouldInRequestBillEdit",
        meta: { title: "器具入库申请单编辑", activeMenu: "scMould/warehouse" },
      },
    ],
  },
    //器具领用申请单维护
  //器具领用申请单维护
  {
    path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
    component: Layout,
@@ -870,7 +885,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldOutRequestBillList",
        component: () => import("@/views/scMould/warehouse/Sc_MouldOutRequestBillList"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldOutRequestBillList"),
        name: "Sc_MouldOutRequestBillList",
        meta: { title: "器具领用申请单维护", activeMenu: "scMould/warehouse" },
      },
@@ -889,13 +905,14 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldOutRequestBillEdit",
        component: () => import("@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldOutRequestBillEdit"),
        name: "Sc_MouldOutRequestBillEdit",
        meta: { title: "器具领用申请单编辑", activeMenu: "scMould/warehouse" },
      },
    ],
  },
    //器具调拨申请单维护
  //器具调拨申请单维护
  {
    path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
    component: Layout,
@@ -909,7 +926,8 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
        component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
        name: "Sc_MouldMoveStockRequestBillList",
        meta: { title: "器具调拨申请单维护", activeMenu: "scMould/warehouse" },
      },
@@ -928,14 +946,13 @@
    children: [
      {
        path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
        component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
        component: () =>
          import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
        name: "Sc_MouldMoveStockRequestBillEdit",
        meta: { title: "器具调拨申请单编辑", activeMenu: "scMould/warehouse" },
      },
    ],
  },



  //直接调拨单维护
  {
@@ -977,11 +994,6 @@
      },
    ],
  },






  //权限查询
  {
@@ -1191,7 +1203,29 @@
          import("@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"),
        name: "Kf_POStockInBackBillList",
        meta: {
          title: "采购退料单维护",
          title: "采购退料单列表（已入库）",
          activeMenu: "purchase/postockInBack",
        },
      }
    ],
  },
  {
    path: "/purchase/postockInBack/Kf_POStockInBackBillList0",
    component: Layout,
    hidden: true,
    redirect: "noredirect",
    meta: {
      breadcrumb: false, // 如果设置为false，则不会在breadcrumb面包屑中显示
      activeMenu: "/purchase/postockInBack/Kf_POStockInBackBillList", // 当路由设置了该属性，则会高亮相对应的侧边栏。
    },
    children: [
      {
        path: "/purchase/postockInBack/Kf_POStockInBackBillList0",
        component: () =>
          import("@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"),
        name: "Kf_POStockInBackBillList",
        meta: {
          title: "采购退料单列表（未入库）",
          activeMenu: "purchase/postockInBack",
        },
      },
@@ -1210,13 +1244,15 @@
    children: [
      {
        path: "/icmo/productInBill/productInBillList",
        component: () => import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
        component: () =>
          import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
        name: "ProductInBillList",
        meta: { title: "生产入库单列表", activeMenu: "icmo/productInBill" },
      },
      {
        path: "/icmo/productInBill/productInBillEdit",
        component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
        component: () =>
          import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
        name: "ProductInBillEdit",
        meta: { title: "生产入库单", activeMenu: "icmo/productInBill" },
      },
@@ -1236,9 +1272,13 @@
    children: [
      {
        path: "/purchase/OtherOutBill/OtherOutBillList",
        component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
        component: () =>
          import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
        name: "OtherOutBillList",
        meta: { title: "其他出库单列表", activeMenu: "/views/KCGL/OtherOutBill" },
        meta: {
          title: "其他出库单列表",
          activeMenu: "/views/KCGL/OtherOutBill",
        },
      },
    ],
  },
@@ -1255,7 +1295,8 @@
    children: [
      {
        path: "/purchase/OtherOutBill/OtherOutBillEdit",
        component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
        component: () =>
          import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
        name: "OtherOutBillEdit",
        meta: { title: "其他出库单", activeMenu: "/views/KCGL/OtherOutBill" },
      },
@@ -1274,7 +1315,8 @@
    children: [
      {
        path: "/icmo/scICMOReportBill/scICMOReportBillList",
        component: () => import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
        component: () =>
          import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
        name: "ScICMOBillList",
        meta: { title: "生产汇报单维护", activeMenu: "/icmo/scICMOReportBill" },
      },

 src/store/modules/permission.js

@@ -234,7 +234,10 @@
                      noCache: false,
                      title: "销售退货单维护",
                    },
                    component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"),
                    component: () =>
                      import(
                        "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue"
                      ),
                    hidden: false,
                    name: "KfICStockBillMainList",
                    path: "KfICStockBillMainList",
@@ -246,7 +249,10 @@
                      noCache: false,
                      title: "销售退货单",
                    },
                    component: () =>import ("@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"),
                    component: () =>
                      import(
                        "@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue"
                      ),
                    hidden: false,
                    name: "KfICStockBillMainListEdit",
                    path: "KfICStockBillMainListEdit",
@@ -290,7 +296,9 @@
                      title: "出库申请单维护",
                    },
                    component: () =>
                      import("@/views/warehouse/shipment/Kf_StockOutRequestBillList.vue"),
                      import(
                        "@/views/warehouse/shipment/Kf_StockOutRequestBillList.vue"
                      ),
                    hidden: false,
                    name: "Kf_StockOutRequestBillList",
                    path: "Kf_StockOutRequestBillList",
@@ -303,7 +311,9 @@
                      title: "出库申请单",
                    },
                    component: () =>
                      import("@/views/warehouse/shipment/Kf_StockOutRequestBill.vue"),
                      import(
                        "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue"
                      ),
                    hidden: false,
                    name: "Kf_StockOutRequestBill",
                    path: "Kf_StockOutRequestBill",
@@ -331,7 +341,9 @@
                      title: "调拨申请单维护",
                    },
                    component: () =>
                      import("@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue"),
                      import(
                        "@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue"
                      ),
                    hidden: false,
                    name: "Kf_MoveStockRequestBillList",
                    path: "Kf_MoveStockRequestBillList",
@@ -344,7 +356,9 @@
                      title: "调拨申请单",
                    },
                    component: () =>
                      import("@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue"),
                      import(
                        "@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue"
                      ),
                    hidden: false,
                    name: "Kf_MoveStockRequestBillEdit",
                    path: "Kf_MoveStockRequestBillEdit",
@@ -357,7 +371,9 @@
                      title: "直接调拨单维护",
                    },
                    component: () =>
                      import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue"),
                      import(
                        "@/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue"
                      ),
                    hidden: false,
                    name: "Kf_MoveStockBillList",
                    path: "Kf_MoveStockBillList",
@@ -370,7 +386,9 @@
                      title: "直接调拨单",
                    },
                    component: () =>
                      import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue"),
                      import(
                        "@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue"
                      ),
                    hidden: false,
                    name: "Kf_MoveStockBillEdit",
                    path: "Kf_MoveStockBillEdit",
@@ -398,7 +416,9 @@
                      title: "条码生成",
                    },
                    component: () =>
                      import("@/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue"),
                      import(
                        "@/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue"
                      ),
                    hidden: false,
                    name: "Gy_BarCodeBill",
                    path: "Gy_BarCodeBill",
@@ -750,7 +770,7 @@
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "采购退料单维护",
                      title: "采购退料单列表（已入库）",
                    },
                    component: () =>
                      import(
@@ -759,6 +779,23 @@
                    hidden: false,
                    name: "Kf_POStockInBackBillList",
                    path: "Kf_POStockInBackBillList",
                    query: "{\"type\":1}"
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
                      noCache: false,
                      title: "采购退料单列表（未入库）",
                    },
                    component: () =>
                      import(
                        "@/views/purchase/postockInBack/Kf_POStockInBackBillList.vue"
                      ),
                    hidden: false,
                    name: "Kf_POStockInBackBillList",
                    path: "Kf_POStockInBackBillList0",
                    query: "{\"type\":0}"
                  },
                ],
              },
@@ -782,7 +819,10 @@
                      noCache: false,
                      title: "其他出库单列表",
                    },
                    component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"),
                    component: () =>
                      import(
                        "@/views/KCGL/OtherOutBill/Kf_OtherOutBillList.vue"
                      ),
                    hidden: false,
                    name: "OtherOutBillList",
                    path: "OtherOutBillList",
@@ -794,7 +834,10 @@
                      noCache: false,
                      title: "其他出库单",
                    },
                    component: () => import("@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"),
                    component: () =>
                      import(
                        "@/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue"
                      ),
                    hidden: false,
                    name: "OtherOutBillEdit",
                    path: "OtherOutBillEdit",
@@ -876,7 +919,8 @@
                      noCache: false,
                      title: "生产入库列表",
                    },
                    component: () => import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
                    component: () =>
                      import("@/views/ProductInBill/Kf_ProductInBillList.vue"),
                    hidden: false,
                    name: "ProductInBillList",
                    path: "productInBillList",
@@ -888,7 +932,8 @@
                      noCache: false,
                      title: "生产入库单",
                    },
                    component: () => import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
                    component: () =>
                      import("@/views/ProductInBill/Kf_ProductInBillEdit.vue"),
                    hidden: false,
                    name: "ProductInBillEdit",
                    path: "productInBillEdit",
@@ -915,7 +960,10 @@
                      noCache: false,
                      title: "生产汇报列表",
                    },
                    component: () => import("@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"),
                    component: () =>
                      import(
                        "@/views/ICMO/ScICMOReportBill/ScICMOReportBillList.vue"
                      ),
                    hidden: false,
                    name: "ScICMOReportBillList",
                    path: "scICMOReportBillList",
@@ -1052,7 +1100,8 @@
                    hidden: false,
                    name: "Sc_MouldProdMoveBillEdit",
                    path: "Sc_MouldProdMoveBillEdit",
                  },{
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
@@ -1081,7 +1130,8 @@
                    hidden: false,
                    name: "Sc_MouldInRequestBillEdit",
                    path: "Sc_MouldInRequestBillEdit",
                  },{
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
@@ -1110,7 +1160,8 @@
                    hidden: false,
                    name: "Sc_MouldOutRequestBillEdit",
                    path: "Sc_MouldOutRequestBillEdit",
                  },{
                  },
                  {
                    meta: {
                      icon: "build",
                      link: null,
@@ -1249,7 +1300,8 @@
                      noCache: false,
                      title: "角色列表",
                    },
                    component: () =>import("@/views/system/user/Xt_UserGroupList.vue"),
                    component: () =>
                      import("@/views/system/user/Xt_UserGroupList.vue"),
                    hidden: false,
                    name: "Xt_UserGroupList",
                    path: "Xt_UserGroupList",

 src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue

@@ -377,7 +377,8 @@
    this.getdata()
  },
  beforeDestroy() {
    this.$destroy()
    // 下面的代码会导致页面崩溃，先注释掉
    // this.$destroy()
  },
  methods: {
    //#region 表单数据初始化

 src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue

@@ -8,7 +8,7 @@
                    </el-select>
                </el-form-item>
                <el-form-item label="开始日期">
                    <el-date-picker v-model="query.HBeginDate" type="date" placeholder="开始日期" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-mm-dd" format="yyyy-mm-dd"/>
                    <el-date-picker v-model="query.HBeginDate" type="date" placeholder="开始日期" style="width:160px" :disabled="timeCycleDisabled" value-formate="yyyy-MM-dd" format="yyyy-MM-dd"/>
                </el-form-item>
                <el-form-item label="结束日期">
                    <el-date-picker v-model="query.HEndDate" type="date" placeholder="结束日期" style="width:160px" :disabled="timeCycleDisabled" value-format="yyyy-MM-dd" format="yyyy-MM-dd"/>
@@ -220,6 +220,7 @@
//import FbStepFoldinBillEdit from './fbStepFoldinBillEdit'
import FbStepFoldinBillEdit from '@/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'
import dayjs from 'dayjs';


export default {
@@ -322,6 +323,7 @@
            const yyyy = d.getFullYear();
            const mm = String(d.getMonth() + 1).padStart(2, '0');
            const dd = String(d.getDate()).padStart(2, '0');
			
            return `${yyyy}-${mm}-${dd}`;
        },
        onTimeCycleChange() {
@@ -392,8 +394,8 @@
            if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2) 
                sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2));
            
            if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) >= '${q.HBeginDate}'`);
            if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) <= '${q.HEndDate}'`);
            if (q.HBeginDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) >= '${dayjs(q.HBeginDate).format("YYYY-MM-DD")}'`);
            if (q.HEndDate) sWhereParts.push(` and CONVERT(varchar(100),日期, 23) <= '${dayjs(q.HEndDate).format("YYYY-MM-DD")}'`);
            if (q.HBillNo) sWhereParts.push(` and 单据号 like '%${q.HBillNo}%'`);
            if (q.HDeptID) sWhereParts.push(` and 部门 like '%${q.HDeptID}%'`);
            if (q.MaterialCode) sWhereParts.push(` and 物料代码 like '%${q.MaterialCode}%'`);

 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue

@@ -505,7 +505,8 @@
    this.getdata()
  },
  beforeDestroy() {
    this.$destroy()
    // 会导致页面崩溃 先注释掉
    // this.$destroy()
  },
  methods: {
    //#region 表单数据初始化

 src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue

@@ -175,7 +175,7 @@
        @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column align="center" label="序号" type="index" width="80" />
        <el-table-column align="center" label="源单单号" width="120">
        <!-- <el-table-column align="center" label="源单单号" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceBillNo }}</span>
          </template>
@@ -194,7 +194,7 @@
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceEntryID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="HMaterID" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HMaterID }}</span>
@@ -426,7 +426,8 @@
    this.getdata()
  },
  beforeDestroy() {
    this.$destroy()
    
    // this.$destroy()
  },
  methods: {
    //#region 表单数据初始化

 src/views/ProductInBill/Kf_ProductInBillEdit.vue

@@ -164,7 +164,7 @@
        @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
        <el-table-column type="selection" width="55" align="center" />
        <el-table-column align="center" label="序号" type="index" width="80" />
        <el-table-column align="center" label="源单单号" width="120">
        <!-- <el-table-column align="center" label="源单单号" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceBillNo }}</span>
          </template>
@@ -183,7 +183,7 @@
          <template slot-scope="scope">
            <span>{{ scope.row.HSourceEntryID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="HMaterID" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HMaterID }}</span>
@@ -770,10 +770,10 @@
          HSalePrice: 0,
          HSeOrderInterID: 741,
          HSeOrderEntryID: 18,
          HSeOrderBillNo: 'XSFH00000747',
          HSourceInterID: 741,
          HSourceEntryID: 18,
          HSourceBillNo: 'XSFH00000747',
          HSeOrderBillNo: '',
          HSourceInterID: 0,
          HSourceEntryID: 0,
          HSourceBillNo: '',
          HSourceBillType: 1402,
          HRelationQty: 0,
          HRelationMoney: 0,

 src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue

@@ -202,42 +202,31 @@
            </el-col>
        </el-row>
        <div class="tableBox" v-loading="loading">
            <el-row>
                <el-col :span="4">
                    <div class="cgtlType" v-for="(item, index) in backTypeList" :key="index" :class="{ 'cgtlActive': typeIndex==index }" @click="backTypeClick(item,index)">
                        {{item.name}}
                    </div>
                </el-col>
                <el-col :span="20">
                    <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
                        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
                        :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
                        <template v-for="(item, index) in btList">
                            <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
                                v-if="item.type == 'checkbox'" :key="index" />
                            <el-table-column :align="item.align" :prop="item.field" :label="item.title"
                                :width="item.width" :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'"
                                :sortable="item.sort" show-overflow-tooltip :fixed="item.fixed">
                                <template slot-scope="{ row, column }">
                                    <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
                                    <div :style="item.style">
                                        <span v-if="column.property.includes('日期')">{{
                                            parseTime(row[column.property], "{y}-{m}-{d}")
                                        }}</span>
                                        <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
                                            v-else-if="column.property == '单据号'">{{ row.单据号 }}</el-button>
                                        <span v-else>{{ row[column.label] }}</span>
                                    </div>
                                </template>
                            </el-table-column>
            <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
                @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
                :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
                <template v-for="(item, index) in btList">
                    <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
                        v-if="item.type == 'checkbox'" :key="index" />
                    <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
                        :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
                        show-overflow-tooltip :fixed="item.fixed">
                        <template slot-scope="{ row, column }">
                            <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
                            <div :style="item.style">
                                <span v-if="column.property.includes('日期')">{{
                                    parseTime(row[column.property], "{y}-{m}-{d}")
                                }}</span>
                                <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
                                    v-else-if="column.property == '单据号'">{{ row.单据号 }}</el-button>
                                <span v-else>{{ row[column.label] }}</span>
                            </div>
                        </template>
                    </el-table>
                    <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
                        :pageSizes="pageSizes" @pagination="getList" />
                </el-col>

            </el-row>

                    </el-table-column>
                </template>
            </el-table>
            <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
                :pageSizes="pageSizes" @pagination="getList" />
            <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
                <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
            </el-dialog>
@@ -268,7 +257,7 @@
    components: { RowSettings, Edit, PrintList, BarCodeDetail },
    data() {
        return {
            typeIndex:0,
            typeIndex: 0,
            activeSeach: "",
            HModName: "Kf_StockOutRequestBillList",
            backTypeList: [{ name: ' 采购退料列表(已入库)', value: 1, }, { name: '采购退料列表(未入库)', value: 0, }],
@@ -379,9 +368,6 @@
    },

    methods: {
        backTypeClick(item,index){
            this.typeIndex=index
        },
        getSummaries(param) {
            const { columns, data } = param;
            const sums = [];
@@ -437,6 +423,7 @@
            this.eTime = yyyyE + "-" + mmE + "-" + ddE;
        },
        getList() {
            console.log(this.$route.query.type)
            this.pageSize = 50;
            this.tableShow = false;
            this.loading = true;

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue

@@ -9,41 +9,38 @@
      class="searchBox"
    >
      <el-row>
        <el-form-item label="开始日期" style="margin-left: 100px">
          <el-date-picker
            v-model="queryParams.HBeginDate"
            type="date"
            value-format="yyyy-MM-dd"
            format="yyyy-MM-dd"
            placeholder="开始日期"
            style="width:160px"
            :disabled="disableDataPicker"
          />
        </el-form-item>
        <el-form-item label="结束日期">
          <el-date-picker
            v-model="queryParams.HEndDate"
            type="date"
            value-format="yyyy-MM-dd"
            format="yyyy-MM-dd"
            placeholder="结束日期"
            style="width:160px"
            :disabled="disableDataPicker"
          />
        </el-form-item>
        <el-form-item label="日期间隔">
          <el-select
            v-model="queryParams.HInitTimeCycle"
            placeholder="请选择"
            @change="riqiChange"
              <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"
          style="width: 150px"
        >
          <el-option
            v-for="(item, index) in rqsgList"
            :key="index"
            :label="item.label"
            :value="item.value"
          >
            <el-option
              v-for="(item, index) in rqsgList"
              :key="index"
              :label="item.label"
              :value="item.value"
            >
            </el-option>
          </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="单据号" prop="HBillNo">
@@ -417,6 +414,9 @@
       <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">条码明细</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_PackStockDetail">包装容器出入库明细</el-button>
      </el-col>
    </el-row>
    <div class="tableBox" v-loading="loading">
      <el-table
@@ -599,6 +599,8 @@
      </el-dialog>
      <!-- 条码明细 -->
      <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
      <!-- 包装容器出入库明细 -->
      <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail"/>
    </div>
  </div>
</template>
@@ -609,10 +611,11 @@
import Edit from '@/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit'
import BarCodeDetail from '@/views/component/BarCodeDetail'               //条码明细组件
import dayjs from "dayjs";                                                //日期处理库
import PackStockDetail from '@/views/component/PackStockDetail'               //包装明细组件

export default {
  name: "GySource",
  components: { RowSettings,Edit,BarCodeDetail},
  components: { RowSettings,Edit,BarCodeDetail,PackStockDetail},
  props: {
    openPage: { type: String },
  },
@@ -629,6 +632,7 @@
      printListShow: false,
      HClassTag: "ForFilteringSchemes",                     //过滤条件的class类
      barCodeDetailShow: false,                             //条码明细组件容器显示标记
      packStockDetailShow:false,                            //包装容器出入库明细容器显示标记
      HBillType: "1202",
      openBtnHide: false,
      btnHideShow: false,
@@ -1185,8 +1189,8 @@
    },
    //选中行高亮样式
    rowStyle({ row, rowIndex }) {
      if (this.ids.includes(row.HItemID)) {
        return { };
      if (this.ids.includes(row.hmainid)) {
        return { background: "#ecf5ff" };
      }
    },
    //双击行
@@ -1197,7 +1201,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}
      this.ids = selection.map((item) => item.HItemID);
      this.ids = selection.map((item) => item.hmainid);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
      if (!this.single) {
@@ -1578,6 +1582,18 @@
        );
      }
    },
      //#region 包装容器出入库明细
    get_PackStockDetail() {
      // if (this.selectedRow.length !== 1) {
      //   this.$message.warning('请选择一行数据查看条码明细！')
      //   return
      // }
      this.packStockDetailShow = true
      this.$nextTick(() => {
        this.$refs.packStockDetail.open(this.rowForm)
      })
        },
    //#endregion
    // 提交上传文件
    submitFileForm() {
      this.$refs.upload.submit();

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue

@@ -247,12 +247,12 @@
            <span>{{ scope.row.计量单位 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="应收数量" width="120">
        <el-table-column align="center" label="应退数量" width="120">
          <template slot-scope="scope">
              <span>{{ scope.row.HQtyMust }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="实收数量" width="120">
        <el-table-column align="center" label="实退数量" width="120">
          <template slot-scope="scope">
            <el-input-number v-model="scope.row.HQty" :min="0" style="width: 90px;"
              controls-position="right"></el-input-number>
@@ -515,7 +515,7 @@
                    , "规格型号": dataArray[i].规格型号
                    , "HUnitID": dataArray[i].HUnitID
                    , "计量单位": dataArray[i].计量单位
                    , "HQtyMust": dataArray[i].数量.toFixed(6)
                    , "HQtyMust": dataArray[i].应发数量.toFixed(6)
                    , "HQty": dataArray[i].数量.toFixed(6)
                    , "HPieceQty": "0"
                    , "HPrice": dataArray[i].单价.toFixed(4)
@@ -737,8 +737,8 @@
                , "规格型号": result.data[i].规格型号
                , "HUnitID": result.data[i].HUnitID
                , "计量单位": result.data[i].计量单位
                , "HQtyMust": result.data[i].应收数量
                , "HQty": result.data[i].实收数量
                , "HQtyMust": result.data[i].应发数量
                , "HQty": result.data[i].数量
                , "HRemark": result.data[i].表体备注
                , "HPrice": result.data[i].单价
                , "HMoney": result.data[i].金额
@@ -853,8 +853,8 @@
              "规格型号": result.data[i].规格型号,
              "HUnitID": result.data[i].HUnitID,
              "计量单位": result.data[i].计量单位,
              "HQtyMust": result.data[i].应收数量,
              "HQty": result.data[i].实收数量,
              "HQtyMust": result.data[i].应发数量,
              "HQty": result.data[i].数量,
              "HRemark": (result.data[i].表体备注 || "") + " (复制)",
              "HPrice": result.data[i].单价,
              "HMoney": result.data[i].金额,

 src/views/sell/XsSeOutStockBackBillEdit.vue

@@ -320,7 +320,7 @@
        </el-table-column>
        <el-table-column align="center" label="发货仓库" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.计量单位 }}</span>
            <span>{{ scope.row.发货仓库 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="收货仓库" width="120">

 src/views/sell/XsSeOutStockBackBillList.vue

@@ -1403,7 +1403,7 @@
    //打开新增组件弹窗
    handleAddEdit() {
      this.rowForm.HItemID = 0;
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${0}&OperationType=${1}&copyType=${-1}`;
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=0&OperationType=1&CopyType=2`;
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;
@@ -1411,7 +1411,7 @@
    },
    //打开修改组件弹窗
    handleEdit(row, OperationType, copyType) {
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&copyType=${copyType}`;
      this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&CopyType=${copyType}`;
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;

 src/views/sell/sellOut/sellOutBill.vue

@@ -305,7 +305,14 @@
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">条码明细</el-button>
        <el-button
          type="primary"
          icon="el-icon-printer"
          size="mini"
          :disabled="single"
          @click="get_BarCodeDetail"
          >条码明细</el-button
        >
      </el-col>
    </el-row>
    <div class="tableBox" v-loading="loading">
@@ -416,7 +423,7 @@
        <!-- <div>111</div> -->
      </el-dialog>
      <!-- 条码明细 -->
      <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
      <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
    </div>
  </div>
</template>
@@ -426,12 +433,12 @@
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/sell/sellOut/sellOutBillEdit";
import PrintList from "@/views/component/printList";
import BarCodeDetail from '@/views/component/BarCodeDetail'               //条码明细组件
import BarCodeDetail from "@/views/component/BarCodeDetail"; //条码明细组件
import moment from "moment";

export default {
  name: "SellOutBill",
  components: { RowSettings, Edit, PrintList,BarCodeDetail },
  components: { RowSettings, Edit, PrintList, BarCodeDetail },
  data() {
    return {
      activeSeach: "",
@@ -441,7 +448,7 @@
      tableShow: true,
      openPrintList: false,
      printListShow: false,
      barCodeDetailShow: false,                             //条码明细组件容器显示标记
      barCodeDetailShow: false, //条码明细组件容器显示标记
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -1055,6 +1062,7 @@
        .confirm("确认要删除吗，删除后不能恢复")
        .then(() => {
          if (this.rowForm.状态 == "创建") {
            this.loading = true;
            axios
              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
                params: {
@@ -1065,13 +1073,16 @@
              .then((response) => {
                if (response.data.count == 1) {
                  this.getList();
                  this.$modal.msgSuccess("删除成功");
                  this.$modal.msgSuccess(response.data.Message);
                } else {
                  this.$modal.msgError("错误:" + result.code + result.Message);
                }
              })
              .catch((error) => {
                this.$modal.msgError("接口请求失败!");
              })
              .finally(() => {
                this.loading = false;
              });
          } else {
            this.$modal.msgError("此条数据不是创建状态,无法删除!");
@@ -1144,13 +1155,12 @@
      //   this.$message.warning('请选择一行数据查看条码明细！')
      //   return
      // }
      this.barCodeDetailShow = true
      this.barCodeDetailShow = true;
      this.$nextTick(() => {
        this.$refs.barcodeDetail.open(this.rowForm)
      })
        },
        this.$refs.barcodeDetail.open(this.rowForm);
      });
    },
    //#endregion


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

 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue

@@ -683,7 +683,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage["organizationList"]), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
@@ -1390,7 +1390,8 @@
    },
    //打开新增组件弹窗
    handleAddEdit() {
      this.rowForm.HItemID = 0;
      // this.rowForm.HItemID = 0;
      this.iframeUrl = `/iframe/XsSeOrderBillEdit?HInterID=0&OperationType=1&copyType=-1`;
      this.$nextTick(() => {
        this.openEdit = true;
        this.editShow = true;
@@ -1417,13 +1418,9 @@
        .then(() => {
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
              .get(this.baseURL + "Xs_SeOrderBill/DropXs_SeOrderBill", {
                params: {
                  HInter: this.rowForm.hmainid.toString(),
                  HsupId: this.rowForm.HsupId,
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  HInterID: this.rowForm.hmainid.toString(),
                  user: sessionStorage["HUserName"],
                },
              })

 src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue

@@ -435,18 +435,18 @@
        </el-table-column>
        <el-table-column align="center" label="仓库" width="120">
          <template slot-scope="scope">
            <el-input-number
              v-model="scope.row.HQty"
            <el-input
              v-model="scope.row.仓库"
              :min="1"
              style="width: 90px"
              controls-position="right"
            ></el-input-number>
            ></el-input>
          </template>
        </el-table-column>
        <el-table-column align="center" label="数量2" width="120">
          <template slot-scope="scope">
            <el-input-number
              v-model="scope.row.HPrice"
              v-model="scope.row.HQty"
              :min="0"
              style="width: 90px"
              controls-position="right"
@@ -455,22 +455,22 @@
        </el-table-column>
        <el-table-column align="center" label="单价" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxPrice }}</span>
            <span>{{ scope.row.HPrice }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="加税合计" width="120">
        <el-table-column align="center" label="价税合计" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxRate }}</span>
            <span>{{ scope.row.HTaxMoney }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="客户规格型号" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
            <span>{{ scope.row.HPrice * scope.row.规格型号 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="交货日期" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
            <span>{{ scope.row.HTaxPrice * scope.row.HDate }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="备注" width="120">
@@ -648,8 +648,8 @@
    getdata() {
      this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
      this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
      this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
      console.log(this.CopyType2, this.OperationType2, this.HInterID2);
      this.CopyType2 = this.$route.query.CopyType || this.copyType || -1;
      console.log("传递的参数",this.$route.query.CopyType,this.$route.query.OperationType, this.$route.query.HInterID);
      this.formShow = false;
      this.formLoading = true;

@@ -712,7 +712,7 @@
                    HMoney: dataArray[i].金额.toFixed(2),
                    HTaxMoney: dataArray[i].价税合计.toFixed(2),
                    HWHID: dataArray[i].HWHID,
                    发货仓库: dataArray[i].HWHName,
                    仓库: dataArray[i].HWHName,
                    HRemark: "",
                    HQty_Full: "0",
                    HQty_Empty: "0",

 src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue

@@ -23,7 +23,7 @@
                </el-col>
                <el-col :span="6">
                    <el-form-item label="工厂代码" prop="HWorksNumber">
                        <el-select v-model="form.HWorksNumber" placeholder="请选择组织" style="width: 100%">
                        <el-select v-model="form.HWorksNumber" placeholder="请选择工厂" style="width: 100%">
                            <el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
                                :value="item">
                            </el-option>

 src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue

@@ -495,10 +495,13 @@
          this.warehouseShow = false
          this.openData = false
        } else if (num == 3){
            console.log(deptRow)
            this.editData[this.zbIndex].HMaterID = deptRow.HItemID
            this.editData[this.zbIndex].物料代码 = deptRow.物料代码
            this.editData[this.zbIndex].物料名称 = deptRow.物料名称
            this.editData[this.zbIndex].规格型号 = deptRow.规格型号
            this.editData[this.zbIndex].计量单位 = deptRow.计量单位名称
            this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
            this.materialShow = false
            this.openData = false
        } else if (num == 4) {