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

qq_41295110

2025-11-21 44ae944c5aac9b55219baeeaa172d7c4817c1879

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

 .env.development

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

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

 .env.production

@@ -7,3 +7,5 @@
# 智云迈思L-MOM管理系统/生产环境
VUE_APP_BASE_API = 'http://47.96.97.237/API/'

# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 .env.staging

@@ -9,4 +9,7 @@
ENV = 'staging'

# 智云迈思L-MOM管理系统/测试环境
VUE_APP_BASE_API = '/stage-api'
VUE_APP_BASE_API = 'http://192.168.0.51:81/API/'

# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true

 src/router/index.js

@@ -198,7 +198,7 @@
    children: [
      {
        path: "/purchase/POStockInBill/POStockInBillList",

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

        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
        name: "POStockInBillEdit",
        meta: {
          title: "采购入库单编辑",
@@ -398,7 +398,7 @@
    },
    children: [
      {
        path: "/purchase/PoInStock/cgPoInStockBill",
        path: "/purchase/PoInStock/cgPoInStockBillList",
        component: () =>
          import("@/views/purchase/cgPoInStockBill/cgPoInStockBill"),
        name: "CgPoInStockBillList",

 src/views/ICMO/ScICMOBillList.vue

@@ -722,7 +722,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "ScICMOBillList",
  components: { RowSettings },
  props: {
    openPage: { type: String },
@@ -731,7 +731,7 @@
    return {
      iframeUrl: "",
      activeSeach: "",
      HModName: "Cg_POOrderBillList",
      HModName: "Sc_ICMOBillList",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -740,7 +740,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "3710",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -793,7 +793,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -1082,7 +1081,7 @@
          {
            params: {
              sWhere: this.sWhere,
              user: this.user,
              user: sessionStorage["HUserName"],
              Organization: Organization,
              page: this.page,
              size: this.pageSize,
@@ -1172,7 +1171,12 @@
            }
          }
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
          this.DisPlay_HideColumn(
            this.HModName,
            sessionStorage["HUserName"],
            option,
            this.dataList
          );
        }
      } catch (err) {
        this.$modal.msgError(`获取收料通知单错误: ${err}`);
@@ -1474,7 +1478,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1564,7 +1568,7 @@
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  user: this.user,
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
@@ -1590,7 +1594,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            TypeError: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1615,7 +1623,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1643,7 +1651,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1669,7 +1677,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1691,7 +1699,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1757,7 +1769,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

 src/views/basic/gyEmployee/gyEmployee.vue

@@ -509,7 +509,7 @@
  data() {
    return {
      activeSeach: "",
      HModName: "Gy_Employee",
      HModName: "Gy_EmployeeList",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -517,7 +517,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1205",
      HBillType: "Gy_EmployeeList",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -649,7 +649,8 @@
    };
  },
  created() {
    this.fetchData();
    // this.fetchData();
    this.handleQuery();
    this.riqiChange();
  },
  methods: {
@@ -769,33 +770,6 @@
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((response) => {
          let data = response.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((response) => {
              if (response.data.count == 1) {
                this.organizationList = response.data.data; //组织列表
              }
              this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    getList() {
      this.tableShow = false;
      this.loading = true;
@@ -809,7 +783,7 @@
        .get(this.baseURL + "/Gy_Employee/listPage", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            Organization: "浙江智云迈思",
            page: this.page,
            size: this.pageSize,
@@ -900,7 +874,12 @@
              }
            }
            option.data = result;
            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
            this.DisPlay_HideColumn(
              this.HModName,
              sessionStorage["HUserName"],
              option,
              this.dataList
            );
          }
        })
        .catch((error) => {
@@ -1208,7 +1187,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1289,7 +1268,10 @@
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "DeltetGy_Employee", {
                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
                params: {
                  HItemID: this.rowForm.HItemID.toString(),
                  user: sessionStorage["HUserName"],
                },
              })
              .then((response) => {
                if (response.data.count == 1) {
@@ -1314,7 +1296,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1335,7 +1321,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1401,7 +1391,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

 src/views/basic/gyStockPlace/gyStockPlace.vue

@@ -488,7 +488,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API,
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -709,37 +708,6 @@
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((response) => {
          let data = response.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;

          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((response) => {
              if (response.data.count == 1) {
                this.organizationList = response.data.data; //组织列表
                this.queryParams.HOrgName = response.data.data.find(
                  (e) => e.ID == data.HUSEORGID
                )?.Name;
              }
              this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    getList() {
      this.tableShow = false;
      this.loading = true;
@@ -753,7 +721,7 @@
        .get(this.baseURL + "/Gy_StockPlace/list2Page", {
          params: {
            sWhere: `${this.sWhere}`,
            user: this.user,
            user: sessionStorage["HUserName"],
            page: this.page,
            size: this.pageSize,
          },
@@ -842,7 +810,12 @@
              }
            }
            option.data = result;
            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
            this.DisPlay_HideColumn(
              this.HModName,
              sessionStorage["HUserName"],
              option,
              this.dataList
            );
          }
        })
        .catch((error) => {
@@ -1152,7 +1125,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1235,7 +1208,10 @@
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Deltet_Gy_StockPlace", {
                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
                params: {
                  HItemID: this.rowForm.HItemID.toString(),
                  user: sessionStorage["HUserName"],
                },
              })
              .then((response) => {
                if (response.data.count == 1) {
@@ -1305,7 +1281,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",

 src/views/basic/gyWarehouse/gyWarehouse.vue

@@ -1,106 +1,199 @@
<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.HOrgName" placeholder="请选择" class="ForFilteringSchemes">
            <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.Name">
          <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.toString()"
            >
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="同步" :inline="true">
          <el-input v-model="queryParams.HSyncNumber" placeholder="请输入仓库代码" @keyup.enter.native="handleSync">
          <el-input
            v-model="queryParams.HSyncNumber"
            placeholder="请输入仓库代码"
            @keyup.enter.native="handleSync"
          >
            <el-button slot="append" type="primary" @click="handleSync">同步</el-button>
          </el-input>
        </el-form-item>
      </el-row>
      <el-form-item label-width="78px">
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
          搜 索</el-button>
        <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false">取 消</el-button>
          搜 索</el-button
        >
        <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false"
          >取 消</el-button
        >
      </el-form-item>
      <el-collapse v-model="activeSeach">
        <el-collapse-item title="更多" name="1">
          <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" 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-form-item>
              </el-row>
              <el-row>
                <el-form-item label-width="0">
                  <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 comparatorList" :key="index">
                        <el-option :label="item.label" :value="item.value" v-if="!item.hide"></el-option>
                        <el-option
                          :label="item.label"
                          :value="item.value"
                          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-form-item>
              </el-row>
              <el-row>
                <el-form-item label-width="0">
                  <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>
                </el-form-item>
              </el-row>
            </div>
          </el-card>
        </el-collapse-item>
@@ -109,64 +202,158 @@

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">导入</el-button>
        <el-button
          type="primary"
          icon="el-icon-download"
          size="mini"
          @click="handleImport"
          >导入</el-button
        >
      </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" class="zy-hidden">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">搜 索</el-button>
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
          >搜 索</el-button
        >
      </el-col>
      <el-col :span="1.5" class="zy-hidden">
        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重 置</el-button>
        <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> -->
    </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">
@@ -185,10 +372,26 @@
          </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
@@ -210,18 +413,35 @@
          ref="editRef"
        />
      </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="仓库代码" align="center" width="120" />
          <el-table-column label="仓库名称" prop="仓库名称" align="center" width="120" />
@@ -231,13 +451,24 @@
          <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>
@@ -260,7 +491,7 @@
      editRef: null,
      activeSeach: "",
      HModName: "Gy_Warehouse",
      activeSeach: '',
      activeSeach: "",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -313,12 +544,11 @@
      openData: false, //数据弹窗
      dialogTitle: "",
      zuzhiId: "",
      organizationList: [], //组织列表
      organizationList: JSON.parse(sessionStorage["organizationList"]), //组织列表
      subDisabled: false, //编辑页面保存按钮是否禁用(true禁用，false可用)
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API,
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -337,7 +567,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -400,7 +630,7 @@
    };
  },
  created() {
    this.getList();
    this.handleQuery();
    this.riqiChange();
  },
  methods: {
@@ -539,33 +769,6 @@
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((response) => {
          let data = response.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((response) => {
              if (response.data.count == 1) {
                this.organizationList = response.data.data; //组织列表
              }
              this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    getList() {
      this.tableShow = false;
      this.loading = true;
@@ -579,7 +782,7 @@
        .get(this.baseURL + "/Gy_WareHouse/listpage", {
          params: {
            sWhere: `${this.sWhere}`,
            user: this.user,
            user: sessionStorage["HUserName"],
            Organization: "浙江智云迈思",
            page: this.page,
            size: this.pageSize,
@@ -669,7 +872,12 @@
              }
            }
            option.data = result;
            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
            this.DisPlay_HideColumn(
              this.HModName,
              sessionStorage["HUserName"],
              option,
              this.dataList
            );
          }
        })
        .catch((error) => {
@@ -825,14 +1033,14 @@
    handleRowClick(row, column, event) {
      this.lastSelectedRow = this.selectedRow; // 记录上一次选中的行
      this.selectedRow = row; // 记录当前选中的行
      if (this.checkIsIframe) {
      if (this.checkIsIframe()) {
        // 将当前选中的数据暴露到window中
        window.selectedRow = row;
      }
      this.lastSelectedRowIndex = this.tableData.indexOf(row);
      this.$refs.tableData.toggleRowSelection(row);
      if (this.openPage) {
        this.$emit('deptEmit', row, 2)
        this.$emit("deptEmit", row, 2);
      }
    },
    //选中行高亮样式
@@ -849,17 +1057,16 @@
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      // if (this.checkIsIframe) {
      //   // IFrame 双击 返回当前双击的数据
      //   window.parent.iframeWareHouseCallBack(row);
      //   return;
      // }
      if (this.checkIsIframe()) {
        // IFrame 双击 返回当前双击的数据
        window.parent.iframeWareHouseCallBack(row);
        return;
      }
      this.OperationType = 3;
      if (this.openPage) {
        this.$emit('deptEmitDb', row, 2)
      }
      else {
      this.handleEdit();
        this.$emit("deptEmitDb", row, 2);
      } else {
        this.handleEdit();
      }
    },
    // 多选框选中数据
@@ -868,21 +1075,19 @@
      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);
        this.single = selection.length != 1;
        this.multiple = !selection.length;
        if (!this.single) {
          this.rowForm = selection[0];
        }
      }
      }
    },
    //打开侧边搜索弹窗
@@ -968,8 +1173,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()
@@ -994,7 +1201,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1076,7 +1283,10 @@
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "/DeltetGy_Warehouse", {
                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
                params: {
                  HItemID: this.rowForm.HItemID.toString(),
                  user: sessionStorage["HUserName"],
                },
              })
              .then((response) => {
                if (response.data.count == 1) {
@@ -1093,7 +1303,7 @@
            this.$modal.msgError("此条数据不是创建状态,无法删除!");
          }
        })
        .catch(() => { });
        .catch(() => {});
    },
    // 反审核/审核数据
    set_CheckBill(num, form) {
@@ -1101,7 +1311,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1122,7 +1336,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1188,7 +1406,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
@@ -1224,7 +1442,7 @@
            return deleteList.indexOf(item.index) == -1;
          });
        })
        .catch(() => { });
        .catch(() => {});
    },
    getPage(page, list) {
      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1239,6 +1457,7 @@
        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
      }, 100);
    },
  },
};
</script>
<style>
@@ -1246,7 +1465,7 @@
  width: 100%;
}

.form-item-inline>.el-form-item__content {
.form-item-inline > .el-form-item__content {
  display: flex;
  flex-direction: row;
}

 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue

@@ -608,7 +608,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "cgPoInStockBill",
  components: { RowSettings, gySource },
  props: {
    openPage: { type: String },
@@ -618,7 +618,7 @@
      iframeUrl: "",
      activeSeach: "",
      dateRange: [],
      HModName: "Cg_POOrderBillList",
      HModName: "cgPoInStockBill",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -626,7 +626,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1103",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -676,7 +676,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -777,7 +776,8 @@
  },
  created() {
    this.riqiChange();
    this.getList();
    // this.getList();
    this.handleQuery();
  },
  beforeDestroy() {
    // 组件销毁时清理全局方法，避免内存泄漏
@@ -923,7 +923,7 @@
        let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            page: this.page,
            size: this.pageSize,
          },
@@ -1011,7 +1011,12 @@
            }
          }
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
          this.DisPlay_HideColumn(
            this.HModName,
            sessionStorage["HUserName"],
            option,
            this.dataList
          );
        }
      } catch (err) {
        this.$modal.msgError(`获取收料通知单错误: ${err}`);
@@ -1298,7 +1303,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1387,7 +1392,7 @@
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  user: this.user,
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
@@ -1413,7 +1418,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1438,7 +1447,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1466,7 +1475,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1492,7 +1501,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1514,7 +1523,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1580,7 +1593,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue

@@ -613,7 +613,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "Cg_POOrderBillList",
  components: { RowSettings, gySource },
  props: {
    openPage: { type: String },
@@ -630,7 +630,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1102",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -680,7 +680,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -781,7 +780,8 @@
  },
  created() {
    this.riqiChange();
    this.getList();
    // this.getList();
    this.handleQuery();
  },
  beforeDestory() {
    delete window.editGyClose;
@@ -926,7 +926,7 @@
        .get(this.baseURL + "/Cg_POOrderBill/page", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            page: this.page,
            size: this.pageSize,
          },
@@ -1015,7 +1015,12 @@
              }
            }
            option.data = result;
            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
            this.DisPlay_HideColumn(
              this.HModName,
              sessionStorage["HUserName"],
              option,
              this.dataList
            );
          }
        })
        .catch((error) => {
@@ -1317,7 +1322,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1400,7 +1405,10 @@
          if (!this.rowForm.审核人) {
            axios
              .get(this.baseURL + "Cg_POOrderBill/DeltetCg_POOrderBill", {
                params: { HInter: this.rowForm.HInterID.toString(), user: this.user },
                params: {
                  HInter: this.rowForm.HInterID.toString(),
                  user: sessionStorage["HUserName"],
                },
              })
              .then((response) => {
                if (response.data.count == 1) {
@@ -1425,7 +1433,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POOrderBill/AuditCg_POOrderBill", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1448,7 +1460,7 @@
          params: {
            HInterID: HInterID,
            Type: num,
            user: this.user,
            user: sessionStorage["HUserName"],
          },
        });

@@ -1475,7 +1487,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1499,7 +1511,7 @@
          params: {
            HInterID: HInterID,
            Type: num,
            user: this.user,
            user: sessionStorage["HUserName"],
          },
        });

@@ -1520,7 +1532,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((response) => {
          let result = response.data;
@@ -1586,7 +1602,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue

@@ -445,7 +445,7 @@
                }}</span>
                <el-button
                  type="text"
                  @click="handleEdit(row, (OperationType = 3))"
                  @click="handleDblclick1"
                  v-else-if="column.property == '单据号'"
                  >{{ row.单据号 }}</el-button
                >
@@ -660,7 +660,7 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      user: sessionStorage["HUserName"],
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -752,6 +752,17 @@
    this.getList();
  },
  methods: {
    handleDblclick1(){
      // 延迟执行第一个函数
      setTimeout(() => {
        this.handleRowClick();
      });
      
      // 延迟执行第二个函数（可以设置相同或不同的延迟时间）
      setTimeout(() => {
        this.handleDblclick();
      }, 300);
    },
    BillSync() {
      axios.get(`${this.baseURL}/Kf_ICStockBillMain/GetCStockBillList`, {
        params: { BillNo: this.form.HBillno2, BillType: 1403 },
@@ -1340,14 +1351,15 @@
    //退出
    close() {
      this.tableShow = true;
      this.editShow = false;
      this.openEdit = false;
      this.getList();
    },
    //打开新增组件弹窗
    handleAddEdit() {
     this.rowForm.hmainid = 0
      this.editShow = true
      this.openEdit = true
      this.editShow = true
    },
    //打开修改组件弹窗
    handleEdit() {
@@ -1358,10 +1370,13 @@
          this.$modal.msgError("请选择要编辑的数据!");
          return;
      }
        this.openEdit = true;
        this.editShow = true;
        this.openEdit = true;

      });
    },
    // 打开修改组件弹窗
   
    //关闭编辑页面
    editGyClose(val) {
      this.editShow = false;

 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue

@@ -723,37 +723,37 @@
          this.form.HExplanation =data.摘要
          this.form.HInnerBillNo= data.内部单据号
          
          //子表  赋值
          // for (var i = 0; i < result.data.length; i++) {
          //   this.editData.push(
          //     {
          //       "HMaterID": result.data[i].HMaterID
          //       , "物料代码": result.data[i].物料代码
          //       , "物料名称": result.data[i].物料名称
          //       , "规格型号": result.data[i].规格型号
          //       , "HUnitID": result.data[i].HUnitID
          //       , "计量单位": result.data[i].计量单位
          //       , "HQtyMust": result.data[i].应收数量
          //       , "HQty": result.data[i].实收数量
          //       , "HRemark": result.data[i].表体备注
          //       , "HPrice": result.data[i].单价
          //       , "HMoney": result.data[i].金额
          //       , "HOrderPrice": result.data[i].采购金额
          //       , "HWHID": result.data[i].HWHID
          //       , "收料仓库": result.data[i].收料仓库
          //       , "HSPID": result.data[i].HSPID
          //       , "仓位名称": result.data[i].仓位名称
          //       , "HBatchNo": result.data[i].批次
          //       , "HSourceBillNo": result.data[i].源单单号    //源单号
          //       , "HSourceBillType": result.data[i].源单类型   //源单类型
          //       , "HSourceInterID": result.data[i].源单主内码   //源单主内码
          //       , "HSourceEntryID": result.data[i].源单子内码     //源单子内码
          //       , "HTaxRate": result.data[i].税率
          //       , "HTaxPrice": result.data[i].含税单价
          //       , "HlineTotal": result.data[i].含税金额
          //     }
          //   )
          // }
          // 子表  赋值
          for (var i = 0; i < result.data.length; i++) {
            this.editData.push(
              {
                "HMaterID": result.data[i].HMaterID
                , "物料代码": result.data[i].物料代码
                , "物料名称": result.data[i].物料名称
                , "规格型号": result.data[i].规格型号
                , "HUnitID": result.data[i].HUnitID
                , "计量单位": result.data[i].计量单位
                , "HQtyMust": result.data[i].应收数量
                , "HQty": result.data[i].实收数量
                , "HRemark": result.data[i].表体备注
                , "HPrice": result.data[i].单价
                , "HMoney": result.data[i].金额
                , "HOrderPrice": result.data[i].采购金额
                , "HWHID": result.data[i].HWHID
                , "收料仓库": result.data[i].收料仓库
                , "HSPID": result.data[i].HSPID
                , "仓位名称": result.data[i].仓位名称
                , "HBatchNo": result.data[i].批次
                , "HSourceBillNo": result.data[i].源单单号    //源单号
                , "HSourceBillType": result.data[i].源单类型   //源单类型
                , "HSourceInterID": result.data[i].源单主内码   //源单主内码
                , "HSourceEntryID": result.data[i].源单子内码     //源单子内码
                , "HTaxRate": result.data[i].税率
                , "HTaxPrice": result.data[i].含税单价
                , "HlineTotal": result.data[i].含税金额
              }
            )
          }

          if (data.状态 != '创建' && this.copyType != 1) {
            this.$modal.msgError("此条数据不是创建状态，不能修改");

 src/views/sell/XsSeOutStockBackBillEdit.vue

@@ -414,7 +414,7 @@
import dayjs from "dayjs";

export default {
  name: "SellOutBill",
  name: "XsSeOutStockBackBillEdit",
  components: { Dept, Warehouse, Material, RowSettings },
  props: {
    OperationType: { type: Number },

 src/views/sell/XsSeOutStockBackBillList.vue

@@ -624,7 +624,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "XsSeOutStockBackBillList",
  components: { RowSettings },
  props: {
    openPage: { type: String },
@@ -632,7 +632,7 @@
  data() {
    return {
      activeSeach: "",
      HModName: "Cg_POOrderBillList",
      HModName: "XsSeOutStockBackBillList",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -641,7 +641,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1105",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -691,7 +691,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -953,7 +952,7 @@
        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBackBill/list_byPage", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            Organization: HOrgName,
            page: this.page,
            size: this.pageSize,
@@ -1042,7 +1041,12 @@
            }
          }
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
          this.DisPlay_HideColumn(
            this.HModName,
            sessionStorage["HUserName"],
            option,
            this.dataList
          );
        }
      } catch (err) {
        this.$modal.msgError(`获取收料通知单错误: ${err}`);
@@ -1335,7 +1339,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1424,7 +1428,7 @@
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  user: this.user,
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
@@ -1450,7 +1454,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            TypeError: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1475,7 +1483,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1503,7 +1511,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1529,7 +1537,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1551,7 +1559,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1617,7 +1629,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

 src/views/sell/XsSeOutStockBill.vue

@@ -66,7 +66,7 @@
              v-for="(item, index) in organizationList"
              :key="index"
              :label="item.Name"
              :value="item.ID"
              :value="item.ID.toString()"
            >
            </el-option>
          </el-select>
@@ -631,7 +631,7 @@
import dayjs from "dayjs";

export default {
  name: "GySource",
  name: "XsSeOutStockBill",
  components: { RowSettings },
  props: {
    openPage: { type: String },
@@ -640,7 +640,7 @@
    return {
      iframeUrl: "",
      activeSeach: "",
      HModName: "Cg_POOrderBillList",
      HModName: "XsSeOutStockBill",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -649,7 +649,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1402",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -699,7 +699,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -718,7 +717,7 @@
      dateRange: [],
      // 查询参数
      queryParams: {
        HOrgID: null,
        HOrgID: sessionStorage["OrganizationID"],
        HName: null,
        HNumber: null,
        Comparator1: "",
@@ -798,7 +797,6 @@
    };
  },
  created() {
    this.queryParams.HOrgID = sessionStorage["OrganizationID"];
    this.riqiChange();
    this.getList();
  },
@@ -954,13 +952,13 @@
        this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'";
      }
      let Organization = this.organizationList.find(
        (e) => (e.ID = this.queryParams.HOrgID)
        (e) => e.ID == this.queryParams.HOrgID
      )?.Name;
      try {
        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            Organization: Organization,
            page: this.page,
            size: this.pageSize,
@@ -1049,7 +1047,12 @@
            }
          }
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
          this.DisPlay_HideColumn(
            this.HModName,
            sessionStorage["HUserName"],
            option,
            this.dataList
          );
        }
      } catch (err) {
        this.$modal.msgError(`获取收料通知单错误: ${err}`);
@@ -1354,7 +1357,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1443,7 +1446,7 @@
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  user: this.user,
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
@@ -1469,7 +1472,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            TypeError: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1494,7 +1501,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1522,7 +1529,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1548,7 +1555,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1570,7 +1577,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1636,7 +1647,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",

 src/views/sell/XsSeOutStockBillEdit.vue

@@ -431,7 +431,7 @@
import dayjs from "dayjs";

export default {
  name: "SellOutBill",
  name: "XsSeOutStockBillEdit",
  components: { Dept, Warehouse, Material, RowSettings },
  props: {
    OperationType: { type: Number },

 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue

@@ -613,11 +613,9 @@
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import dayjs from "dayjs";
import { computed } from "vue";
import { watch } from "vue";

export default {
  name: "GySource",
  name: "xsSeOrderBill",
  components: { RowSettings },
  props: {
    openPage: { type: String },
@@ -626,7 +624,7 @@
    return {
      iframeUrl: "",
      activeSeach: "",
      HModName: "Cg_POOrderBillList",
      HModName: "xsSeOrderBill",
      editShow: false,
      openEdit: false,
      totalNameList: [],
@@ -635,7 +633,7 @@
      openPrintList: false,
      printListShow: false,
      HClassTag: "ForFilteringSchemes", //过滤条件的class类
      HBillType: "1202",
      HBillType: "1401",
      openBtnHide: false,
      btnHideShow: false,
      rowHideShow: false,
@@ -685,7 +683,6 @@
      OperationType: null, //保存类型（新增1修改3）
      HInterID: null,
      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
      user: "admin",
      currentRow: [],
      lastSelectedRowIndex: null, // 用于记录上次点击的行索引
      lastSelectedRow: null, // 上一次选中的行
@@ -919,35 +916,6 @@
      this.dbEmitData(this.deptform, this.dialogTypeNum);
      this.deptform = {};
    },
    fetchData() {
      //登录用户信息
      axios
        .get(
          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
        )
        .then((res) => {
          let data = res.data.data[0];
          this.zuzhiId = data.HUSEORGID; //根据登录用户获取默认的组织ID
          this.queryParams.HOrgID = data.HUSEORGID;
          this.user = data.Czymc;
          axios
            .get(this.baseURL + "/Web/GetOrganizations", {})
            .then((res) => {
              if (res.data.count == 1) {
                this.organizationList = res.data.data; //组织列表
              }

              this.handleQuery();
              // this.getList();
            })
            .catch((error) => {
              this.$modal.msgError("接口请求失败!");
            });
        })
        .catch((error) => {
          this.$modal.msgError("接口请求失败!");
        });
    },
    async getList() {
      this.tableShow = false;
      this.loading = true;
@@ -965,7 +933,7 @@
        let res = await axios.get(this.baseURL + "Xs_SeOrderBill/list_ByPage", {
          params: {
            sWhere: this.sWhere,
            user: this.user,
            user: sessionStorage["HUserName"],
            Organization: sessionStorage["Organization"],
            page: this.page,
            size: this.pageSize,
@@ -1054,7 +1022,12 @@
            }
          }
          option.data = result;
          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
          this.DisPlay_HideColumn(
            this.HModName,
            sessionStorage["HUserName"],
            option,
            this.dataList
          );
        }
      } catch (err) {
        this.$modal.msgError(`获取收料通知单错误: ${err}`);
@@ -1354,7 +1327,7 @@
        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
          params: {
            HModName: this.HModName,
            user: this.user,
            user: sessionStorage["HUserName"],
            HOrgID: this.zuzhiId,
          },
        })
@@ -1442,7 +1415,7 @@
                  HQty: this.rowForm.HQty,
                  HSourceInterID: this.rowForm.HSourceInterID,
                  HSourceEntryID: this.rowForm.HSourceEntryID,
                  user: this.user,
                  user: sessionStorage["HUserName"],
                },
              })
              .then((res) => {
@@ -1468,7 +1441,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsAudit: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1493,7 +1470,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1521,7 +1498,7 @@
              HInterID: HInterID,
              HEntryID: HEntryID,
              ISAudit: num,
              CurUserName: this.user,
              CurUserName: sessionStorage["HUserName"],
            },
          }
        );
@@ -1547,7 +1524,7 @@
            params: {
              HInterID: HInterID,
              Type: num,
              user: this.user,
              user: sessionStorage["HUserName"],
            },
          }
        );
@@ -1569,7 +1546,11 @@
      //逻辑审核方法
      axios
        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
          params: {
            HInterID: InterID,
            IsStop: num,
            CurUserName: sessionStorage["HUserName"],
          },
        })
        .then((res) => {
          let result = res.data;
@@ -1635,7 +1616,7 @@
        }
      }
      var sSubStr = JSON.stringify(num);
      var sMainSub = sSubStr + "&和" + this.user;
      var sMainSub = sSubStr + "&和" + sessionStorage["HUserName"];
      axios({
        method: "post",
        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",