From 7570f18ad0164dcb9bb71808f68e89053aaa2bbf Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 14 十一月 2025 16:14:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/basic/gy/gySupplierEdit.vue                  | 1250 ++++++
 src/views/sell/XsSeOutStockBackBillList.vue            |   23 
 src/views/gyWarehouse/index.vue                        | 1450 +++++++
 src/views/basic/gyStockPlace/gyStockPlace.vue          |    9 
 src/views/component/dept/index.vue                     |   12 
 src/views/gyStockPlace/index.vue                       | 1348 ++++++
 src/views/sell/XsSeOutStockBill.vue                    |   25 
 src/views/basic/gy/gyDepartmentEdit.vue                |  616 +++
 src/views/basic/gyEmployee/gyEmployee.vue              |  532 -
 src/views/gyStockPlace/edit/index.vue                  |  486 ++
 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue         |   72 
 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue |   17 
 src/views/basic/gy/gyDepartment.vue                    |  929 ++++
 src/store/modules/permission.js                        |  128 
 src/views/basic/gyEmployee/gyEmployeeEdit.vue          |   50 
 src/views/gyEmployee/index.vue                         | 1448 +++++++
 src/router/index.js                                    |  101 
 src/views/basic/gyWarehouse/gyWarehouse.vue            |   36 
 src/views/basic/gy/gySupplier.vue                      |  984 +++++
 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue     |    9 
 .env.development                                       |    4 
 src/views/gyEmployee/edit/index.vue                    | 1310 ++++++
 src/views/ICMO/ScICMOBillList.vue                      |   41 
 src/main.js                                            |    4 
 src/views/sell/sellOut/sellOutBillEdit.vue             |   76 
 src/views/gyWarehouse/edit/index.vue                   |  616 +++
 26 files changed, 10,941 insertions(+), 635 deletions(-)

diff --git a/.env.development b/.env.development
index a0c89aa..233f7a7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@
 ENV = 'development'
 
 # 鏅轰簯杩堟�滾-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
diff --git a/src/main.js b/src/main.js
index 685b0da..3ffc498 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,10 +1,7 @@
 import Vue from 'vue'
-
 import Cookies from 'js-cookie'
-
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
-
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 import App from './App'
@@ -13,7 +10,6 @@
 import directive from './directive' // directive
 import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
-
 import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data"
diff --git a/src/router/index.js b/src/router/index.js
index e7a28ef..78552fa 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -41,31 +41,26 @@
       },
     ],
   },
-  //鐧诲綍
   {
     path: "/login",
     component: () => import("@/views/login"),
     hidden: true,
   },
-  //娉ㄥ唽
   {
     path: "/register",
     component: () => import("@/views/register"),
     hidden: true,
   },
-  //404
   {
     path: "/404",
     component: () => import("@/views/error/404"),
     hidden: true,
   },
-  //401
   {
     path: "/401",
     component: () => import("@/views/error/401"),
     hidden: true,
   },
-  //棣栭〉
   {
     path: "",
     component: Layout,
@@ -79,7 +74,6 @@
       },
     ],
   },
-  //涓汉涓績
   {
     path: "/user",
     component: Layout,
@@ -94,43 +88,27 @@
       },
     ],
   },
-  // //鐧诲綍璺宠浆椤�
-  // {
-  //   path: "/indexPage",
-  //   component: () => import("@/views/indexPage"),
-  //   hidden: true,
-  // },
   //閿�鍞嚭搴撳崟
-  // {
-  //   path: "/sales/salesOUt/sellOutBill",
-  //   component: () => import("@/views/sellOutBill/index"),
-  //   hidden: true,
-  // },
   {
-    path: "/sales/salesOUt/sellOutBill",
+    path: "/sell/sellOut/sellOutBill",
     component: Layout,
     hidden: true,
     // permissions: ["system:goods:add"],
     redirect: "noredirect",
     meta: {
       breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/sales/salesOUt", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+      activeMenu: "/sell/sellOut", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
     },
     children: [
       {
-        path: "/sales/salesOUt/sellOutBill",
-        component: () => import("@/views/sell/sellOutBill"),
+        path: "/sell/sellOut/sellOutBill",
+        component: () => import("@/views/sell/sellOut/sellOutBill"),
         name: "SellOutBill",
-        meta: { title: "閿�鍞嚭搴撳崟", activeMenu: "sales/salesOUt" },
+        meta: { title: "閿�鍞嚭搴撳崟", activeMenu: "sell/sellOut" },
       },
     ],
   },
   //閿�鍞嚭搴撳崟缂栬緫椤甸潰
-  // {
-  //   path: "/sellOutBillEdit",
-  //   component: () => import("@/views/sales/salesOUt/sellOutBill/edit/index"),
-  //   hidden: true,
-  // },
   {
     path: "/sell/sellOut/sellOutBillEdit",
     component: Layout,
@@ -168,61 +146,23 @@
       },
     ],
   },
-  //閲囪喘鍏ュ簱鍗�
-  {
-    path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
-    component: Layout,
-    hidden: true,
-    // permissions: ["system:goods:add"],
-    redirect: "noredirect",
-    meta: {
-      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/CaiGouGuanLi/CaiGouRuKu", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
-    },
-    children: [
-      {
-        path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList",
-        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
-        name: "Kf_POStockInBillList",
-        meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "CaiGouGuanLi/CaiGouRuKu" },
-      },
-    ],
-  },
-  //閲囪喘鍏ュ簱鍗曠紪杈戦〉闈�
-  {
-    path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit",
-    component: Layout,
-    hidden: true,
-    redirect: "noredirect",
-    meta: {
-      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
-    },
-    children: [
-      {
-        path: "/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit",
-        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
-        name: "SellOutBillEdit",
-        meta: { title: "閲囪喘鍏ュ簱鍗曠紪杈�", activeMenu: "/CaiGouGuanLi/CaiGouRuKu" },
-      },
-    ],
-  },
+
   //鐢熶骇璧勬簮
   {
-    path: "/basic/gy/gySource",
+    path: "/basic/production/gySource",
     component: Layout,
     hidden: true,
     redirect: "noredirect",
     meta: {
       breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
-      activeMenu: "/basic/gy/gySource", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+      activeMenu: "/basic/production/gySource", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
     },
     children: [
       {
-        path: "/basic/gy/gySource",
-        component: () => import("@/views/basic/gySource"),
+        path: "/basic/production/gySource",
+        component: () => import("@/views/basic/production/gySource.vue"),
         name: "GySource",
-        meta: { title: "鐢熶骇璧勬簮鍒楄〃", activeMenu: "basic/gy" },
+        meta: { title: "鐢熶骇璧勬簮鍒楄〃", activeMenu: "basic/production" },
       },
     ],
   },
@@ -431,6 +371,25 @@
     component: () => import("@/views/ICMO/ScICMOBillList.vue"),
     hidden: true,
   },
+  //渚涘簲鍟嗗垪琛�
+  {
+    path: "/basic/gy/gySupplier",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/basic/gy/gySupplier", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/basic/gy/gySupplier",
+        component: () => import("@/views/basic/gy/gySupplier.vue"),
+        name: "GySupplier",
+        meta: { title: "渚涘簲鍟嗗垪琛�", activeMenu: "basic/gy" },
+      },
+    ],
+  },
 ];
 
 // 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index d43a115..23d1b2d 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -44,8 +44,8 @@
               title: "閿�鍞鐞�",
             },
             hidden: false,
-            name: "Sales",
-            path: "/sales",
+            name: "Sell",
+            path: "/sell",
             redirect: "noRedirect",
             children: [
               {
@@ -56,8 +56,8 @@
                   title: "閿�鍞嚭搴撳崟",
                 },
                 hidden: false,
-                name: "SalesOUt",
-                path: "salesOUt",
+                name: "SellOut",
+                path: "sellOut",
                 redirect: "noRedirect",
                 component: "Layout",
                 children: [
@@ -210,8 +210,8 @@
                   title: "鐢熶骇璧勬枡",
                 },
                 hidden: false,
-                name: "Gy",
-                path: "gy",
+                name: "Production",
+                path: "production",
                 redirect: "noRedirect",
                 component: "Layout",
                 children: [
@@ -222,7 +222,8 @@
                       noCache: false,
                       title: "鐢熶骇璧勬枡鍒楄〃",
                     },
-                    component: () => import("@/views/basic/gySource/index.vue"),
+                    component: () =>
+                      import("@/views/basic/production/gySource.vue"),
                     hidden: false,
                     name: "GySource",
                     path: "gySource",
@@ -280,6 +281,31 @@
                     hidden: false,
                     name: "GyEmployee",
                     path: "gyEmployee",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "閮ㄩ棬鍒楄〃",
+                    },
+                    component: () =>
+                      import("@/views/basic/gy/gyDepartment.vue"),
+                    hidden: false,
+                    name: "GyDepartment",
+                    path: "gyDepartment",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "渚涘簲鍟嗗垪琛�",
+                    },
+                    component: () => import("@/views/basic/gy/gySupplier.vue"),
+                    hidden: false,
+                    name: "GySupplier",
+                    path: "gySupplier",
                   },
                 ],
               },
@@ -357,50 +383,6 @@
                   },
                 ],
               },
-              {
-                alwaysShow: true,
-                component: "Layout",
-                meta: {
-                  icon: "build",
-                  link: null,
-                  noCache: false,
-                  title: "绯荤粺绠＄悊",
-                },
-                hidden: false,
-                name: "System",
-                path: "/system",
-                redirect: "noRedirect",
-                children: [
-                  {
-                    meta: {
-                      icon: "build",
-                      link: null,
-                      noCache: false,
-                      title: "鐢ㄦ埛绠＄悊",
-                    },
-                    hidden: false,
-                    name: "User",
-                    path: "user",
-                    redirect: "noRedirect",
-                    component: "Layout",
-                    children: [
-                      {
-                        meta: {
-                          icon: "build",
-                          link: null,
-                          noCache: false,
-                          title: "鐢ㄦ埛鍒楄〃",
-                        },
-                        component: () =>
-                          import("@/views/system/user/xtUserList.vue"),
-                        hidden: false,
-                        name: "XtUserList",
-                        path: "xtUserList",
-                      },
-                    ],
-                  },
-                ],
-              },
             ],
           },
           {
@@ -446,6 +428,50 @@
               },
             ],
           },
+          {
+            alwaysShow: true,
+            component: "Layout",
+            meta: {
+              icon: "build",
+              link: null,
+              noCache: false,
+              title: "绯荤粺绠＄悊",
+            },
+            hidden: false,
+            name: "System",
+            path: "/system",
+            redirect: "noRedirect",
+            children: [
+              {
+                meta: {
+                  icon: "build",
+                  link: null,
+                  noCache: false,
+                  title: "鐢ㄦ埛绠＄悊",
+                },
+                hidden: false,
+                name: "User",
+                path: "user",
+                redirect: "noRedirect",
+                component: "Layout",
+                children: [
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鐢ㄦ埛鍒楄〃",
+                    },
+                    component: () =>
+                      import("@/views/system/user/xtUserList.vue"),
+                    hidden: false,
+                    name: "XtUserList",
+                    path: "xtUserList",
+                  },
+                ],
+              },
+            ],
+          },
         ];
         const sdata = JSON.parse(JSON.stringify(data));
         const rdata = JSON.parse(JSON.stringify(data));
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index d29ac19..7c13427 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -376,7 +376,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
-          @click="handleDelete((row = rowForm))"
+          @click="handleDelete"
           >鍒犻櫎
         </el-button>
       </el-col>
@@ -879,8 +879,7 @@
   },
   mounted() {},
   created() {
-    // this.form.Organization = sessionStorage["Organization"];
-    this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+    this.form.Organization = sessionStorage["Organization"];
     this.riqiChange();
     this.get_HProjectList();
     this.get_HDeptNameList();
@@ -1038,13 +1037,42 @@
       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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
       if (this.pageSize == 0) {
         this.pageSize = 50;
       }
-      // this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"];
 
       if (this.dateRange.length > 0) {
         this.sWhere +=
@@ -1530,14 +1558,13 @@
       (this.multiple = true), this.getList();
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      console.log(row);
+    handleDelete() {
       this.$modal
         .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
         .then(() => {
           if (!this.rowForm.瀹℃牳浜�) {
             axios
-              .get(this.baseURL + "/Sc_ICMOBill/DeltetSc_ICMOReportBill", {
+              .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                 params: {
                   HInter: this.rowForm.hmainid.toString(),
                   HsupId: this.rowForm.HsupId,
diff --git a/src/views/basic/gy/gyDepartment.vue b/src/views/basic/gy/gyDepartment.vue
new file mode 100644
index 0000000..edeec23
--- /dev/null
+++ b/src/views/basic/gy/gyDepartment.vue
@@ -0,0 +1,929 @@
+<template>
+  <div style="padding: 10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
+      <el-row>
+        <el-form-item label="閮ㄩ棬浠ｇ爜" prop="HNumber" style="margin-left: 100px;">
+          <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ラ儴闂ㄤ唬鐮�" @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="閮ㄩ棬鍚嶇О" prop="HName">
+          <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="缁勭粐">
+          <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨">
+            <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label-width="78px">
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+            鎼� 绱�</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="resetQuery">閲� 缃�</el-button>
+        </el-form-item>
+      </el-row>
+      <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-col :span="7">
+                    <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨">
+                      <span v-for="(item, index) in btList" :key="index">
+                        <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="璇烽�夋嫨">
+                      <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" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <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="璇烽�夋嫨">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <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" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨">
+                      <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="璇烽�夋嫨">
+                      <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" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <el-col :span="1.5">
+        <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-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-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-col>
+      <el-col :span="1.5">
+        <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-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-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-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-col>
+      <el-col :span="1.5">
+        <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-col>
+    </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">
+        <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">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{
+                    row.鍗曟嵁鍙�
+                  }}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+        @pagination="getList" />
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <el-dialog title="缂栬緫鐢熶骇璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+        @close="close">
+        <edit :OperationType=OperationType :linterid=this.rowForm.HItemID :HSouceBillType=this.rowForm.HSourceBillType
+          :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
+      </el-dialog>
+      <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-button type="primary">鏂囦欢涓婁紶</el-button>
+          </el-upload>
+        </div>
+        <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="鎿嶄綔" align="center">
+            <template slot-scope="scope">
+              <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" />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/basic/gy/gyDepartmentEdit.vue'
+
+export default {
+  name: 'GyDepartment',
+  components: { RowSettings, Edit },
+  props: {
+    openPage: { type: String, },
+  },
+  data() {
+    return {
+      activeSeach: '',
+      HModName: 'Gy_DepartmentList',
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      // HBillType: '1205',
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      dialogTitle: '',
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      activeName: 'first',
+
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HOrgID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: ["HItemID", "HUSEORGID", "HEmpID", "璐熻矗浜�"],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {},
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞�
+        open: false,
+        // 寮瑰嚭灞傛爣棰�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        // headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: process.env.VUE_APP_BASE_API + "/Gy_Source/Gy_Source_Excel"
+      },
+      uploadData: [],
+      alluploadList: [],
+      uploadTableLoading: false,
+      uploadPageSizes: [50, 100, 500, 5000, 50000],
+      uploadPage: 1,
+      uploadPageSize: 50,
+      uploadTotal: 0,
+    };
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    //鍒楄〃鏁版嵁
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"]-0
+      this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
+      //鐢熶骇璧勬枡鍒楄〃
+      axios.get(this.baseURL + '/Gy_Department/list', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "Organization": sessionStorage["Organization"],
+          "page": this.page,
+          "size": this.pageSize
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁＄畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          this.dataList = option
+          option.data = data1.data;
+          var result = data1.data;
+          var temp = "";
+          for (var i = 0; i < result.length; i++) {
+            if (temp != result[i]["HItemID"]) {
+              temp = result[i]["HItemID"];
+            } else {
+              result[i].鏃ユ湡 = null;
+              result[i].鍗曟嵁鍙� = "";
+              /*result[i].鐘舵�� = "";*/
+              result[i].绾㈣摑鍗曟爣璁� = "";
+              result[i].hsupid = "";
+              result[i].瀹㈡埛 = "";
+              result[i].HEmpID = "";
+              result[i].涓氬姟鍛� = "";
+              result[i].hmanagerid = "";
+              result[i].涓荤 = "";
+              result[i].hsecmanagerid = "";
+              result[i].鍙戣揣浜� = "";
+              result[i].hkeeperid = "";
+              result[i].淇濈鍛� = "";
+              result[i].HDeptID = "";
+              result[i].閮ㄩ棬 = "";
+              result[i].閿�鍞柟寮� = "";
+            }
+          }
+          option.data = result;
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {
+        let data1 = res.data
+        if (data1.data.length != 0) {
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.HItemID)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 3
+      this.handleEdit()
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map(item => item.HItemID)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HNumber) {
+        this.sWhere += " and 閮ㄩ棬浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+      }
+      if (this.queryParams.HName) {
+        this.sWhere += " and 閮ㄩ棬鍚嶇О like '%" + this.queryParams.HName + "%'";
+      }
+      if (this.queryParams.HOrgID) {
+        this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'"
+      }
+      // this.sWhere += this.addSWhereByOpenType()
+      // this.sWhere += this.getOrgIDByUser()
+      this.getList()
+
+    },
+    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+    addSWhereByOpenType() {
+      //鑾峰彇鍙傛暟
+      var sWhere = "";
+      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+      if (this.openPage) {
+        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''"
+        return sWhere;
+      }
+      return sWhere;
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+    getOrgIDByUser() {
+      var res = "";
+      axios.get(this.baseURL + '/Xt_User/getOrgIDListByUser', {
+        params: {
+          HModName: this.HModName,
+          user: sessionStorage["HUserName"],
+          HOrgID: sessionStorage["OrganizationID"]
+        },
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          if (result.data[0].sWhere == "1") {
+            res = " and HUSEORGID = '" + sessionStorage["OrganizationID"] + "'";
+          } else {
+            res = result.data[0].sWhere;
+          }
+        }
+      }).catch(error => {
+        res = " and 1 = 0";
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      return res;
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HOrgID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.resetForm("queryForm")
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      this.tableShow = true
+      this.openEdit = false
+       this.editShow= false
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.HItemID = 0
+      this.$nextTick(() => {
+        this.openEdit = true
+        this.editShow = true
+      })
+
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit() {
+      this.$nextTick(() => {
+        this.openEdit = true
+        this.editShow = true
+      })
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editGyClose(val) {
+      this.editShow = false
+      this.openEdit = false
+      this.multiple = true,
+        this.getList()
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        if (!this.rowForm.瀹℃牳浜�) {
+          axios.get(this.baseURL + "DeltetGy_Source", {
+            params: { 'HItemID': this.rowForm.HItemID.toString(), 'user': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+        } else {
+          this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+        }
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+        params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 鍙嶇鐢�/绂佺敤鏁版嵁
+    set_De_Stop(num, form) {
+      var InterID = form.HItemID || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
+        params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    handleImport() {
+      this.uploadData = []
+      this.upload.isUploading = false
+      this.upload.title = "瀵煎叆";
+      this.upload.open = true;
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadTableLoading = true
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      // this.upload.open = false;
+      this.upload.isUploading = true;
+      this.$refs.upload.clearFiles();
+      if (response.code == 1) {
+        this.alluploadList = response.data
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
+        this.uploadTotal = this.alluploadList.length
+        this.uploadTableLoading = false
+        // this.set_AddNew(response.data)
+      } else {
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.Message + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+      }
+
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    set_AddNew() {
+      var num = [];
+      for (var i = 0; i < this.uploadData.length; i++) {
+        if (this.uploadData[i] != "") {
+          num.push(this.uploadData[i])
+        }
+      }
+      var sSubStr = JSON.stringify(num);
+      var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+      axios({
+        method: 'post',
+        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+        data: {
+          'sMainSub': sMainSub
+        },
+      }).then(res => {
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + res.data.Message + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+        this.upload.open = false
+        this.getList()
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    uploadDataIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    uploadDataDelete(row) {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        const deleteList = [row.index]
+        const data = this.uploadData
+        this.uploadData = data.filter(item => {
+          return deleteList.indexOf(item.index) == -1
+        });
+      }).catch(() => { })
+    },
+    getPage(page, list) {
+      let sindex = (parseInt(page) - 1) * this.uploadPageSize
+      let eindex = parseInt(page) * this.uploadPageSize
+      let newList = list.slice(sindex, eindex)
+      console.log(newList)
+      return newList
+    },
+    currentPage(val) {
+      this.uploadPage = val.page
+      setTimeout(() => {
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
+      }, 100)
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/basic/gy/gyDepartmentEdit.vue b/src/views/basic/gy/gyDepartmentEdit.vue
new file mode 100644
index 0000000..cc6803e
--- /dev/null
+++ b/src/views/basic/gy/gyDepartmentEdit.vue
@@ -0,0 +1,616 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled"
+        >淇� 瀛�</el-button
+      >
+      <el-button
+        type="primary"
+        @click="set_CheckBill(0, form)"
+        :disabled="CheckBillDisabled"
+        >瀹� 鏍�</el-button
+      >
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+    </div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber">
+                <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-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍔╄鐮�" prop="HHelpCode">
+                <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜"> </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浠撳簱鍦板潃" prop="HAddress">
+                <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ヤ粨搴撳湴鍧�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鑱旂郴鐢佃瘽" prop="HPhone">
+                <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <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"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
+                <el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍚敤浠撲綅" prop="HSPFlag">
+                <el-checkbox v-model="form.HSPFlag">鏄惁鍚敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="璐熷簱瀛樻帶鍒舵爣璁�" prop="HStockCtrlFlag">
+                <el-checkbox v-model="form.HStockCtrlFlag">鏄惁鍚敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="缁勭粐" prop="HUSEORGID">
+                <el-select
+                  v-model="form.HUSEORGID"
+                  placeholder="璇烽�夋嫨缁勭粐"
+                  :disabled="zzSelDis"
+                >
+                  <el-option
+                    v-for="(item, index) in organizationList"
+                    :key="index"
+                    :label="item.Name"
+                    :value="item.ID"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍏朵粬淇℃伅" name="second">
+          <el-row>
+            <el-col :span="16">
+              <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item class="form-inline" label="浠撳簱绠＄悊鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨浠撳簱绠＄悊鍛�">
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍒涘缓浜�" prop="HMakeEmp">
+                <el-input v-model="form.HMakeEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤浜�" prop="HStopEmp">
+                <el-input v-model="form.HStopEmp" placeholder="璇疯緭鍏ョ鐢ㄤ汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀹℃牳浜�" prop="HCheckEmp">
+                <el-input v-model="form.HCheckEmp" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍒涘缓鏃ユ湡" prop="HMakeDate">
+                <el-date-picker
+                  v-model="form.HMakeDate"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤鏃ユ湡" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </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" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+      <Employee
+        @deptEmitDb="dbEmitData"
+        @deptEmit="emitData"
+        v-if="employeeShow"
+      ></Employee>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+import Warehouse from "@/views/component/warehouse";
+import Material from "@/views/component/material";
+import RowSettings from "@/views/component/rowSettings";
+import GyWorkCenter from "@/views/component/gyWorkCenter";
+import Employee from "@/views/component/employee";
+import moment from "moment";
+import dayjs from "dayjs";
+
+export default {
+  name: "gyWarehouse_Edit",
+  components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, Employee },
+  props: {
+    OperationType: { type: Number },
+    linterid: { type: Number },
+    HSouceBillType: { type: String },
+    copyType: { type: Number },
+  },
+  data() {
+    return {
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      zzSelDis: false,
+      rowHideShow: false,
+      openRowHide: false,
+      workCenterShow: false,
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      zbIndex: null,
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      employeeShow: false, // 浠撳簱绠＄悊鍛樼粍浠�
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: 0,
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      CheckBillDisabled: true,
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+
+      // 琛ㄥ崟鍙傛暟
+      form: {
+        HWarehouseType: "鐢熶骇浠撳簱",
+      },
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HNumber: [{ required: true, message: "浠撳簱浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
+        HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+        HWarehouseType: [
+          { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
+        ],
+      },
+
+      HWarehouseTypeList: [
+        {
+          Name: "鐢熶骇浠撳簱",
+        },
+        {
+          Name: "妯″叿浠撳簱",
+        },
+      ],
+    };
+  },
+  created() {
+    this.reset();
+    this.fetchData();
+  },
+  activated() {
+    this.reset();
+    this.fetchData();
+  },
+  methods: {
+    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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          this.user = data.Czymc;
+          axios
+            .get(this.baseURL + "/Web/GetOrganizations", {})
+            .then((response) => {
+              if (response.data.count == 1) {
+                this.organizationList = response.data.data; //缁勭粐鍒楄〃
+                this.getdata();
+              }
+            })
+            .catch((error) => {
+              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    getdata() {
+      this.reset();
+      console.log(this.OperationType);
+      if (this.OperationType != 1) {
+        this.zzSelDis = true;
+        axios
+          .get(this.baseURL + "/Gy_Warehouse/cx", {
+            params: {
+              HInterID: this.linterid,
+            },
+          })
+          .then((response) => {
+            console.log(response);
+            let result = response.data;
+            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"),
+              });
+              if (!data.HCheckEmp) {
+                this.CheckBillDisabled = false;
+              }
+            }
+            this.$nextTick(() => {
+              this.formShow = true;
+              this.formLoading = false;
+            });
+          })
+          .catch((error) => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      } else if (this.OperationType == 1) {
+        let date = new Date();
+        this.form.HMakeDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+        this.$nextTick(() => {
+          this.formShow = true;
+          this.formLoading = false;
+        });
+      }
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.openRowHide = val;
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      console.log(deptRow, num);
+      // num=1 浠撳簱绠＄悊鍛�
+      if (num == 1) {
+        this.form.HEmpID = deptRow.HItemID;
+        this.form.HEmpName = deptRow["鑱屽憳鍚嶇О"];
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum);
+      this.deptform = {};
+    },
+    deptClose() {
+      this.deptform = {};
+      this.openData = false;
+    },
+
+    //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HNumber: null,
+        HItemID: 0,
+        HName: null,
+        HHelpCode: null,
+        HWorkTimes: "0",
+        HMaxWorkTimes: "0",
+        HRelationID: "0",
+        HMinAdd: "0",
+        HClassCount: "0",
+        HOverTimes: "0",
+        HCenter: null,
+        HCenterID: null,
+        HGroup: null,
+        HGroupID: 0,
+        HDeptName: null,
+        HDeptID: 0,
+        HProcName: null,
+        HProcID: 0,
+        HProcNumber: null,
+        HStopflag: false,
+        HType: null,
+        HRemark: null,
+        HUseFlag: "鏈娴�",
+        HUSEORGID: this.zuzhiId,
+        HCREATEORGID: this.zuzhiId,
+        HMacAddr: null,
+        HEmpID: 0,
+        HEmpName: null,
+        HMakeEmp: this.user,
+        HMakeTime: null,
+        HStopEmp: null,
+        HStopTime: null,
+        HCheckEmp: null,
+        HCheckTime: null,
+        HPrimarySourceID: 0,
+        HPrimarySourceName: null,
+        HParentID: 0,
+        HCubicleQty: "1",
+        HProdLinePeopleNum: "0",
+      };
+      this.editData = [];
+      this.editBtData = [];
+      this.ids = [];
+      this.formShow = false;
+      this.subDisabled = false;
+      this.formLoading = true;
+      this.CheckBillDisabled = true;
+      this.activeName = "first";
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset();
+      this.formShow = false;
+      // console.log()
+      this.$emit("editCloseGy", 0);
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let fhck = false;
+          this.$nextTick(() => {
+            if (!fhck) {
+              console.log(4);
+              var sMainStr = JSON.stringify(this.form);
+              // var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ";" + this.user;
+              axios({
+                method: "post",
+                url: this.baseURL + "/Gy_Warehouse/ModifyByID",
+                data: {
+                  oMain: sMainSub,
+                },
+              })
+                .then((response) => {
+                  console.log(response);
+                  if (response.data.count == 1) {
+                    this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                    this.CheckBillDisabled = false;
+                    this.$modal.msgSuccess(response.data.Message);
+                  } else {
+                    this.$modal.msgError(response.data.Message);
+                    this.CheckBillDisabled = false;
+                    this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
+                  }
+                })
+                .catch((error) => {
+                  this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
+            }
+          });
+        }
+      });
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (this.rowForm.鐘舵�� == "鍒涘缓") {
+            axios
+              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+                params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.CheckBillDisabled = true;
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    showReset() {
+      this.deptShow = false;
+      this.warehouseShow = false;
+      this.materialShow = false;
+      this.workCenterShow = false;
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      if (row) {
+        this.zbIndex = row.index - 1;
+      }
+      this.showReset();
+      if (num == 1) {
+        this.dialogTitle = "浠撳簱绠＄悊鍛樺垪琛�";
+        this.employeeShow = true;
+        this.openData = true;
+      }
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+
+.form-inline > .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+}
+</style>
diff --git a/src/views/basic/gy/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
new file mode 100644
index 0000000..448b439
--- /dev/null
+++ b/src/views/basic/gy/gySupplier.vue
@@ -0,0 +1,984 @@
+<template>
+  <div style="padding: 10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="98px" class="searchBox">
+      <el-row>
+        <el-form-item label="渚涘簲鍟嗕唬鐮�" prop="HNumber" style="margin-left: 100px;">
+          <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヤ緵搴斿晢浠ｇ爜" @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="渚涘簲鍟嗗悕绉�" prop="HName">
+          <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" @keyup.enter.native="handleQuery" />
+        </el-form-item>
+        <el-form-item label="缁勭粐">
+          <el-select v-model="queryParams.HUSEORGID" placeholder="璇烽�夋嫨">
+            <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label-width="78px">
+          <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+            鎼� 绱�</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="resetQuery">閲� 缃�</el-button>
+        </el-form-item>
+      </el-row>
+      <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-col :span="7">
+                    <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨">
+                      <span v-for="(item, index) in btList" :key="index">
+                        <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="璇烽�夋嫨">
+                      <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" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <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="璇烽�夋嫨">
+                        <span v-for="(item, index) in btList" :key="index">
+                          <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" />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-row>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨">
+                      <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="璇烽�夋嫨">
+                      <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" />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+        </el-collapse-item>
+      </el-collapse>
+    </el-form>
+    <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
+      <el-col :span="1.5">
+        <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-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-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-col>
+      <el-col :span="1.5">
+        <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-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-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-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-col>
+      <el-col :span="1.5">
+        <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-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleBtnHide">鎸夐挳璁剧疆</el-button>
+      </el-col> -->
+    </el-row>
+    <div class="tableBox" v-loading="loading">
+      <el-row>
+        <el-col :span="4">
+          <el-tree :data="treeOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
+            @node-click="handleNodeClick" />
+        </el-col>
+        <el-col :span="20">
+          <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">
+                <template slot-scope="{row,  column }">
+                  <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+                  <div :style="item.style">
+                    <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}')
+                    }}</span>
+                    <el-button type="text" @click="handleEdit(row, OperationType = 3)"
+                      v-else-if="column.property == '渚涘簲鍟嗕唬鐮�'">{{
+                        row.渚涘簲鍟嗕唬鐮�
+                      }}</el-button>
+                    <span v-else>{{ row[column.label] }}</span>
+                  </div>
+                </template>
+              </el-table-column>
+            </template>
+          </el-table>
+          <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+            @pagination="getList" />
+        </el-col>
+      </el-row>
+
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+        <!-- <BtnSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" /> -->
+
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <el-dialog title="缂栬緫鐢熶骇璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+        <edit :OperationType=OperationType :linterid=this.rowForm.HItemID :HSouceBillType=this.rowForm.HSourceBillType
+          :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
+      </el-dialog>
+      <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-button type="primary">鏂囦欢涓婁紶</el-button>
+          </el-upload>
+        </div>
+        <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="鎿嶄綔" align="center">
+            <template slot-scope="scope">
+              <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" />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import BtnSettings from '@/views/component/btnSettings'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/basic/gy/gySupplierEdit.vue'
+export default {
+  name: 'GySource',
+  components: { RowSettings, Edit, BtnSettings },
+  props: {
+    openPage: { type: String, },
+  },
+  data() {
+    return {
+      treeSql:'',
+      HSupClsName: 0,
+      //鏍戠粨鏋�
+      treeOptions: undefined,
+      defaultProps: {
+        children: "children",
+        label: "title"
+      },
+      activeSeach: '',
+      HModName: 'Gy_Supplier',
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      HBillType: '1205',
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: '=', value: '=' },
+        { label: '>=', value: '>=' },
+        { label: '>', value: '>' },
+        { label: '<=', value: '<=' },
+        { label: '<', value: '<' },
+        { label: '<>', value: '<>' },
+        { label: '鍖呭惈', value: '7' },
+        { label: '宸﹀寘鍚�', value: '8' },
+        { label: '鍙冲寘鍚�', value: '9' },
+        { label: '涓嶅寘鍚�', value: '10' },
+      ],
+      sWhere: '',
+      dialogTitle: '',
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      activeName: 'first',
+
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HUSEORGID: sessionStorage["OrganizationID"] - 0,
+        HName: null,
+        HNumber: null,
+        HSupTypeID: null,
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: ["sorderid", "HItemID", "HCurID", "HSSID", "HAreaID", "HPSStyleID"],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HSupName: [
+          { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HDate: [
+          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HExRate: [
+          { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      },
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞�
+        open: false,
+        // 寮瑰嚭灞傛爣棰�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        // headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: process.env.VUE_APP_BASE_API + "/Gy_Source/Gy_Source_Excel"
+      },
+      uploadData: [],
+      alluploadList: [],
+      uploadTableLoading: false,
+      uploadPageSizes: [50, 100, 500, 5000, 50000],
+      uploadPage: 1,
+      uploadPageSize: 50,
+      uploadTotal: 0,
+    };
+  },
+  created() {
+    this.getList()
+    this.getTreeselect()
+  },
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '鍚堣';
+          return;
+        }
+        const values = data.map(item => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+
+          } else {
+            sums[index] = '';
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.getList()
+    },
+    getTreeselect() {
+      axios.get(this.baseURL + '/Gy_BadReason/Gy_SupTypeTreeListByLevel',).then(response => {
+        let data1 = response.data
+        if (data1.count == 1) {
+          this.treeOptions = JSON.parse(data1.data);
+          console.log(this.treeOptions)
+        }
+
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 绛涢�夎妭鐐�
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 鑺傜偣鍗曞嚮浜嬩欢
+    handleNodeClick(data) {
+      if (data.id == "100") {
+        this.treeSql = " and HSupTypeID = 0 ";
+        this.queryParams.HSupTypeID = 0;
+      } else if (data.id == "0") {
+        this.treeSql = "";
+        this.queryParams.HSupTypeID = 0;
+      } else {
+        this.treeSql = " and HSupTypeID = '" + data.id + "' ";
+        this.HSupClsName = data.title;
+        this.queryParams.HSupTypeID = data.id;
+      }
+      this.handleQuery()
+    },
+    //鍒楄〃鏁版嵁
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
+      console.log(this.sWhere)
+      //鐢熶骇璧勬枡鍒楄〃
+      axios.get(this.baseURL + '/Gy_Supplier/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "Organization": sessionStorage["Organization"],
+          "page": this.page,
+          "size": this.pageSize
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.code == 1) {
+          this.btResList = data1.list//鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
+          this.total = data1.count;
+          var data = [];//鍒楀瓧娈垫暟鎹�
+          var col = [];
+          var totalArray = ["浠舵暟"];
+          //缁欑┖鐨勬暟缁勮祴鍊�
+          for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
+            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+          for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+            if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁＄畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+            } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+            }
+            else {
+              col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+            }
+
+          }
+          option.cols = [col]
+          this.dataList = option
+          option.data = data1.data;
+          var result = data1.data;
+          option.data = result;
+          this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+        }else{
+          console.log(response)
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = []
+      axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+        params: {
+          "HModName": HModName,
+          "user": user,
+        },
+      }).then(res => {
+        let data1 = res.data
+        if (data1.data.length != 0) {
+          var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+          var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+          newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+          dataCol = data1.data[0].HGridString.split(',');
+          //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+          if (dataCol.length == option.cols[0].length - 1) {
+            //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+            for (var j = 0; j < option.cols[0].length - 1; j++) {
+              for (var i = 0; i < option.cols[0].length - 1; i++) {
+                var dataCols = dataCol[j].split('|');
+                //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                  //闅愯棌鍒�
+                  if (dataCols[1] == 1) {
+                    option.cols[0][i + 1]["hide"] = true;
+                  }
+                  //璁剧疆鍒楀
+                  if (dataCols[3] > 0) {
+                    option.cols[0][i + 1]["width"] = dataCols[3];
+                  }
+                  //璁剧疆鍐呭瀛椾綋澶у皬
+                  if (data1.data[0].HFontSize != 0) {
+                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+                  } else {
+                    option.cols[0][i + 1]["style"] = "font-size:100%";
+                  }
+                  //鏄剧ず鍒�
+                  if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
+                    option.cols[0][i + 1]["hide"] = false;
+                  }
+                  //缁熻鍒�
+                  if (dataCols[6] == 1) {
+                    option.cols[0][i + 1]["totalRow"] = true;
+                  } else {
+                    option.cols[0][i + 1]["totalRow"] = false;
+                  }
+                  //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                  switch (dataCols[2]) {
+                    case "L":
+                      option.cols[0][i + 1]["align"] = "left";
+                      break;
+                    case "M":
+                      option.cols[0][i + 1]["align"] = "center";
+                      break;
+                    case "R":
+                      option.cols[0][i + 1]["align"] = "right";
+                      break;
+                  }
+                  //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                  if (dataCols[4] != null && dataCols[4] != "") {
+                    option.cols[0][i + 1]["title"] = dataCols[4];
+                  }
+                  newCols[0].push(option.cols[0][i + 1]);
+                  break;
+                }
+              }
+            }
+            //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+            if (dataCol.length == newCols[0].length - 1) {
+              option.cols = newCols;
+              //鍙栨秷鍐荤粨鍒�
+              for (var i = 1; i < option.cols[0].length - 1; i++) {
+                if (option.cols[0][i + 1]["fixed"] != null) {
+                  option.cols[0][i + 1]["fixed"] = null;
+                }
+                else {
+                  break;
+                }
+              }
+              //鍐荤粨鍒�
+              if (data1.data[0].HFixCols != 0) {
+                for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                  if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
+                    data1.data[0].HFixCols += 1;
+                  }
+
+                  option.cols[0][i + 1]["fixed"] = "left";
+                }
+              }
+              //璁剧疆鍒楁帓搴�
+              for (var i = 1; i < option.cols[0].length; i++) {
+                if (data1.data[0].HSortFlag == "鏄�") {
+                  option.cols[0][i]["sort"] = true;
+                }
+                else {
+                  option.cols[0][i]["sort"] = false;
+                }
+              }
+            }
+          }
+          this.btList = option.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          if (data1.data[0].HPageSize == 0) {
+            this.pageSize = 50
+          } else {
+            this.pageSize = data1.data[0].HPageSize
+          }
+          this.tableData = option.data
+          this.tableShow = true
+          this.loading = false
+        } else {
+          this.btList = dataOption.cols[0]
+          this.btList.map(item => {
+            if (!item.hide) {
+              this.totalNameList.push(item)
+            }
+          })
+          this.tableData = dataOption.data
+          this.tableShow = true
+          this.loading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
+      let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span)
+      return h(span, column.label)
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.HItemID)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 3
+      this.handleEdit()
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map(item => item.HItemID)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = ''
+      if (this.treeSql) {
+        this.sWhere += this.treeSql
+        console.log(this.sWhere)
+      }
+      
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HNumber) {
+        this.sWhere += " and 渚涘簲鍟嗕唬鐮� like '%" + this.queryParams.HNumber + "%'";
+      }
+      if (this.queryParams.HName) {
+        this.sWhere += " and 渚涘簲鍟嗗悕绉� like '%" + this.queryParams.HName + "%'";
+      }
+      if (this.queryParams.HUSEORGID) {
+        this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
+      }
+      // this.sWhere += this.addSWhereByOpenType()
+      // this.sWhere += this.getOrgIDByUser()
+      this.getList()
+
+    },
+    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+    addSWhereByOpenType() {
+      //鑾峰彇鍙傛暟
+      var sWhere = "";
+      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+      if (this.openPage) {
+        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''"
+        return sWhere;
+      }
+      return sWhere;
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+    getOrgIDByUser() {
+      var res = "";
+      axios.get(this.baseURL + '/Xt_User/getOrgIDListByUser', {
+        params: {
+          HModName: this.HModName,
+          user: sessionStorage["HUserName"],
+          HOrgID: sessionStorage["OrganizationID"]
+        },
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          if (result.data[0].sWhere == "1") {
+            res = " and HUSEORGID = '" + sessionStorage["OrganizationID"] + "'";
+          } else {
+            res = result.data[0].sWhere;
+          }
+        }
+      }).catch(error => {
+        res = " and 1 = 0";
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      return res;
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HUSEORGID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.resetForm("queryForm")
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.HItemID = 0
+      this.$nextTick(() => {
+        this.openEdit = true
+        this.editShow = true
+      })
+
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit() {
+      this.$nextTick(() => {
+        this.openEdit = true
+        this.editShow = true
+      })
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editGyClose(val) {
+      this.editShow = false
+      this.openEdit = false
+      this.multiple = true,
+        this.getList()
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        if (!this.rowForm.瀹℃牳浜�) {
+          axios.get(this.baseURL + "DeltetGy_Source", {
+            params: { 'HItemID': this.rowForm.HItemID.toString(), 'user': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.getList()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+        } else {
+          this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+        }
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+        params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 鍙嶇鐢�/绂佺敤鏁版嵁
+    set_De_Stop(num, form) {
+      var InterID = form.HItemID || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Gy_Source/StopGy_Source", {
+        params: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.getList();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    handleImport() {
+      this.uploadData = []
+      this.upload.isUploading = false
+      this.upload.title = "瀵煎叆";
+      this.upload.open = true;
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadTableLoading = true
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      // this.upload.open = false;
+      this.upload.isUploading = true;
+      this.$refs.upload.clearFiles();
+      if (response.code == 1) {
+        this.alluploadList = response.data
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
+        this.uploadTotal = this.alluploadList.length
+        this.uploadTableLoading = false
+        // this.set_AddNew(response.data)
+      } else {
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.Message + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+      }
+
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    set_AddNew() {
+      var num = [];
+      for (var i = 0; i < this.uploadData.length; i++) {
+        if (this.uploadData[i] != "") {
+          num.push(this.uploadData[i])
+        }
+      }
+      var sSubStr = JSON.stringify(num);
+      var sMainSub = sSubStr + '&鍜�' + sessionStorage["HUserName"];
+      axios({
+        method: 'post',
+        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+        data: {
+          'sMainSub': sMainSub
+        },
+      }).then(res => {
+        this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + res.data.Message + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+        this.upload.open = false
+        this.getList()
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    uploadDataIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    uploadDataDelete(row) {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        const deleteList = [row.index]
+        const data = this.uploadData
+        this.uploadData = data.filter(item => {
+          return deleteList.indexOf(item.index) == -1
+        });
+      }).catch(() => { })
+    },
+    getPage(page, list) {
+      let sindex = (parseInt(page) - 1) * this.uploadPageSize
+      let eindex = parseInt(page) * this.uploadPageSize
+      let newList = list.slice(sindex, eindex)
+      console.log(newList)
+      return newList
+    },
+    currentPage(val) {
+      this.uploadPage = val.page
+      setTimeout(() => {
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
+      }, 100)
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/basic/gy/gySupplierEdit.vue b/src/views/basic/gy/gySupplierEdit.vue
new file mode 100644
index 0000000..48fb5a7
--- /dev/null
+++ b/src/views/basic/gy/gySupplierEdit.vue
@@ -0,0 +1,1250 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+      <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
+      <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+      <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
+    </div>
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">渚涘簲鍟嗚缃�</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="缂栫爜" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏃ユ湡" prop="HDate">
+                <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
+                <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
+                  <el-option label="閿�鍞鍗�" value="1401" />
+                  <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
+                <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="閿�鍞憳" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="閿�鍞儴闂�" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ラ攢鍞儴闂�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="涓荤" prop="HManagerName">
+                <el-input v-model="form.HManagerName" placeholder="璇疯緭鍏ヤ富绠�" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹㈡埛" prop="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ュ鎴�" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鑱旂郴浜�" prop="HLinkMan">
+                <el-input v-model="form.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鑱旂郴鐢佃瘽" prop="HLinkPhone">
+                <el-input v-model="form.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ鏂欎汉">
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="浠撶" prop="HKeeperName">
+                <el-input v-model="form.HKeeperName" placeholder="璇疯緭鍏ヤ粨绠�">
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-form-item label="澶囨敞" prop="HRemark">
+            <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+          </el-form-item>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="椤圭洰浠ｇ爜" prop="HProjectNumber">
+                <el-input v-model="form.HProjectNumber" placeholder="璇疯緭鍏ラ」鐩唬鐮�" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="椤圭洰鍚嶇О" prop="HProjectName">
+                <el-input v-model="form.HProjectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鐝粍" prop="HGroupName">
+                <el-input v-model="form.HGroupName" placeholder="璇疯緭鍏ョ彮缁�" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍑哄簱浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ュ嚭搴撲粨搴�">
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍏朵粬淇℃伅" name="second">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="缁勭粐" prop="HOrgID">
+                <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="甯佸埆" prop="HCurName">
+                <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="姹囩巼" prop="HExRate">
+                <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
+                <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
+                <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
+                  <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
+                <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇＄敤棰濆害" prop="HCreditRating_Now">
+                <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
+                <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟浜�" prop="HMaker">
+                <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼浜�" prop="HUpDater">
+                <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳浜�" prop="HChecker">
+                <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+                <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+                <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+                <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+                <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+                <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+                <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+                <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+      <div style="margin-bottom: 10px;">
+        <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+        <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+          size="mini">鎻掑叆涓�琛�</el-button>
+        <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+        <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+          size="mini">涓婄Щ</el-button>
+        <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+          size="mini">涓嬬Щ</el-button>
+      </div>
+      <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+        @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+        <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.鐗╂枡浠ｇ爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
+              @dblclick.native="openDataDialog(3, scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
+              controls-position="right"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鍗曚环" width="120">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
+              controls-position="right"></el-input-number>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鍚◣鍗曚环" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HTaxPrice }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="绋庣巼" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HTaxRate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閲戦" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="浠风◣鍚堣" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HTaxPrice * scope.row.HQty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鍙戣揣浠撳簱" width="120">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.鍙戣揣浠撳簱" placeholder="璇疯緭鍏ュ彂璐т粨搴�" @keyup.native.f7="openDataDialog(2, scope.row)"
+              @dblclick.native="openDataDialog(2, scope.row)" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="澶囨敞" width="120">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閲囪喘鏁伴噺" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HReqBuyQty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鐢宠鍑哄簱鏁伴噺" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HReqOutQty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="褰撳墠搴撳瓨" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HCurrentInventory }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="danger" icon="el-icon-delete" size="mini" circle
+              @click="handleDeleteSysZb(scope.row)"></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+    <!-- 閮ㄩ棬寮圭獥 -->
+    <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+      <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import Dept from '@/views/component/dept'
+import Warehouse from '@/views/component/warehouse'
+import Material from '@/views/component/material'
+import RowSettings from '@/views/component/rowSettings'
+import moment from 'moment';
+
+export default {
+  name: 'SellOutBillEdit',
+  components: { Dept, Warehouse, Material, RowSettings },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      zzSelDis: false,
+      rowHideShow: false,
+      openRowHide: false,
+      hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+      materialShow: false,//鐗╂枡鏁版嵁缁勪欢
+      deptform: {},//寮圭獥閫変腑鏁版嵁
+      openData: false,//鏁版嵁寮圭獥
+      dialogTitle: '',
+      organizationList: [],//缁勭粐鍒楄〃
+      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      checkedSysZb: [],
+      editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+      editBtData: [],//瀛愯〃琛ㄥご
+      activeName: 'first',
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HProjectNumber: '',
+        HCusID: null,
+        HMaterNumber: '',
+        HMaterName: '',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      btResList: [],
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HSupName: [
+          { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HDate: [
+          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HExRate: [
+          { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.setInitHCurName()
+    this.fetchData()
+    this.getdata()
+  },
+  beforeDestroy() {
+    this.$destroy()
+  },
+  methods: {
+    fetchData() {
+      axios.get(this.baseURL + "/Web/GetOrganizations", {
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.organizationList = response.data.data;//缁勭粐鍒楄〃
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    getdata() {
+      console.log(this.copyType, this.OperationType)
+      this.formShow = false
+      this.formLoading = true
+
+      if (this.OperationType == 4) {
+        this.zzSelDis = true
+        this.handleAdd()
+        var data = this.getUrlVars_JSON();
+        var dataArray = [];
+        for (var i = 0; i < data.length; i++) {
+          // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+          axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+            params: {
+              "HInterID": data[i].hmainid
+              , "HSubID": data[i].hsubid
+            },
+          }).then(response => {
+            let result = response.data
+            if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+              this.temp = result.data[0];
+            } else {
+              this.temp = result.data;
+            }
+            if (this.temp) {
+              dataArray.push(this.temp);
+              this.form.HDeptID = dataArray[0].HDeptID
+              this.form.HDeptName = dataArray[0].閮ㄩ棬
+              this.form.HEmpID = dataArray[0].HEmpID
+              this.form.HEmpName = dataArray[0].涓氬姟鍛�
+              this.form.HManagerID = dataArray[0].HManagerID
+              this.form.HManagerName = dataArray[0].涓荤
+              this.form.HMainSourceInterID = "0"
+              this.form.HMainSourceEntryID = "0"
+              this.form.HMainSourceBillNo = ""
+              this.form.HMainSourceBillType = dataArray[0].HBillType
+              this.form.HSupID = dataArray[0].HCusID
+              this.form.HSupName = dataArray[0].瀹㈡埛
+              this.form.HLinkMan = dataArray[0].鑱旂郴浜�
+              this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
+              this.form.HSellSID = dataArray[0].HSellSID
+              this.form.HSellSName = dataArray[0].閿�鍞柟寮�
+              this.form.HCurID = dataArray[0].HCurID
+              this.form.HCurName = dataArray[0].甯佸埆
+              this.form.HExRate = dataArray[0].姹囩巼
+              for (var i = 0; i < dataArray.length; i++) {
+                this.editData.push(
+                  {
+                    "HMaterID": dataArray[i].HMaterID
+                    , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+                    , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+                    , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+                    , "HUnitID": dataArray[i].HUnitID
+                    , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+                    , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+                    , "HQty": dataArray[i].鏁伴噺.toFixed(6)
+                    , "HPieceQty": "0"
+                    , "HPrice": dataArray[i].鍗曚环.toFixed(4)
+                    , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
+                    , "HTaxRate": dataArray[i].绋庣巼
+                    , "HMoney": dataArray[i].閲戦.toFixed(2)
+                    , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
+                    , "HWHID": dataArray[i].HWHID
+                    , "鍙戣揣浠撳簱": dataArray[i].HWHName
+                    , "HRemark": ""
+                    , "HQty_Full": "0"
+                    , "HQty_Empty": "0"
+                    , "HQty_Back": "0"
+                    , "HCostPrice": "0"
+                    , "HCostMoney": "0"
+                    , "HSalePrice": "0"
+                    , "HSeOrderInterID": dataArray[i].hmainid
+                    , "HSeOrderEntryID": dataArray[i].hsubid
+                    , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+                    , "HSourceInterID": dataArray[i].hmainid
+                    , "HSourceEntryID": dataArray[i].hsubid
+                    , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+                    , "HSourceBillType": dataArray[i].HBillType
+                    , "HRelationQty": "0"
+                    , "HRelationMoney": "0"
+                    , 'HSPID': "0"
+                    , 'HSPName': ""
+                    , 'HSPGroupID': "0"
+                    , "HSPGroupName": ""
+                    , 'HSCWHID': "0"
+                    , 'HSCWHName': ""
+                    , 'HSCSPID': "0"
+                    , 'HSCSPName': ""
+                    , 'HBatchNo': ""
+                    , 'HPOOrderInterID': "0"
+                    , 'HPOOrderEntryID': "0"
+                    , 'HPOOrderBillNo': ""
+                    , 'HPropertyID': "0"
+                    , 'HPropertyName': ""
+                    , 'HSecUnitID': "0"
+                    , 'HSecUnitName': ""
+                    , 'HSecUnitRate': "0"
+                    , 'HEngineNum': ""
+                    , 'HUnderPanNum': ""
+                    , 'HLeaveFactCard': ""
+                    , 'HReqBuyQty': "0"
+                    , 'HReqOutQty': "0"
+                    , 'HCurrentInventory': "0"
+                  }
+                );
+              }
+            }
+            this.$nextTick(() => {
+              this.formShow = true
+              this.formLoading = false
+            })
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+        }
+      } else if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+        this.handleAdd()
+      } else if (this.OperationType == 3 || this.copyType == 1) {
+        this.handleUpdate()
+      }
+    },
+    // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+    getUrlVars_JSON() {
+      var datajson;
+      var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+      var arr = str.substring(str.lastIndexOf("=") + 1);
+      datajson = JSON.parse(decodeURI(arr));
+      return datajson;
+    },
+    //鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
+    getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
+      axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+        params: {
+          "HInterID": HSourceInterID
+          , "HSubID": HSourceEntryID
+        },
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+          this.temp = result.data[0];
+        } else {
+          this.temp = result.data;
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+
+      this.rowHideShow = false
+      this.openRowHide = val
+      this.$destroy()
+    },
+
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      if (num == 1) {
+        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+        this.form.HDeptID = deptRow.HItemID
+        this.form.HEmpID = deptRow.HEmpID
+        this.form.HManagerName = deptRow.璐熻矗浜�
+        this.openData = false
+      } else if (num == 2) {
+        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+        this.openData = false
+      }
+      else if (num == 3) {
+        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+        this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+        this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
+        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
+        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+        this.openData = false
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num
+      this.deptform = deptRow
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum)
+      this.deptform = {}
+    },
+    deptClose() {
+      this.deptform = {}
+      this.openData = false
+    },
+    //鏂板璁剧疆榛樿绋庣巼鍜岃揣甯�
+    setInitHCurName() {
+      axios.get(this.baseURL + '/Gy_Currency/list1', {
+        params: { "sWhere": " and 璐у竵鍚嶇О = '浜烘皯甯�'", "user": sessionStorage["HUserName"] },
+      }).then(response => {
+        let data1 = response.data
+        if (data1.data != null) {
+          this.form.HCurName = data1.data[0].璐у竵鍚嶇О
+          this.form.HCurID = data1.data[0].HItemID
+        } else {
+          this.$modal.msgError(data1.code + data1.Message);
+        }
+      }).catch(error => {
+        console.log(error)
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HCREATEORGID: null,
+        HUSEORGID: null,
+        HUseOrg: null,
+        HNumber: null,
+        HHelpCode: null,
+        HShortName: null,
+        HAddress: null,
+        HLinkMan: null,
+        HLinkPhone: null,
+        HMobilePhone: null,
+        HFax: null,
+        HPostalCode: null,
+        HEmail: null,
+        HCorMan: null,
+        HBank: null,
+        HTaxNum: null,
+        HEnglishName: null,
+        HEnglishAddress: null,
+        HCountry: null,
+        HAreaID: null,
+        HAreaName: null,
+        HTaxRate: 13,
+        HCurID: null,
+        HCurName: null,
+        HSSID: null,
+        HSSName: null,
+        HBankAccount: null,
+        HName: null,
+        HPSStyleID: null,
+        HPSStyleName: null,
+        HRemark: null,
+        HUpDater: null,
+        HStopflag: null,
+        HMaterClass: null,
+        HSupTypeID: null,
+        HSupClsName: null,
+        HMaker: sessionStorage["HMaker"],
+        HMakeDate: new Date(),
+        HChecker: null,
+        HCheckDate: null,
+        HStopMan: null,
+        HStopDate: null,
+      }
+      this.editData = []
+      this.editBtData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset()
+      if (!this.OperationType && !this.copyType) {
+        const obj = { path: "/basic/gy/gySupplierEdit", name: "GySupplierEdit" };
+        this.$tab.closePage(obj);
+      } else {
+        this.formShow = false
+        this.$emit('editClose', false)
+      }
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+    getCzyglByUser() {
+      axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+        params: { "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let dataForm = response.data.data[0]
+        this.form.HDeptID = dataForm.HDeptID
+        this.form.HDeptName = dataForm.HDeptName
+        this.form.HEmpID = dataForm.HEmpID
+        this.form.HEmpName = dataForm.HEmpName
+        this.form.HManagerID = dataForm.HManagerID
+        this.form.HManagerName = dataForm.HManagerName
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      let date = new Date()
+      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+      if (this.OperationType == 1) {
+        this.handleAddSysZb()
+      }
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    getHBillNo() {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+        params: {
+          HBillType: '1205'
+        }
+      }).then(response => {
+        this.form.HMaker = sessionStorage["HUserName"]
+        this.form.HBillNo = response.data.data[0].HBillNo
+        this.form.HInterID = response.data.data[0].HInterID
+        // this.copyType = 0
+        // this.getCzyglByUser()
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+    getBarCodeNoteBySellOutBill(rowHmainid) {
+      axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+        params: { "HInterID": rowHmainid }
+      }).then(response => {
+        if (response.data.count == 1) {
+          if (response.data.data[2].length > 0) {
+            this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+            this.subDisabled = true
+          }
+        } else { }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+    getCustomerBalance(HCusID) {
+      axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+        params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
+      }).then(response => {
+        var data = response.data.data[0];
+        this.form.HCusBalance = data.HCusBalance
+        this.form.HCreditRating_Now = data.HCreditRating_Now
+        this.form.HAvailableBalance = data.HAvailableBalance
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate() {
+      this.reset()
+      let rowHmainid = this.linterid
+      console.log(this.linterid)
+      axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
+        params: { 'HInterID': rowHmainid }
+      }).then(response => {
+        if (response.data.count == 1) {
+          var result = response.data
+          var data = response.data.data[0]
+          this.form.BillType = data.HSourceBillType
+          if (this.copyType == 1) {
+            this.getHBillNo()
+            let date = new Date()
+            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+          } else {
+            this.form.HBillNo = data.鍗曟嵁鍙�
+            this.form.HInterID = data.hmainid
+            this.form.HDate = data.鏃ユ湡
+            this.form.HMaker = data.鍒跺崟浜�
+            this.form.HUpDater = data.淇敼浜�
+            this.form.HChecker = data.瀹℃牳浜�
+            this.form.HMakeDate = data.鍒跺崟鏃ユ湡
+            this.form.HUpDateDate = data.淇敼鏃ユ湡
+            this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+            this.form.HCloseMan = data.鍏抽棴浜�
+            this.form.HDeleteMan = data.浣滃簾浜�
+            this.form.HCloseDate = data.鍏抽棴鏃ユ湡
+            this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+          }
+          this.form.HBillSubType = data.HBillSubType
+          this.form.HMainSourceInterID = data.HMainSourceInterID
+          this.form.HMainSourceEntryID = data.HMainSourceEntryID
+          this.form.HMainSourceBillType = data.HMainSourceBillType
+          this.form.HMainSourceBillNo = data.HMainSourceBillNo
+          this.form.HEmpName = data.涓氬姟鍛�
+          this.form.HEmpID = data.HEmpID
+          this.form.HDeptName = data.閮ㄩ棬
+          this.form.HDeptID = data.HDeptID
+          this.form.HManagerName = data.涓荤
+          this.form.HManagerID = data.HManagerID
+          this.form.HSupName = data.瀹㈡埛
+          this.form.HSupID = data.HSupID
+          this.form.HLinkMan = data.鑱旂郴浜�
+          this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
+          this.form.HSecManagerName = data.鍙戣揣浜�
+          this.form.HSecManagerID = data.HSecManagerID
+          this.form.HKeeperName = data.淇濈鍛�
+          this.form.HKeeperID = data.HKeeperID
+          this.form.HRemark = data.琛ㄥご澶囨敞
+          this.form.HProjectNumber = data.椤圭洰缂栫爜
+          this.form.HProjectID = data.HProjectID
+          this.form.HProjectName = data.椤圭洰鍚嶇О
+          this.form.HGroupName = data.鐝粍
+          this.form.HGroupID = data.HGroupID
+          this.form.HWHName = data.涓昏〃浠撳簱
+          this.form.HWHID = data.HWHID_Main
+          this.form.HConveyCompName = data.杩愯緭鍏徃
+          this.form.HConveyCompID = data.HConveyCompID
+          this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
+          this.form.HConveyTypeID = data.HConveyTypeID
+          this.form.HConveyMoney = data.HConveyMoney
+          this.form.HCarriage = data.杩愯垂
+          this.form.HSTOCKORGID = data.HSTOCKORGID
+          this.form.HOWNERID = data.HOWNERID
+          this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
+          this.form.HSCWHID = data.HSCWHID
+          this.form.HCheckStatusMan = data.鏍搁攢浜�
+          this.form.HExplanation = data.鎽樿
+          this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
+          this.form.HCurName = data.甯佸埆
+          this.form.HCurID = data.HCurID
+          this.form.HExRate = data.姹囩巼
+          this.form.HSellSName = data.閿�鍞柟寮�
+          this.form.HSellSID = data.HSellSID
+          //  this.form.HCusBalance=data
+          //  this.form.HCreditRating_Now=HConveyMoney
+          //  this.form.HAvailableBalance=data
+          this.form.HPriceType = data.鍗曚环绫诲瀷
+          this.form.HOrgID = data.HOrgID
+          this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+          this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
+          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].搴斿彂鏁伴噺.toFixed(6)
+                , "HQty": result.data[i].鏁伴噺.toFixed(6)
+                , "HPieceQty": result.data[i].浠舵暟.toFixed(0)
+                , "HPrice": result.data[i].鍗曚环.toFixed(4)
+                , "HTaxPrice": result.data[i].鍚◣鍗曚环.toFixed(4)
+                , "HTaxRate": result.data[i].绋庣巼
+                , "HMoney": (result.data[i].鏁伴噺 * result.data[i].鍗曚环).toFixed(2)
+                , "HTaxMoney": (result.data[i].鏁伴噺 * result.data[i].鍚◣鍗曚环, 2).toFixed(2)
+                , "HWHID": result.data[i].hwhid
+                , "鍙戣揣浠撳簱": result.data[i].鍙戣揣浠撳簱
+                , "HRemark": result.data[i].琛ㄤ綋澶囨敞
+                , "HQty_Full": result.data[i].婊¤溅閲嶉噺
+                , "HQty_Empty": result.data[i].绌鸿溅閲嶉噺
+                , "HQty_Back": result.data[i].鍥炶溅閲嶉噺
+                , "HCostPrice": result.data[i].鎴愭湰鍗曚环
+                , "HCostMoney": result.data[i].鎴愭湰閲戦
+                , "HSalePrice": result.data[i].閿�鍞崟浠�
+                , "HSeOrderInterID": result.data[i].HSeOrderInterID
+                , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
+                , "HSeOrderBillNo": result.data[i].閿�鍞鍗曞彿
+                , "HSourceInterID": result.data[i].HSourceInterID
+                , "HSourceEntryID": result.data[i].HSourceEntryID
+                , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿
+                , "HSourceBillType": result.data[i].HSourceBillType
+                , "HRelationQty": result.data[i].鍏宠仈鏁伴噺
+                , "HRelationMoney": result.data[i].鍏宠仈閲戦
+                , 'HSPID': result.data[i].HSPID
+                , 'HSPName': result.data[i].浠撲綅
+                , 'HSPGroupID': result.data[i].HSPGroupID
+                , "HSPGroupName": result.data[i].浠撲綅缁�
+                , 'HSCWHID': result.data[i].HSCWHID
+                , 'HSCWHName': result.data[i].璋冨嚭浠撳簱
+                , 'HSCSPID': result.data[i].HSCSPID
+                , 'HSCSPName': result.data[i].璋冨嚭浠撲綅
+                , 'HBatchNo': result.data[i].鎵规
+                , 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
+                , 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
+                , 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
+                , 'HPropertyID': result.data[i].HPropertyID
+                , 'HPropertyName': result.data[i].杈呭姪灞炴��
+                , 'HSecUnitID': result.data[i].HSecUnitID
+                , 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
+                , 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
+                , 'HEngineNum': result.data[i].鍙戝姩鏈哄彿
+                , 'HUnderPanNum': result.data[i].鍦扮洏鍙�
+                , 'HLeaveFactCard': result.data[i].鍑哄巶璇�
+                , 'HReqBuyQty': result.data[i].鐢宠閲囪喘鏁伴噺
+                , 'HReqOutQty': result.data[i].鐢宠鍑哄簱鏁伴噺
+                , 'HCurrentInventory': result.data[i].褰撳墠搴撳瓨
+              }
+            );
+          }
+          if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+            this.subDisabled = true
+          }
+          this.formShow = true
+          this.formLoading = false
+
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+    getCustomerByCusID(HCusID) {
+      axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+        params: {
+          HCusID: HCusID
+        }
+      }).then(response => {
+        this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
+        this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
+        // this.form = response.data.data[0]
+
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+    rowSysZbIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+    handleAddSysZb(index, num) {
+      if (num == 1 && !index) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+      } else {
+        let obj = {
+          HMaterID: 0,
+          鐗╂枡浠ｇ爜: '',
+          鐗╂枡鍚嶇О: '',
+          瑙勬牸鍨嬪彿: '',
+          HUnitID: 0,
+          璁￠噺鍗曚綅: '',
+          HQtyMust: 1,
+          HQty: 1,
+          HPieceQty: 0,
+          HPrice: 0,
+          HTaxPrice: 0,
+          HTaxRate: 0,
+          HMoney: 0,
+          HTaxMoney: 0,
+          HWHID: 0,
+          鍙戣揣浠撳簱: '',
+          HRemark: '',
+          HQty_Full: 0,
+          HQty_Empty: 0,
+          HQty_Back: 0,
+          HCostPrice: 0,
+          HCostMoney: 0,
+          HSalePrice: 0,
+          HSeOrderInterID: 741,
+          HSeOrderEntryID: 18,
+          HSeOrderBillNo: 'XSFH00000747',
+          HSourceInterID: 741,
+          HSourceEntryID: 18,
+          HSourceBillNo: 'XSFH00000747',
+          HSourceBillType: 1402,
+          HRelationQty: 0,
+          HRelationMoney: 0,
+          HSPID: 0,
+          HSPName: '',
+          HSPGroupID: 0,
+          HSPGroupName: '',
+          HSCWHID: 0,
+          HSCWHName: '',
+          HSCSPID: 0,
+          HSCSPName: '',
+          HBatchNo: '',
+          HPOOrderInterID: 0,
+          HPOOrderEntryID: 0,
+          HPOOrderBillNo: '',
+          HPropertyID: 0,
+          HPropertyName: '',
+          HSecUnitID: 0,
+          HSecUnitName: '',
+          HSecUnitRate: 0,
+          HEngineNum: '',
+          HUnderPanNum: '',
+          HLeaveFactCard: '',
+          HReqBuyQty: 0,
+          HReqOutQty: 0,
+          HCurrentInventory: 0,
+        }
+        if (index) {
+          this.editData.splice(index, 0, obj);
+          this.$set(this.editData, index, obj)
+        } else {
+          this.editData.push(obj);
+        }
+      }
+    },
+    handleCopyZbRow() {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+        this.editData.push(copyRow);
+      }
+    },
+    handleMoveRowUp(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == 1) {
+          this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num - 1, 0, record);
+        }
+      }
+    },
+    handleMoveRowDown(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == this.editData.length) {
+          this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num + 1, 0, record);
+        }
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    handleDeleteSysZb(row) {
+      this.checkedSysZb = []
+      this.checkedSysZb.push(row.index)
+      if (this.checkedSysZb.length == 0) {
+        this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+      } else {
+        const editData = this.editData;
+        const checkedSysZb = this.checkedSysZb;
+        this.editData = editData.filter(function (item) {
+          return checkedSysZb.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+    handleTableZbEdit(selection) {
+      this.checkedSysZb = selection.map(item => item.index)
+      this.zbSelForm = selection[0]
+      this.zbIndex = this.checkedSysZb[0]
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
+    get_MAXNum_Task(Type) {
+      var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+      axios({
+        method: 'get',
+        url: this.baseURL + "/CommonModel/searchMethod",
+        params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.form.HBillNo = response.data.data[0].HBillNo;
+        } else {
+          this.$modal.msgError(response.data.code + response.data.Message);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let fhck = false
+          this.editData.map((item, index) => {
+            if (!item.鍙戣揣浠撳簱) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+            }
+          })
+          this.$nextTick(() => {
+            if (!fhck) {
+              var sMainStr = JSON.stringify(this.form);
+              var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+              axios({
+                method: 'post',
+                url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+                data: {
+                  'msg': sMainSub
+                },
+              }).then(response => {
+                if (response.data.count == 1) {
+                  this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                  this.$modal.msgSuccess(response.data.Message);
+                  this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+                  if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  {
+                    this.set_CheckBill(0, this.form); //瀹℃牳
+                  }
+                  this.addBtnShow = true
+                }
+              }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+            }
+          })
+        }
+      });
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+        params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    showReset() {
+      this.deptShow = false
+      this.warehouseShow = false
+      this.materialShow = false
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      if (row) {
+        this.zbIndex = row.index - 1
+      }
+      this.showReset()
+      if (num == 1) {
+        this.dialogTitle = '閮ㄩ棬鍒楄〃'
+        this.deptShow = true
+        this.openData = true
+      } else if (num == 2) {
+        this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+        this.warehouseShow = true
+        this.openData = true
+      } else if (num == 3) {
+        this.dialogTitle = '鐗╂枡鍒楄〃'
+        this.materialShow = true
+        this.openData = true
+      }
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index b6ef727..18cb6f4 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -1,52 +1,26 @@
 <template>
-  <div style="padding: 10px">
-    <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="item.ID"
-              :label="item.Name"
-              :value="item.ID.toString()"
-            >
+          <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">
@@ -56,132 +30,69 @@
               <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>
@@ -202,293 +113,120 @@
         >
       </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-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-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>
@@ -499,18 +237,17 @@
 import RowSettings from "@/views/component/rowSettings";
 import Edit from "@/views/basic/gyEmployee/gyEmployeeEdit";
 import gySource from "@/views/basic/gySource";
-import { env } from "echarts";
 
 export default {
-  name: "GySource",
+  name: "GyEmployee",
   components: { RowSettings, Edit, gySource },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
-      activeSeach: "",
-      HModName: "Gy_Source",
+      activeSeach: '',
+      HModName: "Gy_Employee",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -563,7 +300,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
+      organizationList: [], //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -587,7 +324,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: sessionStorage["OrganizationID"],
+        HOrgID: null,
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -650,7 +387,7 @@
     };
   },
   created() {
-    this.handleQuery();
+    this.fetchData();
     this.riqiChange();
   },
   methods: {
@@ -770,6 +507,33 @@
       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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
@@ -790,6 +554,7 @@
           },
         })
         .then((response) => {
+          console.log(response.data.data)
           this.tyResList = response.data.data; //鎬绘暟鎹�
           let data1 = response.data;
           let option = [];
@@ -1031,6 +796,10 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit('deptEmit', row, 4)
+        
+      }
     },
     //閫変腑琛岄珮浜牱寮�
     rowStyle({ row, rowIndex }) {
@@ -1041,16 +810,32 @@
     //鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
       this.OperationType = 3;
-      this.handleEdit();
+      if (this.openPage) {
+        this.$emit('deptEmitDb', row, 4)
+      } else {
+        this.handleEdit();
+      }
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
       // this.rowForm = {}
-      this.ids = selection.map((item) => item.HItemID);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-      if (!this.single) {
-        this.rowForm = selection[0];
+      if (this.openPage) {
+        //鍒楄〃鍗曢��
+        if (selection.length > 1) {
+          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]
+      } else {
+        //澶氶��
+        this.ids = selection.map((item) => item.HItemID);
+        this.single = selection.length != 1;
+        this.multiple = !selection.length;
+        if (!this.single) {
+          this.rowForm = selection[0];
+        }
       }
     },
     //鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1131,10 +916,10 @@
         this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
       }
       if (this.queryParams.HNumber) {
-        this.sWhere += " and 鑱屽憳浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+        this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
       }
       if (this.queryParams.HName) {
-        this.sWhere += " and 鑱屽憳鍚嶇О like '%" + this.queryParams.HName + "%'";
+        this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
       }
       if (this.queryParams.HOrgID) {
         this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
@@ -1210,7 +995,6 @@
 
     //閫�鍑�
     close() {
-      this.editGyClose();
       this.tableShow = true;
       this.openEdit = false;
       this.getList();
@@ -1261,7 +1045,7 @@
             this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
           }
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 鍙嶅鏍�/瀹℃牳鏁版嵁
     set_CheckBill(num, form) {
@@ -1337,8 +1121,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 }
         );
@@ -1367,8 +1151,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 }
           );
@@ -1392,7 +1176,7 @@
             return deleteList.indexOf(item.index) == -1;
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     getPage(page, list) {
       let sindex = (parseInt(page) - 1) * this.uploadPageSize;
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 3836c5f..5908024 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -869,17 +869,6 @@
     copyType: { type: Number },
     HOrgID: { type: Number },
   },
-  computed: {
-    CheckBillDisabled: {
-      get() {
-        if (!this.form["HCheckEmp"]) {
-          return false;
-        }
-
-        return true;
-      },
-    },
-  },
   data() {
     return {
       formShow: false,
@@ -912,6 +901,7 @@
       zuzhiId: 0,
       organizationList: [], //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      CheckBillDisabled: true,
       // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
@@ -1112,15 +1102,26 @@
       console.log(selection);
     },
     fetchData() {
-      this.zuzhiId = sessionStorage["OrganizationID"]; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
-      this.user = sessionStorage["HUserName"];
+      //鐧诲綍鐢ㄦ埛淇℃伅
       axios
-        .get(this.baseURL + "/Web/GetOrganizations", {})
+        .get(
+          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
+        )
         .then((response) => {
-          if (response.data.count == 1) {
-            this.organizationList = response.data.data; //缁勭粐鍒楄〃
-            this.getdata();
-          }
+          let data = response.data.data[0];
+          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          this.user = data.Czymc;
+          axios
+            .get(this.baseURL + "/Web/GetOrganizations", {})
+            .then((response) => {
+              if (response.data.count == 1) {
+                this.organizationList = response.data.data; //缁勭粐鍒楄〃
+                this.getdata();
+              }
+            })
+            .catch((error) => {
+              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
         })
         .catch((error) => {
           this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1280,10 +1281,7 @@
                 HOverPayRate: data.瓒呴姣旂巼,
                 HStopflag: data.绂佺敤鏍囪,
                 HRemark: data.澶囨敞,
-                HCheckEmp: data["瀹℃牳浜�"],
               });
-
-              console.log(this.form.HCheckEmp);
 
               if (this.OperationType == 3) {
                 // 缂栬緫鏃惰幏鍙栨枃浠跺垪琛�
@@ -1520,6 +1518,7 @@
       this.formShow = false;
       this.subDisabled = false;
       this.formLoading = true;
+      this.CheckBillDisabled = true;
       this.activeName = "first";
       this.resetForm("form");
     },
@@ -1554,9 +1553,11 @@
                   console.log(response);
                   if (response.data.count == 1) {
                     this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                    this.CheckBillDisabled = false;
                     this.$modal.msgSuccess(response.data.Message);
                   } else {
                     this.$modal.msgError(response.data.Message);
+                    this.CheckBillDisabled = false;
                     this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
                   }
                 })
@@ -1600,15 +1601,14 @@
       var InterID = form.HItemID || form.HInterID;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
+        .get(this.baseURL + "/Gy_Source/AuditGy_Source", {
           params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
         })
         .then((response) => {
           let result = response.data;
           if (result.code == 1) {
             this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
-            // this.CheckBillDisabled = true;
-            this.getdata();
+            this.CheckBillDisabled = true;
           } else {
             this.$modal.msgError("閿欒:" + result.code + result.Message);
           }
@@ -1628,7 +1628,7 @@
       this.classTimePrjShow = false;
       this.dutyShow = false;
       this.groupShow = false;
-      this.dormShow = false;
+      this.dormShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 41211f2..e91221e 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -26,7 +26,7 @@
         </el-form-item>
         <el-form-item label="缁勭粐">
           <el-select
-            v-model="queryParams.HOrgID"
+            v-model="queryParams.HOrgName"
             placeholder="璇烽�夋嫨"
             class="ForFilteringSchemes"
           >
@@ -34,7 +34,7 @@
               v-for="(item, index) in organizationList"
               :key="index"
               :label="item.Name"
-              :value="item.ID"
+              :value="item.Name"
             >
             </el-option>
           </el-select>
@@ -479,7 +479,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
+      organizationList: [], //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -503,7 +503,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: sessionStorage["HOrganizationID"],
+        HOrgID: null,
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -1175,7 +1175,6 @@
 
     //閫�鍑�
     close() {
-      this.editGyClose();
       this.tableShow = true;
       this.openEdit = false;
       this.getList();
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index ec2455d..76c7bd8 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -26,7 +26,7 @@
         </el-form-item>
         <el-form-item label="缁勭粐">
           <el-select
-            v-model="queryParams.HOrgID"
+            v-model="queryParams.HOrgName"
             placeholder="璇烽�夋嫨"
             class="ForFilteringSchemes"
           >
@@ -34,7 +34,7 @@
               v-for="(item, index) in organizationList"
               :key="index"
               :label="item.Name"
-              :value="item.ID.toString()"
+              :value="item.Name"
             >
             </el-option>
           </el-select>
@@ -539,7 +539,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
+      organizationList: [], //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -563,7 +563,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: sessionStorage["OrganizationID"],
+        HOrgID: null,
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -626,7 +626,6 @@
     };
   },
   created() {
-    this.HOrgID = sessionStorage["OrganizationID"];
     this.getList();
     this.riqiChange();
   },
@@ -763,6 +762,33 @@
       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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
diff --git a/src/views/component/dept/index.vue b/src/views/component/dept/index.vue
index bf97686..e411866 100644
--- a/src/views/component/dept/index.vue
+++ b/src/views/component/dept/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="padding: 10px;">
-        <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px" style="z-index: 2005;">
+    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px" style="z-index: 2005;">
       <div style="padding: 50px; width: 630px;">
         <div class="searchText">
           <div style="font-size: 18px;">QUICK SEARCH</div>
@@ -9,11 +9,9 @@
         </div>
       </div>
     </el-drawer>
-
-   <div>
-        <el-button type="primary" icon="el-icon-help"  @click="handleSearch">鎼� 绱�</el-button>
-  
-</div>
+    <div>
+      <el-button type="primary" icon="el-icon-help" @click="handleSearch">鎼� 绱�</el-button>
+    </div>
     <el-table v-loading="loading" :data="tableData" ref="deptTable" max-height="550"
       @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
       @cell-dblclick="handleDblclick">
@@ -99,7 +97,7 @@
   },
 
   methods: {
-        //鎵撳紑渚ц竟鎼滅储寮圭獥
+    //鎵撳紑渚ц竟鎼滅储寮圭獥
     handleSearch() {
       this.searchOpen = true
     },
diff --git a/src/views/gyEmployee/edit/index.vue b/src/views/gyEmployee/edit/index.vue
new file mode 100644
index 0000000..6cb0bb3
--- /dev/null
+++ b/src/views/gyEmployee/edit/index.vue
@@ -0,0 +1,1310 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled"
+        >淇� 瀛�</el-button
+      >
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+      <el-button
+        type="primary"
+        @click="set_CheckBill(0, form)"
+        :disabled="CheckBillDisabled"
+        >瀹� 鏍�</el-button
+      >
+    </div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鑱屽憳浠ｇ爜" prop="HNumber">
+                <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-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="宸ョ" prop="HWorkTypeName">
+                <el-input v-model="form.HWorkTypeName" placeholder="璇烽�夋嫨宸ョ" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鏍哥畻鏂瑰紡" prop="HCTPrjName">
+                <el-input v-model="form.HCTPrjName" placeholder="璇烽�夋嫨鏍哥畻鏂瑰紡" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鑱屽憳绯绘暟" prop="HEmpRate">
+                <el-input v-model="form.HEmpRate" placeholder="杈撳叆鑱屽憳绯绘暟"> </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="宀椾綅" prop="HPostName">
+                <el-input v-model="form.HPostName" placeholder="璇烽�夋嫨宀椾綅" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鑱屽姟" prop="HDutyName">
+                <el-input v-model="form.HDutyName" placeholder="璇烽�夋嫨鑱屽姟" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鐝粍" prop="HGroupName">
+                <el-input v-model="form.HGroupName" placeholder="璇烽�夋嫨鐝粍" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(4)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="14">
+              <el-form-item label="澶囨敞" prop="HUSEORGID">
+                <el-input
+                  type="text"
+                  v-model="this.form.HRemark"
+                  placeholder="璇疯緭鍏ュ娉�"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="浜轰簨淇℃伅" name="second">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鏀挎不闈㈣矊" prop="HGovStatus">
+                <el-select v-model="form.HGovStatus">
+                  <el-option
+                    v-for="item in HGovStatusList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀛﹀巻" prop="HStopEmp">
+                <el-select v-model="form.HKnowLev">
+                  <el-option
+                    v-for="item in HKnowLevList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="濠氬Щ鐘跺喌" prop="HMarr">
+                <el-select v-model="form.HMarr">
+                  <el-option
+                    v-for="item in HMarrList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="妗ｆ缂栧彿" prop="HArchivesNo">
+                <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-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-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-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="姣曚笟鏃堕棿" prop="HGradDate">
+                <el-date-picker
+                  v-model="form.HGradDate"
+                  type="date"
+                  placeholder="閫夋嫨姣曚笟鏃堕棿"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀹胯垗" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="澶栬姘村钩" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="璁＄畻鏈烘按骞�" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="涓撲笟" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="15">
+              <el-form-item label="鐜板湪鍦板潃" prop="HMakeTime">
+                <el-input></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鐢靛瓙閭" prop="HCheckTime">
+                <el-input></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="15">
+              <el-form-item label="瀹跺涵鍦板潃" prop="HMakeTime">
+                <el-input></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="閭斂缂栫爜" prop="HCheckTime">
+                <el-input></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="15">
+              <el-form-item label="鍘熷叕鍙�" prop="HMakeTime">
+                <el-input></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鑱旂郴鐢佃瘽" prop="HCheckTime">
+                <el-input></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鎵嬫満鍙风爜" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鐢ㄥ伐绫诲瀷" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="杩涘巶鏃ユ湡" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="杞鏃ユ湡" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="淇濋櫓璇佺紪鍙�" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍙備繚" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍙備繚鏃ユ湡" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍚堝悓鍒版湡鏃ユ湡" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍚堝悓寮�濮嬫棩鏈�" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍚堝悓鏈熼檺" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂昏亴鏃ユ湡" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鏆備綇璇佸埌鏈熸棩" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="14">
+              <el-form-item label="绂昏亴鍘熷洜" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浼犵湡鍙风爜" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绛剧害" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鎬у埆" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍑虹敓骞存湀" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="骞撮緞" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="绫嶈疮" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="姘戞棌" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鎴风睄绫诲埆" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍏朵粬淇℃伅" name="third">
+          <el-row>
+            <el-col :span="16">
+              <el-form-item label="韬唤璇�" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="涓嶆墦鍗�" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤鏍囧織" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="璋冧紤鏍囧織" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="宸ヨ祫绫诲瀷" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="杞紤璋冧紤鏍囧織" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍋滃彂宸ヨ祫" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鍩烘湰宸ヨ祫" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="鑱屽姟鑰冩牳宸ヨ祫" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="甯︾彮绯绘暟" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="鏀粯绫诲瀷" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鏈�楂樺伐璧�" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="瓒呴姣旂巼" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鍓╀綑宸ヨ祫" prop="HMakeTime">
+                <el-date-picker
+                  v-model="form.HMakeTime"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="闄勪欢淇℃伅" name="forth">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍗曠彮宸ユ椂" prop="HWorkTimes">
+                <el-input-number
+                  v-model="form.HWorkTimes"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绫诲瀷" prop="HType">
+                <el-select
+                  v-model="form.HType"
+                  placeholder="璇烽�夋嫨绫诲瀷"
+                  :disabled="zzSelDis"
+                >
+                  <el-option value="鐢熶骇绾�">鐢熶骇绾�</el-option>
+                  <el-option value="浜�">浜�</el-option>
+                  <el-option value="璁惧">璁惧</el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍏宠仈ID" prop="HRelationID">
+                <el-input-number
+                  v-model="form.HRelationID"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍗曠彮鏈�澶у伐鏃�" prop="HMaxWorkTimes">
+                <el-input-number
+                  v-model="form.HMaxWorkTimes"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鏈�灏忚繘闃�" prop="HMinAdd">
+                <el-input-number
+                  v-model="form.HMinAdd"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="姣忔棩鐝" prop="HClassCount">
+                <el-input-number
+                  v-model="form.HClassCount"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍔犵彮宸ユ椂" prop="HOverTimes">
+                <el-input-number
+                  v-model="form.HOverTimes"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="宸ュ簭" prop="HProcName">
+                <el-input v-model="form.HProcName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="榛樿鐢熶骇鐝粍" prop="HGroup">
+                <el-input v-model="form.HGroup" placeholder="璇烽�夋嫨榛樿鐢熶骇鐝粍" disabled>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="涓昏祫婧�" prop="HPrimarySourceName">
+                <el-input
+                  v-model="form.HPrimarySourceName"
+                  placeholder="璇烽�夋嫨涓昏祫婧�"
+                  disabled
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="宸ヤ綅鏁伴噺" prop="HCubicleQty">
+                <el-input-number
+                  v-model="form.HCubicleQty"
+                  controls-position="right"
+                  :min="1"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浜х嚎浜烘暟" prop="HProdLinePeopleNum">
+                <el-input-number
+                  v-model="form.HProdLinePeopleNum"
+                  controls-position="right"
+                  :min="0"
+                ></el-input-number>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </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" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+import Warehouse from "@/views/component/warehouse";
+import Material from "@/views/component/material";
+import RowSettings from "@/views/component/rowSettings";
+import GyWorkCenter from "@/views/component/gyWorkCenter";
+import moment from "moment";
+
+export default {
+  name: "SellOutBill",
+  components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter },
+  props: {
+    OperationType: { type: Number },
+    linterid: { type: Number },
+    HSouceBillType: { type: String },
+    copyType: { type: Number },
+  },
+  data() {
+    return {
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      zzSelDis: false,
+      rowHideShow: false,
+      openRowHide: false,
+      workCenterShow: false,
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      zbIndex: null,
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: 0,
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      CheckBillDisabled: true,
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HNumber: [{ required: true, message: "鐢熶骇璧勬簮浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
+        HName: [{ required: true, message: "鐢熶骇璧勬簮鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+        HCenter: [{ required: true, message: "宸ヤ綔涓績涓嶈兘涓虹┖", trigger: "blur" }],
+      },
+
+      HGovStatusList: [
+        { label: "缇や紬", value: "缇や紬" },
+        { label: "鍥㈠憳", value: "鍥㈠憳" },
+        { label: "鍏氬憳", value: "鍏氬憳" },
+        { label: "鍏朵粬鍏氭淳", value: "鍏朵粬鍏氭淳" },
+      ],
+
+      HKnowLevList: [
+        { label: "灏忓", value: "灏忓" },
+        { label: "鍒濅腑", value: "鍒濅腑" },
+        { label: "楂樹腑", value: "楂樹腑" },
+        { label: "澶т笓", value: "澶т笓" },
+        { label: "鏈", value: "鏈" },
+        { label: "鐮旂┒鐢�", value: "鐮旂┒鐢�" },
+        { label: "纭曞＋", value: "纭曞＋" },
+        { label: "鍗氬＋", value: "鍗氬＋" },
+        { label: "鍗氬＋鍚�", value: "鍗氬＋鍚�" },
+      ],
+
+      HMarrList: [
+        { label: "宸插", value: "宸插" },
+        { label: "鏈", value: "鏈" },
+        { label: "绂诲紓", value: "绂诲紓" },
+      ],
+    };
+  },
+  created() {
+    this.reset();
+    this.fetchData();
+  },
+  activated() {
+    this.reset();
+    this.fetchData();
+  },
+  methods: {
+    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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          this.user = data.Czymc;
+          axios
+            .get(this.baseURL + "/Web/GetOrganizations", {})
+            .then((response) => {
+              if (response.data.count == 1) {
+                this.organizationList = response.data.data; //缁勭粐鍒楄〃
+                this.getdata();
+              }
+            })
+            .catch((error) => {
+              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    getdata() {
+      this.reset();
+      console.log(this.OperationType);
+      if (this.OperationType != 1) {
+        this.zzSelDis = true;
+        axios
+          .get(this.baseURL + "GetGy_SourceDetail", {
+            params: {
+              HID: this.linterid,
+            },
+          })
+          .then((response) => {
+            console.log(response);
+            let result = response.data;
+            if (result.code == 1) {
+              // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+              var data = result.data.h_v_Edit_IF_SourceList[0];
+              this.form.HNumber = data.鐢熶骇璧勬簮浠ｇ爜;
+              this.form.HItemID = this.OperationType == 2 ? 0 : data.HItemID;
+              this.form.HName = data.鐢熶骇璧勬簮鍚嶇О;
+              this.form.HHelpCode = data.鍔╄浠ｇ爜;
+              this.form.HWorkTimes = data.鍗曠彮宸ユ椂;
+              this.form.HMaxWorkTimes = data.鍗曠彮鏈�澶у伐鏃�;
+              this.form.HRelationID = data.鍏宠仈ID;
+              this.form.HMinAdd = data.鏈�灏忚繘闃�;
+              this.form.HClassCount = data.姣忔棩鐝;
+              this.form.HOverTimes = data.鍔犵彮宸ユ椂;
+              this.form.HCenter = data.宸ヤ綔涓績;
+              this.form.HCenterID = data.宸ヤ綔涓績ID;
+              this.form.HGroup = data.鐝粍鍚嶇О;
+              this.form.HGroupID = data.鐝粍ID;
+              this.form.HDeptName = data.閮ㄩ棬鍚嶇О;
+              this.form.HDeptID = data.閮ㄩ棬ID;
+              this.form.HProcName = data.宸ュ簭;
+              this.form.HProcID = data.宸ュ簭ID;
+              this.form.HProcNumber = data.宸ュ簭浠ｇ爜;
+              this.form.HStopflag = data.绂佺敤鏍囪;
+              this.form.HType = data.绫诲瀷;
+              this.form.HRemark = data.澶囨敞;
+              this.form.HUseFlag = data.HUseFlag;
+              this.form.HUSEORGID = data.HUSEORGID;
+              this.form.HCREATEORGID = data.HCREATEORGID;
+              this.form.HMacAddr = data.mac鍦板潃;
+              this.form.HEmpID = data.HEmpID;
+              this.form.HEmpName = data.璐熻矗浜�;
+              this.form.HMakeEmp = data.鍒涘缓浜�;
+              this.form.HMakeTime = data.鍒涘缓鏃ユ湡;
+              this.form.HStopEmp = data.绂佺敤浜�;
+              this.form.HStopTime = data.绂佺敤鏃ユ湡;
+              this.form.HCheckEmp = data.瀹℃牳浜�;
+              this.form.HCheckTime = data.瀹℃牳鏃ユ湡;
+              this.form.HPrimarySourceID = data.HParentID;
+              this.form.HPrimarySourceName = data.涓昏祫婧愬悕绉�;
+              this.form.HParentID = data.HParentID;
+              this.form.HCubicleQty = data.鍗犵敤宸ヤ綅鏁�;
+              this.form.HProdLinePeopleNum = data.浜х嚎浜烘暟;
+              if (!data.HCheckEmp) {
+                this.CheckBillDisabled = false;
+              }
+            }
+            this.$nextTick(() => {
+              this.formShow = true;
+              this.formLoading = false;
+            });
+          })
+          .catch((error) => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      } else if (this.OperationType == 1) {
+        let date = new Date();
+        this.form.HMakeTime = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+        this.$nextTick(() => {
+          this.formShow = true;
+          this.formLoading = false;
+        });
+      }
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.openRowHide = val;
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      if (num == 1) {
+        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+        this.form.HDeptID = deptRow.HItemID;
+        this.form.HEmpID = deptRow.HEmpID;
+        this.form.HManagerName = deptRow.璐熻矗浜�;
+        this.openData = false;
+      } else if (num == 2) {
+        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+        this.openData = false;
+      } else if (num == 3) {
+        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+        this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+        this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+        this.openData = false;
+      } else if (num == 4) {
+        this.form.HCenterID = deptRow.HItemID;
+        this.form.HCenter = deptRow.宸ヤ綔涓績鍚嶇О;
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum);
+      this.deptform = {};
+    },
+    deptClose() {
+      this.deptform = {};
+      this.openData = false;
+    },
+
+    //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HNumber: null,
+        HItemID: 0,
+        HName: null,
+        HHelpCode: null,
+        HWorkTimes: "0",
+        HMaxWorkTimes: "0",
+        HRelationID: "0",
+        HMinAdd: "0",
+        HClassCount: "0",
+        HOverTimes: "0",
+        HCenter: null,
+        HCenterID: null,
+        HGroup: null,
+        HGroupID: 0,
+        HDeptName: null,
+        HDeptID: 0,
+        HProcName: null,
+        HProcID: 0,
+        HProcNumber: null,
+        HStopflag: false,
+        HType: null,
+        HRemark: null,
+        HUseFlag: "鏈娴�",
+        HUSEORGID: this.zuzhiId,
+        HCREATEORGID: this.zuzhiId,
+        HMacAddr: null,
+        HEmpID: 0,
+        HEmpName: null,
+        HMakeEmp: this.user,
+        HMakeTime: null,
+        HStopEmp: null,
+        HStopTime: null,
+        HCheckEmp: null,
+        HCheckTime: null,
+        HPrimarySourceID: 0,
+        HPrimarySourceName: null,
+        HParentID: 0,
+        HCubicleQty: "1",
+        HProdLinePeopleNum: "0",
+      };
+      this.editData = [];
+      this.editBtData = [];
+      this.ids = [];
+      this.formShow = false;
+      this.subDisabled = false;
+      this.formLoading = true;
+      this.CheckBillDisabled = true;
+      this.activeName = "first";
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset();
+      this.formShow = false;
+      // console.log()
+      this.$emit("editCloseGy", 0);
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let fhck = false;
+          this.$nextTick(() => {
+            if (!fhck) {
+              console.log(4);
+              var sMainStr = JSON.stringify(this.form);
+              // var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ";" + this.user;
+              axios({
+                method: "post",
+                url: this.baseURL + "SaveGy_SourceList",
+                data: {
+                  msg: sMainSub,
+                },
+              })
+                .then((response) => {
+                  console.log(response);
+                  if (response.data.count == 1) {
+                    this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                    this.CheckBillDisabled = false;
+                    this.$modal.msgSuccess(response.data.Message);
+                  } else {
+                    this.$modal.msgError(response.data.Message);
+                    this.CheckBillDisabled = false;
+                    this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
+                  }
+                })
+                .catch((error) => {
+                  this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
+            }
+          });
+        }
+      });
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (this.rowForm.鐘舵�� == "鍒涘缓") {
+            axios
+              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+                params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Source/AuditGy_Source", {
+          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.CheckBillDisabled = true;
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    showReset() {
+      this.deptShow = false;
+      this.warehouseShow = false;
+      this.materialShow = false;
+      this.workCenterShow = false;
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      if (row) {
+        this.zbIndex = row.index - 1;
+      }
+      this.showReset();
+      if (num == 1) {
+        this.dialogTitle = "閮ㄩ棬鍒楄〃";
+        this.deptShow = true;
+        this.openData = true;
+      } else if (num == 2) {
+        this.dialogTitle = "鍑哄簱浠撳簱鍒楄〃";
+        this.warehouseShow = true;
+        this.openData = true;
+      } else if (num == 3) {
+        this.dialogTitle = "鐗╂枡鍒楄〃";
+        this.materialShow = true;
+        this.openData = true;
+      } else if (num == 4) {
+        this.dialogTitle = "宸ヤ綔涓績";
+        this.workCenterShow = true;
+        this.openData = true;
+      }
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/gyEmployee/index.vue b/src/views/gyEmployee/index.vue
new file mode 100644
index 0000000..ac7292e
--- /dev/null
+++ b/src/views/gyEmployee/index.vue
@@ -0,0 +1,1448 @@
+<template>
+  <div style="padding: 10px">
+    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
+      <div style="padding: 50px; width: 630px">
+        <div class="searchText">
+          <div style="font-size: 18px">QUICK SEARCH</div>
+          <div>蹇�熸悳绱�</div>
+          <div class="searchImg"></div>
+        </div>
+        <el-form :model="queryParams" ref="queryForm" label-width="98px">
+          <el-row>
+            <el-form-item label="鑱屽憳浠ｇ爜" prop="HNumber">
+              <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-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-option>
+              </el-select>
+            </el-form-item>
+          </el-row>
+          <el-card class="box-card">
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <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>
+                      </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>
+                  </el-col>
+                  <el-col :span="11">
+                    <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"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <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"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <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-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>
+                  </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>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input
+                      v-model="queryParams.ColContent"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+          <el-form-item label-width="78px" style="margin-top: 50px">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+              鎼� 绱�</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
+              >鍙� 娑�</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-drawer>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleImport"
+          >瀵煎叆</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          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="success"
+          plain
+          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="success"
+          plain
+          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="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="single"
+          @click="handleDelete"
+          >鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          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="success"
+          plain
+          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="success"
+          plain
+          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="success"
+          plain
+          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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          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>
+      <el-col :span="1.5">
+        <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"
+      >
+        <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"
+          >
+            <template slot-scope="{ row, column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{
+                  parseTime(row[column.property], "{y}-{m}-{d}")
+                }}</span>
+                <el-button
+                  type="text"
+                  @click="handleEdit(row, (OperationType = 3))"
+                  v-else-if="column.property == '鍗曟嵁鍙�'"
+                  >{{ row.鍗曟嵁鍙� }}</el-button
+                >
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="page"
+        :limit.sync="pageSize"
+        :pageSizes="pageSizes"
+        @pagination="getList"
+      />
+      <el-dialog
+        title="闅愯棌鍒楄缃�"
+        :visible.sync="openRowHide"
+        width="816px"
+        append-to-body
+      >
+        <RowSettings
+          :colName="btResList"
+          :HModName="HModName"
+          @rowEditClose="rowSetClose"
+          v-if="rowHideShow"
+        />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <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>
+      <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-button type="primary">鏂囦欢涓婁紶</el-button>
+          </el-upload>
+        </div>
+        <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="鎿嶄綔" align="center">
+            <template slot-scope="scope">
+              <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"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from "@/views/gyEmployee/edit";
+
+export default {
+  name: "GySource",
+  components: { RowSettings, Edit },
+  props: {
+    openPage: { type: String },
+  },
+  data() {
+    return {
+      HModName: "Gy_Source",
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
+      HBillType: "1205",
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: "=", value: "=" },
+        { label: ">=", value: ">=" },
+        { label: ">", value: ">" },
+        { label: "<=", value: "<=" },
+        { label: "<", value: "<" },
+        { label: "<>", value: "<>" },
+        { label: "鍖呭惈", value: "7" },
+        { label: "宸﹀寘鍚�", value: "8" },
+        { label: "鍙冲寘鍚�", value: "9" },
+        { label: "涓嶅寘鍚�", value: "10" },
+      ],
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      rqsgList: [
+        { label: "浠婂ぉ", value: 0 },
+        { label: "杩戜袱澶�", value: 1 },
+        { label: "杩戜笁澶�", value: 2 },
+        { label: "杩戝洓澶�", value: 3 },
+        { label: "杩戜簲澶�", value: 4 },
+        { label: "杩戝叚澶�", value: 5 },
+        { label: "杩戜竷澶�", value: 6 },
+        { label: "杩�30澶�", value: 29 },
+        { label: "杩戝崐骞�", value: 180 },
+        { label: "杩戜竴骞�", value: 365 },
+      ],
+      hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: "",
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //鐢熶骇璧勬枡瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HOrgID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
+      btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
+      btResList: [],
+      tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 50,
+      total: 0,
+      scollHeight: document.body.clientHeight * (38.056 / 100),
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+        HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+      },
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞�
+        open: false,
+        // 寮瑰嚭灞傛爣棰�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        // headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+      },
+      uploadData: [],
+      alluploadList: [],
+      uploadTableLoading: false,
+      uploadPageSizes: [50, 100, 500, 5000, 50000],
+      uploadPage: 1,
+      uploadPageSize: 50,
+      uploadTotal: 0,
+    };
+  },
+  created() {
+    this.fetchData();
+    this.riqiChange();
+  },
+  methods: {
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "鍚堣";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = "";
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios
+        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+        .then((response) => {
+          var data1 = response.data;
+          if (data1.count == 1) {
+            if (data1.data == "姘村姟") {
+              result = true;
+            }
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return result;
+    },
+    handleSellOpen() {
+      this.$router.push("/sellBill");
+    },
+    handleSellOutOpen() {
+      this.$router.push("/sellOutBill");
+    },
+    handleBtnHide() {
+      this.btnHideShow = true;
+      this.openBtnHide = true;
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.tableShow = true;
+      this.openRowHide = val;
+      this.getList();
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, "0");
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, "0");
+      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
+      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
+      this.dateRange = [this.sTime, this.eTime];
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      if (num == 1) {
+        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+        this.form.HDeptID = deptRow.HItemID;
+        this.form.HEmpID = deptRow.HEmpID;
+        this.form.HManagerName = deptRow.璐熻矗浜�;
+        this.openData = false;
+      } else if (num == 2) {
+        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+        this.openData = false;
+      } else if (num == 3) {
+        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+        this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+        this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
+      if (this.pageSize == 0) {
+        this.pageSize = 50;
+      }
+      // this.queryParams.HOrgID = 100038
+      this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
+      //鐢熶骇璧勬枡鍒楄〃
+      axios
+        .get(this.baseURL + "/Gy_Employee/listPage", {
+          params: {
+            sWhere: this.sWhere,
+            user: this.user,
+            Organization: "娴欐睙鏅轰簯杩堟��",
+            page: this.page,
+            size: this.pageSize,
+          },
+        })
+        .then((response) => {
+          this.tyResList = response.data.data; //鎬绘暟鎹�
+          let data1 = response.data;
+          let option = [];
+          if (data1.code == 1) {
+            this.btResList = data1.list; //鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
+            this.total = data1.count;
+            var data = []; //鍒楀瓧娈垫暟鎹�
+            var col = [];
+            var totalArray = ["浠舵暟"];
+            //缁欑┖鐨勬暟缁勮祴鍊�
+            for (var key in data1.list) {
+              //寰簭閬嶅巻鏁扮粍
+              data.push({
+                id: data1.list[key].ColmCols,
+                name: data1.list[key].ColmCols,
+                Type: data1.list[key].ColmType,
+              }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            }
+            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+            col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+            for (var i = 0; i < data.length; i++) {
+              //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+              if (this.titleData.indexOf(data[i].name) > -1) {
+                //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁＄畻鍒�
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  hide: true,
+                }); //闅愯棌id鍒�
+              } else if (
+                totalArray.indexOf(data[i].name) > -1 ||
+                data[i].Type == "Decimal" ||
+                data[i].Type == "Int32"
+              ) {
+                //璁＄畻鍒�
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  sort: true,
+                  totalRow: true,
+                  width: 120,
+                });
+              } else {
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  sort: true,
+                  width: 200,
+                });
+              }
+            }
+            option.cols = [col];
+            this.dataList = option;
+            option.data = data1.data;
+            var result = data1.data;
+            var temp = "";
+            for (var i = 0; i < result.length; i++) {
+              if (temp != result[i]["HItemID"]) {
+                temp = result[i]["HItemID"];
+              } else {
+                result[i].鏃ユ湡 = null;
+                result[i].鍗曟嵁鍙� = "";
+                /*result[i].鐘舵�� = "";*/
+                result[i].绾㈣摑鍗曟爣璁� = "";
+                result[i].hsupid = "";
+                result[i].瀹㈡埛 = "";
+                result[i].HEmpID = "";
+                result[i].涓氬姟鍛� = "";
+                result[i].hmanagerid = "";
+                result[i].涓荤 = "";
+                result[i].hsecmanagerid = "";
+                result[i].鍙戣揣浜� = "";
+                result[i].hkeeperid = "";
+                result[i].淇濈鍛� = "";
+                result[i].HDeptID = "";
+                result[i].閮ㄩ棬 = "";
+                result[i].閿�鍞柟寮� = "";
+              }
+            }
+            option.data = result;
+            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = [];
+      axios
+        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+          params: {
+            HModName: HModName,
+            user: user,
+          },
+        })
+        .then((res) => {
+          let data1 = res.data;
+          if (data1.data.length != 0) {
+            var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+            newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
+            dataCol = data1.data[0].HGridString.split(",");
+            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+            if (dataCol.length == option.cols[0].length - 1) {
+              //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+              for (var j = 0; j < option.cols[0].length - 1; j++) {
+                for (var i = 0; i < option.cols[0].length - 1; i++) {
+                  var dataCols = dataCol[j].split("|");
+                  //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                  if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                    //闅愯棌鍒�
+                    if (dataCols[1] == 1) {
+                      option.cols[0][i + 1]["hide"] = true;
+                    }
+                    //璁剧疆鍒楀
+                    if (dataCols[3] > 0) {
+                      option.cols[0][i + 1]["width"] = dataCols[3];
+                    }
+                    //璁剧疆鍐呭瀛椾綋澶у皬
+                    if (data1.data[0].HFontSize != 0) {
+                      option.cols[0][i + 1]["style"] =
+                        "font-size:" + data1.data[0].HFontSize + "px;";
+                    } else {
+                      option.cols[0][i + 1]["style"] = "font-size:100%";
+                    }
+                    //鏄剧ず鍒�
+                    if (
+                      dataCols[1] == 0 &&
+                      this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
+                    ) {
+                      option.cols[0][i + 1]["hide"] = false;
+                    }
+                    //缁熻鍒�
+                    if (dataCols[6] == 1) {
+                      option.cols[0][i + 1]["totalRow"] = true;
+                    } else {
+                      option.cols[0][i + 1]["totalRow"] = false;
+                    }
+                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                    switch (dataCols[2]) {
+                      case "L":
+                        option.cols[0][i + 1]["align"] = "left";
+                        break;
+                      case "M":
+                        option.cols[0][i + 1]["align"] = "center";
+                        break;
+                      case "R":
+                        option.cols[0][i + 1]["align"] = "right";
+                        break;
+                    }
+                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                    if (dataCols[4] != null && dataCols[4] != "") {
+                      option.cols[0][i + 1]["title"] = dataCols[4];
+                    }
+                    newCols[0].push(option.cols[0][i + 1]);
+                    break;
+                  }
+                }
+              }
+              //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+              if (dataCol.length == newCols[0].length - 1) {
+                option.cols = newCols;
+                //鍙栨秷鍐荤粨鍒�
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                  if (option.cols[0][i + 1]["fixed"] != null) {
+                    option.cols[0][i + 1]["fixed"] = null;
+                  } else {
+                    break;
+                  }
+                }
+                //鍐荤粨鍒�
+                if (data1.data[0].HFixCols != 0) {
+                  for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                    if (
+                      dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
+                    ) {
+                      data1.data[0].HFixCols += 1;
+                    }
+
+                    option.cols[0][i + 1]["fixed"] = "left";
+                  }
+                }
+                //璁剧疆鍒楁帓搴�
+                for (var i = 1; i < option.cols[0].length; i++) {
+                  if (data1.data[0].HSortFlag == "鏄�") {
+                    option.cols[0][i]["sort"] = true;
+                  } else {
+                    option.cols[0][i]["sort"] = false;
+                  }
+                }
+              }
+            }
+            this.btList = option.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            if (data1.data[0].HPageSize == 0) {
+              this.pageSize = 50;
+            } else {
+              this.pageSize = data1.data[0].HPageSize;
+            }
+            this.tableData = option.data;
+            this.tableShow = true;
+            this.loading = false;
+          } else {
+            this.btList = dataOption.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            this.tableData = dataOption.data;
+            this.tableShow = true;
+            this.loading = false;
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    renderHeader(h, { column, $index }) {
+      // 鏂板缓涓�涓� span
+      let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label;
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span);
+      return h(span, column.label);
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.HItemID)) {
+        return { background: "#ecf5ff" };
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 3;
+      this.handleEdit();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map((item) => item.HItemID);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      if (!this.single) {
+        this.rowForm = selection[0];
+      }
+    },
+    //鎵撳紑渚ц竟鎼滅储寮圭獥
+    handleSearch() {
+      this.searchOpen = true;
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = "";
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 =
+              "" +
+              this.queryParams.Comparator1 +
+              "'" +
+              this.queryParams.ColContent1 +
+              "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HNumber) {
+        this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+      }
+      if (this.queryParams.HName) {
+        this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+      }
+      if (this.queryParams.HOrgID) {
+        this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
+      }
+      // this.sWhere += this.addSWhereByOpenType()
+      // this.sWhere += this.getOrgIDByUser()
+      this.searchOpen = false;
+      this.getList();
+    },
+    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+    addSWhereByOpenType() {
+      //鑾峰彇鍙傛暟
+      var sWhere = "";
+      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+      if (this.openPage) {
+        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''";
+        return sWhere;
+      }
+      return sWhere;
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+    getOrgIDByUser() {
+      var res = "";
+      axios
+        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+          params: {
+            HModName: this.HModName,
+            user: this.user,
+            HOrgID: this.zuzhiId,
+          },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.count == 1) {
+            if (result.data[0].sWhere == "1") {
+              res = " and HUSEORGID = '" + this.zuzhiId + "'";
+            } else {
+              res = result.data[0].sWhere;
+            }
+          }
+        })
+        .catch((error) => {
+          res = " and 1 = 0";
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return res;
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.sWhere = "";
+      this.queryParams = {
+        HBillNo: "",
+        HInitTimeCycle: 29,
+        HProjectNumber: "",
+        HCusID: null,
+        HMaterNumber: "",
+        HMaterName: "",
+        ColName1: "",
+        ColName2: "",
+        ColName: "",
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+      };
+      this.riqiChange();
+      this.resetForm("queryForm");
+      this.getList();
+    },
+
+    //閫�鍑�
+    close() {
+      this.tableShow = true;
+      this.openEdit = false;
+      this.getList();
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.HItemID = 0;
+      this.$nextTick(() => {
+        this.openEdit = true;
+        this.editShow = true;
+      });
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit() {
+      this.$nextTick(() => {
+        this.openEdit = true;
+        this.editShow = true;
+      });
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editGyClose(val) {
+      this.editShow = false;
+      this.openEdit = false;
+      (this.multiple = true), this.getList();
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (!this.rowForm.瀹℃牳浜�) {
+            axios
+              .get(this.baseURL + "DeltetGy_Employee", {
+                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.getList();
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
+          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.getList();
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    // 鍙嶇鐢�/绂佺敤鏁版嵁
+    set_De_Stop(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
+          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.getList();
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `gySource_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+    },
+    handleImport() {
+      this.uploadData = [];
+      this.upload.isUploading = false;
+      this.upload.title = "瀵煎叆";
+      this.upload.open = true;
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadTableLoading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      // this.upload.open = false;
+      this.upload.isUploading = true;
+      this.$refs.upload.clearFiles();
+      if (response.code == 1) {
+        this.alluploadList = response.data;
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+        this.uploadTotal = this.alluploadList.length;
+        this.uploadTableLoading = false;
+        // this.set_AddNew(response.data)
+      } else {
+        this.$alert(
+          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+            response.Message +
+            "</div>",
+          "瀵煎叆缁撴灉",
+          { dangerouslyUseHTMLString: true }
+        );
+      }
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    set_AddNew() {
+      var num = [];
+      for (var i = 0; i < this.uploadData.length; i++) {
+        if (this.uploadData[i] != "") {
+          num.push(this.uploadData[i]);
+        }
+      }
+      var sSubStr = JSON.stringify(num);
+      var sMainSub = sSubStr + "&鍜�" + this.user;
+      axios({
+        method: "post",
+        url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+        data: {
+          sMainSub: sMainSub,
+        },
+      })
+        .then((res) => {
+          this.$alert(
+            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+              res.data.Message +
+              "</div>",
+            "瀵煎叆缁撴灉",
+            { dangerouslyUseHTMLString: true }
+          );
+          this.upload.open = false;
+          this.getList();
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    uploadDataIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    uploadDataDelete(row) {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          const deleteList = [row.index];
+          const data = this.uploadData;
+          this.uploadData = data.filter((item) => {
+            return deleteList.indexOf(item.index) == -1;
+          });
+        })
+        .catch(() => {});
+    },
+    getPage(page, list) {
+      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
+      let eindex = parseInt(page) * this.uploadPageSize;
+      let newList = list.slice(sindex, eindex);
+      console.log(newList);
+      return newList;
+    },
+    currentPage(val) {
+      this.uploadPage = val.page;
+      setTimeout(() => {
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+      }, 100);
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/gyStockPlace/edit/index.vue b/src/views/gyStockPlace/edit/index.vue
new file mode 100644
index 0000000..4a806cf
--- /dev/null
+++ b/src/views/gyStockPlace/edit/index.vue
@@ -0,0 +1,486 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled"
+        >淇� 瀛�</el-button
+      >
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+    </div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浠撲綅浠ｇ爜" prop="HNumber">
+                <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-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-input>
+                <el-button icon="el-icon-search" @click="openDataDialog(1)"></el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浣跨敤缁勭粐" prop="HUSEORGID">
+                <el-select
+                  v-model="form.HUSEORGID"
+                  placeholder="璇烽�夋嫨缁勭粐"
+                  :disabled="zzSelDis"
+                >
+                  <el-option
+                    v-for="(item, index) in organizationList"
+                    :key="index"
+                    :label="item.Name"
+                    :value="item.ID"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍔╄鐮�" prop="HHelpCode">
+                <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ュ姪璁扮爜" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ュ娉�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="榛樿浠撲綅" prop="HStandard">
+                <el-checkbox v-model="form.HStandard">鏄惁榛樿</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
+                <el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row> </el-row>
+        </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" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+import Warehouse from "@/views/component/warehouse";
+import Material from "@/views/component/material";
+import RowSettings from "@/views/component/rowSettings";
+import GyWorkCenter from "@/views/component/gyWorkCenter";
+import Employee from "@/views/component/employee";
+import moment from "moment";
+import dayjs from "dayjs";
+
+export default {
+  name: "gyWarehouse_Edit",
+  components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, Employee },
+  props: {
+    OperationType: { type: Number },
+    linterid: { type: Number },
+    HSouceBillType: { type: String },
+    copyType: { type: Number },
+  },
+  data() {
+    return {
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      zzSelDis: false,
+      rowHideShow: false,
+      openRowHide: false,
+      workCenterShow: false,
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      zbIndex: null,
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      employeeShow: false, // 浠撳簱绠＄悊鍛樼粍浠�
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: 0,
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      CheckBillDisabled: true,
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+
+      // 琛ㄥ崟鍙傛暟
+      form: {
+        HWarehouseType: "鐢熶骇浠撳簱",
+      },
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HNumber: [{ required: true, message: "浠撳簱浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
+        HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+        HWarehouseType: [
+          { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
+        ],
+      },
+
+      HWarehouseTypeList: [
+        {
+          Name: "鐢熶骇浠撳簱",
+        },
+        {
+          Name: "妯″叿浠撳簱",
+        },
+      ],
+    };
+  },
+  created() {
+    this.reset();
+    this.fetchData();
+  },
+  activated() {
+    this.reset();
+    this.fetchData();
+  },
+  methods: {
+    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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          this.user = data.Czymc;
+          axios
+            .get(this.baseURL + "/Web/GetOrganizations", {})
+            .then((response) => {
+              if (response.data.count == 1) {
+                this.organizationList = response.data.data; //缁勭粐鍒楄〃
+                this.getdata();
+              }
+            })
+            .catch((error) => {
+              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    getdata() {
+      this.reset();
+      console.log(this.OperationType);
+      if (this.OperationType != 1) {
+        this.zzSelDis = true;
+        axios
+          .get(this.baseURL + "/Gy_StockPlace/cx", {
+            params: {
+              HInterID: this.linterid,
+            },
+          })
+          .then((response) => {
+            console.log(response);
+            let result = response.data;
+            if (result.code == 1) {
+              // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+              var data = result.data[0];
+
+              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;
+              }
+            }
+            this.$nextTick(() => {
+              this.formShow = true;
+              this.formLoading = false;
+            });
+          })
+          .catch((error) => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      } else if (this.OperationType == 1) {
+        let date = new Date();
+        this.form.HMakeDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+        this.$nextTick(() => {
+          this.formShow = true;
+          this.formLoading = false;
+        });
+      }
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.openRowHide = val;
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      console.log(deptRow, num);
+      // num=1 浠撳簱
+      if (num == 2) {
+        Object.assign(this.form, {
+          HSPGroupName: deptRow.浠撳簱鍚嶇О,
+          HSPGroupID: deptRow.HItemID,
+          HSPGroupNumber: deptRow.浠撳簱浠ｇ爜,
+        });
+
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum);
+      this.deptform = {};
+    },
+    deptClose() {
+      this.deptform = {};
+      this.openData = false;
+    },
+
+    //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HNumber: null,
+        HItemID: 0,
+        HName: null,
+        HHelpCode: null,
+        HWorkTimes: "0",
+        HMaxWorkTimes: "0",
+        HRelationID: "0",
+        HMinAdd: "0",
+        HClassCount: "0",
+        HOverTimes: "0",
+        HCenter: null,
+        HCenterID: null,
+        HGroup: null,
+        HGroupID: 0,
+        HDeptName: null,
+        HDeptID: 0,
+        HProcName: null,
+        HProcID: 0,
+        HProcNumber: null,
+        HStopflag: false,
+        HType: null,
+        HRemark: null,
+        HUseFlag: "鏈娴�",
+        HUSEORGID: this.zuzhiId,
+        HCREATEORGID: this.zuzhiId,
+        HMacAddr: null,
+        HEmpID: 0,
+        HEmpName: null,
+        HMakeEmp: this.user,
+        HMakeTime: null,
+        HStopEmp: null,
+        HStopTime: null,
+        HCheckEmp: null,
+        HCheckTime: null,
+        HPrimarySourceID: 0,
+        HPrimarySourceName: null,
+        HParentID: 0,
+        HCubicleQty: "1",
+        HProdLinePeopleNum: "0",
+      };
+      this.editData = [];
+      this.editBtData = [];
+      this.ids = [];
+      this.formShow = false;
+      this.subDisabled = false;
+      this.formLoading = true;
+      this.CheckBillDisabled = true;
+      this.activeName = "first";
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset();
+      this.formShow = false;
+      // console.log()
+      this.$emit("editCloseGy", 0);
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let fhck = false;
+          this.$nextTick(() => {
+            if (!fhck) {
+              console.log(4);
+              var sMainStr = JSON.stringify(this.form);
+              // var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ";" + this.user;
+              axios({
+                method: "post",
+                url: this.baseURL + "/Gy_StockPlace/AddBill1",
+                data: {
+                  oMain: sMainSub,
+                },
+              })
+                .then((response) => {
+                  console.log(response);
+                  if (response.data.count == 1) {
+                    this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                    this.CheckBillDisabled = false;
+                    this.$modal.msgSuccess(response.data.Message);
+                  } else {
+                    this.$modal.msgError(response.data.Message);
+                    this.CheckBillDisabled = false;
+                    this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
+                  }
+                })
+                .catch((error) => {
+                  this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
+            }
+          });
+        }
+      });
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (this.rowForm.鐘舵�� == "鍒涘缓") {
+            axios
+              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+                params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.CheckBillDisabled = true;
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    showReset() {
+      this.deptShow = false;
+      this.warehouseShow = false;
+      this.materialShow = false;
+      this.workCenterShow = false;
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      if (row) {
+        this.zbIndex = row.index - 1;
+      }
+      this.showReset();
+      if (num == 1) {
+        this.dialogTitle = "浠撲綅鍒楄〃";
+        this.warehouseShow = true;
+        this.openData = true;
+      }
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+
+.form-inline > .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+}
+</style>
diff --git a/src/views/gyStockPlace/index.vue b/src/views/gyStockPlace/index.vue
new file mode 100644
index 0000000..a3c1b79
--- /dev/null
+++ b/src/views/gyStockPlace/index.vue
@@ -0,0 +1,1348 @@
+<template>
+  <div style="padding: 10px">
+    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
+      <div style="padding: 50px; width: 630px">
+        <div class="searchText">
+          <div style="font-size: 18px">QUICK SEARCH</div>
+          <div>蹇�熸悳绱�</div>
+          <div class="searchImg"></div>
+        </div>
+        <el-form :model="queryParams" ref="queryForm" label-width="98px">
+          <el-row>
+            <el-form-item label="浠撲綅浠ｇ爜" prop="HNumber">
+              <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-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-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍚屾" class="wh-sync">
+              <el-input
+                v-model="queryParams.HSyncNumber"
+                placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�"
+                @keyup.enter.native="handleSync"
+              />
+              <el-button @click="handleSync">鍚屾</el-button>
+            </el-form-item>
+          </el-row>
+          <el-card class="box-card">
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <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>
+                      </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>
+                  </el-col>
+                  <el-col :span="11">
+                    <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"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <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"
+                    >
+                      <span v-for="(item, index) in comparatorList" :key="index">
+                        <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-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>
+                  </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>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input
+                      v-model="queryParams.ColContent"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+          <el-form-item label-width="78px" style="margin-top: 50px">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+              鎼� 绱�</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
+              >鍙� 娑�</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-drawer>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          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="success"
+          plain
+          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="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="single"
+          @click="handleDelete"
+          >鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          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>
+      <el-col :span="1.5">
+        <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"
+      >
+        <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"
+          >
+            <template slot-scope="{ row, column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{
+                  parseTime(row[column.property], "{y}-{m}-{d}")
+                }}</span>
+                <el-button
+                  type="text"
+                  @click="handleEdit(row, (OperationType = 3))"
+                  v-else-if="column.property == '鍗曟嵁鍙�'"
+                  >{{ row.鍗曟嵁鍙� }}</el-button
+                >
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="page"
+        :limit.sync="pageSize"
+        :pageSizes="pageSizes"
+        @pagination="getList"
+      />
+      <el-dialog
+        title="闅愯棌鍒楄缃�"
+        :visible.sync="openRowHide"
+        width="816px"
+        append-to-body
+      >
+        <RowSettings
+          :colName="btResList"
+          :HModName="HModName"
+          @rowEditClose="rowSetClose"
+          v-if="rowHideShow"
+        />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <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>
+      <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-button type="primary">鏂囦欢涓婁紶</el-button>
+          </el-upload>
+        </div>
+        <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="鎿嶄綔" align="center">
+            <template slot-scope="scope">
+              <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"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from "@/views/gyStockPlace/edit";
+import GyStockPlace from "@/views/gyStockPlace";
+
+export default {
+  name: "GyStockPlace",
+  components: { RowSettings, Edit, GyStockPlace },
+  props: {
+    openPage: { type: String },
+  },
+  data() {
+    return {
+      HModName: "Gy_Warehouse",
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
+      HBillType: "Gy_Warehouse",
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: "=", value: "=" },
+        { label: ">=", value: ">=" },
+        { label: ">", value: ">" },
+        { label: "<=", value: "<=" },
+        { label: "<", value: "<" },
+        { label: "<>", value: "<>" },
+        { label: "鍖呭惈", value: "7" },
+        { label: "宸﹀寘鍚�", value: "8" },
+        { label: "鍙冲寘鍚�", value: "9" },
+        { label: "涓嶅寘鍚�", value: "10" },
+      ],
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      rqsgList: [
+        { label: "浠婂ぉ", value: 0 },
+        { label: "杩戜袱澶�", value: 1 },
+        { label: "杩戜笁澶�", value: 2 },
+        { label: "杩戝洓澶�", value: 3 },
+        { label: "杩戜簲澶�", value: 4 },
+        { label: "杩戝叚澶�", value: 5 },
+        { label: "杩戜竷澶�", value: 6 },
+        { label: "杩�30澶�", value: 29 },
+        { label: "杩戝崐骞�", value: 180 },
+        { label: "杩戜竴骞�", value: 365 },
+      ],
+      hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: "",
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: "http://localhost:81/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //鐢熶骇璧勬枡瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HOrgID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
+      btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
+      btResList: [],
+      tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: ["HItemID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 50,
+      total: 0,
+      scollHeight: document.body.clientHeight * (38.056 / 100),
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+        HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+      },
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞�
+        open: false,
+        // 寮瑰嚭灞傛爣棰�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        // headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+      },
+      uploadData: [],
+      alluploadList: [],
+      uploadTableLoading: false,
+      uploadPageSizes: [50, 100, 500, 5000, 50000],
+      uploadPage: 1,
+      uploadPageSize: 50,
+      uploadTotal: 0,
+    };
+  },
+  created() {
+    this.fetchData();
+    this.riqiChange();
+  },
+  methods: {
+    // 浠撲綅鍚屾(API涓殏鏃舵病鏈夊搴旂殑API)
+    async handleSync() {
+      try {
+        let res = await axios.get(this.baseURL + "/Gy_StockPlace/Gy_StockPlaceViewApi", {
+          params: {
+            Number: this.queryParams.HSyncNumber,
+            Type: "CW",
+            HUseOrgID: this.queryParams.HOrgID,
+          },
+        });
+        console.log(res.data);
+        let { count, Message } = res.data;
+
+        if (count == 1) {
+          this.$modal.msgSuccess(Message);
+        } else {
+          this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${Message}`);
+        }
+      } catch (err) {
+        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+      }
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "鍚堣";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = "";
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios
+        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+        .then((response) => {
+          var data1 = response.data;
+          if (data1.count == 1) {
+            if (data1.data == "姘村姟") {
+              result = true;
+            }
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return result;
+    },
+    handleBtnHide() {
+      this.btnHideShow = true;
+      this.openBtnHide = true;
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.tableShow = true;
+      this.openRowHide = val;
+      this.getList();
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, "0");
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, "0");
+      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
+      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
+      this.dateRange = [this.sTime, this.eTime];
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      if (num == 1) {
+        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+        this.form.HDeptID = deptRow.HItemID;
+        this.form.HEmpID = deptRow.HEmpID;
+        this.form.HManagerName = deptRow.璐熻矗浜�;
+        this.openData = false;
+      } else if (num == 2) {
+        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+        this.openData = false;
+      } else if (num == 3) {
+        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+        this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+        this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
+      if (this.pageSize == 0) {
+        this.pageSize = 50;
+      }
+      // this.queryParams.HOrgID = 100038
+      this.sWhere += "";
+      //浠撲綅鍒楄〃
+      axios
+        .get(this.baseURL + "/Gy_StockPlace/list1page", {
+          params: {
+            sWhere: `${this.sWhere}`,
+            user: this.user,
+            Organization: "娴欐睙鏅轰簯杩堟��",
+            page: this.page,
+            size: this.pageSize,
+          },
+        })
+        .then((response) => {
+          this.tyResList = response.data.data; //鎬绘暟鎹�
+          let data1 = response.data;
+          let option = [];
+          if (data1.code == 1) {
+            this.btResList = data1.list; //鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
+            this.total = data1.count;
+            var data = []; //鍒楀瓧娈垫暟鎹�
+            var col = [];
+            var totalArray = ["浠舵暟"];
+            //缁欑┖鐨勬暟缁勮祴鍊�
+            for (var key in data1.list) {
+              //寰簭閬嶅巻鏁扮粍
+              data.push({
+                id: data1.list[key].ColmCols,
+                name: data1.list[key].ColmCols,
+                Type: data1.list[key].ColmType,
+              }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            }
+            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+            col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+            for (var i = 0; i < data.length; i++) {
+              //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+              if (this.titleData.indexOf(data[i].name) > -1) {
+                //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁＄畻鍒�
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  hide: true,
+                }); //闅愯棌id鍒�
+              } else if (
+                totalArray.indexOf(data[i].name) > -1 ||
+                data[i].Type == "Decimal" ||
+                data[i].Type == "Int32"
+              ) {
+                //璁＄畻鍒�
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  sort: true,
+                  totalRow: true,
+                  width: 120,
+                });
+              } else {
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  sort: true,
+                  width: 200,
+                });
+              }
+            }
+            option.cols = [col];
+            this.dataList = option;
+            option.data = data1.data;
+            var result = data1.data;
+            var temp = "";
+            for (var i = 0; i < result.length; i++) {
+              if (temp != result[i]["HItemID"]) {
+                temp = result[i]["HItemID"];
+              } else {
+                result[i].鏃ユ湡 = null;
+                result[i].鍗曟嵁鍙� = "";
+                /*result[i].鐘舵�� = "";*/
+                result[i].绾㈣摑鍗曟爣璁� = "";
+                result[i].hsupid = "";
+                result[i].瀹㈡埛 = "";
+                result[i].HEmpID = "";
+                result[i].涓氬姟鍛� = "";
+                result[i].hmanagerid = "";
+                result[i].涓荤 = "";
+                result[i].hsecmanagerid = "";
+                result[i].鍙戣揣浜� = "";
+                result[i].hkeeperid = "";
+                result[i].淇濈鍛� = "";
+                result[i].HDeptID = "";
+                result[i].閮ㄩ棬 = "";
+                result[i].閿�鍞柟寮� = "";
+              }
+            }
+            option.data = result;
+            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = [];
+      axios
+        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+          params: {
+            HModName: HModName,
+            user: user,
+          },
+        })
+        .then((res) => {
+          let data1 = res.data;
+          if (data1.data.length != 0) {
+            var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+            newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
+            dataCol = data1.data[0].HGridString.split(",");
+            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+            if (dataCol.length == option.cols[0].length - 1) {
+              //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+              for (var j = 0; j < option.cols[0].length - 1; j++) {
+                for (var i = 0; i < option.cols[0].length - 1; i++) {
+                  var dataCols = dataCol[j].split("|");
+                  //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                  if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                    //闅愯棌鍒�
+                    if (dataCols[1] == 1) {
+                      option.cols[0][i + 1]["hide"] = true;
+                    }
+                    //璁剧疆鍒楀
+                    if (dataCols[3] > 0) {
+                      option.cols[0][i + 1]["width"] = dataCols[3];
+                    }
+                    //璁剧疆鍐呭瀛椾綋澶у皬
+                    if (data1.data[0].HFontSize != 0) {
+                      option.cols[0][i + 1]["style"] =
+                        "font-size:" + data1.data[0].HFontSize + "px;";
+                    } else {
+                      option.cols[0][i + 1]["style"] = "font-size:100%";
+                    }
+                    //鏄剧ず鍒�
+                    if (
+                      dataCols[1] == 0 &&
+                      this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
+                    ) {
+                      option.cols[0][i + 1]["hide"] = false;
+                    }
+                    //缁熻鍒�
+                    if (dataCols[6] == 1) {
+                      option.cols[0][i + 1]["totalRow"] = true;
+                    } else {
+                      option.cols[0][i + 1]["totalRow"] = false;
+                    }
+                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                    switch (dataCols[2]) {
+                      case "L":
+                        option.cols[0][i + 1]["align"] = "left";
+                        break;
+                      case "M":
+                        option.cols[0][i + 1]["align"] = "center";
+                        break;
+                      case "R":
+                        option.cols[0][i + 1]["align"] = "right";
+                        break;
+                    }
+                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                    if (dataCols[4] != null && dataCols[4] != "") {
+                      option.cols[0][i + 1]["title"] = dataCols[4];
+                    }
+                    newCols[0].push(option.cols[0][i + 1]);
+                    break;
+                  }
+                }
+              }
+              //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+              if (dataCol.length == newCols[0].length - 1) {
+                option.cols = newCols;
+                //鍙栨秷鍐荤粨鍒�
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                  if (option.cols[0][i + 1]["fixed"] != null) {
+                    option.cols[0][i + 1]["fixed"] = null;
+                  } else {
+                    break;
+                  }
+                }
+                //鍐荤粨鍒�
+                if (data1.data[0].HFixCols != 0) {
+                  for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                    if (
+                      dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
+                    ) {
+                      data1.data[0].HFixCols += 1;
+                    }
+
+                    option.cols[0][i + 1]["fixed"] = "left";
+                  }
+                }
+                //璁剧疆鍒楁帓搴�
+                for (var i = 1; i < option.cols[0].length; i++) {
+                  if (data1.data[0].HSortFlag == "鏄�") {
+                    option.cols[0][i]["sort"] = true;
+                  } else {
+                    option.cols[0][i]["sort"] = false;
+                  }
+                }
+              }
+            }
+            this.btList = option.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            if (data1.data[0].HPageSize == 0) {
+              this.pageSize = 50;
+            } else {
+              this.pageSize = data1.data[0].HPageSize;
+            }
+            this.tableData = option.data;
+            this.tableShow = true;
+            this.loading = false;
+          } else {
+            this.btList = dataOption.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            this.tableData = dataOption.data;
+            this.tableShow = true;
+            this.loading = false;
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    renderHeader(h, { column, $index }) {
+      // 鏂板缓涓�涓� span
+      let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label;
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span);
+      return h(span, column.label);
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.HItemID)) {
+        return { background: "#ecf5ff" };
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 3;
+      this.handleEdit();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map((item) => item.HItemID);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      if (!this.single) {
+        this.rowForm = selection[0];
+      }
+    },
+    //鎵撳紑渚ц竟鎼滅储寮圭獥
+    handleSearch() {
+      this.searchOpen = true;
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = "";
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 =
+              "" +
+              this.queryParams.Comparator1 +
+              "'" +
+              this.queryParams.ColContent1 +
+              "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HNumber) {
+        this.sWhere += " and 浠撲綅浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+      }
+      if (this.queryParams.HName) {
+        this.sWhere += " and 浠撲綅鍚嶇О like '%" + this.queryParams.HName + "%'";
+      }
+      if (this.queryParams.HOrgName) {
+        this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+      }
+      // this.sWhere += this.addSWhereByOpenType()
+      // this.sWhere += this.getOrgIDByUser()
+      this.searchOpen = false;
+      this.getList();
+    },
+    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+    addSWhereByOpenType() {
+      //鑾峰彇鍙傛暟
+      var sWhere = "";
+      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+      if (this.openPage) {
+        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''";
+        return sWhere;
+      }
+      return sWhere;
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+    getOrgIDByUser() {
+      var res = "";
+      axios
+        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+          params: {
+            HModName: this.HModName,
+            user: this.user,
+            HOrgID: this.zuzhiId,
+          },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.count == 1) {
+            if (result.data[0].sWhere == "1") {
+              res = " and HUSEORGID = '" + this.zuzhiId + "'";
+            } else {
+              res = result.data[0].sWhere;
+            }
+          }
+        })
+        .catch((error) => {
+          res = " and 1 = 0";
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return res;
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.sWhere = "";
+      this.queryParams = {
+        HNumber: "",
+        HName: "",
+        HBillNo: "",
+        HInitTimeCycle: 29,
+        HProjectNumber: "",
+        HCusID: null,
+        HMaterNumber: "",
+        HMaterName: "",
+        ColName1: "",
+        ColName2: "",
+        ColName: "",
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+      };
+      this.riqiChange();
+      this.resetForm("queryForm");
+      this.getList();
+    },
+
+    //閫�鍑�
+    close() {
+      this.tableShow = true;
+      this.openEdit = false;
+      this.getList();
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.HItemID = 0;
+      this.$nextTick(() => {
+        this.openEdit = true;
+        this.editShow = true;
+      });
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit() {
+      this.$nextTick(() => {
+        this.openEdit = true;
+        this.editShow = true;
+      });
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editGyClose(val) {
+      this.editShow = false;
+      this.openEdit = false;
+      (this.multiple = true), this.getList();
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (!this.rowForm.瀹℃牳浜�) {
+            axios
+              .get(this.baseURL + "Deltet_Gy_StockPlace", {
+                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.getList();
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `gyStockPlace_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+    },
+    handleImport() {
+      this.uploadData = [];
+      this.upload.isUploading = false;
+      this.upload.title = "瀵煎叆";
+      this.upload.open = true;
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadTableLoading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      // this.upload.open = false;
+      this.upload.isUploading = true;
+      this.$refs.upload.clearFiles();
+      if (response.code == 1) {
+        this.alluploadList = response.data;
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+        this.uploadTotal = this.alluploadList.length;
+        this.uploadTableLoading = false;
+        // this.set_AddNew(response.data)
+      } else {
+        this.$alert(
+          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+            response.Message +
+            "</div>",
+          "瀵煎叆缁撴灉",
+          { dangerouslyUseHTMLString: true }
+        );
+      }
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    set_AddNew() {
+      var num = [];
+      for (var i = 0; i < this.uploadData.length; i++) {
+        if (this.uploadData[i] != "") {
+          num.push(this.uploadData[i]);
+        }
+      }
+      var sSubStr = JSON.stringify(num);
+      var sMainSub = sSubStr + "&鍜�" + this.user;
+      axios({
+        method: "post",
+        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
+        data: {
+          sMainSub: sMainSub,
+        },
+      })
+        .then((res) => {
+          this.$alert(
+            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+              res.data.Message +
+              "</div>",
+            "瀵煎叆缁撴灉",
+            { dangerouslyUseHTMLString: true }
+          );
+          this.upload.open = false;
+          this.getList();
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    uploadDataIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    uploadDataDelete(row) {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          const deleteList = [row.index];
+          const data = this.uploadData;
+          this.uploadData = data.filter((item) => {
+            return deleteList.indexOf(item.index) == -1;
+          });
+        })
+        .catch(() => {});
+    },
+    getPage(page, list) {
+      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
+      let eindex = parseInt(page) * this.uploadPageSize;
+      let newList = list.slice(sindex, eindex);
+      console.log(newList);
+      return newList;
+    },
+    currentPage(val) {
+      this.uploadPage = val.page;
+      setTimeout(() => {
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+      }, 100);
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+
+.wh-sync > .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+  width: 60%;
+}
+</style>
diff --git a/src/views/gyWarehouse/edit/index.vue b/src/views/gyWarehouse/edit/index.vue
new file mode 100644
index 0000000..a49f3c7
--- /dev/null
+++ b/src/views/gyWarehouse/edit/index.vue
@@ -0,0 +1,616 @@
+<template>
+  <div v-loading="formLoading" v-if="formShow">
+    <div style="margin-bottom: 10px; border-bottom: 1px solid #f6f6f6">
+      <el-button type="primary" @click="submitForm" :disabled="subDisabled"
+        >淇� 瀛�</el-button
+      >
+      <el-button
+        type="primary"
+        @click="set_CheckBill(0, form)"
+        :disabled="CheckBillDisabled"
+        >瀹� 鏍�</el-button
+      >
+      <el-button type="primary" @click="close">閫� 鍑�</el-button>
+    </div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber">
+                <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-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍔╄鐮�" prop="HHelpCode">
+                <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜"> </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="浠撳簱鍦板潃" prop="HAddress">
+                <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ヤ粨搴撳湴鍧�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鑱旂郴鐢佃瘽" prop="HPhone">
+                <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <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"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤鏍囧織" prop="HStopflag">
+                <el-checkbox v-model="form.HStopflag" disabled>鏄惁绂佺敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="鍚敤浠撲綅" prop="HSPFlag">
+                <el-checkbox v-model="form.HSPFlag">鏄惁鍚敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="璐熷簱瀛樻帶鍒舵爣璁�" prop="HStockCtrlFlag">
+                <el-checkbox v-model="form.HStockCtrlFlag">鏄惁鍚敤</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="缁勭粐" prop="HUSEORGID">
+                <el-select
+                  v-model="form.HUSEORGID"
+                  placeholder="璇烽�夋嫨缁勭粐"
+                  :disabled="zzSelDis"
+                >
+                  <el-option
+                    v-for="(item, index) in organizationList"
+                    :key="index"
+                    :label="item.Name"
+                    :value="item.ID"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍏朵粬淇℃伅" name="second">
+          <el-row>
+            <el-col :span="16">
+              <el-form-item class="form-inline" label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�..."></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item class="form-inline" label="浠撳簱绠＄悊鍛�" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨浠撳簱绠＄悊鍛�">
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="openDataDialog(1)"
+                  ></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍒涘缓浜�" prop="HMakeEmp">
+                <el-input v-model="form.HMakeEmp" placeholder="璇疯緭鍏ュ垱寤轰汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤浜�" prop="HStopEmp">
+                <el-input v-model="form.HStopEmp" placeholder="璇疯緭鍏ョ鐢ㄤ汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀹℃牳浜�" prop="HCheckEmp">
+                <el-input v-model="form.HCheckEmp" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="鍒涘缓鏃ユ湡" prop="HMakeDate">
+                <el-date-picker
+                  v-model="form.HMakeDate"
+                  type="date"
+                  placeholder="閫夋嫨鍒涘缓鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="绂佺敤鏃ユ湡" prop="HStopTime">
+                <el-date-picker
+                  v-model="form.HStopTime"
+                  type="date"
+                  placeholder="閫夋嫨绂佺敤鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckTime">
+                <el-date-picker
+                  v-model="form.HCheckTime"
+                  type="date"
+                  placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+                  disabled
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </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" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+      <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+      <Employee
+        @deptEmitDb="dbEmitData"
+        @deptEmit="emitData"
+        v-if="employeeShow"
+      ></Employee>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+        <el-button @click="deptClose">鍙� 娑�</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import Dept from "@/views/component/dept";
+import Warehouse from "@/views/component/warehouse";
+import Material from "@/views/component/material";
+import RowSettings from "@/views/component/rowSettings";
+import GyWorkCenter from "@/views/component/gyWorkCenter";
+import Employee from "@/views/component/employee";
+import moment from "moment";
+import dayjs from "dayjs";
+
+export default {
+  name: "gyWarehouse_Edit",
+  components: { Dept, Warehouse, Material, RowSettings, GyWorkCenter, Employee },
+  props: {
+    OperationType: { type: Number },
+    linterid: { type: Number },
+    HSouceBillType: { type: String },
+    copyType: { type: Number },
+  },
+  data() {
+    return {
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      zzSelDis: false,
+      rowHideShow: false,
+      openRowHide: false,
+      workCenterShow: false,
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      zbIndex: null,
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      employeeShow: false, // 浠撳簱绠＄悊鍛樼粍浠�
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: 0,
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      CheckBillDisabled: true,
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+
+      // 琛ㄥ崟鍙傛暟
+      form: {
+        HWarehouseType: "鐢熶骇浠撳簱",
+      },
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HNumber: [{ required: true, message: "浠撳簱浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
+        HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+        HWarehouseType: [
+          { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
+        ],
+      },
+
+      HWarehouseTypeList: [
+        {
+          Name: "鐢熶骇浠撳簱",
+        },
+        {
+          Name: "妯″叿浠撳簱",
+        },
+      ],
+    };
+  },
+  created() {
+    this.reset();
+    this.fetchData();
+  },
+  activated() {
+    this.reset();
+    this.fetchData();
+  },
+  methods: {
+    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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          this.user = data.Czymc;
+          axios
+            .get(this.baseURL + "/Web/GetOrganizations", {})
+            .then((response) => {
+              if (response.data.count == 1) {
+                this.organizationList = response.data.data; //缁勭粐鍒楄〃
+                this.getdata();
+              }
+            })
+            .catch((error) => {
+              this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    getdata() {
+      this.reset();
+      console.log(this.OperationType);
+      if (this.OperationType != 1) {
+        this.zzSelDis = true;
+        axios
+          .get(this.baseURL + "/Gy_Warehouse/cx", {
+            params: {
+              HInterID: this.linterid,
+            },
+          })
+          .then((response) => {
+            console.log(response);
+            let result = response.data;
+            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"),
+              });
+              if (!data.HCheckEmp) {
+                this.CheckBillDisabled = false;
+              }
+            }
+            this.$nextTick(() => {
+              this.formShow = true;
+              this.formLoading = false;
+            });
+          })
+          .catch((error) => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+      } else if (this.OperationType == 1) {
+        let date = new Date();
+        this.form.HMakeDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+        this.$nextTick(() => {
+          this.formShow = true;
+          this.formLoading = false;
+        });
+      }
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.openRowHide = val;
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      console.log(deptRow, num);
+      // num=1 浠撳簱绠＄悊鍛�
+      if (num == 1) {
+        this.form.HEmpID = deptRow.HItemID;
+        this.form.HEmpName = deptRow["鑱屽憳鍚嶇О"];
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum);
+      this.deptform = {};
+    },
+    deptClose() {
+      this.deptform = {};
+      this.openData = false;
+    },
+
+    //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HNumber: null,
+        HItemID: 0,
+        HName: null,
+        HHelpCode: null,
+        HWorkTimes: "0",
+        HMaxWorkTimes: "0",
+        HRelationID: "0",
+        HMinAdd: "0",
+        HClassCount: "0",
+        HOverTimes: "0",
+        HCenter: null,
+        HCenterID: null,
+        HGroup: null,
+        HGroupID: 0,
+        HDeptName: null,
+        HDeptID: 0,
+        HProcName: null,
+        HProcID: 0,
+        HProcNumber: null,
+        HStopflag: false,
+        HType: null,
+        HRemark: null,
+        HUseFlag: "鏈娴�",
+        HUSEORGID: this.zuzhiId,
+        HCREATEORGID: this.zuzhiId,
+        HMacAddr: null,
+        HEmpID: 0,
+        HEmpName: null,
+        HMakeEmp: this.user,
+        HMakeTime: null,
+        HStopEmp: null,
+        HStopTime: null,
+        HCheckEmp: null,
+        HCheckTime: null,
+        HPrimarySourceID: 0,
+        HPrimarySourceName: null,
+        HParentID: 0,
+        HCubicleQty: "1",
+        HProdLinePeopleNum: "0",
+      };
+      this.editData = [];
+      this.editBtData = [];
+      this.ids = [];
+      this.formShow = false;
+      this.subDisabled = false;
+      this.formLoading = true;
+      this.CheckBillDisabled = true;
+      this.activeName = "first";
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset();
+      this.formShow = false;
+      // console.log()
+      this.$emit("editCloseGy", 0);
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          let fhck = false;
+          this.$nextTick(() => {
+            if (!fhck) {
+              console.log(4);
+              var sMainStr = JSON.stringify(this.form);
+              // var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ";" + this.user;
+              axios({
+                method: "post",
+                url: this.baseURL + "/Gy_Warehouse/ModifyByID",
+                data: {
+                  oMain: sMainSub,
+                },
+              })
+                .then((response) => {
+                  console.log(response);
+                  if (response.data.count == 1) {
+                    this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                    this.CheckBillDisabled = false;
+                    this.$modal.msgSuccess(response.data.Message);
+                  } else {
+                    this.$modal.msgError(response.data.Message);
+                    this.CheckBillDisabled = false;
+                    this.subDisabled = false; //璁剧疆淇濆瓨鎸夐挳鍙敤
+                  }
+                })
+                .catch((error) => {
+                  this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+                });
+            }
+          });
+        }
+      });
+    },
+
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (this.rowForm.鐘舵�� == "鍒涘缓") {
+            axios
+              .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+                params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.CheckBillDisabled = true;
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    showReset() {
+      this.deptShow = false;
+      this.warehouseShow = false;
+      this.materialShow = false;
+      this.workCenterShow = false;
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      if (row) {
+        this.zbIndex = row.index - 1;
+      }
+      this.showReset();
+      if (num == 1) {
+        this.dialogTitle = "浠撳簱绠＄悊鍛樺垪琛�";
+        this.employeeShow = true;
+        this.openData = true;
+      }
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+
+.form-inline > .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+}
+</style>
diff --git a/src/views/gyWarehouse/index.vue b/src/views/gyWarehouse/index.vue
new file mode 100644
index 0000000..c2a11f4
--- /dev/null
+++ b/src/views/gyWarehouse/index.vue
@@ -0,0 +1,1450 @@
+<template>
+  <div style="padding: 10px">
+    <el-drawer title="鏌ヨ" :visible.sync="searchOpen" :with-header="false" size="650px">
+      <div style="padding: 50px; width: 630px">
+        <div class="searchText">
+          <div style="font-size: 18px">QUICK SEARCH</div>
+          <div>蹇�熸悳绱�</div>
+          <div class="searchImg"></div>
+        </div>
+        <el-form :model="queryParams" ref="queryForm" label-width="98px">
+          <el-row>
+            <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber">
+              <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-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-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="鍚屾" class="wh-sync">
+              <el-input
+                v-model="queryParams.HSyncNumber"
+                placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+                @keyup.enter.native="handleSync"
+              />
+              <el-button @click="handleSync">鍚屾</el-button>
+            </el-form-item>
+          </el-row>
+          <el-card class="box-card">
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-form-item label-width="0">
+                <el-row>
+                  <el-col :span="7">
+                    <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>
+                      </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>
+                  </el-col>
+                  <el-col :span="11">
+                    <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"
+                    >
+                      <span v-for="(item, index) in btList" :key="index">
+                        <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"
+                    >
+                      <span v-for="(item, index) in comparatorList" :key="index">
+                        <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-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>
+                  </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>
+                  </el-col>
+                  <el-col :span="11">
+                    <el-input
+                      v-model="queryParams.ColContent"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </div>
+          </el-card>
+          <el-form-item label-width="78px" style="margin-top: 50px">
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">
+              鎼� 绱�</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="searchOpen = false"
+              >鍙� 娑�</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </div>
+    </el-drawer>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleImport"
+          >瀵煎叆</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          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="success"
+          plain
+          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="success"
+          plain
+          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="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="single"
+          @click="handleDelete"
+          >鍒犻櫎
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          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="success"
+          plain
+          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="success"
+          plain
+          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="success"
+          plain
+          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="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          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>
+      <el-col :span="1.5">
+        <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"
+      >
+        <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"
+          >
+            <template slot-scope="{ row, column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{
+                  parseTime(row[column.property], "{y}-{m}-{d}")
+                }}</span>
+                <el-button
+                  type="text"
+                  @click="handleEdit(row, (OperationType = 3))"
+                  v-else-if="column.property == '鍗曟嵁鍙�'"
+                  >{{ row.鍗曟嵁鍙� }}</el-button
+                >
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="page"
+        :limit.sync="pageSize"
+        :pageSizes="pageSizes"
+        @pagination="getList"
+      />
+      <el-dialog
+        title="闅愯棌鍒楄缃�"
+        :visible.sync="openRowHide"
+        width="816px"
+        append-to-body
+      >
+        <RowSettings
+          :colName="btResList"
+          :HModName="HModName"
+          @rowEditClose="rowSetClose"
+          v-if="rowHideShow"
+        />
+      </el-dialog>
+      <!-- 缂栬緫 -->
+      <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>
+      <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-button type="primary">鏂囦欢涓婁紶</el-button>
+          </el-upload>
+        </div>
+        <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="鎿嶄綔" align="center">
+            <template slot-scope="scope">
+              <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"
+        />
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from "axios";
+import RowSettings from "@/views/component/rowSettings";
+import Edit from "@/views/gyWarehouse/edit";
+import gyWarehouse from "@/views/gyWarehouse";
+
+export default {
+  name: "GyWarehouse",
+  components: { RowSettings, Edit, gyWarehouse },
+  props: {
+    openPage: { type: String },
+  },
+  data() {
+    return {
+      HModName: "Gy_Warehouse",
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
+      HBillType: "Gy_Warehouse",
+      openBtnHide: false,
+      btnHideShow: false,
+      rowHideShow: false,
+      openRowHide: false,
+      copyType: 0,
+      comparatorList: [
+        { label: "=", value: "=" },
+        { label: ">=", value: ">=" },
+        { label: ">", value: ">" },
+        { label: "<=", value: "<=" },
+        { label: "<", value: "<" },
+        { label: "<>", value: "<>" },
+        { label: "鍖呭惈", value: "7" },
+        { label: "宸﹀寘鍚�", value: "8" },
+        { label: "鍙冲寘鍚�", value: "9" },
+        { label: "涓嶅寘鍚�", value: "10" },
+      ],
+      sWhere: "",
+      sTime: "",
+      eTime: "",
+      rqsgList: [
+        { label: "浠婂ぉ", value: 0 },
+        { label: "杩戜袱澶�", value: 1 },
+        { label: "杩戜笁澶�", value: 2 },
+        { label: "杩戝洓澶�", value: 3 },
+        { label: "杩戜簲澶�", value: 4 },
+        { label: "杩戝叚澶�", value: 5 },
+        { label: "杩戜竷澶�", value: 6 },
+        { label: "杩�30澶�", value: 29 },
+        { label: "杩戝崐骞�", value: 180 },
+        { label: "杩戜竴骞�", value: 365 },
+      ],
+      hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {}, //瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false, //浠撳簱鏁版嵁缁勪欢
+      materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+      deptform: {}, //寮圭獥閫変腑鏁版嵁
+      openData: false, //鏁版嵁寮圭獥
+      dialogTitle: "",
+      zuzhiId: "",
+      organizationList: [], //缁勭粐鍒楄〃
+      subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: "http://localhost:81/API/",
+      user: "admin",
+      currentRow: [],
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      checkedSysZb: [],
+      editData: [], //鐢熶骇璧勬枡瀛愯〃
+      editBtData: [], //瀛愯〃琛ㄥご
+      activeName: "first",
+      searchOpen: false,
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HOrgID: null,
+        HName: null,
+        HNumber: null,
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [], //閿�鍞嚭搴撳垪琛紙鎺ュ彛鏁版嵁锛�
+      btList: [], //閿�鍞嚭搴撹〃澶村垪琛ㄦ樉绀�
+      btResList: [],
+      tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: ["HItemID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 50,
+      total: 0,
+      scollHeight: document.body.clientHeight * (38.056 / 100),
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍￠獙
+      rules: {
+        HSupName: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
+        HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+        HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+      },
+      upload: {
+        // 鏄惁鏄剧ず寮瑰嚭灞�
+        open: false,
+        // 寮瑰嚭灞傛爣棰�
+        title: "",
+        // 鏄惁绂佺敤涓婁紶
+        isUploading: false,
+        // 鏄惁鏇存柊宸茬粡瀛樺湪鐨勬暟鎹�
+        updateSupport: 0,
+        // 璁剧疆涓婁紶鐨勮姹傚ご閮�
+        // headers: { Authorization: "Bearer " + getToken() },
+        // 涓婁紶鐨勫湴鍧�
+        url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+      },
+      uploadData: [],
+      alluploadList: [],
+      uploadTableLoading: false,
+      uploadPageSizes: [50, 100, 500, 5000, 50000],
+      uploadPage: 1,
+      uploadPageSize: 50,
+      uploadTotal: 0,
+    };
+  },
+  created() {
+    this.fetchData();
+    this.riqiChange();
+  },
+  methods: {
+    // 浠撳簱鍚屾
+    async handleSync() {
+      try {
+        let res = await axios.get(this.baseURL + "/Gy_Warehouse/Gy_WarehouseViewApi", {
+          params: {
+            Number: this.queryParams.HSyncNumber,
+            Type: "CK",
+            HUseOrgID: this.queryParams.HOrgID,
+          },
+        });
+        console.log(res.data);
+        let { count, Message } = res.data;
+
+        if (count == 1) {
+          this.$modal.msgSuccess(Message);
+        } else {
+          this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${Message}`);
+        }
+      } catch (err) {
+        this.$modal.msgError(`鎺ュ彛璇锋眰澶辫触: ${err}`);
+      }
+    },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "鍚堣";
+          return;
+        }
+        const values = data.map((item) => Number(item[column.property]));
+        if (this.totalNameList[index].totalRow) {
+          if (!values.every((value) => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+          } else {
+            sums[index] = "";
+          }
+        }
+      }, 1000);
+      return sums;
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      axios
+        .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+        .then((response) => {
+          var data1 = response.data;
+          if (data1.count == 1) {
+            if (data1.data == "姘村姟") {
+              result = true;
+            }
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return result;
+    },
+    handleBtnHide() {
+      this.btnHideShow = true;
+      this.openBtnHide = true;
+    },
+    handleRowHide() {
+      this.rowHideShow = true;
+      this.openRowHide = true;
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false;
+      this.tableShow = true;
+      this.openRowHide = val;
+      this.getList();
+    },
+    riqiChange() {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
+      const yyyyS = start.getFullYear();
+      const mmS = String(start.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddS = String(start.getDate()).padStart(2, "0");
+      const yyyyE = end.getFullYear();
+      const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
+      const ddE = String(end.getDate()).padStart(2, "0");
+      this.sTime = yyyyS + "-" + mmS + "-" + ddS;
+      this.eTime = yyyyE + "-" + mmE + "-" + ddE;
+      this.dateRange = [this.sTime, this.eTime];
+    },
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      if (num == 1) {
+        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
+        this.form.HDeptID = deptRow.HItemID;
+        this.form.HEmpID = deptRow.HEmpID;
+        this.form.HManagerName = deptRow.璐熻矗浜�;
+        this.openData = false;
+      } else if (num == 2) {
+        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+        this.openData = false;
+      } else if (num == 3) {
+        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+        this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+        this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+        this.openData = false;
+      }
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num;
+      this.deptform = deptRow;
+    },
+    deptClickSub() {
+      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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
+      if (this.pageSize == 0) {
+        this.pageSize = 50;
+      }
+      // this.queryParams.HOrgID = 100038
+      this.sWhere += "";
+      //鐢熶骇璧勬枡鍒楄〃
+      axios
+        .get(this.baseURL + "/Gy_WareHouse/listpage", {
+          params: {
+            sWhere: `${this.sWhere}`,
+            user: this.user,
+            Organization: "娴欐睙鏅轰簯杩堟��",
+            page: this.page,
+            size: this.pageSize,
+          },
+        })
+        .then((response) => {
+          this.tyResList = response.data.data; //鎬绘暟鎹�
+          let data1 = response.data;
+          let option = [];
+          if (data1.code == 1) {
+            this.btResList = data1.list; //鐢熶骇璧勬枡鎺ュ彛琛ㄥご鏁版嵁
+            this.total = data1.count;
+            var data = []; //鍒楀瓧娈垫暟鎹�
+            var col = [];
+            var totalArray = ["浠舵暟"];
+            //缁欑┖鐨勬暟缁勮祴鍊�
+            for (var key in data1.list) {
+              //寰簭閬嶅巻鏁扮粍
+              data.push({
+                id: data1.list[key].ColmCols,
+                name: data1.list[key].ColmCols,
+                Type: data1.list[key].ColmType,
+              }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            }
+            //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+            col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+            for (var i = 0; i < data.length; i++) {
+              //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+              if (this.titleData.indexOf(data[i].name) > -1) {
+                //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑  //璁＄畻鍒�
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  hide: true,
+                }); //闅愯棌id鍒�
+              } else if (
+                totalArray.indexOf(data[i].name) > -1 ||
+                data[i].Type == "Decimal" ||
+                data[i].Type == "Int32"
+              ) {
+                //璁＄畻鍒�
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  sort: true,
+                  totalRow: true,
+                  width: 120,
+                });
+              } else {
+                col.push({
+                  field: data[i].id,
+                  title: data[i].name,
+                  align: "center",
+                  sort: true,
+                  width: 200,
+                });
+              }
+            }
+            option.cols = [col];
+            this.dataList = option;
+            option.data = data1.data;
+            var result = data1.data;
+            var temp = "";
+            for (var i = 0; i < result.length; i++) {
+              if (temp != result[i]["HItemID"]) {
+                temp = result[i]["HItemID"];
+              } else {
+                result[i].鏃ユ湡 = null;
+                result[i].鍗曟嵁鍙� = "";
+                /*result[i].鐘舵�� = "";*/
+                result[i].绾㈣摑鍗曟爣璁� = "";
+                result[i].hsupid = "";
+                result[i].瀹㈡埛 = "";
+                result[i].HEmpID = "";
+                result[i].涓氬姟鍛� = "";
+                result[i].hmanagerid = "";
+                result[i].涓荤 = "";
+                result[i].hsecmanagerid = "";
+                result[i].鍙戣揣浜� = "";
+                result[i].hkeeperid = "";
+                result[i].淇濈鍛� = "";
+                result[i].HDeptID = "";
+                result[i].閮ㄩ棬 = "";
+                result[i].閿�鍞柟寮� = "";
+              }
+            }
+            option.data = result;
+            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    DisPlay_HideColumn(HModName, user, option, dataOption) {
+      this.totalNameList = [];
+      axios
+        .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+          params: {
+            HModName: HModName,
+            user: user,
+          },
+        })
+        .then((res) => {
+          let data1 = res.data;
+          if (data1.data.length != 0) {
+            var dataCol = []; //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+            var newCols = [[]]; //瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+            newCols[0].push(option.cols[0][0]); //鏀惧叆绗竴涓猚heckbox
+            dataCol = data1.data[0].HGridString.split(",");
+            //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+            if (dataCol.length == option.cols[0].length - 1) {
+              //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+              for (var j = 0; j < option.cols[0].length - 1; j++) {
+                for (var i = 0; i < option.cols[0].length - 1; i++) {
+                  var dataCols = dataCol[j].split("|");
+                  //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+                  if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+                    //闅愯棌鍒�
+                    if (dataCols[1] == 1) {
+                      option.cols[0][i + 1]["hide"] = true;
+                    }
+                    //璁剧疆鍒楀
+                    if (dataCols[3] > 0) {
+                      option.cols[0][i + 1]["width"] = dataCols[3];
+                    }
+                    //璁剧疆鍐呭瀛椾綋澶у皬
+                    if (data1.data[0].HFontSize != 0) {
+                      option.cols[0][i + 1]["style"] =
+                        "font-size:" + data1.data[0].HFontSize + "px;";
+                    } else {
+                      option.cols[0][i + 1]["style"] = "font-size:100%";
+                    }
+                    //鏄剧ず鍒�
+                    if (
+                      dataCols[1] == 0 &&
+                      this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1
+                    ) {
+                      option.cols[0][i + 1]["hide"] = false;
+                    }
+                    //缁熻鍒�
+                    if (dataCols[6] == 1) {
+                      option.cols[0][i + 1]["totalRow"] = true;
+                    } else {
+                      option.cols[0][i + 1]["totalRow"] = false;
+                    }
+                    //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+                    switch (dataCols[2]) {
+                      case "L":
+                        option.cols[0][i + 1]["align"] = "left";
+                        break;
+                      case "M":
+                        option.cols[0][i + 1]["align"] = "center";
+                        break;
+                      case "R":
+                        option.cols[0][i + 1]["align"] = "right";
+                        break;
+                    }
+                    //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+                    if (dataCols[4] != null && dataCols[4] != "") {
+                      option.cols[0][i + 1]["title"] = dataCols[4];
+                    }
+                    newCols[0].push(option.cols[0][i + 1]);
+                    break;
+                  }
+                }
+              }
+              //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+              if (dataCol.length == newCols[0].length - 1) {
+                option.cols = newCols;
+                //鍙栨秷鍐荤粨鍒�
+                for (var i = 1; i < option.cols[0].length - 1; i++) {
+                  if (option.cols[0][i + 1]["fixed"] != null) {
+                    option.cols[0][i + 1]["fixed"] = null;
+                  } else {
+                    break;
+                  }
+                }
+                //鍐荤粨鍒�
+                if (data1.data[0].HFixCols != 0) {
+                  for (var i = 0; i < data1.data[0].HFixCols; i++) {
+                    if (
+                      dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1
+                    ) {
+                      data1.data[0].HFixCols += 1;
+                    }
+
+                    option.cols[0][i + 1]["fixed"] = "left";
+                  }
+                }
+                //璁剧疆鍒楁帓搴�
+                for (var i = 1; i < option.cols[0].length; i++) {
+                  if (data1.data[0].HSortFlag == "鏄�") {
+                    option.cols[0][i]["sort"] = true;
+                  } else {
+                    option.cols[0][i]["sort"] = false;
+                  }
+                }
+              }
+            }
+            this.btList = option.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            if (data1.data[0].HPageSize == 0) {
+              this.pageSize = 50;
+            } else {
+              this.pageSize = data1.data[0].HPageSize;
+            }
+            this.tableData = option.data;
+            this.tableShow = true;
+            this.loading = false;
+          } else {
+            this.btList = dataOption.cols[0];
+            this.btList.map((item) => {
+              if (!item.hide) {
+                this.totalNameList.push(item);
+              }
+            });
+            this.tableData = dataOption.data;
+            this.tableShow = true;
+            this.loading = false;
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    renderHeader(h, { column, $index }) {
+      // 鏂板缓涓�涓� span
+      let span = document.createElement(span); // 璁剧疆琛ㄥご鍚嶇О
+      span.innerText = column.label;
+      //涓存椂鎻掑叆 document
+      document.body.appendChild(span); // 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
+      document.body.removeChild(span);
+      return h(span, column.label);
+    },
+    //鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.HItemID)) {
+        return { background: "#ecf5ff" };
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 3;
+      this.handleEdit();
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map((item) => item.HItemID);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+      if (!this.single) {
+        this.rowForm = selection[0];
+      }
+    },
+    //鎵撳紑渚ц竟鎼滅储寮圭獥
+    handleSearch() {
+      this.searchOpen = true;
+    },
+    /** 鎼滅储鎸夐挳鎿嶄綔 */
+    handleQuery() {
+      this.sWhere = "";
+      if (this.queryParams.ColName && this.queryParams.Comparator) {
+        var com = "";
+        switch (this.queryParams.Comparator) {
+          case "7":
+            com = "like'%" + this.queryParams.ColContent + "%'";
+            break;
+          case "8":
+            com = "like'%" + this.queryParams.ColContent + "'";
+            break;
+          case "9":
+            com = "like'" + this.queryParams.ColContent + "%'";
+            break;
+          case "10":
+            com = "not like'%" + this.queryParams.ColContent + "%'";
+            break;
+          default:
+            com =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName + " " + com;
+      }
+      if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+        var com1 = "";
+        switch (this.queryParams.Comparator1) {
+          case "7":
+            com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "8":
+            com1 = "like'%" + this.queryParams.ColContent1 + "'";
+            break;
+          case "9":
+            com1 = "like'" + this.queryParams.ColContent1 + "%'";
+            break;
+          case "10":
+            com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+            break;
+          default:
+            com1 =
+              "" +
+              this.queryParams.Comparator1 +
+              "'" +
+              this.queryParams.ColContent1 +
+              "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+      }
+      if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+        var com2 = "";
+        switch (this.queryParams.Comparator2) {
+          case "7":
+            com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "8":
+            com2 = "like'%" + this.queryParams.ColContent2 + "'";
+            break;
+          case "9":
+            com2 = "like'" + this.queryParams.ColContent2 + "%'";
+            break;
+          case "10":
+            com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+            break;
+          default:
+            com2 =
+              "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+            break;
+        }
+        this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+      }
+      if (this.queryParams.HNumber) {
+        this.sWhere += " and 浠撳簱浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+      }
+      if (this.queryParams.HName) {
+        this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
+      }
+      if (this.queryParams.HOrgName) {
+        this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+      }
+      // this.sWhere += this.addSWhereByOpenType()
+      // this.sWhere += this.getOrgIDByUser()
+      this.searchOpen = false;
+      this.getList();
+    },
+    // 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+    addSWhereByOpenType() {
+      //鑾峰彇鍙傛暟
+      var sWhere = "";
+      //this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
+      if (this.openPage) {
+        sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'')  != ''";
+        return sWhere;
+      }
+      return sWhere;
+    },
+    //鏍规嵁鐢ㄦ埛鑾峰彇鐢ㄦ埛鍏宠仈缁勭粐鐨勮繃婊ゆ潯浠�
+    getOrgIDByUser() {
+      var res = "";
+      axios
+        .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+          params: {
+            HModName: this.HModName,
+            user: this.user,
+            HOrgID: this.zuzhiId,
+          },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.count == 1) {
+            if (result.data[0].sWhere == "1") {
+              res = " and HUSEORGID = '" + this.zuzhiId + "'";
+            } else {
+              res = result.data[0].sWhere;
+            }
+          }
+        })
+        .catch((error) => {
+          res = " and 1 = 0";
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+      return res;
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.dateRange = [];
+      this.sWhere = "";
+      this.queryParams = {
+        HBillNo: "",
+        HInitTimeCycle: 29,
+        HProjectNumber: "",
+        HCusID: null,
+        HMaterNumber: "",
+        HMaterName: "",
+        ColName1: "",
+        ColName2: "",
+        ColName: "",
+        Comparator1: "",
+        Comparator2: "",
+        Comparator: "",
+        ColContent1: "",
+        ColContent2: "",
+        ColContent: "",
+        HSyncNumber,
+      };
+      this.riqiChange();
+      this.resetForm("queryForm");
+      this.getList();
+    },
+
+    //閫�鍑�
+    close() {
+      this.tableShow = true;
+      this.openEdit = false;
+      this.getList();
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.HItemID = 0;
+      this.$nextTick(() => {
+        this.openEdit = true;
+        this.editShow = true;
+      });
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit() {
+      this.$nextTick(() => {
+        this.openEdit = true;
+        this.editShow = true;
+      });
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editGyClose(val) {
+      this.editShow = false;
+      this.openEdit = false;
+      (this.multiple = true), this.getList();
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          if (!this.rowForm.瀹℃牳浜�) {
+            axios
+              .get(this.baseURL + "/DeltetGy_Warehouse", {
+                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+              })
+              .then((response) => {
+                if (response.data.count == 1) {
+                  this.getList();
+                  this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+                } else {
+                  this.$modal.msgError("閿欒:" + result.code + result.Message);
+                }
+              })
+              .catch((error) => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+          } else {
+            this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+          }
+        })
+        .catch(() => {});
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.getList();
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    // 鍙嶇鐢�/绂佺敤鏁版嵁
+    set_De_Stop(num, form) {
+      var InterID = form.HItemID || form.HInterID;
+      //閫昏緫瀹℃牳鏂规硶
+      axios
+        .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
+          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+        })
+        .then((response) => {
+          let result = response.data;
+          if (result.code == 1) {
+            this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+            this.getList();
+          } else {
+            this.$modal.msgError("閿欒:" + result.code + result.Message);
+          }
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    //瀵煎嚭
+    handleExport() {
+      const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
+      const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
+      this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
+      this.$XLSX.writeFile(wb, `gyWarehouse_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
+    },
+    handleImport() {
+      this.uploadData = [];
+      this.upload.isUploading = false;
+      this.upload.title = "瀵煎叆";
+      this.upload.open = true;
+    },
+    // 鏂囦欢涓婁紶涓鐞�
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+      this.uploadTableLoading = true;
+    },
+    // 鏂囦欢涓婁紶鎴愬姛澶勭悊
+    handleFileSuccess(response, file, fileList) {
+      // this.upload.open = false;
+      this.upload.isUploading = true;
+      this.$refs.upload.clearFiles();
+      if (response.code == 1) {
+        this.alluploadList = response.data;
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+        this.uploadTotal = this.alluploadList.length;
+        this.uploadTableLoading = false;
+        // this.set_AddNew(response.data)
+      } else {
+        this.$alert(
+          "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+            response.Message +
+            "</div>",
+          "瀵煎叆缁撴灉",
+          { dangerouslyUseHTMLString: true }
+        );
+      }
+    },
+    // 鎻愪氦涓婁紶鏂囦欢
+    submitFileForm() {
+      this.$refs.upload.submit();
+    },
+    set_AddNew() {
+      var num = [];
+      for (var i = 0; i < this.uploadData.length; i++) {
+        if (this.uploadData[i] != "") {
+          num.push(this.uploadData[i]);
+        }
+      }
+      var sSubStr = JSON.stringify(num);
+      var sMainSub = sSubStr + "&鍜�" + this.user;
+      axios({
+        method: "post",
+        url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
+        data: {
+          sMainSub: sMainSub,
+        },
+      })
+        .then((res) => {
+          this.$alert(
+            "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
+              res.data.Message +
+              "</div>",
+            "瀵煎叆缁撴灉",
+            { dangerouslyUseHTMLString: true }
+          );
+          this.upload.open = false;
+          this.getList();
+        })
+        .catch((error) => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+    },
+    uploadDataIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    uploadDataDelete(row) {
+      this.$modal
+        .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
+        .then(() => {
+          const deleteList = [row.index];
+          const data = this.uploadData;
+          this.uploadData = data.filter((item) => {
+            return deleteList.indexOf(item.index) == -1;
+          });
+        })
+        .catch(() => {});
+    },
+    getPage(page, list) {
+      let sindex = (parseInt(page) - 1) * this.uploadPageSize;
+      let eindex = parseInt(page) * this.uploadPageSize;
+      let newList = list.slice(sindex, eindex);
+      console.log(newList);
+      return newList;
+    },
+    currentPage(val) {
+      this.uploadPage = val.page;
+      setTimeout(() => {
+        this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
+      }, 100);
+    },
+  },
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+
+.wh-sync > .el-form-item__content {
+  display: flex;
+  flex-direction: row;
+  width: 60%;
+}
+</style>
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index 21f443e..f27247e 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -270,7 +270,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
-          @click="handleDelete((row = rowForm))"
+          @click="handleDelete"
           >鍒犻櫎
         </el-button>
       </el-col>
@@ -1356,8 +1356,7 @@
       (this.multiple = true), this.getList();
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      console.log(row);
+    handleDelete() {
       this.$modal
         .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
         .then(() => {
@@ -1365,11 +1364,11 @@
             axios
               .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
                 params: {
-                  HInterID: row.hmainid.toString(),
-                  HsupId: row.hsubId,
-                  HQty: row["鏁伴噺"],
-                  HSourceInterID: row["婧愬崟涓诲唴鐮�"],
-                  HSourceEntryID: row["婧愬崟瀛愬唴鐮�"],
+                  HInter: this.rowForm.hmainid.toString(),
+                  HsupId: this.rowForm.HsupId,
+                  HQty: this.rowForm.HQty,
+                  HSourceInterID: this.rowForm.HSourceInterID,
+                  HSourceEntryID: this.rowForm.HSourceEntryID,
                   user: this.user,
                 },
               })
@@ -1395,7 +1394,7 @@
       var InterID = form.HItemID || form.HInterID || form.hmainid;
       //閫昏緫瀹℃牳鏂规硶
       axios
-        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill_Swell", {
+        .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
           params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
         })
         .then((res) => {
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index 421942d..f7d1bf6 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -284,7 +284,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
-          @click="handleDelete((row = rowForm))"
+          @click="handleDelete"
           >鍒犻櫎
         </el-button>
       </el-col>
@@ -1385,15 +1385,14 @@
       (this.multiple = true), this.getList();
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      console.log(row);
+    handleDelete() {
       this.$modal
         .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
         .then(() => {
-          if (!row.瀹℃牳浜�) {
+          if (!this.rowForm.瀹℃牳浜�) {
             axios
               .get(this.baseURL + "Cg_POOrderBill/DeltetCg_POOrderBill", {
-                params: { HInterID: row.hmainid.toString(), user: this.user },
+                params: { HInter: this.rowForm.HInterID.toString(), user: this.user },
               })
               .then((response) => {
                 if (response.data.count == 1) {
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index 05c85b7..5ecb99e 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -49,7 +49,7 @@
           >
             <el-option
               v-for="(item, index) in organizationList"
-              :key="item.ID"
+              :key="index"
               :label="item.Name"
               :value="item.ID"
             >
@@ -287,7 +287,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
-          @click="handleDelete((form = rowForm))"
+          @click="handleDelete"
           >鍒犻櫎
         </el-button>
       </el-col>
@@ -499,7 +499,7 @@
       </el-dialog>
       <!-- 缂栬緫 -->
       <el-dialog
-        title="缂栬緫閫�璐ч�氱煡鍗�"
+        title="缂栬緫鑱屽憳"
         :visible.sync="openEdit"
         width="1480px"
         append-to-body
@@ -699,7 +699,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: sessionStorage["OrganizationID"],
+        HOrgID: null,
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -934,7 +934,7 @@
       }
 
       try {
-        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBackBill/list_byPage", {
+        let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
             user: this.user,
@@ -1392,8 +1392,7 @@
       (this.multiple = true), this.getList();
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(form) {
-      console.log(form);
+    handleDelete() {
       this.$modal
         .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
         .then(() => {
@@ -1401,11 +1400,11 @@
             axios
               .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                 params: {
-                  HInterID: form.hmainid.toString(),
-                  HsupId: form.hsubid,
-                  HQty: form["鏁伴噺"],
-                  HSourceInterID: form["婧愬崟涓诲唴鐮�"],
-                  HSourceEntryID: form["婧愬崟瀛愬唴鐮�"],
+                  HInter: this.rowForm.hmainid.toString(),
+                  HsupId: this.rowForm.HsupId,
+                  HQty: this.rowForm.HQty,
+                  HSourceInterID: this.rowForm.HSourceInterID,
+                  HSourceEntryID: this.rowForm.HSourceEntryID,
                   user: this.user,
                 },
               })
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 890a09b..08a7ac7 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -56,9 +56,9 @@
           >
             <el-option
               v-for="(item, index) in organizationList"
-              :key="item.ID"
+              :key="index"
               :label="item.Name"
-              :value="item.ID.toString()"
+              :value="item.ID"
             >
             </el-option>
           </el-select>
@@ -294,7 +294,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
-          @click="handleDelete((form = rowForm))"
+          @click="handleDelete"
           >鍒犻櫎
         </el-button>
       </el-col>
@@ -506,7 +506,7 @@
       </el-dialog>
       <!-- 缂栬緫 -->
       <el-dialog
-        title="缂栬緫鍙戣揣閫氱煡鍗�"
+        title="缂栬緫鑱屽憳"
         :visible.sync="openEdit"
         width="1480px"
         append-to-body
@@ -706,7 +706,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: sessionStorage.getItem("OrganizationID"),
+        HOrgID: null,
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -782,7 +782,7 @@
   },
   mounted() {},
   created() {
-    this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+    this.queryParams.HOrgID = sessionStorage["Organization"];
     this.riqiChange();
     this.getList();
   },
@@ -1409,8 +1409,7 @@
       (this.multiple = true), this.getList();
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      console.log(row);
+    handleDelete() {
       this.$modal
         .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
         .then(() => {
@@ -1418,11 +1417,11 @@
             axios
               .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
                 params: {
-                  HInterID: row.hmainid.toString(),
-                  HsupId: row.hsubid,
-                  HQty: row["鏁伴噺"],
-                  HSourceInterID: row["婧愬崟涓诲唴鐮�"],
-                  HSourceEntryID: row["婧愬崟瀛愬唴鐮�"],
+                  HInter: this.rowForm.hmainid.toString(),
+                  HsupId: this.rowForm.HsupId,
+                  HQty: this.rowForm.HQty,
+                  HSourceInterID: this.rowForm.HSourceInterID,
+                  HSourceEntryID: this.rowForm.HSourceEntryID,
                   user: this.user,
                 },
               })
diff --git a/src/views/sell/sellOut/sellOutBillEdit.vue b/src/views/sell/sellOut/sellOutBillEdit.vue
index 83812f3..7731239 100644
--- a/src/views/sell/sellOut/sellOutBillEdit.vue
+++ b/src/views/sell/sellOut/sellOutBillEdit.vue
@@ -43,7 +43,7 @@
             <el-col :span="6">
               <el-form-item label="閿�鍞憳" prop="HEmpName">
                 <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
-                  <el-button slot="append" icon="el-icon-search"></el-button>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4)"></el-button>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -352,13 +352,14 @@
       <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
       <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
       <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
         <el-button @click="deptClose">鍙� 娑�</el-button>
       </div>
     </el-dialog>
     <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
-      <RowSettings :colName="btResList" HModName="Kf_SellOutBillList" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+      <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
     </el-dialog>
   </div>
 </template>
@@ -369,11 +370,12 @@
 import Warehouse from '@/views/component/warehouse'
 import Material from '@/views/component/material'
 import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
 import moment from 'moment';
 
 export default {
-  name: 'SellOutBill',
-  components: { Dept, Warehouse, Material, RowSettings },
+  name: 'SellOutBillEdit',
+  components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
   props: {
     OperationType: { type: Number, },
     linterid: { type: Number, },
@@ -383,6 +385,7 @@
   },
   data() {
     return {
+      HModName: "Kf_SellOutBill",
       formShow: false,
       temp: undefined,
       formLoading: true,
@@ -397,6 +400,7 @@
       deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
       warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
       materialShow: false,//鐗╂枡鏁版嵁缁勪欢
+      gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
       deptform: {},//寮圭獥閫変腑鏁版嵁
       openData: false,//鏁版嵁寮圭獥
       dialogTitle: '',
@@ -643,28 +647,40 @@
     //閮ㄩ棬寮圭獥璧嬪��
     dbEmitData(deptRow, num) {
       // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
-      if (num == 1) {
-        this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-        this.form.HDeptID = deptRow.HItemID
-        this.form.HEmpID = deptRow.HEmpID
-        this.form.HManagerName = deptRow.璐熻矗浜�
-        this.openData = false
-      } else if (num == 2) {
-        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-        this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
-        this.openData = false
+      console.log(deptRow)
+      if (deptRow.HItemID) {
+        if (num == 1) {
+          this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+          this.form.HDeptID = deptRow.HItemID
+          this.form.HManagerName = deptRow.璐熻矗浜�
+          this.deptShow = false
+          this.openData = false
+        } else if (num == 2) {
+          this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+          this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+          this.warehouseShow = false
+          this.openData = false
+        } else if (num == 3) {
+          this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+          this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
+          this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
+          this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
+          this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
+          this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
+          this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+          this.materialShow = false
+          this.openData = false
+        } else if (num == 4) {
+          this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+          this.form.HEmpID = deptRow.HItemID
+          this.gyEmployeeShow = false
+          this.openData = false
+        }
+      } else {
+        this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
       }
-      else if (num == 3) {
-        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-        this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
-        this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
-        this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
-        this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
-        this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
-        this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
-        this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
-        this.openData = false
-      }
+
     },
     emitData(deptRow, num) {
       this.dialogTypeNum = num
@@ -761,8 +777,8 @@
       this.reset()
 
       if (!this.OperationType && !this.copyType) {
-        // this.$router.back()
-        window.close()
+        const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
+        this.$tab.closePage(obj);
       } else {
         this.formShow = false
         this.$emit('editClose', false)
@@ -1225,9 +1241,11 @@
       this.deptShow = false
       this.warehouseShow = false
       this.materialShow = false
+      this.gyEmployeeShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
+      //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
       if (row) {
         this.zbIndex = row.index - 1
       }
@@ -1244,6 +1262,10 @@
         this.dialogTitle = '鐗╂枡鍒楄〃'
         this.materialShow = true
         this.openData = true
+      } else if (num == 4) {
+        this.dialogTitle = '閿�鍞憳鍒楄〃'
+        this.gyEmployeeShow = true
+        this.openData = true
       }
     },
   }
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index 495fc89..e12a25e 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -41,12 +41,20 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="椤圭洰缂栧彿" prop="HProjectNumber">
-          <el-input
-            v-model="queryParams.HProjectNumber"
-            placeholder="璇疯緭鍏ラ」鐩紪鍙�"
-            @keyup.enter.native="handleQuery"
-          />
+        <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-option>
+          </el-select>
         </el-form-item>
       </el-row>
 
@@ -270,7 +278,7 @@
           icon="el-icon-delete"
           size="mini"
           :disabled="single"
-          @click="handleDelete((row = rowForm))"
+          @click="handleDelete"
           >鍒犻櫎
         </el-button>
       </el-col>
@@ -482,7 +490,7 @@
       </el-dialog>
       <!-- 缂栬緫 -->
       <el-dialog
-        title="缂栬緫閿�鍞鍗�"
+        title="缂栬緫鑱屽憳"
         :visible.sync="openEdit"
         width="1480px"
         append-to-body
@@ -596,7 +604,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "xsSeOrderBill",
+  name: "GySource",
   components: { RowSettings },
   props: {
     openPage: { type: String },
@@ -658,7 +666,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
+      organizationList: [], //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -682,7 +690,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: sessionStorage["OrganizationID"],
+        HOrgID: sessionStorage["Organization"],
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -756,7 +764,9 @@
       uploadTotal: 0,
     };
   },
-  mounted() {},
+  mounted() {
+    this.queryParams.HOrgID = sessionStorage["Organization"];
+  },
   created() {
     this.riqiChange();
     this.getList();
@@ -886,6 +896,35 @@
     deptClickSub() {
       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; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+          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;
@@ -1264,9 +1303,7 @@
       if (this.queryParams.HMaterName) {
         this.sWhere += " and 鐗╂枡鍚嶇О like ''%" + this.queryParams.HMaterName + "%''";
       }
-      if (this.queryParams.HProjectNumber) {
-        this.sWhere += " and 椤圭洰缂栫爜 like ''%" + this.queryParams.HProjectNumber + "%''";
-      }
+
       // if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
       //   this.sWhere += `  and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
       // }
@@ -1370,8 +1407,7 @@
       (this.multiple = true), this.getList();
     },
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
-    handleDelete(row) {
-      console.log(row);
+    handleDelete() {
       this.$modal
         .confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
         .then(() => {
@@ -1379,7 +1415,7 @@
             axios
               .get(this.baseURL + "Cg_POInStockBill/DeltetPOInStockBill", {
                 params: {
-                  HInterID: this.rowForm.hmainid.toString(),
+                  HInter: this.rowForm.hmainid.toString(),
                   HsupId: this.rowForm.HsupId,
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,

--
Gitblit v1.9.1