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

llj

2025-11-19 1791a782cad48b6932b2415f5f2ef96bb7238493

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

 src/router/index.js

@@ -127,7 +127,7 @@
      },
    ],
  },
   //销售退货单
  //销售退货单
  {
    path: "/sell/StockBillMainList/KfICStockBillMainList",
    component: Layout,
@@ -141,10 +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,10 +160,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" },
      }, 
      },
    ],
  },
  //用户列表
@@ -198,8 +198,7 @@
    children: [
      {
        path: "/purchase/POStockInBill/POStockInBillList",
        component: () =>
          import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),

        name: "POStockInBillList",
        meta: { title: "采购入库单", activeMenu: "purchase/POStockInBill" },
      },
@@ -218,8 +217,7 @@
    children: [
      {
        path: "/purchase/POStockInBill/POStockInBillEdit",
        component: () =>
          import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),

        name: "POStockInBillEdit",
        meta: {
          title: "采购入库单编辑",
@@ -350,6 +348,7 @@
        component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
        name: "XsSeOrderBill",
        meta: { title: "销售订单维护", activeMenu: "sell/seOrder" },

      },
      {
        path: "/sell/seOrder/xsSeOrderBillEdit",
@@ -379,6 +378,7 @@
      },
      {
        path: "/purchase/poOrder/cgPoOrderBillEdit",

        component: () =>
          import("@/views/purchase/cgPoOrderBill/cgPoOrderBillEdit"),
        name: "CgPoOrderBillEdit",
@@ -510,6 +510,7 @@
  },
  // i节点页面
  {

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

        path: "XsSeOutStockBillEdit",
        component: () => import("@/views/sell/XsSeOutStockBillEdit"), // 发货通知单
        name: "IframeXsSeOutStockBillEdit",
@@ -531,7 +533,32 @@
        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: 'GyWarehouse',
        component: () => import("@/views/basic/gyWarehouse/gyWarehouse"), // 仓库
        name: 'IframeGyWarehouse',
        meta: { title: '仓库列表', noCache: true, noLoading: true }
      },

    ]
  },    // 客户
  {
@@ -594,9 +621,11 @@
    children: [
      {
        path: "/purchase/POStockInBill/FbStepFoldinBillList",

        component: () =>
          import("@/views/FbStepFoldinBillList/fbStepFoldinBillList.vue"),
        name: "FbStepFoldinBillList",

        meta: {
          title: "分布式调入单列表",
          activeMenu: "/purchase/POStockInBill",
@@ -617,9 +646,11 @@
    children: [
      {
        path: "/purchase/POStockInBill/FbStepFoldOutBillList",

        component: () =>
          import("@/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue"),
        name: "FbStepFoldOutBillList",

        meta: {
          title: "分布式调出单列表",
          activeMenu: "/purchase/POStockInBill",

 src/views/ICMO/ScICMOBillEdit.vue

@@ -1089,96 +1089,100 @@
            }

            // this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data[0].单据号,
              HInterID: data[0].hmainid,
              HPRDORGID: data[0].HPRDORGID,
              HDate: dayjs(new Date(data[0].日期)).format("YYYY-MM-DD"),
              HSeOrderBillNo: data[0].源单单号,
              HSeOrderInterID: data[0].源单主内码,
              HSeOrderEntryID: data[0].源单子内码,
              HMainSourceBillSubType: data[0].HMainSourceBillSubType,
            this.form = {
              ...{
                HBillNo: data[0].单据号,
                HInterID: data[0].hmainid,
                HPRDORGID: data[0].HPRDORGID,
                HDate: dayjs(new Date(data[0].日期)).format("YYYY-MM-DD"),
                HSeOrderBillNo: data[0].源单单号,
                HSeOrderInterID: data[0].源单主内码,
                HSeOrderEntryID: data[0].源单子内码,
                HMainSourceBillSubType: data[0].HMainSourceBillSubType,

              HSourceInterID: data[0].HSourceInterID,
              HSourceEntryID: data[0].HSourceEntryID,
              HSourceBillNo: data[0].HSourceBillNo,
              HSourceBillType: data[0].HSourceBillType,
              HEmpID: data[0].HEmpID,
              HEmpName: data[0].业务员,
              HCusID: data[0].HEntryCusID,
              HCusName: data[0].客户,
              HCenterID: data[0].HCenterID,
              HCenterName: data[0].工作中心,
              HDeptID: data[0].HDeptID,
              HDeptName: data[0].生产车间,
              HQty: data[0].生产任务单数量,
              HMaterID: data[0].HMaterID,
              HMaterNumber: data[0].产品代码,
              HMaterName: data[0].产品名称,
              HModel: data[0].规格型号,
              HSourceID: data[0].HSourceID_b,
              HSourceName: data[0].HsourceName,
              HUnitID: data[0].HUnitID,
              HUnitName: data[0].计量单位,
              HIsStockQty: data[0].HIsStockQty,
              HIsStockQty_SeOrderBill: data[0].HIsStockQty_SeOrderBill ? 1 : 0,
              HBomID: data[0].HBomID,
              HBomName: data[0].BOM单编码,
              HPlanBeginDate: dayjs(new Date(data[0].计划开工日期)).format("YYYY-MM-DD"),
              HPlanEndDate: dayjs(new Date(data[0].计划完工日期)).format("YYYY-MM-DD"),
              HBeginDate: dayjs(new Date(data[0].最迟开工日期)).format("YYYY-MM-DD"),
              HEndDate: dayjs(new Date(data[0].最迟完工日期)).format("YYYY-MM-DD"),
              HRemark: data[0].表头备注,
              HRemark3: data[0].底部备注,
              HAuxQty: data[0].HAuxQty,
              HAuxUnit: data[0].HAuxUnit,
              HAuxUnitName: data[0].HAuxUnitName,
                HSourceInterID: data[0].HSourceInterID,
                HSourceEntryID: data[0].HSourceEntryID,
                HSourceBillNo: data[0].HSourceBillNo,
                HSourceBillType: data[0].HSourceBillType,
                HEmpID: data[0].HEmpID,
                HEmpName: data[0].业务员,
                HCusID: data[0].HEntryCusID,
                HCusName: data[0].客户,
                HCenterID: data[0].HCenterID,
                HCenterName: data[0].工作中心,
                HDeptID: data[0].HDeptID,
                HDeptName: data[0].生产车间,
                HQty: data[0].生产任务单数量,
                HMaterID: data[0].HMaterID,
                HMaterNumber: data[0].产品代码,
                HMaterName: data[0].产品名称,
                HModel: data[0].规格型号,
                HSourceID: data[0].HSourceID_b,
                HSourceName: data[0].HsourceName,
                HUnitID: data[0].HUnitID,
                HUnitName: data[0].计量单位,
                HIsStockQty: data[0].HIsStockQty,
                HIsStockQty_SeOrderBill: data[0].HIsStockQty_SeOrderBill ? 1 : 0,
                HBomID: data[0].HBomID,
                HBomName: data[0].BOM单编码,
                HPlanBeginDate: dayjs(new Date(data[0].计划开工日期)).format(
                  "YYYY-MM-DD"
                ),
                HPlanEndDate: dayjs(new Date(data[0].计划完工日期)).format("YYYY-MM-DD"),
                HBeginDate: dayjs(new Date(data[0].最迟开工日期)).format("YYYY-MM-DD"),
                HEndDate: dayjs(new Date(data[0].最迟完工日期)).format("YYYY-MM-DD"),
                HRemark: data[0].表头备注,
                HRemark3: data[0].底部备注,
                HAuxQty: data[0].HAuxQty,
                HAuxUnit: data[0].HAuxUnit,
                HAuxUnitName: data[0].HAuxUnitName,

              HAuxQty2: data[0].HAuxQty2,
              HAuxUnit2: data[0].HAuxUnit2,
              HAuxUnitName2: data[0].HAuxUnitName2,
                HAuxQty2: data[0].HAuxQty2,
                HAuxUnit2: data[0].HAuxUnit2,
                HAuxUnitName2: data[0].HAuxUnitName2,

              HWidth: data[0].HWidth,
              HWeight: data[0].HWeight,
              HColorRemark: data[0].染色要求,
              HCusMaterName: data[0].客户物料名称,
              HCusModel: data[0].客户规格型号,
              HCusMaterNumber: data[0].客户物料编码,
              HOrderPickRemark: data[0].订单包装备注,
              HWidth_New: data[0].生产幅宽,
              HWeight_New: data[0].生产克重,
              HRemark_New: data[0].生产规格,
              //其他信息
              hmakers: this.OperationType2 == 2 ? "" : data[0].制单人,
              hmakedate:
                this.OperationType2 == 2
                  ? ""
                  : data[0].制单日期 == null
                  ? ""
                  : dayjs(new Date(data[0].制单日期)).format("YYYY-MM-DD"),
              hchecker: this.OperationType2 == 2 ? "" : data[0].审核人,
              hcheckdate:
                this.OperationType2 == 2
                  ? ""
                  : data[0].审核日期 == null
                  ? ""
                  : dayjs(new Date(data[0].审核日期)).format("YYYY-MM-DD"),
              hupdater: this.OperationType2 == 2 ? "" : data[0].修改人,
              hupdatedate:
                this.OperationType2 == 2
                  ? ""
                  : data[0].修改日期 == null
                  ? ""
                  : dayjs(new Date(data[0].修改日期)).format("YYYY-MM-DD"),
              hdeleteman: this.OperationType2 == 2 ? "" : data[0].作废人,
              hdeletedate:
                this.OperationType2 == 2
                  ? ""
                  : data[0].作废日期 == null
                  ? ""
                  : dayjs(new Date(data[0].作废日期)).format("YYYY-MM-DD"),
              HPlanOrderProcNo: data[0].HPlanOrderProcNo,
            });
                HWidth: data[0].HWidth,
                HWeight: data[0].HWeight,
                HColorRemark: data[0].染色要求,
                HCusMaterName: data[0].客户物料名称,
                HCusModel: data[0].客户规格型号,
                HCusMaterNumber: data[0].客户物料编码,
                HOrderPickRemark: data[0].订单包装备注,
                HWidth_New: data[0].生产幅宽,
                HWeight_New: data[0].生产克重,
                HRemark_New: data[0].生产规格,
                //其他信息
                hmakers: this.OperationType2 == 2 ? "" : data[0].制单人,
                hmakedate:
                  this.OperationType2 == 2
                    ? ""
                    : data[0].制单日期 == null
                    ? ""
                    : dayjs(new Date(data[0].制单日期)).format("YYYY-MM-DD"),
                hchecker: this.OperationType2 == 2 ? "" : data[0].审核人,
                hcheckdate:
                  this.OperationType2 == 2
                    ? ""
                    : data[0].审核日期 == null
                    ? ""
                    : dayjs(new Date(data[0].审核日期)).format("YYYY-MM-DD"),
                hupdater: this.OperationType2 == 2 ? "" : data[0].修改人,
                hupdatedate:
                  this.OperationType2 == 2
                    ? ""
                    : data[0].修改日期 == null
                    ? ""
                    : dayjs(new Date(data[0].修改日期)).format("YYYY-MM-DD"),
                hdeleteman: this.OperationType2 == 2 ? "" : data[0].作废人,
                hdeletedate:
                  this.OperationType2 == 2
                    ? ""
                    : data[0].作废日期 == null
                    ? ""
                    : dayjs(new Date(data[0].作废日期)).format("YYYY-MM-DD"),
                HPlanOrderProcNo: data[0].HPlanOrderProcNo,
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();

 src/views/basic/gyEmployee/gyEmployee.vue

@@ -1,26 +1,52 @@
<template>
  <div style="padding: 10px;position: relative;">
    <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
  <div style="padding: 10px; position: relative">
    <el-form
      :model="queryParams"
      ref="queryForm"
      label-width="98px"
      :inline="true"
      class="searchBox"
    >
      <el-row>
        <el-form-item label="职员代码" prop="HNumber" style="padding-left: 100px">
          <el-input v-model="queryParams.HNumber" placeholder="请输入职员代码" @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes" />
          <el-input
            v-model="queryParams.HNumber"
            placeholder="请输入职员代码"
            @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes"
          />
        </el-form-item>
        <el-form-item label="职员名称" prop="HName">
          <el-input v-model="queryParams.HName" placeholder="请输入职员名称" @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes" />
          <el-input
            v-model="queryParams.HName"
            placeholder="请输入职员名称"
            @keyup.enter.native="handleQuery"
            class="ForFilteringSchemes"
          />
        </el-form-item>
        <el-form-item label="组织">
          <el-select v-model="queryParams.HOrgID" placeholder="请选择" class="ForFilteringSchemes">
            <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
          <el-select
            v-model="queryParams.HOrgID"
            placeholder="请选择"
            class="ForFilteringSchemes"
          >
            <el-option
              v-for="(item, index) in organizationList"
              :key="index"
              :label="item.Name"
              :value="item.ID"
            >
            </el-option>
          </el-select>
        </el-form-item>
      </el-row>
      <el-form-item label-width="78px">
        <el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
          搜 索</el-button>
        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">取 消</el-button>
          搜 索</el-button
        >
        <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
          >取 消</el-button
        >
      </el-form-item>
      <el-collapse v-model="activeSeach">
        <el-collapse-item title="更多" name="1">
@@ -30,69 +56,132 @@
              <el-form-item label-width="0">
                <el-row>
                  <el-col :span="7">
                    <el-select v-model="queryParams.ColName1" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                    <el-select
                      v-model="queryParams.ColName1"
                      placeholder="请选择"
                      @change="riqiChange"
                      class="ForFilteringSchemes"
                    >
                      <span v-for="(item, index) in btList" :key="index">
                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                        <el-option
                          :label="item.field"
                          :value="item.field"
                          v-if="!item.hide"
                        ></el-option>
                      </span>
                    </el-select>
                  </el-col>
                  <el-col :span="6" style="padding: 0 10px">
                    <el-select v-model="queryParams.Comparator1" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
                        :value="item.value"></el-option>
                    <el-select
                      v-model="queryParams.Comparator1"
                      placeholder="请选择"
                      @change="riqiChange"
                      class="ForFilteringSchemes"
                    >
                      <el-option
                        v-for="(item, index) in comparatorList"
                        :key="index"
                        :label="item.label"
                        :value="item.value"
                      ></el-option>
                    </el-select>
                  </el-col>
                  <el-col :span="11">
                    <el-input v-model="queryParams.ColContent1" placeholder="请输入" clearable
                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
                    <el-input
                      v-model="queryParams.ColContent1"
                      placeholder="请输入"
                      clearable
                      @keyup.enter.native="handleQuery"
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
              <el-form-item label-width="0">
                <el-row>
                  <el-col :span="7">
                    <el-select v-model="queryParams.ColName2" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                    <el-select
                      v-model="queryParams.ColName2"
                      placeholder="请选择"
                      @change="riqiChange"
                      class="ForFilteringSchemes"
                    >
                      <span v-for="(item, index) in btList" :key="index">
                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                        <el-option
                          :label="item.field"
                          :value="item.field"
                          v-if="!item.hide"
                        ></el-option>
                      </span>
                    </el-select>
                  </el-col>
                  <el-col :span="6" style="padding: 0 10px">
                    <el-select v-model="queryParams.Comparator2" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                    <el-select
                      v-model="queryParams.Comparator2"
                      placeholder="请选择"
                      @change="riqiChange"
                      class="ForFilteringSchemes"
                    >
                      <span v-for="(item, index) in btList" :key="index">
                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                        <el-option
                          :label="item.field"
                          :value="item.field"
                          v-if="!item.hide"
                        ></el-option>
                      </span>
                    </el-select>
                  </el-col>
                  <el-col :span="11">
                    <el-input v-model="queryParams.ColContent2" placeholder="请输入" clearable
                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
                    <el-input
                      v-model="queryParams.ColContent2"
                      placeholder="请输入"
                      clearable
                      @keyup.enter.native="handleQuery"
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
              <el-form-item label-width="0">
                <el-row>
                  <el-col :span="7">
                    <el-select v-model="queryParams.ColName" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
                        :value="item.field"></el-option>
                    <el-select
                      v-model="queryParams.ColName"
                      placeholder="请选择"
                      @change="riqiChange"
                      class="ForFilteringSchemes"
                    >
                      <el-option
                        v-for="(item, index) in btList"
                        :key="index"
                        :label="item.field"
                        :value="item.field"
                      ></el-option>
                    </el-select>
                  </el-col>
                  <el-col :span="6" style="padding: 0 10px">
                    <el-select v-model="queryParams.Comparator" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
                        :value="item.value"></el-option>
                    <el-select
                      v-model="queryParams.Comparator"
                      placeholder="请选择"
                      @change="riqiChange"
                      class="ForFilteringSchemes"
                    >
                      <el-option
                        v-for="(item, index) in comparatorList"
                        :key="index"
                        :label="item.label"
                        :value="item.value"
                      ></el-option>
                    </el-select>
                  </el-col>
                  <el-col :span="11">
                    <el-input v-model="queryParams.ColContent" placeholder="请输入" clearable
                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
                    <el-input
                      v-model="queryParams.ColContent"
                      placeholder="请输入"
                      clearable
                      @keyup.enter.native="handleQuery"
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
@@ -113,120 +202,293 @@
        >
      </el-col> -->
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
          id="btn-Add">新增</el-button>
        <el-button
          type="primary"
          icon="el-icon-plus"
          size="mini"
          @click="handleAddEdit((OperationType = 1))"
          id="btn-Add"
          >新增</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit((row = rowForm), (OperationType = 3))">编辑</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleEdit((row = rowForm), (OperationType = 3))"
          >编辑</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleEdit((row = rowForm), (OperationType = 2))">复制</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleEdit((row = rowForm), (OperationType = 2))"
          >复制</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除
        <el-button
          type="primary"
          icon="el-icon-delete"
          size="mini"
          :disabled="single"
          @click="handleDelete"
          >删除
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_CheckBill(0, (form = rowForm))">审核</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="set_CheckBill(0, (form = rowForm))"
          >审核</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_CheckBill(1, (form = rowForm))">返审核</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="set_CheckBill(1, (form = rowForm))"
          >返审核</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_De_Stop(0, (form = rowForm))">禁用</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="set_De_Stop(0, (form = rowForm))"
          >禁用</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
          @click="set_De_Stop(1, (form = rowForm))">反禁用</el-button>
        <el-button
          type="primary"
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="set_De_Stop(1, (form = rowForm))"
          >反禁用</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
        <el-button
          type="primary"
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          >导出</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">隐藏列设置</el-button>
        <el-button
          type="primary"
          icon="el-icon-download"
          size="mini"
          @click="handleRowHide"
          >隐藏列设置</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">搜 索</el-button>
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
          >搜 索</el-button
        >
      </el-col>
      <el-col :span="1.5">
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重 置</el-button>
      <el-col :span="1.5" class="zy-hidden">
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重 置</el-button
        >
      </el-col>
      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
    </el-row>
    <div class="tableBox" v-loading="loading">
      <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
        @cell-dblclick="handleDblclick" v-if="tableShow">
      <el-table
        :data="tableData"
        ref="tableData"
        max-height="750"
        :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.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
            show-overflow-tooltip :fixed="item.fixed">
          <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.sorderid"
            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>
                <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>
        </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" />
      <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>
      <!-- 编辑 -->
      <el-dialog title="编辑职员" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
        :before-close="close">
        <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
          :HSouceBillType="this.rowForm.HSourceBillType" :HOrgID="this.queryParams.HOrgID" :copyType="copyType"
          @editCloseGy="editGyClose" v-if="editShow" />
      <el-dialog
        title="编辑职员"
        :visible.sync="openEdit"
        width="1480px"
        append-to-body
        class="xsckdBox"
        :before-close="close"
      >
        <edit
          :OperationType="OperationType"
          :linterid="this.rowForm.HItemID"
          :HSouceBillType="this.rowForm.HSourceBillType"
          :HOrgID="this.queryParams.HOrgID"
          :copyType="copyType"
          @editCloseGy="editGyClose"
          v-if="editShow"
        />
      </el-dialog>
      <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
      <el-dialog
        :title="upload.title"
        :visible.sync="upload.open"
        width="1500px"
        append-to-body
      >
        <div style="margin-top: -20px">
          <el-button type="primary" @click="set_AddNew">导入数据</el-button>
          <el-button type="primary" @click="upload.open = false">退 出</el-button>
          <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
            :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
            :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
          <el-upload
            ref="upload"
            :limit="1"
            accept=".xlsx, .xls"
            style="display: inline-block; margin-left: 10px"
            :action="upload.url + '?updateSupport=' + upload.updateSupport"
            :disabled="upload.isUploading"
            :on-progress="handleFileUploadProgress"
            :on-success="handleFileSuccess"
          >
            <el-button type="primary">文件上传</el-button>
          </el-upload>
        </div>
        <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
          height="550">
        <el-table
          :data="uploadData"
          v-loading="uploadTableLoading"
          :row-class-name="uploadDataIndex"
          border
          height="550"
        >
          <el-table-column type="index" label="序号" width="55" align="center" />
          <el-table-column label="组织代码" prop="组织代码" align="center" width="120" />
          <el-table-column label="组织名称" prop="组织名称" align="center" width="120" />
          <el-table-column label="生产资源名称" prop="生产资源名称" align="center" width="120" />
          <el-table-column label="生产资源代码" prop="生产资源代码" align="center" width="120" />
          <el-table-column
            label="生产资源名称"
            prop="生产资源名称"
            align="center"
            width="120"
          />
          <el-table-column
            label="生产资源代码"
            prop="生产资源代码"
            align="center"
            width="120"
          />
          <el-table-column label="部门代码" prop="部门代码" align="center" width="120" />
          <el-table-column label="部门名称" prop="部门名称" align="center" width="120" />
          <el-table-column label="负责人代码" prop="负责人代码" align="center" width="120" />
          <el-table-column
            label="负责人代码"
            prop="负责人代码"
            align="center"
            width="120"
          />
          <el-table-column label="负责人" prop="负责人" align="center" width="120" />
          <el-table-column label="工作中心代码" prop="工作中心代码" align="center" width="120" />
          <el-table-column label="工作中心名称" prop="工作中心名称" align="center" width="120" />
          <el-table-column
            label="工作中心代码"
            prop="工作中心代码"
            align="center"
            width="120"
          />
          <el-table-column
            label="工作中心名称"
            prop="工作中心名称"
            align="center"
            width="120"
          />
          <el-table-column label="单班工时" prop="单班工时" align="center" width="120" />
          <el-table-column label="操作" align="center">
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-delete"
                @click="uploadDataDelete(scope.row)">删除</el-button>
              <el-button
                size="mini"
                type="text"
                icon="el-icon-delete"
                @click="uploadDataDelete(scope.row)"
                >删除</el-button
              >
            </template>
          </el-table-column>
        </el-table>
        <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
          :pageSizes="uploadPageSizes" @pagination="currentPage" />
        <pagination
          v-show="uploadTotal > 0"
          :total="uploadTotal"
          :page.sync="uploadPage"
          :limit.sync="uploadPageSize"
          :pageSizes="uploadPageSizes"
          @pagination="currentPage"
        />
      </el-dialog>
    </div>
  </div>
@@ -246,7 +508,7 @@
  },
  data() {
    return {
      activeSeach: '',
      activeSeach: "",
      HModName: "Gy_Employee",
      editShow: false,
      openEdit: false,
@@ -554,7 +816,7 @@
          },
        })
        .then((response) => {
          console.log(response.data.data)
          console.log(response.data.data);
          this.tyResList = response.data.data; //总数据
          let data1 = response.data;
          let option = [];
@@ -797,7 +1059,7 @@
      this.lastSelectedRowIndex = this.tableData.indexOf(row);
      this.$refs.tableData.toggleRowSelection(row);
      if (this.openPage) {
        this.$emit('deptEmit', row, 4)
        this.$emit("deptEmit", row, 4);
      }
    },
    //选中行高亮样式
@@ -810,7 +1072,7 @@
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 4)
        this.$emit("deptEmitDb", row, 4);
      } else {
        this.handleEdit();
      }
@@ -821,12 +1083,12 @@
      if (this.openPage) {
        //列表单选
        if (selection.length > 1) {
          const del_row = selection.shift()
          this.$refs.tableData.toggleRowSelection(del_row, false) //设置这一行取消选中
          const del_row = selection.shift();
          this.$refs.tableData.toggleRowSelection(del_row, false); //设置这一行取消选中
        }
        this.rowForm = {}
        this.ids = selection.map(item => item.HItemID)
        this.rowForm = selection[0]
        this.rowForm = {};
        this.ids = selection.map((item) => item.HItemID);
        this.rowForm = selection[0];
      } else {
        //多选
        this.ids = selection.map((item) => item.HItemID);
@@ -1044,7 +1306,7 @@
            this.$modal.msgError("此条数据不是创建状态,无法删除!");
          }
        })
        .catch(() => { });
        .catch(() => {});
    },
    // 反审核/审核数据
    set_CheckBill(num, form) {
@@ -1120,8 +1382,8 @@
      } else {
        this.$alert(
          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
          response.Message +
          "</div>",
            response.Message +
            "</div>",
          "导入结果",
          { dangerouslyUseHTMLString: true }
        );
@@ -1150,8 +1412,8 @@
        .then((res) => {
          this.$alert(
            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
            res.data.Message +
            "</div>",
              res.data.Message +
              "</div>",
            "导入结果",
            { dangerouslyUseHTMLString: true }
          );
@@ -1175,7 +1437,7 @@
            return deleteList.indexOf(item.index) == -1;
          });
        })
        .catch(() => { });
        .catch(() => {});
    },
    getPage(page, list) {
      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1197,4 +1459,7 @@
.xsckdBox .el-date-editor.el-input {
  width: 100%;
}
.zy-hidden {
  display: none;
}
</style>

 src/views/basic/gyEmployee/gyEmployeeEdit.vue

@@ -225,24 +225,24 @@
          <el-row>
            <el-col :span="8">
              <el-form-item label="档案编号" prop="HArchivesNo">
                <el-input type="text" :v-model="form.HArchivesNo"></el-input>
                <el-input type="text" v-model="form.HArchivesNo"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="职称" prop="HProTitleID">
                <el-input type="text" :v-model="form.HProTitleID"></el-input>
                <el-input type="text" v-model="form.HProTitleID"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="薪资等级" prop="HSalaryLev">
                <el-input type="text" :v-model="form.HSalaryLev"></el-input>
                <el-input type="text" v-model="form.HSalaryLev"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>
            <el-col :span="8">
              <el-form-item label="毕业学校" prop="HGradSchool">
                <el-input type="text" :v-model="form.HGradSchool"></el-input>
                <el-input type="text" v-model="form.HGradSchool"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="8">
@@ -1193,94 +1193,98 @@
            if (result.code == 1) {
              // 说明验证成功了，
              var data = result.data.h_v_Edit_IF_EmployeeList[0];

              Object.assign(this.form, {
                HNumber: data.职员代码,
                HItemID: this.OperationType == 2 ? 0 : data.HItemID,
                HName: data.职员名称,
                HHelpCode: data.助记代码,
                HGroupID: data.HGroupID,
                HGroupName: data.班组名称,
                HGroupNumber: data.班组代码,
                HEndFlag: data.明细标记,
                HNoBrushFlag: data.是否打卡,
                HOverType: data.是否调休,
                HShiftFlag: data.是否轮班调休,
                HStopwagesFlag: data.是否停发,
                HInsuranceStatus: data.是否参保,
                HDeptID: data.部门ID,
                HDeptName: data.部门名称,
                HDutyID: data.职务ID,
                HDutyName: data.职务名称,
                HDutyNumber: data.职务代码,
                HDormID: data.宿舍ID,
                HDormName: data.宿舍名称,
                HDormNumber: data.宿舍代码,
                HWorkTypeID: data.工种ID,
                HWorkTypeName: data.工种名称,
                HWorkTypeNumber: data.工种代码,
                HCTPrjID: data.核算方式ID,
                HCTPrjName: data.核算方式名称,
                HCTPrjNumber: data.核算方式代码,
                HPostID: data.岗位ID,
                HPostName: data.岗位名称,
                HPostNumber: data.岗位代码,
                HSex: data.性别,
                HBirthDay: dayjs(data.出生年月).format("YYYY-MM-DD"),
                HAge: data.年龄,
                HBlighty: data.籍贯,
                HNation: data.民族,
                HBlightyType: data.户籍类别,
                HGovStatus: data.政治面貌,
                HKnowLev: data.学历,
                HMarr: data.婚姻状况,
                HArchivesNo: data.档案编号,
                HProTitleID: data.职称,
                HSalaryLev: data.薪资等级,
                HGradSchool: data.毕业学校,
                HGradDate: dayjs(data.毕业时间).format("YYYY-MM-DD"),
                HEngLev: data.外语水平,
                HCompLev: data.计算机水平,
                HSpec: data.专业,
                HNowAdd: data.现住地址,
                HEmail: data.电子邮箱,
                HHomeAdd: data.家庭地址,
                HPostalCode: data.邮政编码,
                HOldCompany: data.原公司,
                HLinkPhone: data.联系电话,
                HMobilePhone: data.手机号,
                HWorkType: data.用工类型,
                HInComDate: dayjs(data.进厂日期).format("YYYY-MM-DD"),
                HRelDate: dayjs(data.转正日期).format("YYYY-MM-DD"),
                HInsuranceNo: data.保险证编号,
                HContractBDate: dayjs(data.合同开始日期).format("YYYY-MM-DD"),
                HContractEDate: dayjs(data.合同到期日期).format("YYYY-MM-DD"),
                HContractYear: data.合同期限,
                HInsuranceDate: dayjs(data.参保日期).format("YYYY-MM-DD"),
                HDimissionDate: dayjs(data.离职日期).format("YYYY-MM-DD"),
                HStayCardEDate: dayjs(data.暂住证到期日).format("YYYY-MM-DD"),
                HEmpRate: data.职员系数,
                HBSTDeptID: data.贝士达部门,
                HRemark: data.备注,
                HDimissionReason: data.离职原因,
                linteridCard: data.身份证,
                HEmpType: data.工资类型,
                HBankAccount: data.银行账户,
                HInsuranceSubsidy: data.保险补贴,
                HOtherDeduct3: data.其他扣款3,
                HMedicare: data.医疗保险,
                HInsurance: data.养老保险,
                HDrydock: data.失业保险,
                HBasePay: data.基本工资,
                HExamLevPostMoney: data.职务考核工资,
                HExamRate: data.考核系数,
                HPayType: data.支付类型,
                HLeftMoneyRate: data.剩余工资,
                HHighestPay: data.最高工资,
                HOverPayRate: data.超额比率,
                HStopflag: data.禁用标记,
                HRemark: data.备注,
              });
              console.log(data);
              this.form = {
                ...{
                  HNumber: data.职员代码,
                  HItemID: this.OperationType == 2 ? 0 : data.HItemID,
                  HName: data.职员名称,
                  HHelpCode: data.助记代码,
                  HGroupID: data.HGroupID,
                  HGroupName: data.班组名称,
                  HGroupNumber: data.班组代码,
                  HEndFlag: data.明细标记 == "true" ? true : false,
                  HNoBrushFlag: data.是否打卡 == "true" ? true : false,
                  HOverType: data.是否调休 == "true" ? true : false,
                  HShiftFlag: data.是否轮班调休 == "true" ? true : false,
                  HStopwagesFlag: data.是否停发 == "true" ? true : false,
                  HInsuranceStatus: data.是否参保,
                  HDeptID: data.部门ID,
                  HDeptName: data.部门名称,
                  HDutyID: data.职务ID,
                  HDutyName: data.职务名称,
                  HDutyNumber: data.职务代码,
                  HDormID: data.宿舍ID,
                  HDormName: data.宿舍名称,
                  HDormNumber: data.宿舍代码,
                  HWorkTypeID: data.工种ID,
                  HWorkTypeName: data.工种名称,
                  HWorkTypeNumber: data.工种代码,
                  HCTPrjID: data.核算方式ID,
                  HCTPrjName: data.核算方式名称,
                  HCTPrjNumber: data.核算方式代码,
                  HPostID: data.岗位ID,
                  HPostName: data.岗位名称,
                  HPostNumber: data.岗位代码,
                  HSex: data.性别,
                  HBirthDay: dayjs(data.出生年月).format("YYYY-MM-DD"),
                  HAge: data.年龄,
                  HBlighty: data.籍贯,
                  HNation: data.民族,
                  HBlightyType: data.户籍类别,
                  HGovStatus: data.政治面貌,
                  HKnowLev: data.学历,
                  HMarr: data.婚姻状况,
                  HArchivesNo: data.档案编号,
                  HProTitleID: data.职称,
                  HSalaryLev: data.薪资等级,
                  HGradSchool: data.毕业学校,
                  HGradDate: dayjs(data.毕业时间).format("YYYY-MM-DD"),
                  HEngLev: data.外语水平,
                  HCompLev: data.计算机水平,
                  HSpec: data.专业,
                  HNowAdd: data.现住地址,
                  HEmail: data.电子邮箱,
                  HHomeAdd: data.家庭地址,
                  HPostalCode: data.邮政编码,
                  HOldCompany: data.原公司,
                  HLinkPhone: data.联系电话,
                  HMobilePhone: data.手机号,
                  HWorkType: data.用工类型,
                  HInComDate: dayjs(data.进厂日期).format("YYYY-MM-DD"),
                  HRelDate: dayjs(data.转正日期).format("YYYY-MM-DD"),
                  HInsuranceNo: data.保险证编号,
                  HContractBDate: dayjs(data.合同开始日期).format("YYYY-MM-DD"),
                  HContractEDate: dayjs(data.合同到期日期).format("YYYY-MM-DD"),
                  HContractYear: data.合同期限,
                  HInsuranceDate: dayjs(data.参保日期).format("YYYY-MM-DD"),
                  HDimissionDate: dayjs(data.离职日期).format("YYYY-MM-DD"),
                  HStayCardEDate: dayjs(data.暂住证到期日).format("YYYY-MM-DD"),
                  HEmpRate: data.职员系数,
                  HBSTDeptID: data.贝士达部门,
                  HRemark: data.备注,
                  HDimissionReason: data.离职原因,
                  linteridCard: data.身份证,
                  HEmpType: data.工资类型,
                  HBankAccount: data.银行账户,
                  HInsuranceSubsidy: data.保险补贴,
                  HOtherDeduct3: data.其他扣款3,
                  HMedicare: data.医疗保险,
                  HInsurance: data.养老保险,
                  HDrydock: data.失业保险,
                  HBasePay: data.基本工资,
                  HExamLevPostMoney: data.职务考核工资,
                  HExamRate: data.考核系数,
                  HPayType: data.支付类型,
                  HLeftMoneyRate: data.剩余工资,
                  HHighestPay: data.最高工资,
                  HOverPayRate: data.超额比率,
                  HStopflag: data.禁用标记,
                  HRemark: data.备注,
                  HIDCard: data.身份证 || "",
                  HFax: data.传真号码 || "",
                },
              };

              if (this.OperationType == 3) {
                // 编辑时获取文件列表
@@ -1374,7 +1378,7 @@
      } else if (num == "Group") {
        // 班组
        Object.assign(this.form, {
          HGroupItem: deptRow.HItemID,
          HGroupID: deptRow.HItemID,
          HGroupName: deptRow.班组名称,
          HGroupNumber: deptRow.班组代码,
        });

 src/views/basic/gyStockPlace/gyStockPlace.vue

@@ -26,7 +26,7 @@
        </el-form-item>
        <el-form-item label="组织">
          <el-select
            v-model="queryParams.HOrgName"
            v-model="queryParams.HOrgID"
            placeholder="请选择"
            class="ForFilteringSchemes"
          >
@@ -34,7 +34,7 @@
              v-for="(item, index) in organizationList"
              :key="index"
              :label="item.Name"
              :value="item.Name"
              :value="item.ID.toString()"
            >
            </el-option>
          </el-select>
@@ -62,8 +62,8 @@
          <el-card class="box-card">
            <div slot="header" class="clearfix"><span>过滤</span></div>
            <div>
              <el-form-item label-width="0">
                <el-row>
              <el-row>
                <el-form-item label-width="0">
                  <el-col :span="7">
                    <el-select
                      v-model="queryParams.ColName1"
@@ -104,10 +104,10 @@
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
              <el-form-item label-width="0">
                <el-row>
                </el-form-item>
              </el-row>
              <el-row>
                <el-form-item label-width="0">
                  <el-col :span="7">
                    <el-select
                      v-model="queryParams.ColName2"
@@ -149,10 +149,10 @@
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
              <el-form-item label-width="0">
                <el-row>
                </el-form-item>
              </el-row>
              <el-row>
                <el-form-item label-width="0">
                  <el-col :span="7">
                    <el-select
                      v-model="queryParams.ColName"
@@ -192,8 +192,8 @@
                      class="ForFilteringSchemes"
                    />
                  </el-col>
                </el-row>
              </el-form-item>
                </el-form-item>
              </el-row>
            </div>
          </el-card>
        </el-collapse-item>
@@ -248,12 +248,12 @@
          >隐藏列设置</el-button
        >
      </el-col>
      <el-col :span="1.5">
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
          >搜 索</el-button
        >
      </el-col>
      <el-col :span="1.5">
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重 置</el-button
        >
@@ -303,8 +303,8 @@
                <el-button
                  type="text"
                  @click="handleEdit(row, (OperationType = 3))"
                  v-else-if="column.property == '单据号'"
                  >{{ row.单据号 }}</el-button
                  v-else-if="column.property == '仓位代码'"
                  >{{ row.仓位代码 }}</el-button
                >
                <span v-else>{{ row[column.label] }}</span>
              </div>
@@ -341,6 +341,7 @@
        append-to-body
        class="xsckdBox"
        :before-close="close"
        @close="beforeEditCloseHandler"
      >
        <edit
          :OperationType="OperationType"
@@ -349,6 +350,7 @@
          :copyType="copyType"
          @editCloseGy="editGyClose"
          v-if="editShow"
          ref="editRef"
        />
      </el-dialog>
      <el-dialog
@@ -426,6 +428,8 @@
  },
  data() {
    return {
      editRef: null,
      activeSeach: "",
      HModName: "Gy_Warehouse",
      editShow: false,
      openEdit: false,
@@ -479,7 +483,7 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage["organizationList"]), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
@@ -503,7 +507,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -528,7 +532,7 @@
      btResList: [],
      tableData: [], //销售出库列表(分页显示)
      dataList: [],
      titleData: ["HItemID", "HParentID"], //不需要显示的字段 可扩展
      titleData: ["HItemID", "HParentID", "选择"], //不需要显示的字段 可扩展
      pageSizes: [50, 100, 500, 5000, 50000],
      page: 1,
      pageSize: 50,
@@ -566,10 +570,13 @@
    };
  },
  created() {
    this.fetchData();
    this.handleQuery();
    this.riqiChange();
  },
  methods: {
    beforeEditCloseHandler() {
      this.$refs.editRef.close();
    },
    // 仓位同步(API中暂时没有对应的API)
    async handleSync() {
      try {
@@ -743,11 +750,10 @@
      this.sWhere += "";
      //仓位列表
      axios
        .get(this.baseURL + "/Gy_StockPlace/list1page", {
        .get(this.baseURL + "/Gy_StockPlace/list2Page", {
          params: {
            sWhere: `${this.sWhere}`,
            user: this.user,
            Organization: "浙江智云迈思",
            page: this.page,
            size: this.pageSize,
          },
@@ -1099,8 +1105,10 @@
      if (this.queryParams.HName) {
        this.sWhere += " and 仓位名称 like '%" + this.queryParams.HName + "%'";
      }
      if (this.queryParams.HOrgName) {
        this.sWhere += " and 组织名称 = '" + this.queryParams.HOrgName + "'";
      if (this.queryParams.HOrgID) {
        let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
          ?.Name;
        this.sWhere += " and 组织名称 = '" + OrgName + "'";
      }
      // this.sWhere += this.addSWhereByOpenType()
      // this.sWhere += this.getOrgIDByUser()
@@ -1342,4 +1350,7 @@
  flex-direction: row;
  width: 60%;
}
.zy-hidden {
  display: none;
}
</style>

 src/views/basic/gyStockPlace/gyStockPlaceEdit.vue

@@ -12,17 +12,17 @@
          <el-row>
            <el-col :span="8">
              <el-form-item label="仓位代码" prop="HNumber">
                <el-input v-model="form.HNumber" placeholder="请输入仓库代码" />
                <el-input v-model="form.HNumber" placeholder="请输入仓位代码" />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="仓位名称" prop="HName">
                <el-input v-model="form.HName" placeholder="请输入仓库名称" />
                <el-input v-model="form.HName" placeholder="请输入仓位名称" />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="所属仓位" prop="HSPGroupName" class="form-inline">
                <el-input disabled v-model="form.HSPGroupName" placeholder="请选择仓位">
              <el-form-item label="所属仓库" prop="HSPGroupName" class="form-inline">
                <el-input disabled v-model="form.HSPGroupName" placeholder="请选择仓库">
                </el-input>
                <el-button icon="el-icon-search" @click="openDataDialog(1)"></el-button>
              </el-form-item>
@@ -48,12 +48,12 @@
            </el-col>
            <el-col :span="8">
              <el-form-item label="助记码" prop="HHelpCode">
                <el-input v-model="form.HAddress" placeholder="请输入助记码" />
                <el-input v-model="form.HHelpCode" placeholder="请输入助记码" />
              </el-form-item>
            </el-col>
            <el-col :span="8">
              <el-form-item label="备注" prop="HRemark">
                <el-input v-model="form.HPhone" placeholder="请输入备注" />
                <el-input v-model="form.HRemark" placeholder="请输入备注" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -73,17 +73,26 @@
        </el-tab-pane>
      </el-tabs>
    </el-form>
    <!-- 部门弹窗 -->
    <!-- 选择弹窗 -->
    <el-dialog
      :title="dialogTitle"
      :visible.sync="openData"
      width="1280px"
      append-to-body
    >
      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
      <!-- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" /> -->
      <div style="height: 60vh" v-if="openData">
        <iframe
          :src="iframeUrl"
          frameborder="0"
          width="100%"
          height="100%"
          ref="iframeInstance"
        ></iframe>
      </div>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -114,6 +123,9 @@
  },
  data() {
    return {
      dialogEnabledNum: -1,
      iframeInstance: null,
      iframeUrl: "",
      formShow: false,
      temp: undefined,
      formLoading: true,
@@ -187,9 +199,22 @@
    this.reset();
    this.fetchData();
  },
  mounted() {
    window.iframeWareHouseCallBack = (info) => {
      console.log(info);
      // 回调赋值
      this.form.HSPGroupName = info["仓库名称"];
      this.form.HSPGroupID = info["HSPGroupID"];
      // 关闭弹窗
      this.deptClose();
    };
  },
  activated() {
    this.reset();
    this.fetchData();
  },
  beforeDestroy() {
    delete window.iframeWareHouseCallBack;
  },
  methods: {
    fetchData() {
@@ -235,18 +260,21 @@
            if (result.code == 1) {
              // 说明验证成功了，
              var data = result.data[0];
              this.form = {
                ...{
                  HUSEORGID: data.HUSEORGID,
                  HItemID: data.HMainID,
                  HNumber: data.仓位代码,
                  HName: data.仓位名称,
                  HHelpCode: data.助记码,
                  HRemark: data.备注,
                  HSPGroupID: data.HSPGroupID,
                  HSPGroupName: data.所属仓位,
                  HStopflag: data.禁用标记 == "Y" ? true : false,
                  HStandard: data.默认仓位 == "Y" ? true : false,
                },
              };

              Object.assign(this.form, {
                HItemID: data.HMainID,
                HNumber: data.仓位代码,
                HName: data.仓位名称,
                HHelpCode: data.助记码,
                HRemark: data.备注,
                HSPGroupID: data.HSPGroupID,
                HSPGroupName: data.所属仓位,
                HStopflag: data.禁用标记 == "Y" ? true : false,
                HStandard: data.默认仓位 == "Y" ? true : false,
              });
              if (!data.HCheckEmp) {
                this.CheckBillDisabled = false;
              }
@@ -299,8 +327,19 @@
      this.deptform = deptRow;
    },
    deptClickSub() {
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
      // this.dbEmitData(this.deptform, this.dialogTypeNum);
      // this.deptform = {};
      // 从打开的iframe中获取选中数据
      let selectedRow = this.$refs.iframeInstance.contentWindow.selectedRow;
      console.log(selectedRow);
      if (this.dialogEnabledNum == 1) {
        // 修改选中仓库数据
        this.form.HSPGroupName = selectedRow["仓库名称"];
        this.form.HSPGroupID = selectedRow["HSPGroupID"];
      }

      selectedRow = null; // 手动置空，方便GC回收，防止泄露
      this.deptClose();
    },
    deptClose() {
      this.deptform = {};
@@ -461,12 +500,14 @@
    },
    //  打开数据列表弹窗
    openDataDialog(num, row) {
      this.dialogEnabledNum = num;
      if (row) {
        this.zbIndex = row.index - 1;
      }
      this.showReset();
      if (num == 1) {
        this.dialogTitle = "仓位列表";
        this.iframeUrl = "/iframe/GyWarehouse";
        this.dialogTitle = "仓库列表";
        this.warehouseShow = true;
        this.openData = true;
      }

 src/views/basic/gyWarehouse/gyWarehouse.vue

@@ -149,10 +149,10 @@
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">隐藏列设置</el-button>
      </el-col>
      <el-col :span="1.5">
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">搜 索</el-button>
      </el-col>
      <el-col :span="1.5">
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重 置</el-button>
      </el-col>
      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
@@ -173,8 +173,12 @@
                <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>
                <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>
@@ -187,11 +191,24 @@
        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog title="编辑仓库" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
        :before-close="close">
        <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
          :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose"
          v-if="editShow" />
      <el-dialog
        title="编辑仓库"
        :visible.sync="openEdit"
        width="1480px"
        append-to-body
        class="xsckdBox"
        :before-close="close"
        @close="editBeforeCloseHandle"
      >
        <edit
          :OperationType="OperationType"
          :linterid="this.rowForm.HItemID"
          :HSouceBillType="this.rowForm.HSourceBillType"
          :copyType="copyType"
          @editCloseGy="editGyClose"
          v-if="editShow"
          ref="editRef"
        />
      </el-dialog>
      <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
        <div style="margin-top: -20px">
@@ -206,7 +223,7 @@
        <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
          height="550">
          <el-table-column type="index" label="序号" width="55" align="center" />
          <el-table-column label="仓库代码" prop="仓库代码" align="center" width="120" />
          <el-table-column label="仓库代码" align="center" width="120" />
          <el-table-column label="仓库名称" prop="仓库名称" align="center" width="120" />
          <el-table-column label="联系电话" prop="联系电话" align="center" width="120" />
          <el-table-column label="职员代码" prop="职员代码" align="center" width="120" />
@@ -240,6 +257,8 @@
  },
  data() {
    return {
      editRef: null,
      activeSeach: "",
      HModName: "Gy_Warehouse",
      activeSeach: '',
      editShow: false,
@@ -385,6 +404,9 @@
    this.riqiChange();
  },
  methods: {
    editBeforeCloseHandle() {
      this.$refs.editRef.close();
    },
    // 仓库同步
    async handleSync() {
      try {
@@ -803,6 +825,10 @@
    handleRowClick(row, column, event) {
      this.lastSelectedRow = this.selectedRow; // 记录上一次选中的行
      this.selectedRow = row; // 记录当前选中的行
      if (this.checkIsIframe) {
        // 将当前选中的数据暴露到window中
        window.selectedRow = row;
      }
      this.lastSelectedRowIndex = this.tableData.indexOf(row);
      this.$refs.tableData.toggleRowSelection(row);
      if (this.openPage) {
@@ -815,14 +841,25 @@
        return { background: "#ecf5ff" };
      }
    },
    checkIsIframe() {
      if (window.self == window.top) {
        return false;
      }
      return true;
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      if (this.checkIsIframe) {
        // IFrame 双击 返回当前双击的数据
        window.parent.iframeWareHouseCallBack(row);
        return;
      }
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 2)
      }
      else {
        this.handleEdit();
      this.handleEdit();
      }
    },
    // 多选框选中数据
@@ -838,12 +875,12 @@
        this.ids = selection.map(item => item.HItemID)
        this.rowForm = selection[0]
      } else {
        this.ids = selection.map((item) => item.HItemID);
        this.single = selection.length != 1;
        this.multiple = !selection.length;
        if (!this.single) {
          this.rowForm = selection[0];
        }
      this.ids = selection.map((item) => item.HItemID);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
      if (!this.single) {
        this.rowForm = selection[0];
      }
      }
    },
    //打开侧边搜索弹窗
@@ -1004,7 +1041,7 @@

    //退出
    close() {
      this.tableShow = true;
      this.tableShow = false;
      this.openEdit = false;
      this.getList();
    },
@@ -1130,8 +1167,8 @@
      } else {
        this.$alert(
          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
          response.Message +
          "</div>",
            response.Message +
            "</div>",
          "导入结果",
          { dangerouslyUseHTMLString: true }
        );
@@ -1160,8 +1197,8 @@
        .then((res) => {
          this.$alert(
            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
            res.data.Message +
            "</div>",
              res.data.Message +
              "</div>",
            "导入结果",
            { dangerouslyUseHTMLString: true }
          );
@@ -1212,4 +1249,8 @@
  display: flex;
  flex-direction: row;
}

.zy-hidden {
  display: none;
}
</style>

 src/views/basic/gyWarehouse/gyWarehouseEdit.vue

@@ -47,10 +47,19 @@
              <el-form-item label="仓库类型" prop="HWarehouseType">
                <el-select v-model="form.HWarehouseType" placeholder="请选择仓库类型">
                  <el-option
                    v-for="(item, index) in HWarehouseTypeList"
                    :key="index"
                    :label="item.Name"
                    :value="item.Name"
                    v-for="item in [
                      {
                        label: '生产仓库',
                        value: '生产仓库',
                      },
                      {
                        label: '模具仓库',
                        value: '模具仓库',
                      },
                    ]"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value"
                  >
                  </el-option>
                </el-select>
@@ -265,26 +274,12 @@
      ids: [],

      // 表单参数
      form: {
        HWarehouseType: "生产仓库",
      },
      form: {},
      // 表单校验
      rules: {
        HNumber: [{ required: true, message: "仓库代码不能为空", trigger: "blur" }],
        HName: [{ required: true, message: "仓库名称名称不能为空", trigger: "blur" }],
        HWarehouseType: [
          { required: true, message: "仓库类型不能为空", trigger: "blur" },
        ],
      },

      HWarehouseTypeList: [
        {
          Name: "生产仓库",
        },
        {
          Name: "模具仓库",
        },
      ],
    };
  },
  created() {
@@ -324,7 +319,6 @@
    },
    getdata() {
      this.reset();
      console.log(this.OperationType);
      if (this.OperationType != 1) {
        this.zzSelDis = true;
        axios
@@ -339,52 +333,68 @@
            if (result.code == 1) {
              // 说明验证成功了，
              var data = result.data[0];

              Object.assign(this.form, {
                HNumber: data.仓库代码,
                HItemID: data.HItemID,
                HParentID: data.HParentID,
                HShortNumber: data.HNumber,
                HName: data.仓库名称,
                HHelpCode: data.HHelpCode,
                HEmpID: data.HEmpID,
                HEmpName: data.HEmpName,
                HAddress: data.仓库地址,
                HPhone: data.联系电话,
                HStopflag: data.禁用标记,
                HStockCtrlFlag: data.负库存控制标记,
                HSPFlag: data.启用仓位 == "Y" ? 1 : 0,
                HRemark: data.HRemark,
                HWarehouseType: data.仓库类型,
                //, "HItemID": data.条码编号
                HBarCode: data.HBarCode,
                HUSEORGID: data.HUSEORGID,
                //, "HCreator": data.创建人
                //, "lngBillKey": data.lngBillKey
                //, "lngBillSubKey": data.lngBillSubKey
                //, "HMaker": data.HMaker
                //, "HCreateDate": data.创建日期
                HUpDater: sessionStorage["HUserName"],
                HMakeEmp: data["创建人"],
                HMakeDate:
                  data["创建日期"] == null
                    ? ""
                    : dayjs(new Date(data["创建日期"])).format("yyyy-MM-dd"),
                HCheckEmp: data["审核人"],
                HCheckDate:
                  data["审核日期"] == null
                    ? ""
                    : dayjs(new Date(data["审核日期"])).format("yyyy-MM-dd"),
                HStopEmp: data["禁用人"],
                HStopDate:
                  data["禁用日期"] == null
                    ? ""
                    : dayjs(new Date(data["禁用日期"])).format("yyyy-MM-dd"),
              });
              // 使用 Object.assign 丢失响应式 改为使用 this.form = {...{}}
              this.form = {
                ...{
                  HNumber: data.仓库代码,
                  HItemID: data.HItemID,
                  HParentID: data.HParentID,
                  HShortNumber: data.HNumber,
                  HName: data.仓库名称,
                  HHelpCode: data.HHelpCode,
                  HEmpID: data.HEmpID,
                  HEmpName: data.HEmpName,
                  HAddress: data.仓库地址,
                  HPhone: data.联系电话,
                  HStopflag: data.禁用标记 == "true",
                  HStockCtrlFlag: data.负库存控制标记 == "true",
                  HSPFlag: data.启用仓位 == "Y" ? true : false,
                  HRemark: data.HRemark,
                  HWarehouseType: data.仓库类型,
                  //, "HItemID": data.条码编号
                  HBarCode: data.HBarCode,
                  HUSEORGID: data.HUSEORGID,
                  //, "HCreator": data.创建人
                  //, "lngBillKey": data.lngBillKey
                  //, "lngBillSubKey": data.lngBillSubKey
                  //, "HMaker": data.HMaker
                  //, "HCreateDate": data.创建日期
                  HUpDater: sessionStorage["HUserName"],
                  HMakeEmp: data["创建人"],
                  HMakeDate:
                    data["创建日期"] == null
                      ? ""
                      : dayjs(new Date(data["创建日期"])).format("yyyy-MM-dd"),
                  HCheckEmp: data["审核人"],
                  HCheckDate:
                    data["审核日期"] == null
                      ? ""
                      : dayjs(new Date(data["审核日期"])).format("yyyy-MM-dd"),
                  HStopEmp: data["禁用人"],
                  HStopDate:
                    data["禁用日期"] == null
                      ? ""
                      : dayjs(new Date(data["禁用日期"])).format("yyyy-MM-dd"),
                },
              };
              if (!data.HCheckEmp) {
                this.CheckBillDisabled = false;
              }
            }

            if (this.OperationType == 2) {
              // 复制
              Object.assign(this.form, {
                HItemID: 0,
                HMakeEmp: sessionStorage["HUserName"],
                HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
                HCheckEmp: "",
                HCheckDate: "",
                HStopEmp: "",
                HStopDate: "",
              });
            }

            this.$nextTick(() => {
              this.formShow = true;
              this.formLoading = false;

 src/views/component/employee/index.vue

@@ -48,7 +48,7 @@
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: "http://47.96.97.237/API",
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
@@ -106,7 +106,7 @@
      let sWhere = "";
      this.loading = true;
      axios
        .get(process.env.VUE_APP_BASE_URL + "/Gy_Employee/list", {
        .get(this.baseURL + "/Gy_Employee/list", {
          params: { sWhere: sWhere, user: this.user, Organization: "浙江智云迈思" },
        })
        .then((response) => {

 src/views/purchase/cgPoInStockBill/cgPoInStockBillEdit.vue

@@ -883,58 +883,60 @@
            var result = response.data;
            var data = response.data.data[0];
            this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data.单据号,
              HDate: dayjs(data.日期),
              HInnerBillNo: data.内部单据号,
              HEmpID: data.HEmpID,
              HEmpName: data.业务员,
              HSupID: data.HSupID,
              HSupName: data.供应商,
              HWHID: data.主表仓库ID,
              HWHName: data.主表仓库,
              HCurID: data.HCurID,
              HCurName: data.币别,
              HExRate: data.汇率,
              HDeptName: data.部门,
              HDeptID: data.HDeptID,
              HManagerName: data.主管,
              HManagerID: data.HManagerID,
              HSourceBillType: data.源单类型,
              HAddress: data.交货地点,
              HExRate: data.汇率,
              HProjectID: data.HProjectID,
              HProjectNumber: data.项目代码,
              HProjectName: data.项目名称,
              HInvoiceBillNo: data.发票编号,
              Box2: "",
              HRemark: data.表头备注,
              HMaker: data.制单人,
              HChecker: data.审核人,
              HCloseMan: data.关闭人,
              HUpDater: data.修改人,
              HDeleteMan: data.作废人,
              HMakeDate:
                data.制单日期 == null
                  ? ""
                  : dayjs(data.制单日期).format("YYYY-MM-DD hh:mm:ss"),
              HCheckDate:
                data.审核日期 == null
                  ? ""
                  : dayjs(data.审核日期).format("YYYY-MM-DD hh:mm:ss"),
              HCloseDate:
                data.关闭日期 == null
                  ? ""
                  : dayjs(data.关闭日期).format("YYYY-MM-DD hh:mm:ss"),
              HUpDateDate:
                data.修改日期 == null
                  ? ""
                  : dayjs(data.修改日期).format("YYYY-MM-DD hh:mm:ss"),
              HDeleteDate:
                data.作废日期 == null
                  ? ""
                  : dayjs(data.作废日期).format("YYYY-MM-DD hh:mm:ss"),
            });
            this.form = {
              ...{
                HBillNo: data.单据号,
                HDate: dayjs(data.日期),
                HInnerBillNo: data.内部单据号,
                HEmpID: data.HEmpID,
                HEmpName: data.业务员,
                HSupID: data.HSupID,
                HSupName: data.供应商,
                HWHID: data.主表仓库ID,
                HWHName: data.主表仓库,
                HCurID: data.HCurID,
                HCurName: data.币别,
                HExRate: data.汇率,
                HDeptName: data.部门,
                HDeptID: data.HDeptID,
                HManagerName: data.主管,
                HManagerID: data.HManagerID,
                HSourceBillType: data.源单类型,
                HAddress: data.交货地点,
                HExRate: data.汇率,
                HProjectID: data.HProjectID,
                HProjectNumber: data.项目代码,
                HProjectName: data.项目名称,
                HInvoiceBillNo: data.发票编号,
                Box2: "",
                HRemark: data.表头备注,
                HMaker: data.制单人,
                HChecker: data.审核人,
                HCloseMan: data.关闭人,
                HUpDater: data.修改人,
                HDeleteMan: data.作废人,
                HMakeDate:
                  data.制单日期 == null
                    ? ""
                    : dayjs(data.制单日期).format("YYYY-MM-DD hh:mm:ss"),
                HCheckDate:
                  data.审核日期 == null
                    ? ""
                    : dayjs(data.审核日期).format("YYYY-MM-DD hh:mm:ss"),
                HCloseDate:
                  data.关闭日期 == null
                    ? ""
                    : dayjs(data.关闭日期).format("YYYY-MM-DD hh:mm:ss"),
                HUpDateDate:
                  data.修改日期 == null
                    ? ""
                    : dayjs(data.修改日期).format("YYYY-MM-DD hh:mm:ss"),
                HDeleteDate:
                  data.作废日期 == null
                    ? ""
                    : dayjs(data.作废日期).format("YYYY-MM-DD hh:mm:ss"),
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();

 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue

@@ -775,21 +775,18 @@
  },
  mounted() {
    this.queryParams.HOrgID = sessionStorage["Organization"];
    window.editGyClose = () => {
      this.editGyClose(); // 组件内的方法绑定到windows
    };
  },
  created() {
    this.riqiChange();
    this.getList();
  },
  beforeDestory() {
    delete window.editGyClose;
  },
  methods: {
    handleTabActive() {
      window.editGyClose = () => {
        this.editGyClose(); // 组件内的方法绑定到windows
      };
    },
    handleTabInactive() {
      // 组件销毁时清理全局方法，避免内存泄漏
      delete window.editGyClose;
    },
    onDateScanOptionChangerHandler(e) {
      this.queryParams.timeSpan = e;
      if (e == -1) {

 src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue

@@ -905,63 +905,65 @@
            var result = response.data;
            var data = response.data.data[0];
            this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data.单据号, //设置单据号的第一个值为“HBillNo”字段的值是data.单据号`的值
              HDate: dayjs(data.日期).format("YYYY-MM-DD"), //设置“HDate”字段的值为`data.日期`经过`dayjs`函数处理后的格式
              HSSDate: dayjs(data.结算日期).format("YYYY-MM-DD"), //但设置的是“结算日期”字段。
              //,"HInnerBillNo": data.内部单据号
              HAddress: data.交货地点, // 设置“交货地点”字段的值。
              HDeptName: data.部门, // 设置“部门”名称字段的值。
              HDeptID: data.HDeptID, // 设置“HDeptID”名称字段的值。
              HSupID: data.HSupID, // 设置“HSupID”名称字段的值。
              HSupName: data.供应商, // 设置“供应商”名称字段的值。
              HEmpID: data.HEmpID,
              HEmpName: data.业务员, // 设置“业务员”名称字段的值。
              HCurID: data.HCurID,
              HCurName: data.币别, // 设置“币别”名称字段的值。
              HExRate: data.汇率, // 设置“汇率”名称字段的值。
              HManagerName: data.主管, // 设置“主管”名称字段的值。
              HManagerID: data.HManagerID,
              HPSStyleID: data.HPSStyleID,
              HPSStyleName: data.采购方式, // 设置“采购方式”名称字段的值。
              HSSID: data.HSSID,
              HSSName: data.结算方式, // 设置“结算方式”名称字段的值。
              HLinkMan: data.联系人, // 设置“联系人”名称字段的值。
              HLinkPhone: data.联系人电话, // 设置“联系电话”名称字段的值。
              HInnerBillNo: data.辅助字段, // 设置“辅助字段”名称字段的值。
              HProjectID: data.HProjectID,
              HProjectNumber: data.项目代码, // 设置“项目代码”名称字段的值。
              HProjectName: data.项目名称, // 设置“项目名称”名称字段的值。
              HWHID: data.HWHID,
              HOrgID: data.HOrgID,
              HWHName: data.仓库, // 设置“仓库”名称字段的值。
              HRemark: data.表头备注, // 设置“表头备注”名称字段的值。
              HMaker: data.制单人, // 设置“制单人”名称字段的值。
              HChecker: data.审核人, // 设置“审核人”名称字段的值。
              HCloseMan: data.关闭人, // 设置“关闭人”名称字段的值。
              HUpDater: data.修改人, // 设置“修改人”名称字段的值。
              HDeleteMan: data.作废人, // 设置“作废人”名称字段的值。
              HMakeDate:
                data.制单日期 == null
                  ? ""
                  : dayjs(data.制单日期).format("yyyy-MM-dd hh:mm:ss"),
              HCheckDate:
                data.审核日期 == null
                  ? ""
                  : dayjs(data.审核日期).format("yyyy-MM-dd hh:mm:ss"),
              HCloseDate:
                data.关闭日期 == null
                  ? ""
                  : dayjs(data.关闭日期).format("yyyy-MM-dd hh:mm:ss"),
              HUpDateDate:
                data.修改日期 == null
                  ? ""
                  : dayjs(data.修改日期).format("yyyy-MM-dd hh:mm:ss"),
              HDeleteDate:
                data.作废日期 == null
                  ? ""
                  : dayjs(data.作废日期).format("yyyy-MM-dd hh:mm:ss"),
            });
            this.form = {
              ...{
                HBillNo: data.单据号, //设置单据号的第一个值为“HBillNo”字段的值是data.单据号`的值
                HDate: dayjs(data.日期).format("YYYY-MM-DD"), //设置“HDate”字段的值为`data.日期`经过`dayjs`函数处理后的格式
                HSSDate: dayjs(data.结算日期).format("YYYY-MM-DD"), //但设置的是“结算日期”字段。
                //,"HInnerBillNo": data.内部单据号
                HAddress: data.交货地点, // 设置“交货地点”字段的值。
                HDeptName: data.部门, // 设置“部门”名称字段的值。
                HDeptID: data.HDeptID, // 设置“HDeptID”名称字段的值。
                HSupID: data.HSupID, // 设置“HSupID”名称字段的值。
                HSupName: data.供应商, // 设置“供应商”名称字段的值。
                HEmpID: data.HEmpID,
                HEmpName: data.业务员, // 设置“业务员”名称字段的值。
                HCurID: data.HCurID,
                HCurName: data.币别, // 设置“币别”名称字段的值。
                HExRate: data.汇率, // 设置“汇率”名称字段的值。
                HManagerName: data.主管, // 设置“主管”名称字段的值。
                HManagerID: data.HManagerID,
                HPSStyleID: data.HPSStyleID,
                HPSStyleName: data.采购方式, // 设置“采购方式”名称字段的值。
                HSSID: data.HSSID,
                HSSName: data.结算方式, // 设置“结算方式”名称字段的值。
                HLinkMan: data.联系人, // 设置“联系人”名称字段的值。
                HLinkPhone: data.联系人电话, // 设置“联系电话”名称字段的值。
                HInnerBillNo: data.辅助字段, // 设置“辅助字段”名称字段的值。
                HProjectID: data.HProjectID,
                HProjectNumber: data.项目代码, // 设置“项目代码”名称字段的值。
                HProjectName: data.项目名称, // 设置“项目名称”名称字段的值。
                HWHID: data.HWHID,
                HOrgID: data.HOrgID,
                HWHName: data.仓库, // 设置“仓库”名称字段的值。
                HRemark: data.表头备注, // 设置“表头备注”名称字段的值。
                HMaker: data.制单人, // 设置“制单人”名称字段的值。
                HChecker: data.审核人, // 设置“审核人”名称字段的值。
                HCloseMan: data.关闭人, // 设置“关闭人”名称字段的值。
                HUpDater: data.修改人, // 设置“修改人”名称字段的值。
                HDeleteMan: data.作废人, // 设置“作废人”名称字段的值。
                HMakeDate:
                  data.制单日期 == null
                    ? ""
                    : dayjs(data.制单日期).format("yyyy-MM-dd hh:mm:ss"),
                HCheckDate:
                  data.审核日期 == null
                    ? ""
                    : dayjs(data.审核日期).format("yyyy-MM-dd hh:mm:ss"),
                HCloseDate:
                  data.关闭日期 == null
                    ? ""
                    : dayjs(data.关闭日期).format("yyyy-MM-dd hh:mm:ss"),
                HUpDateDate:
                  data.修改日期 == null
                    ? ""
                    : dayjs(data.修改日期).format("yyyy-MM-dd hh:mm:ss"),
                HDeleteDate:
                  data.作废日期 == null
                    ? ""
                    : dayjs(data.作废日期).format("yyyy-MM-dd hh:mm:ss"),
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();

 src/views/sell/XsSeOutStockBackBillEdit.vue

@@ -950,41 +950,43 @@
            var result = response.data;
            var data = response.data.data[0];
            this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data.单据号,
              HDate: dayjs(data.日期).format("YYYY-MM-DD"),
              HInnerBillNo: data.销售订单号,
              HDeptID: data.HDeptID,
              HDeptName: data.部门,
              HEmpID: data.HEmpID,
              HEmpName: data.业务员,
              HManagerID: data.HManagerID,
              HManagerName: data.主管,
              HSSID: data.HSSID,
              HSSName: data.结算方式,
              HCurID: data.HCurID,
              HCurName: data.币别,
              HExRate: data.汇率,
              HWHID: data.HWHID_Main,
              HWHName: data.仓库,
              HCusID: data.HCusID,
              HCusName: data.客户,
              HAddress: data.交货地点,
              HProjectID: data.HProjectID,
              HProjectNumber: data.项目编码,
              HProjectName: data.项目名称,
              HRemark: data.表头备注,
              HExplanation: data.摘要,
              HSourceBillType: data.源单类型,
              HMaker: data.制单人,
              HChecker: data.审核人,
              HCloseMan: data.关闭人,
              HMakeDate: data.制单日期,
              HCheckDate: data.审核日期,
              HCloseDate: data.关闭日期,
              HUpDateDate: data.修改日期,
              HDeleteDate: data.作废日期,
            });
            this.form = {
              ...{
                HBillNo: data.单据号,
                HDate: dayjs(data.日期).format("YYYY-MM-DD"),
                HInnerBillNo: data.销售订单号,
                HDeptID: data.HDeptID,
                HDeptName: data.部门,
                HEmpID: data.HEmpID,
                HEmpName: data.业务员,
                HManagerID: data.HManagerID,
                HManagerName: data.主管,
                HSSID: data.HSSID,
                HSSName: data.结算方式,
                HCurID: data.HCurID,
                HCurName: data.币别,
                HExRate: data.汇率,
                HWHID: data.HWHID_Main,
                HWHName: data.仓库,
                HCusID: data.HCusID,
                HCusName: data.客户,
                HAddress: data.交货地点,
                HProjectID: data.HProjectID,
                HProjectNumber: data.项目编码,
                HProjectName: data.项目名称,
                HRemark: data.表头备注,
                HExplanation: data.摘要,
                HSourceBillType: data.源单类型,
                HMaker: data.制单人,
                HChecker: data.审核人,
                HCloseMan: data.关闭人,
                HMakeDate: data.制单日期,
                HCheckDate: data.审核日期,
                HCloseDate: data.关闭日期,
                HUpDateDate: data.修改日期,
                HDeleteDate: data.作废日期,
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();

 src/views/sell/XsSeOutStockBackBillList.vue

@@ -1202,7 +1202,7 @@
    },
    //选中行高亮样式
    rowStyle({ row, rowIndex }) {
      if (this.ids.includes(row.HItemID)) {
      if (this.ids.includes(row.hmainid)) {
        return { background: "#ecf5ff" };
      }
    },
@@ -1214,7 +1214,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) {

 src/views/sell/XsSeOutStockBillEdit.vue

@@ -144,8 +144,8 @@
                  <el-option
                    v-for="(item, index) in HSourceBillTypeList"
                    :key="index"
                    :label="item"
                    :value="item"
                    :label="item.label"
                    :value="item.value"
                  >
                  </el-option>
                </el-select>
@@ -519,6 +519,7 @@
  created() {
    this.fetchData();
    this.getdata();
    this.getHSourceBillType();
  },
  beforeDestroy() {
    if (window.parent) {
@@ -528,6 +529,32 @@
    }
  },
  methods: {
    getHSourceBillType() {
      axios
        .get(`${this.baseURL}/Web/GetHSourceBillType`, {
          params: {
            HName: "发货通知单",
            Num: 2,
          },
        })
        .then((res) => {
          let { data, count, Message } = res.data;
          if (count == 1) {
            // 获取成功
            this.HSourceBillTypeList = Array.from(data).map((e) => {
              return {
                label: e.HSourceBillTypeName,
                value: e.HSourceBillType,
              };
            });
          } else {
            this.$modal.msgError(`获取源单类型失败: ${Message}`);
          }
        })
        .catch((err) => {
          this.$modal.msgError(`获取源单类型失败: ${err}`);
        });
    },
    fetchData() {
      axios
        .get(this.baseURL + "/Web/GetOrganizations", {})
@@ -946,49 +973,51 @@
            var result = response.data;
            var data = response.data.data[0];
            this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data.单据号,
              HInterID: data.hmainid,
              HDate: dayjs(data.日期).format("YYYY-MM-DD"),
              HSeOrderBillNo_M: data.销售订单号,
              HEmpID: data.HEmpID,
              HEmpName: data.业务员,
              HCusID: data.HCusID,
              HCusName: data.客户,
              HWHID: data.主仓库ID,
              HWHName: data.主发货仓库,
              HAddress: data.交货地址,
              HDeptName: data.部门,
              HDeptID: data.HDeptID,
              HCurID: data.HCurID,
              HCurName: data.币别,
              HSSID: data.HSSID,
              HSSName: data.结算方式,
              HExRate: data.汇率,
              HManagerName: data.主管,
              HManagerID: data.HManagerID,
              HSourceBillType: data.源单类型,
              HLinkMan: data.联系人,
              HLinkPhone: data.联系电话,
              //, "HConveyCompID": data.运输公司
              //, "HConveyTypeID": data.运输方式
              //, "HConveyMoney": data.运费
              //, "HDFflag": data.是否垫付
              HProjectID: data.HProjectID,
              HProjectNumber: data.项目编码,
              HProjectName: data.项目名称,
            this.form = {
              ...{
                HBillNo: data.单据号,
                HInterID: data.hmainid,
                HDate: dayjs(data.日期).format("YYYY-MM-DD"),
                HSeOrderBillNo_M: data.销售订单号,
                HEmpID: data.HEmpID,
                HEmpName: data.业务员,
                HCusID: data.HCusID,
                HCusName: data.客户,
                HWHID: data.主仓库ID,
                HWHName: data.主发货仓库,
                HAddress: data.交货地址,
                HDeptName: data.部门,
                HDeptID: data.HDeptID,
                HCurID: data.HCurID,
                HCurName: data.币别,
                HSSID: data.HSSID,
                HSSName: data.结算方式,
                HExRate: data.汇率,
                HManagerName: data.主管,
                HManagerID: data.HManagerID,
                HSourceBillType: data.源单类型,
                HLinkMan: data.联系人,
                HLinkPhone: data.联系电话,
                //, "HConveyCompID": data.运输公司
                //, "HConveyTypeID": data.运输方式
                //, "HConveyMoney": data.运费
                //, "HDFflag": data.是否垫付
                HProjectID: data.HProjectID,
                HProjectNumber: data.项目编码,
                HProjectName: data.项目名称,

              Box2: "",
              HRemark: data.表头备注,
              HMaker: data.制单人,
              HChecker: data.审核人,
              HCloseMan: data.关闭人,
              HMakeDate: data.制单日期,
              HCheckDate: data.审核日期,
              HCloseDate: data.关闭日期,
              HUpDateDate: data.修改日期,
              HDeleteDate: data.作废日期,
            });
                Box2: "",
                HRemark: data.表头备注,
                HMaker: data.制单人,
                HChecker: data.审核人,
                HCloseMan: data.关闭人,
                HMakeDate: data.制单日期,
                HCheckDate: data.审核日期,
                HCloseDate: data.关闭日期,
                HUpDateDate: data.修改日期,
                HDeleteDate: data.作废日期,
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();

 src/views/sell/xsSeOrderBill/xsSeOrderBillEdit.vue

@@ -1046,61 +1046,63 @@
            var result = response.data;
            var data = response.data.data[0];
            this.form.BillType = data.HSourceBillType;
            Object.assign(this.form, {
              HBillNo: data.单据号,
              HDate: dayjs(data.日期).format("YYYY-MM-DD"),
              HInnerBillNo: data.辅助字段,
              HAddress: data.交货地址,
              HDeptID: data.HDeptID,
              HDeptName: data.部门,
              HCusID: data.HCusID,
              HCusName: data.客户,
              HEmpID: data.HEmpID,
              HEmpName: data.业务员,
              HCurID: data.HCurID,
              HCurName: data.币别,
              HExRate: data.汇率,
              HEarnestRate: data.定金比例,
              HBillSubType: data.HBillSubType,
              HManagerID: data.HManagerID,
              HManagerName: data.主管,
              HSellSID: data.HSellSID,
              HSellSName: data.销售方式,
              HSSID: data.HSSID,
              HSSName: data.结算方式,
              HSSDate: dayjs(data.结算日期).format("YYYY-MM-DD"),
              HPayCusID: data.HPayCusID,
              HPayCusName: data.结算方,
              HLinkMan: data.联系人,
              HExplanation: data.摘要,
              HLinkPhone: data.联系电话,
              HProjectID: data.HProjectID,
              HProjectNumber: data.项目编码,
              HProjectName: data.项目名称,
              HWHID: data.主仓库id,
              HWHName: data.主仓库,
              HProductType: data.产品类型,
              HCreditRating_Now: data.HCreditRating_Now,
              HRemark: data.表头备注,
              HMaker: data.制单人,
              HMakeDate:
                data.制单人 == "" ? "" : dayjs(data.制单日期).format("YYYY-MM-DD"),
              HUpDater: data.修改人,
              HUpDateDate:
                data.修改人 == "" ? "" : dayjs(data.修改日期).format("YYYY-MM-DD"),
              HChecker: data.审核人,
              HCheckDate:
                data.审核人 == "" ? "" : dayjs(data.审核日期).format("YYYY-MM-DD"),
              HCloseMan: data.关闭人,
              HCloseDate:
                data.关闭人 == "" ? "" : dayjs(data.关闭日期).format("YYYY-MM-DD"),
              HDeleteMan: data.作废人,
              HDeleteDate:
                data.作废人 == "" ? "" : dayjs(data.作废日期).format("YYYY-MM-DD"),
              HChangeMan: data.变更人,
              HChangeDate:
                data.变更人 == "" ? "" : dayjs(data.变更日期).format("YYYY-MM-DD"),
            });
            this.form = {
              ...{
                HBillNo: data.单据号,
                HDate: dayjs(data.日期).format("YYYY-MM-DD"),
                HInnerBillNo: data.辅助字段,
                HAddress: data.交货地址,
                HDeptID: data.HDeptID,
                HDeptName: data.部门,
                HCusID: data.HCusID,
                HCusName: data.客户,
                HEmpID: data.HEmpID,
                HEmpName: data.业务员,
                HCurID: data.HCurID,
                HCurName: data.币别,
                HExRate: data.汇率,
                HEarnestRate: data.定金比例,
                HBillSubType: data.HBillSubType,
                HManagerID: data.HManagerID,
                HManagerName: data.主管,
                HSellSID: data.HSellSID,
                HSellSName: data.销售方式,
                HSSID: data.HSSID,
                HSSName: data.结算方式,
                HSSDate: dayjs(data.结算日期).format("YYYY-MM-DD"),
                HPayCusID: data.HPayCusID,
                HPayCusName: data.结算方,
                HLinkMan: data.联系人,
                HExplanation: data.摘要,
                HLinkPhone: data.联系电话,
                HProjectID: data.HProjectID,
                HProjectNumber: data.项目编码,
                HProjectName: data.项目名称,
                HWHID: data.主仓库id,
                HWHName: data.主仓库,
                HProductType: data.产品类型,
                HCreditRating_Now: data.HCreditRating_Now,
                HRemark: data.表头备注,
                HMaker: data.制单人,
                HMakeDate:
                  data.制单人 == "" ? "" : dayjs(data.制单日期).format("YYYY-MM-DD"),
                HUpDater: data.修改人,
                HUpDateDate:
                  data.修改人 == "" ? "" : dayjs(data.修改日期).format("YYYY-MM-DD"),
                HChecker: data.审核人,
                HCheckDate:
                  data.审核人 == "" ? "" : dayjs(data.审核日期).format("YYYY-MM-DD"),
                HCloseMan: data.关闭人,
                HCloseDate:
                  data.关闭人 == "" ? "" : dayjs(data.关闭日期).format("YYYY-MM-DD"),
                HDeleteMan: data.作废人,
                HDeleteDate:
                  data.作废人 == "" ? "" : dayjs(data.作废日期).format("YYYY-MM-DD"),
                HChangeMan: data.变更人,
                HChangeDate:
                  data.变更人 == "" ? "" : dayjs(data.变更日期).format("YYYY-MM-DD"),
              },
            };
            if (this.copyType == 1) {
              this.getHBillNo();
              let date = new Date();