From c2b23cc8c94d1bee188b472c7a94ccc840ec0811 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 24 十一月 2025 09:53:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/scMould/basicModeling/Gy_MouldFile.vue                     | 1485 ++++++
 src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue                 | 1239 +++++
 src/views/basic/gy/gySupplierEdit.vue                                |  444 -
 src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue             | 1173 +---
 src/views/sell/XsSeOutStockBackBillList.vue                          |   49 
 src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue            | 1088 ++++
 src/views/basic/gyStockPlace/gyStockPlace.vue                        |   81 
 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue     |  829 +++
 src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue                |  870 +++
 src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue                  |  103 
 src/views/sell/XsSeOutStockBill.vue                                  |   55 
 src/layout/components/Navbar.vue                                     |    6 
 src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue             | 1228 ++---
 .env.staging                                                         |    5 
 src/views/basic/gyEmployee/gyEmployee.vue                            |   74 
 src/views/sell/XsSeOutStockBillEdit.vue                              |    2 
 src/layout/components/Sidebar/index.vue                              |    1 
 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue     |   23 
 src/views/sell/xsSeOrderBill/xsSeOrderBill.vue                       |   80 
 src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue              |   35 
 src/permission.js                                                    |  101 
 src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue              | 1177 +---
 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue |   62 
 src/store/modules/user.js                                            |   14 
 src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue             |   35 
 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue               |   51 
 src/views/sell/XsSeOutStockBackBillEdit.vue                          |    2 
 src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue             |   35 
 src/views/basic/gy/gyDepartment.vue                                  |    1 
 src/views/scMould/basicModeling/Gy_MouldFileList.vue                 |  158 
 src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue     | 1104 ++++
 src/store/modules/permission.js                                      |   61 
 src/router/index.js                                                  |   88 
 src/views/basic/gyWarehouse/gyWarehouse.vue                          |  571 +
 src/views/basic/gy/gySupplier.vue                                    |    3 
 src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue                   |   52 
 .env.development                                                     |    4 
 src/views/GyCustomer/index.vue                                       |    2 
 src/views/sell/sellOut/sellOutBill.vue                               |   22 
 src/views/login.vue                                                  |    1 
 src/views/ICMO/ScICMOBillList.vue                                    |  705 --
 src/views/gyMaterial/GyMaterial.vue                                  |   14 
 .env.production                                                      |    2 
 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue                | 1179 ++++
 44 files changed, 10,648 insertions(+), 3,666 deletions(-)

diff --git a/.env.development b/.env.development
index 233f7a7..a0c89aa 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/.env.production b/.env.production
index 634d712..68ca0f2 100644
--- a/.env.production
+++ b/.env.production
@@ -7,3 +7,5 @@
 # 鏅轰簯杩堟�滾-MOM绠$悊绯荤粺/鐢熶骇鐜
 VUE_APP_BASE_API = 'http://47.96.97.237/API/'
 
+# 璺敱鎳掑姞杞�
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index e86d15e..1a84e05 100644
--- a/.env.staging
+++ b/.env.staging
@@ -9,4 +9,7 @@
 ENV = 'staging'
 
 # 鏅轰簯杩堟�滾-MOM绠$悊绯荤粺/娴嬭瘯鐜
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = 'http://192.168.0.51:81/API/'
+
+# 璺敱鎳掑姞杞�
+VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3ba4078..5d9ab49 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -25,9 +25,9 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
+          <!-- <router-link to="/user/profile">
             <el-dropdown-item>涓汉涓績</el-dropdown-item>
-          </router-link>
+          </router-link> -->
           <el-dropdown-item @click.native="setLayout" v-if="setting">
             <span>甯冨眬璁剧疆</span>
           </el-dropdown-item>
@@ -99,7 +99,7 @@
         cancelButtonText: '鍙栨秷',
         type: 'warning'
       }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
+        this.$store.dispatch('FedLogOut').then(() => {
           location.href = '/index'
         })
       }).catch(() => { })
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index d35a05a..129fafc 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -33,7 +33,6 @@
             const { meta, path } = route
             // if set path, the sidebar will highlight the path you set
             if (meta.activeMenu) {
-                console.log(meta.activeMenu)
                 return meta.activeMenu
             }
             return path
diff --git a/src/permission.js b/src/permission.js
index 69893a0..b9e977d 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,65 +1,82 @@
-import router from './router'
-import store from './store'
-import { Message } from 'element-ui'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isPathMatch } from '@/utils/validate'
-import { isRelogin } from '@/utils/request'
+import router from "./router";
+import store from "./store";
+import { Message } from "element-ui";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
+import { isPathMatch } from "@/utils/validate";
+import { isRelogin } from "@/utils/request";
 
-NProgress.configure({ showSpinner: false })
+NProgress.configure({ showSpinner: false });
 
-const whiteList = [ '/login', '/register', '/printList',
-  '/hBarPlanPrint', '/gySource', '/gyWarehouse', '/gyStockPlace', '/gyEmployee','/GyCustomer','/gyMaterial','/FbStepFoldinBillList','/FbStepFoldOutBillList' ] // no redirect whitelist
+const whiteList = [
+  "/login",
+  "/register",
+  "/printList",
+  "/hBarPlanPrint",
+  "/gySource",
+  "/gyWarehouse",
+  "/gyStockPlace",
+  "/gyEmployee",
+  "/GyCustomer",
+  "/gyMaterial",
+  "/FbStepFoldinBillList",
+  "/FbStepFoldOutBillList",
+]; // no redirect whitelist
 
 const isWhiteList = (path) => {
-  return whiteList.some(pattern => isPathMatch(pattern, path))
-}
+  return whiteList.some((pattern) => isPathMatch(pattern, path));
+};
 
 router.beforeEach((to, from, next) => {
-  NProgress.start()
+  NProgress.start();
   if (getToken()) {
-    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
     /* has token*/
-    if (to.path === '/login') {
-      next({ path: '/' })
-      NProgress.done()
-    } else if (isWhiteList(to.path)) {
-      next()
+    // if (to.path === "/login") {
+    //   next({ path: "/" });
+    //   NProgress.done();
+    // } else
+    if (isWhiteList(to.path)) {
+      next();
     } else {
-      if (store.getters.roles.length === 0) {
-        isRelogin.show = true
+      if (!sessionStorage["HMaker"]) {
+        next("/login"); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+      }
+      if (store.getters.permission_routes.length === 0) {
+        isRelogin.show = true;
         // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
-            router.addRoutes(accessRoutes) // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
-            next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+        store .dispatch("GetInfo").then(() => {
+            isRelogin.show = false;
+            store.dispatch("GenerateRoutes").then((accessRoutes) => {
+              // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
+              router.addRoutes(accessRoutes); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
+              next({ ...to, replace: true }); // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+            });
           })
-        }).catch(err => {
-            store.dispatch('LogOut').then(() => {
-              Message.error(err)
-              next({ path: '/' })
-            })
-          })
-        next()
+          .catch((err) => {
+            store.dispatch("LogOut").then(() => {
+              Message.error(err);
+              next({ path: "/" });
+            });
+          });
+        next();
       } else {
-        next()
+        next();
       }
     }
   } else {
     // 娌℃湁token
     if (isWhiteList(to.path)) {
       // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
-      next()
+      next();
     } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
-      NProgress.done()
+      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+      NProgress.done();
     }
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});
diff --git a/src/router/index.js b/src/router/index.js
index 39879db..61543d8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -198,7 +198,7 @@
     children: [
       {
         path: "/purchase/POStockInBill/POStockInBillList",
-
+        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue"),
         name: "POStockInBillList",
         meta: { title: "閲囪喘鍏ュ簱鍗�", activeMenu: "purchase/POStockInBill" },
       },
@@ -217,7 +217,7 @@
     children: [
       {
         path: "/purchase/POStockInBill/POStockInBillEdit",
-
+        component: () => import("@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue"),
         name: "POStockInBillEdit",
         meta: {
           title: "閲囪喘鍏ュ簱鍗曠紪杈�",
@@ -398,7 +398,7 @@
     },
     children: [
       {
-        path: "/purchase/PoInStock/cgPoInStockBill",
+        path: "/purchase/PoInStock/cgPoInStockBillList",
         component: () =>
           import("@/views/purchase/cgPoInStockBill/cgPoInStockBill"),
         name: "CgPoInStockBillList",
@@ -774,6 +774,88 @@
       },
     ],
   },
+  //鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�
+  {
+    path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
+    component: Layout,
+    hidden: true,
+    // permissions: ["system:goods:add"],
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillList",
+        component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"),
+        name: "Sc_MouldMoveStockRequestBillList",
+        meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�", activeMenu: "scMould/warehouse" },
+      },
+    ],
+  },
+  //鍣ㄥ叿璋冩嫧鐢宠鍗�
+  {
+    path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit",
+        component: () => import("@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"),
+        name: "Sc_MouldMoveStockRequestBillEdit",
+        meta: { title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠紪杈�", activeMenu: "scMould/warehouse" },
+      },
+    ],
+  },
+
+
+
+  //鐩存帴璋冩嫧鍗曠淮鎶�
+  {
+    path: "/warehouse/transfer/Kf_MoveStockBillList",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/warehouse/transfer", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/warehouse/transfer/Kf_MoveStockBillList",
+        component: () =>
+          import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue"),
+        name: "Kf_MoveStockBillList",
+        meta: { title: "鐩存帴璋冩嫧鍗曠淮鎶�", activeMenu: "warehouse/transfer" },
+      },
+    ],
+  },
+  //鐩存帴璋冩嫧鍗曠紪杈戦〉闈�
+  {
+    path: "/warehouse/transfer/Kf_MoveStockBillEdit",
+    component: Layout,
+    hidden: true,
+    redirect: "noredirect",
+    meta: {
+      breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+      activeMenu: "/warehouse/transfer", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+    },
+    children: [
+      {
+        path: "/warehouse/transfer/Kf_MoveStockBillEdit",
+        component: () =>
+          import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue"),
+        name: "Kf_MoveStockBillEdit",
+        meta: { title: "鐩存帴璋冩嫧鍗�", activeMenu: "warehouse/transfer" },
+      },
+    ],
+  },
 
 
 
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 6bf9aeb..7ddc571 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -295,7 +295,7 @@
                     name: "Kf_StockOutRequestBillList",
                     path: "Kf_StockOutRequestBillList",
                   },
-                   {
+                  {
                     meta: {
                       icon: "build",
                       link: null,
@@ -310,7 +310,7 @@
                   },
                 ],
               },
-               {
+              {
                 meta: {
                   icon: "build",
                   link: null,
@@ -336,7 +336,7 @@
                     name: "Kf_MoveStockRequestBillList",
                     path: "Kf_MoveStockRequestBillList",
                   },
-                   {
+                  {
                     meta: {
                       icon: "build",
                       link: null,
@@ -348,6 +348,32 @@
                     hidden: false,
                     name: "Kf_MoveStockRequestBillEdit",
                     path: "Kf_MoveStockRequestBillEdit",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鐩存帴璋冩嫧鍗曠淮鎶�",
+                    },
+                    component: () =>
+                      import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue"),
+                    hidden: false,
+                    name: "Kf_MoveStockBillList",
+                    path: "Kf_MoveStockBillList",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鐩存帴璋冩嫧鍗�",
+                    },
+                    component: () =>
+                      import("@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue"),
+                    hidden: false,
+                    name: "Kf_MoveStockBillEdit",
+                    path: "Kf_MoveStockBillEdit",
                   },
                 ],
               },
@@ -987,6 +1013,35 @@
                     hidden: false,
                     name: "Sc_MouldProdMoveBillEdit",
                     path: "Sc_MouldProdMoveBillEdit",
+                  },{
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鍣ㄥ叿璋冩嫧鐢宠鍗曠淮鎶�",
+                    },
+                    component: () =>
+                      import(
+                        "@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList"
+                      ),
+                    hidden: false,
+                    name: "Sc_MouldMoveStockRequestBillList",
+                    path: "Sc_MouldMoveStockRequestBillList",
+                  },
+                  {
+                    meta: {
+                      icon: "build",
+                      link: null,
+                      noCache: false,
+                      title: "鍣ㄥ叿璋冩嫧鐢宠鍗�",
+                    },
+                    component: () =>
+                      import(
+                        "@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit"
+                      ),
+                    hidden: false,
+                    name: "Sc_MouldMoveStockRequestBillEdit",
+                    path: "Sc_MouldMoveStockRequestBillEdit",
                   },
                 ],
               },
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 019798c..095133c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -96,7 +96,13 @@
             sessionStorage["HCheckEmpName"] = res.data[0].HCheckEmpName;
             sessionStorage["login"] = "login";
             sessionStorage["HType"] = "PC";
-
+            commit("SET_NICK_NAME", sessionStorage["HUserName"]);
+            getOrganizations().then((res) => {
+              if (res.count == 1) {
+                const stringifiedItems = JSON.stringify(res.data);
+                sessionStorage.setItem("organizationList", stringifiedItems);
+              }
+            });
             setToken(res.token);
             commit("SET_TOKEN", res.token);
             resolve();
@@ -111,12 +117,6 @@
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         commit("SET_NICK_NAME", sessionStorage["HUserName"]);
-        getOrganizations().then((res) => {
-          if (res.count == 1) {
-            const stringifiedItems = JSON.stringify(res.data);
-          sessionStorage.setItem("organizationList", stringifiedItems);
-          }
-        });
         resolve();
       });
     },
diff --git a/src/views/GyCustomer/index.vue b/src/views/GyCustomer/index.vue
index 2d0e1fb..06f328a 100644
--- a/src/views/GyCustomer/index.vue
+++ b/src/views/GyCustomer/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 10px; position: relative;">
+  <div style="padding: 10px;position: relative;">
     <el-card style="margin-bottom: 10px;">
       <el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
         <el-form-item label="瀹㈡埛浠g爜" prop="HNumber">
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 030a0e1..697f158 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -1,13 +1,6 @@
 <template>
-  <div style="padding: 10px">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      label-width="78px"
-      class="searchBox"
-    >
+  <div style="padding: 10px;position: relative;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
       <el-row>
         <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
           <el-date-picker
@@ -28,136 +21,89 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="鏃ユ湡闂撮殧">
-          <el-select
-            v-model="queryParams.HInitTimeCycle"
-            placeholder="璇烽�夋嫨"
-            @change="riqiChange"
-          >
-            <el-option
-              v-for="(item, index) in rqsgList"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange">
+            <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
-          <el-input
-            v-model="queryParams.HBillNo"
-            placeholder="璇疯緭鍏ュ崟鎹彿"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
         </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.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.toString()">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
-          <el-input
-            v-model="queryParams.HBillNo"
-            placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="涓氬姟鐘舵��" prop="HStatus">
           <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨涓氬姟鐘舵��">
-            <el-option
-              :label="item.label"
-              :value="item.value"
-              :key="index"
-              v-for="(item, index) in [
-                {
-                  label: '寮�宸�',
-                  value: '寮�宸�',
-                },
-                {
-                  label: '璁″垝',
-                  value: '璁″垝',
-                },
-                {
-                  label: '璁″垝纭',
-                  value: '璁″垝纭',
-                },
-                {
-                  label: '涓嬭揪',
-                  value: '涓嬭揪',
-                },
-                {
-                  label: '鍏ㄩ儴',
-                  value: '0',
-                },
-                {
-                  label: '瀹屽伐',
-                  value: '瀹屽伐',
-                },
-                {
-                  label: '缁撴',
-                  value: '缁撴',
-                },
-              ]"
-            ></el-option>
+            <el-option :label="item.label" :value="item.value" :key="index" v-for="(item, index) in [
+              {
+                label: '寮�宸�',
+                value: '寮�宸�',
+              },
+              {
+                label: '璁″垝',
+                value: '璁″垝',
+              },
+              {
+                label: '璁″垝纭',
+                value: '璁″垝纭',
+              },
+              {
+                label: '涓嬭揪',
+                value: '涓嬭揪',
+              },
+              {
+                label: '鍏ㄩ儴',
+                value: '0',
+              },
+              {
+                label: '瀹屽伐',
+                value: '瀹屽伐',
+              },
+              {
+                label: '缁撴',
+                value: '缁撴',
+              },
+            ]"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鏄惁涓嬫帹鐢熸垚娴佽浆鍗�" prop="HSF" label-width="180px">
           <el-select v-model="queryParams.HSF">
-            <el-option
-              :label="item.label"
-              :value="item.value"
-              :key="item.label"
-              v-for="item in [
-                {
-                  label: '鍏ㄩ儴',
-                  value: '鍏ㄩ儴',
-                },
-                {
-                  label: '宸蹭笅鎺�',
-                  value: '宸蹭笅鎺�',
-                },
-                {
-                  label: '鏈笅鎺�',
-                  value: '鏈笅鎺�',
-                },
-              ]"
-            ></el-option>
+            <el-option :label="item.label" :value="item.value" :key="item.label" v-for="item in [
+              {
+                label: '鍏ㄩ儴',
+                value: '鍏ㄩ儴',
+              },
+              {
+                label: '宸蹭笅鎺�',
+                value: '宸蹭笅鎺�',
+              },
+              {
+                label: '鏈笅鎺�',
+                value: '鏈笅鎺�',
+              },
+            ]"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
-          <el-input
-            v-model="queryParams.HModel"
-            placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.HModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="椤圭洰鍙�" prop="HProject">
           <el-select v-model="queryParams.HProject">
-            <el-option
-              :label="item.label"
-              :value="item.value"
-              :key="item.label"
-              v-for="item in HProjectList"
-            ></el-option>
+            <el-option :label="item.label" :value="item.value" :key="item.label"
+              v-for="item in HProjectList"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
           <el-select v-model="queryParams.HDeptName">
-            <el-option
-              :label="item.label"
-              :value="item.value"
-              :key="item.label"
-              v-for="item in HDeptNameList"
-            ></el-option>
+            <el-option :label="item.label" :value="item.value" :key="item.label"
+              v-for="item in HDeptNameList"></el-option>
           </el-select>
         </el-form-item>
       </el-row>
@@ -165,25 +111,13 @@
       <el-collapse v-model="activeSeach">
         <el-collapse-item title="鏇村" name="1">
           <el-form-item label="鍗曟嵁绫诲瀷" prop="HBillType">
-            <el-input
-              v-model="queryParams.HBillType"
-              placeholder="璇疯緭鍏ュ崟鎹被鍨�"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.HBillType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="鍞竴ID" prop="HErpID">
-            <el-input
-              v-model="queryParams.HErpID"
-              placeholder="璇疯緭鍏ュ敮涓�ID"
-              @keyup.enter.native="handleQuery"
-            />
+            <el-input v-model="queryParams.HErpID" placeholder="璇疯緭鍏ュ敮涓�ID" @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
-            <el-input
-              v-model="HBillNo2"
-              placeholder="璇疯緭鍏ュ崟鎹彿"
-              @keyup.enter.native="syncBill"
-            >
+            <el-input v-model="HBillNo2" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="syncBill">
               <el-button slot="append" @click="syncBill">閲嶆柊鍚屾</el-button>
             </el-input>
           </el-form-item>
@@ -193,132 +127,69 @@
               <el-row>
                 <el-form-item label-width="0">
                   <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName1"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
+                    <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
+                      class="ForFilteringSchemes">
                       <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
+                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                       </span>
                     </el-select>
                   </el-col>
                   <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator1"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in comparatorList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
+                    <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
+                      class="ForFilteringSchemes">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
                     </el-select>
                   </el-col>
                   <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent1"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
+                    <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
                   </el-col>
                 </el-form-item>
               </el-row>
               <el-row>
                 <el-form-item label-width="0">
                   <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName2"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
+                    <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
+                      class="ForFilteringSchemes">
                       <span v-for="(item, index) in btList" :key="index">
-                        <el-option
-                          :label="item.field"
-                          :value="item.field"
-                          v-if="!item.hide"
-                        ></el-option>
+                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                       </span>
                     </el-select>
                   </el-col>
                   <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator2"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
+                    <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
+                      class="ForFilteringSchemes">
                       <span v-for="(item, index) in 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-form-item>
               </el-row>
               <el-row>
                 <el-form-item label-width="0">
                   <el-col :span="7">
-                    <el-select
-                      v-model="queryParams.ColName"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in btList"
-                        :key="index"
-                        :label="item.field"
-                        :value="item.field"
-                      ></el-option>
+                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
+                      class="ForFilteringSchemes">
+                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
+                        :value="item.field"></el-option>
                     </el-select>
                   </el-col>
                   <el-col :span="6" style="padding: 0 10px">
-                    <el-select
-                      v-model="queryParams.Comparator"
-                      placeholder="璇烽�夋嫨"
-                      @change="riqiChange"
-                      class="ForFilteringSchemes"
-                    >
-                      <el-option
-                        v-for="(item, index) in comparatorList"
-                        :key="index"
-                        :label="item.label"
-                        :value="item.value"
-                      ></el-option>
+                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
+                      class="ForFilteringSchemes">
+                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+                        :value="item.value"></el-option>
                     </el-select>
                   </el-col>
                   <el-col :span="11">
-                    <el-input
-                      v-model="queryParams.ColContent"
-                      placeholder="璇疯緭鍏�"
-                      clearable
-                      @keyup.enter.native="handleQuery"
-                      class="ForFilteringSchemes"
-                    />
+                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
+                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
                   </el-col>
                 </el-form-item>
               </el-row>
@@ -329,11 +200,8 @@
 
       <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-form>
 
@@ -349,64 +217,28 @@
         >
       </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(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_CheckBill(2, (form = rowForm))"
-          >鍙嶅鏍�</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_CheckBill(2, (form = rowForm))">鍙嶅鏍�</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -431,187 +263,79 @@
         >
       </el-col> -->
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="set_CloseBill(1, (form = rowForm))"
-          >鍏抽棴</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_CloseBill(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_CloseBill(2, (form = rowForm))"
-          >鍙嶅叧闂�</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_CloseBill(2, (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_CloseRow(0, (form = rowForm))"
-          >琛屽叧闂�</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_CloseRow(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_CloseRow(1, (form = rowForm))"
-          >琛屽弽鍏抽棴</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_CloseRow(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_DropBill(1, (form = rowForm))"
-          >浣滃簾</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_DropBill(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_DropBill(2, (form = rowForm))"
-          >鍙嶄綔搴�</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="set_DropBill(2, (form = rowForm))">鍙嶄綔搴�</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="push_PackingInStockBill((form = rowForm))"
-          >涓嬫帹鍖呰棰嗙敤鐢宠鍗�</el-button
-        >
+        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
+          @click="push_PackingInStockBill((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 type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >閲� 缃�</el-button
-        >
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
       </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
     <div class="tableBox" v-loading="loading">
-      <el-table
-        :data="tableData"
-        ref="tableData"
-        max-height="750"
-        :summary-method="getSummaries"
-        @selection-change="handleSelectionChange"
-        show-summary
-        border
-        @row-click="handleRowClick"
-        :row-style="rowStyle"
-        @cell-dblclick="handleDblclick"
-        v-if="tableShow"
-      >
+      <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
         <template v-for="(item, index) in btList">
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center"
-            :fixed="item.fixed"
-            v-if="item.type == 'checkbox'"
-            :key="index"
-          />
-          <el-table-column
-            :align="item.align"
-            :prop="item.field"
-            :label="item.title"
-            :width="item.width"
-            :key="item.sorderid"
-            v-else-if="!item.hide && item.type != 'checkbox'"
-            :sortable="item.sort"
-            show-overflow-tooltip
-            :fixed="item.fixed"
-          >
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
+            :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
+            show-overflow-tooltip :fixed="item.fixed">
             <template slot-scope="{ row, column }">
               <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
               <div :style="item.style">
                 <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"
-      >
+      <el-dialog title="缂栬緫鐢熶骇璁㈠崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+        :before-close="close">
         <!-- <edit
           :OperationType="OperationType"
           :linterid="this.rowForm.HItemID"
@@ -625,92 +349,39 @@
           <iframe :src="iframeUrl" width="100%" height="100%" frameborder="0"></iframe>
         </div>
       </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="缁勭粐浠g爜" prop="缁勭粐浠g爜" 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="鐢熶骇璧勬簮浠g爜"
-            prop="鐢熶骇璧勬簮浠g爜"
-            align="center"
-            width="120"
-          />
+          <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
+          <el-table-column label="鐢熶骇璧勬簮浠g爜" prop="鐢熶骇璧勬簮浠g爜" align="center" width="120" />
           <el-table-column label="閮ㄩ棬浠g爜" prop="閮ㄩ棬浠g爜" 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="宸ヤ綔涓績浠g爜"
-            prop="宸ヤ綔涓績浠g爜"
-            align="center"
-            width="120"
-          />
-          <el-table-column
-            label="宸ヤ綔涓績鍚嶇О"
-            prop="宸ヤ綔涓績鍚嶇О"
-            align="center"
-            width="120"
-          />
+          <el-table-column label="宸ヤ綔涓績浠g爜" prop="宸ヤ綔涓績浠g爜" 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>
@@ -722,16 +393,17 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "GySource",
+  name: "ScICMOBillList",
   components: { RowSettings },
   props: {
     openPage: { type: String },
   },
   data() {
     return {
+      selRowList: [],
       iframeUrl: "",
       activeSeach: "",
-      HModName: "Cg_POOrderBillList",
+      HModName: "Sc_ICMOBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -740,7 +412,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "3710",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -773,6 +445,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰闂撮殧", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -793,7 +466,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -1008,6 +680,9 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        return;
+      }
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -1082,7 +757,7 @@
           {
             params: {
               sWhere: this.sWhere,
-              user: this.user,
+              user: sessionStorage["HUserName"],
               Organization: Organization,
               page: this.page,
               size: this.pageSize,
@@ -1172,7 +847,12 @@
             }
           }
           option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
         }
       } catch (err) {
         this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1329,6 +1009,9 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage == 'Gy_BarCodeBill') {
+        this.$emit('deptEmit', this.selRowList, 10)
+      }
     },
     //閫変腑琛岄珮浜牱寮�
     rowStyle({ row, rowIndex }) {
@@ -1339,16 +1022,28 @@
     //鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
       this.OperationType = 3;
-      this.handleEdit(row, this.OperationType);
+      if (this.openPage == 'Gy_BarCodeBill') {
+        let rowdata=[]
+        rowdata.push(row)
+        console.log(rowdata)
+        this.$emit('deptEmit', rowdata, 10)
+      } else {
+        this.handleEdit(row, this.OperationType);
+      }
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {
+      console.log(selection)
       // this.rowForm = {}
+      this.selRowList = selection
       this.ids = selection.map((item) => item.hmainid);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
       if (!this.single) {
         this.rowForm = selection[0];
+      }
+      if (this.openPage == 'Gy_BarCodeBill') {
+        this.$emit('deptEmit', this.selRowList, 10)
       }
     },
     //鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1474,7 +1169,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1564,7 +1259,7 @@
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,
                   HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
+                  user: sessionStorage["HUserName"],
                 },
               })
               .then((res) => {
@@ -1582,7 +1277,7 @@
             this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
           }
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     // 鍙嶅鏍�/瀹℃牳鏁版嵁
     set_CheckBill(num, form) {
@@ -1590,7 +1285,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
-          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            TypeError: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1615,7 +1314,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1643,7 +1342,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1669,7 +1368,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1691,7 +1390,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1738,8 +1441,8 @@
       } else {
         this.$alert(
           "<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
-            res.Message +
-            "</div>",
+          res.Message +
+          "</div>",
           "瀵煎叆缁撴灉",
           { dangerouslyUseHTMLString: true }
         );
@@ -1757,7 +1460,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
@@ -1768,8 +1471,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 }
           );
@@ -1793,7 +1496,7 @@
             return deleteList.indexOf(item.index) == -1;
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     getPage(page, list) {
       let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1816,7 +1519,7 @@
   width: 100%;
 }
 
-.form-item-inline > .el-form-item__content {
+.form-item-inline>.el-form-item__content {
   display: flex;
   flex-direction: row;
   width: 60%;
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
new file mode 100644
index 0000000..466d0e0
--- /dev/null
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue
@@ -0,0 +1,1179 @@
+<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="璇疯緭鍏ュ崟鎹紪鍙�" disabled="true" />
+              </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="HEmpName">
+                <el-input v-model="form.HKeeperName" 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="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-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+                <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="HWHName">
+                <el-input v-model="form.HWHName" 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="HSCWHName">
+                <el-input v-model="form.HSCWHName" 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="6">
+              <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+                <el-select v-model="form.HSourceBillType" @change="sourceBillTypeChange" >
+                  <el-option v-for="(item, index) in sourceBillTypeList" :key="index" :label="item.HSourceBillTypeName" :value="item.HSourceBillType">
+                </el-option>
+                </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" @click="openDataDialog(1)"></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-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-row  v-show="formHideDataShow">
+            <el-col :span="6">
+              <el-form-item label="涓荤" prop="HMangerName">
+                <el-input v-model="form.HMangerName" 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="HKeeperName">
+                <el-input v-model="form.HKeeperName" 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="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" 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="椤圭洰浠g爜" prop="HProNumber">
+                <el-input v-model="form.HProNumber" 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="HProName">
+                <el-input v-model="form.HProName" placeholder="璇疯緭鍏ラ」鐩悕绉�" disabled>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+                <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍙戠エ缂栧彿" prop="HInvoiceBillNo">
+                <el-input v-model="form.HInvoiceBillNo" placeholder="璇疯緭鍏ュ彂绁ㄧ紪鍙�">
+                </el-input>
+              </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">
+            <span>{{ scope.row.HSourceBillNo }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="婧愬崟绫诲瀷" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HSourceBillType }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="婧愬崟涓诲唴鐮�" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HSourceInterID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="婧愬崟瀛愬唴鐮�" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HSourceEntryID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="HMaterID" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HMaterID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="鐗╂枡浠g爜" width="120">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.鐗╂枡浠g爜" 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="HUnitID" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HUnitID }}</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="HPropertyID" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HPropertyID }}</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.HSecUnitRate }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HQtyMust }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.HQty" :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">
+            <el-input-number v-model="scope.row.HPieceQty" :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">
+            <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.HMoney = scope.row.HPrice * scope.row.HQty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="璋冨嚭鍗曚环" width="120">
+          <template slot-scope="scope">
+            <el-input-number v-model="scope.row.HOutPrice" :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.HOutMoney = scope.row.HOutPrice * scope.row.HQty }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="HWHID" width="120">
+          <template slot-scope="scope">
+            <span>{{scope.row.HWHID}}</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="HSPID" width="120">
+          <template slot-scope="scope">
+            <span>{{scope.row.HSPID}}</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="HSCWHID" width="120">
+          <template slot-scope="scope">
+            <span>{{scope.row.HSCWHID}}</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="HSCSPID" width="120">
+          <template slot-scope="scope">
+            <span>{{scope.row.HSCSPID}}</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.HBatchNo" placeholder="璇疯緭鍏ユ壒娆�" />
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閲囪喘璁㈠崟鍙�" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HPOOrderBillNo }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閲囪喘璁㈠崟涓诲唴鐮�" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HPOOrderInterID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閲囪喘璁㈠崟瀛愬唴鐮�" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HPOOrderEntryID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閿�鍞鍗曞彿" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HPOOrderBillNo }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閿�鍞鍗曚富鍐呯爜" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HSeOrderInterID }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="閿�鍞鍗曞瓙鍐呯爜" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.HSeOrderEntryID }}</span>
+          </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="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_MoveStockBillEdit" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment';
+import RowSettings from '@/views/component/rowSettings'
+import Dept from '@/views/component/dept'
+import Warehouse from '@/views/component/warehouse'
+import Material from '@/views/component/material'
+
+export default {
+  name: 'MoveStockBillEdit',
+  components: { Dept, Warehouse, Material, RowSettings },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      baseURL: process.env.VUE_APP_BASE_API,                                     //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣↖P)
+
+      organizationList: [],                                                      //椤甸潰鍒濆鍖栫粍缁囧垪琛�
+      sourceBillTypeList: [],                                                   //椤甸潰鍒濆鍖栨簮鍗曠被鍨嬪垪琛�
+
+      loading: true,                                                             // 閬僵灞�
+
+      addBtnShow: false,                                                         //鏂板鎸夐挳鏄剧ず鏍囪
+      subDisabled: false,                                                        //淇濆瓨鎸夐挳绂佺敤鏍囪
+
+      formShow: false,                                                           //琛ㄥ崟鏄惁鏄剧ず鏍囪
+      formHideDataShow: false,                                                   //琛ㄥ崟闅愯棌鍐呭鏍囪
+      formLoading: true,                                                         //琛ㄥ崟鍔犺浇閬僵
+      zzSelDis: false,                                                           //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
+
+      rowHideShow: false,                                                        //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+      openRowHide: false,                                                        //鍒楄缃粍浠舵樉绀烘爣璁�
+
+      dialogTitle: '',                                                           //寮圭獥鏍囬
+      openData: false,                                                           //鏁版嵁寮圭獥
+      dialogTypeNum: null,                                                       //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false,                                                           //閮ㄩ棬鏁版嵁缁勪欢鏄剧ず鏍囪
+      warehouseShow: false,                                                      //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
+      materialShow: false,                                                       //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
+      stockPlaceShow: false,                                                     //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
+      deptform: {},                                                              //寮圭獥閫変腑鏁版嵁
+      
+      temp: undefined,                                                           //涓存椂鍙橀噺
+      btResList: [],                                                             // 鍒楄缃�
+      form: {},                                                                  // 琛ㄥ崟鍙傛暟
+      rules: {                                                                   // 琛ㄥ崟鏍¢獙
+      },
+      
+      checkedSysZb: [],
+      editData: [],                                                              //瀛愯〃鏁版嵁
+      editBtData: [],                                                            //瀛愯〃琛ㄥご
+      activeName: 'first',
+      zbIndex: null,
+      zbSelForm: {},                                                             //瀛愯〃閫変腑鏁版嵁,鐢ㄤ簬瀛愯〃澶嶅埗銆佷笂绉汇�佷笅绉荤瓑鎿嶄綔
+    };
+  },
+  created() {
+    this.fetchData()
+    this.fetchData_SourceBillTypeList()
+    this.getdata()
+  },
+  beforeDestroy() {
+    this.$destroy()
+  },
+  methods: {
+    //#region 琛ㄥ崟鏁版嵁鍒濆鍖�
+    getdata() {
+      this.formShow = false
+      this.formLoading = true
+
+      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+        this.handleAdd()
+      } 
+      else if (this.OperationType == 3 || this.copyType == 1) { 
+        this.handleUpdate()
+      }
+    },
+    //#endregion
+
+    //#region 椤甸潰鏁版嵁鍒濆鍖�
+    reset() {
+      this.form = {
+        HInterID: 0,
+        HBillNo: "",
+        HDate: new Date(),
+        HInnerBillNo: "",
+        HSupID: 0,
+        HSupName: "",
+        HWHID: 0,
+        HWHName: "",
+        HSecManagerID: 0,
+        HSecManagerName: "",
+        HKeeperID: 0,
+        HKeeperName: "",
+        HDeptID: 0,
+        HDeptName: "",
+        HManagerID: 0,
+        HMangerName: "",
+        HEmpID: 0,
+        HEmpName: "",
+        HSourceBillType: "",
+        HExplanation :"",
+        HRemark: "",
+        HOrgID: sessionStorage["OrganizationID"] - 0,
+
+        HMaker: sessionStorage["HUserName"],
+        HMakeDate: new Date(),
+        HUpDater: "",
+        HUpDateDate: "",
+        HChecker: "",
+        HCheckDate: "",
+        HCloseMan: "",
+        HCloseDate: "",
+        HDeleteMan: "",
+        HDeleteDate: "",
+      }
+      this.editData = []
+      this.editBtData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.resetForm("form");
+    },
+    //#endregion
+
+    //#region 鏂板鎸夐挳鎿嶄綔
+    handleAdd() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      if (this.OperationType == 1) {
+        this.handleAddSysZb()
+      }
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    //#endregion
+
+    //#region 缂栬緫椤甸潰鍒濆鍖�
+    handleUpdate() {
+      this.reset()
+      let rowHmainid = this.linterid
+      axios.get(this.baseURL + "/Kf_MoveStockBill/Kf_MoveStockBillEdit", {
+        params: { 'HInterID': rowHmainid }
+      }).then(response => {
+        if (response.data.count == 1) {
+          var data = response.data.data[0][0]
+          if (this.copyType == 1) {
+            this.getHBillNo()
+          } 
+          else {
+            this.form.HInterID = data.hmainid
+            this.form.HBillNo = data.鍗曟嵁鍙�
+            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.HEmpID= data.HEmpID
+          this.form.HEmpName= data.涓氬姟鍛�
+          this.form.HDeptName= data.閮ㄩ棬
+          this.form.HDeptID= data.HDeptID
+          this.form.HSupID= data.HSupID
+          this.form.HSupName= data.寰�鏉ュ崟浣�
+          this.form.HWHID= data.HWHID
+          this.form.HWHName= data.璋冨叆浠撳簱
+          this.form.HSCWHID= data.HSCWHID
+          this.form.HSCWHName= data.璋冨嚭浠撳簱
+          this.form.HRemark= data.琛ㄥご澶囨敞
+
+          this.form.HSecManagerID= data.HSecManagerID
+          this.form.HSecManagerName= data.楠屾敹鍛�
+          this.form.HKeeperID= data.HKeeperID
+          this.form.HKeeperName= data.淇濈鍛�
+          this.form.HManagerID= data.HManagerID
+          this.form.HMangerName= data.涓荤
+
+          this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
+          this.form.HExplanation= data.HExplanation
+          this.form.HInvoiceBillNo= data.鍙戠エ缂栧彿
+          
+          //瀛愯〃  璧嬪��
+          var result = response.data.data[1]
+          for (var i = 0; i < result.length; i++) {
+            const data = result[i]
+            this.editData.push(
+              {
+                HSourceBillNo: data.HSourceBillNo
+                , HSourceBillType: data.HSourceBillType
+                , HSourceInterID: data.HSourceInterID
+                , HSourceEntryID: data.HSourceEntryID
+                , HMaterID:data.HMaterID
+                , 鐗╂枡浠g爜: data.鐗╂枡浠g爜
+                , 鐗╂枡鍚嶇О: data.鐗╂枡鍚嶇О
+                , 瑙勬牸鍨嬪彿: data.瑙勬牸鍨嬪彿
+                , HUnitID: data.HUnitID
+                , 璁¢噺鍗曚綅: data.璁¢噺鍗曚綅
+                , HPropertyID:data.HPropertyID
+                , 杈呭姪灞炴��:data.杈呭姪灞炴��
+                , HSecUnitRate:data.HSecUnitRate
+                , HQtyMust: data.HQtyMust
+                , HQty: data.HQty
+                , HPieceQty: data.HPieceQty
+                , HPrice: data.HPrice
+                , HMoney: data.HMoney
+                , HOutPrice: data.HOutPrice
+                , HOutMoney: data.HOutMoney
+                , HWHID: data.HWHID
+                , 璋冨叆浠撳簱: data.璋冨叆浠撳簱
+                , HSPID: data.HSPID
+                , 浠撲綅鍚嶇О: data.浠撲綅鍚嶇О
+                , HSCWHID: data.HSCWHID
+                , 璋冨嚭浠撳簱: data.璋冨嚭浠撳簱
+                , HSCSPID: data.HSCSPID
+                , 璋冨嚭浠撲綅鍚嶇О: data.璋冨嚭浠撲綅鍚嶇О
+                , HBatchNo:data.HBatchNo
+                , HPOOrderInterID: data.HPOOrderInterID
+                , HPOOrderEntryID: data.HPOOrderEntryID
+                , HPOOrderBillNo: data.HPOOrderBillNo
+                , HSeOrderInterID: data.HSeOrderInterID
+                , HSeOrderEntryID: data.HSeOrderEntryID
+                , HSeOrderBillNo: data.HSeOrderBillNo
+                , HRemark: data.HRemark
+              }
+            )
+          }
+
+          // if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
+          //   this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
+          //   this.subDisabled = true
+          // }
+          this.formShow = true
+          this.formLoading = false
+
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鍒楄缃�
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+
+      this.rowHideShow = false
+      this.openRowHide = val
+      this.$destroy()
+    },
+    //#endregion
+
+    //#region 缁勭粐鍊煎彉鏇翠簨浠�
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //#endregion
+
+    //#region 婧愬崟绫诲瀷鍊煎彉鏇翠簨浠�
+    sourceBillTypeChange(val) {
+    },
+    //#endregion
+
+    //#region 鏁版嵁寮圭獥
+    //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    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.stockPlaceShow = true
+        this.openData = true
+      }
+    },
+    //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+    showReset() {
+      this.deptShow = false
+      this.warehouseShow = false
+      this.materialShow = false
+    },
+    //#endregion
+    //#endregion
+
+    //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+    dbEmitData(deptRow, num) {
+      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 == 4) {                                                      //浠撲綅
+        this.editData[this.zbIndex].HSPID = 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].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
+        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
+      }
+    },
+    //#endregion
+
+    //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num
+      this.deptform = deptRow
+    },
+    //#endregion
+
+    //#region 寮圭獥纭畾浜嬩欢
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum)
+      this.deptform = {}
+    },
+    //#endregion
+
+    //#region 寮圭獥鍙栨秷浜嬩欢
+    deptClose() {
+      this.deptform = {}
+      this.openData = false
+    },
+    //#endregion
+    //#endregion
+
+    //#region 宸ュ叿鏍忔寜閽搷浣�
+    //#region 缂栬緫鎻愪氦淇濆瓨
+    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("鎺ュ彛璇锋眰澶辫触!");
+              });
+            }
+          })
+        }
+      });
+    },
+    //#endregion
+
+    //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+    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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 閫�鍑烘寜閽搷浣�
+    close() {
+      this.reset()
+
+      if (!this.OperationType && !this.copyType) {
+        // this.$router.back()
+        window.close()
+      } else {
+        this.formShow = false
+        this.$emit('editClose', false)
+      }
+    },
+    //#endregion
+    //#endregion
+
+    //#region 瀛愯〃鎿嶄綔
+    //#region 璁剧疆瀛愯〃搴忓彿鍒�
+    rowSysZbIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    //#endregion
+
+    //#region 瀛愯〃鏂板銆佹彃鍏ユ寜閽搷浣�
+    handleAddSysZb(index, num) {
+      if (num == 1 && !index) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+      } else {
+        let obj = {
+          HMaterID: 0,
+          鐗╂枡浠g爜: '',
+          鐗╂枡鍚嶇О: '',
+          瑙勬牸鍨嬪彿: '',
+          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);
+        }
+      }
+    },
+    //#endregion
+
+    //#region 瀛愯〃澶嶅埗鎸夐挳
+    handleCopyZbRow() {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+        this.editData.push(copyRow);
+      }
+    },
+    //#endregion
+
+    //#region 瀛愯〃涓婄Щ鎸夐挳
+    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);
+        }
+      }
+    },
+    //#endregion
+
+    //#region 瀛愯〃涓嬬Щ鎸夐挳
+    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);
+        }
+      }
+    },
+    //#endregion
+
+    //#region 瀛愯〃鍒犻櫎鎸夐挳
+    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
+        });
+      }
+    },
+    //#endregion
+
+    //#region 瀛愯〃澶嶉�夋閫変腑鏁版嵁
+    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) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    //#endregion
+    //#endregion
+
+    //#region 閫氱敤鏂规硶銆�
+    //#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+    getUrlVars_JSON() {
+      var datajson;
+      var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+      var arr = str.substring(str.lastIndexOf("=") + 1);
+      datajson = JSON.parse(decodeURI(arr));
+      return datajson;
+    },
+    //#endregion
+
+    //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+    fetchData() {
+      axios.get(this.baseURL + "/Web/GetOrganizations", {
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.organizationList = response.data.data;//缁勭粐鍒楄〃
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+    
+    //#region 婧愬崟绫诲瀷涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+    fetchData_SourceBillTypeList() {
+      var HName = '鐩存帴璋冩嫧鍗�';
+      axios.get(this.baseURL + "/Web/GetHSourceBillType", {
+        params: {
+          HName: HName, 
+          Num: 2
+        }
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.sourceBillTypeList = response.data.data;//缁勭粐鍒楄〃
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鑾峰彇鍐呯爜銆佸崟鎹彿
+    getHBillNo() {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+        params: {
+          HBillType: '1207'
+        }
+      }).then(response => {
+        this.form.HBillNo = response.data.data[0].HBillNo
+        this.form.HInterID = response.data.data[0].HInterID
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鑾峰彇鏈�澶у崟鎹彿
+    get_MAXNum_Task(Type) {
+      var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1207','${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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
+    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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+    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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+  
+    //#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+    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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#endregion
+    
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
new file mode 100644
index 0000000..9daa2b3
--- /dev/null
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
@@ -0,0 +1,870 @@
+<template>
+  <div style="padding: 10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="queryParams.sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="queryParams.eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="缁勭粐" prop="HOrgID">
+        <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 icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <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">
+                        <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-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <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">
+                        <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.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="璇烽�夋嫨" @change="riqiChange">
+                      <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">
+                      <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-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-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</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-outline" 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-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, 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-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">鏉$爜鏄庣粏</el-button>
+      </el-col>
+    </el-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 3)"
+                  v-else-if="column.property == '鍗曟嵁鍙�'">{{
+                    row.鍗曟嵁鍙�
+                  }}</el-button>
+                <span v-else>{{ row[column.label] }}</span>
+              </div>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+      <!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
+      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
+      <!-- 鍒楄缃� -->
+      <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+        <RowSettings :colName="btResList" HModName="Kf_MoveStockBillList" @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.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+          :copyType="copyType" @editClose="editClose" v-if="editShow" />
+      </el-dialog>
+      <!-- 鎵撳嵃 -->
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid Type='Kf_ProductInBillList'
+          HModName='Kf_MoveStockBillList' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+      <!-- 鏉$爜鏄庣粏 -->
+      <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import moment from 'moment';                                              //瀵煎嚭缁勪欢
+import RowSettings from '@/views/component/rowSettings'                   //鍒楄缃粍浠�
+import PrintList from '@/views/component/printList'                       //鎵撳嵃缁勪欢
+import BarCodeDetail from '@/views/component/BarCodeDetail'               //鏉$爜鏄庣粏缁勪欢
+import Edit from '@/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue'    //缂栬緫椤甸潰缁勪欢
+
+export default {
+  name: 'Kf_MoveStockBillList',
+  components: { RowSettings, Edit, PrintList,BarCodeDetail },
+  data() {
+    return {
+      baseURL: process.env.VUE_APP_BASE_API,                //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
+
+      OperationType: null,                                  //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      copyType: 0,                                          //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
+      HInterID: null,
+      
+      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 },
+      ],
+      organizationList: [],                                 //缁勭粐鍒楄〃
+      btList: [],                                           //鍒楄〃琛ㄥご瀛楁鍒楄〃
+      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' },
+      ],
+      
+      dialogTitle: '',                                      // 寮圭獥鏍囬
+      title: "",                                            // 寮瑰嚭灞傛爣棰�
+      open: false,                                          // 鏄惁鏄剧ず寮瑰嚭灞�
+      loading: true,                                        // 閬僵灞�
+      
+      activeSeach: '',
+      // addBtnShow: false,                                    //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
+      editShow: false,                                      //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
+      openEdit: false,                                      //缂栬緫缁勪欢鏄剧ず鏍囪
+      openPrintList: false,                                 //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
+      printListShow: false,                                 //鎵撳嵃缁勪欢鏄剧ず鏍囪
+      openBtnHide: false,                                   //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
+      btnHideShow: false,                                   //鎸夐挳缁勪欢鏄剧ず鏍囪
+      openRowHide: false,                                   //鍒楄缃粍浠舵樉绀烘爣璁�
+      rowHideShow: false,                                   //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
+      barCodeDetailShow: false,                             //鏉$爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
+      
+      
+      
+      // 鏌ヨ鍙傛暟
+      sWhere: '',                                                   // 鎷兼帴杩囨护鏉′欢
+      queryParams: {                                                // form鏁版嵁
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        sTime: '',
+        eTime: '',
+        HOrgID: 0,
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      
+      page: 1,                                                      //page椤电储寮�
+      pageSize: 0,                                                  //page椤甸潰璁板綍鏁�
+      total: 0,                                                     //璁板綍鍚堣鏁�
+      tableShow: true,                                              // table鏄剧ず鏍囪
+      totalNameList: [],                                            // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
+      tableData: [],                                                // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
+      ids: [],                                                      // 閫変腑琛岀殑hmainid鏁扮粍
+      single: true,                                                 // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+      multiple: true,                                               // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
+      lastSelectedRowIndex: null,                                   // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null,                                        // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null,                                            // 褰撳墠閫変腑鐨勮
+      rowForm: {},                                                  // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
+
+      tyResList: [],                                                // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
+      titleData: [],                                                // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      btResList: [],                                                // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
+      dataList: [],                                                 // option璁板綍銆傜敤浜庡綋option鏁版嵁鏃犳晥鏃讹紝鐢ㄤ簬鍒楄缃�
+    };
+  },
+  created() {
+    this.fetchData()                //鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+    this.riqiChange()
+    this.handleQuery();
+  },
+
+  methods: {
+    //#region 璁剧疆琛ㄥご
+    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)
+    },
+    //#endregion
+
+    //#region 鐐瑰嚮琛�
+    handleRowClick(row, column, event) {
+      this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
+      this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
+      this.lastSelectedRowIndex = this.tableData.indexOf(row);
+      this.$refs.tableData.toggleRowSelection(row);
+    },
+    //#endregion
+    
+    //#region 閫変腑琛岄珮浜牱寮�
+    rowStyle({ row, rowIndex }) {
+      if (this.ids.includes(row.hmainid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //#endregion
+
+    //#region 鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 3
+      this.handleEdit()
+    },
+    //#endregion
+
+    //#region 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map(item => item.hmainid)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+      if (!this.single) {
+        this.rowForm = selection[0]
+      }
+    },
+    //#endregion
+    
+    //#region 鏍规嵁鏃ユ湡闂撮殧锛岃缃紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+    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.queryParams.sTime = yyyyS + '-' + mmS + '-' + ddS
+      this.queryParams.eTime = yyyyE + '-' + mmE + '-' + ddE
+    },
+    //#endregion
+    
+    //#region 鍔犺浇缁勭粐涓嬫媺鍒楄〃鏁版嵁
+    fetchData() {
+      axios.get(this.baseURL + "/Web/GetOrganizations", {
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.organizationList = response.data.data;//缁勭粐鍒楄〃
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+    },
+    //#endregion
+
+    //#region 閲嶇疆
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    //#endregion
+
+    //#region 蹇�熻繃婊�
+    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.sTime) {
+        this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
+        this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
+        console.log(this.queryParams.sTime, this.queryParams.eTime)
+        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.eTime + "'";
+      }
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      
+      if (this.queryParams.HOrgID) {
+        this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+      }
+      this.getList()
+    },
+    //#endregion
+
+    //#region 鏌ヨ
+    getList() {
+      this.pageSize = 50
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      this.tableShow = false
+      this.loading = true
+      
+      // 鍒楄〃鏌ヨ
+      axios.get(this.baseURL + '/Kf_MoveStockBill/GetMoveStockBillList', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"]
+        },
+      }).then(response => {
+        this.tyResList = response.data.data//鎬绘暟鎹�
+        let data1 = response.data
+        let option = []
+        if (data1.count == 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;
+          let HModName = "Kf_MoveStockBillList"
+          this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+
+    //#region 鍚堣琛屾暟鎹鐞�
+    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;
+    },
+    //#endregion
+
+    //#endregion
+
+    //#region 鏂板
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //#endregion
+
+    //#region 缂栬緫
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.handleQuery()
+    },
+    //#endregion
+
+    //#region 鍒犻櫎
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        if (this.rowForm.鐘舵�� == "鍒涘缓") {
+          axios.get(this.baseURL + "Kf_MoveStockBill/DelteteGetMoveStockBill", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+          }).then(response => {
+            if (response.data.count == 1) {
+              this.handleQuery()
+              this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+            } else {
+              this.$modal.msgError("閿欒:" + result.code + result.Message);
+            }
+          }).catch(error => {
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+        } else {
+          this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
+        }
+      }).catch(() => { })
+    },
+    //#endregion
+
+    //#region 瀹℃牳/鍙嶅鏍�
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Kf_MoveStockBill/CheckKf_MoveStockBill", {
+        params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+          this.handleQuery();
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鍒楄缃�
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.tableShow = true
+      this.openRowHide = val
+      this.handleQuery()
+    },
+    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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#endregion
+
+    //#region 鎸夐挳璁剧疆
+    handleBtnHide() {
+      this.btnHideShow = true
+      this.openBtnHide = true
+    },
+    //#endregion
+
+    //#region 瀵煎嚭
+    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, `Kf_MoveStockBillList_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //#endregion
+
+    //#region 鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+          params: { "HInterID": this.rowForm.hmainid }
+        }).then(response => {
+          var result = response.data
+          if (result.count == 1) {
+            this.printListShow = true
+            this.openPrintList = true
+            // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+          } else {
+            this.$modal.msgError(result.code + result.Message)
+          }
+        }).catch(error => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+
+
+      }
+      //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+    },
+    //#endregion
+
+    //#region 鏉$爜鏄庣粏
+    get_BarCodeDetail() {
+      // if (this.selectedRow.length !== 1) {
+      //   this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+      //   return
+      // }
+      this.barCodeDetailShow = true
+      this.$nextTick(() => {
+        this.$refs.barcodeDetail.open(this.rowForm)
+      })
+		},
+    //#endregion
+
+    //#region 閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.handleQuery()
+    },
+    //#endregion
+
+    //#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;
+    },
+    //#endregion
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
index d2cad7a..885d566 100644
--- a/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
+++ b/src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue
@@ -68,21 +68,6 @@
                 </el-input>
               </el-form-item>
             </el-col>
-            
-            <el-col :span="6">
-              <el-form-item label="淇濈鍛�" prop="HKeeperName">
-                <el-input v-model="form.HKeeperName" 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="HSecManagerName">
-                <el-input v-model="form.HSecManagerName" 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-form-item label="澶囨敞" prop="HRemark">
             <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
@@ -368,7 +353,7 @@
       </div>
     </el-dialog>
     <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
-      <RowSettings :colName="btResList" HModName="Kf_ProductInBillEdit" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+      <RowSettings :colName="btResList" HModName="Kf_OtherOutBillEdit" @rowEditClose="rowSetClose" v-if="rowHideShow" />
     </el-dialog>
   </div>
 </template>
@@ -382,7 +367,7 @@
 import Material from '@/views/component/material'
 
 export default {
-  name: 'ProductInBill',
+  name: 'OtherOutBillEdit',
   components: { Dept, Warehouse, Material, RowSettings },
   props: {
     OperationType: { type: Number, },
@@ -528,9 +513,7 @@
         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
+          var data = response.data.data[0][0]
           if (this.copyType == 1) {
             this.getHBillNo()
           } 
@@ -569,11 +552,47 @@
           // this.form.HMangerName= data.涓荤
           // this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
           
-          // //瀛愯〃  璧嬪��
-          // for (var i = 0; i < result.data.length; i++) {
-          //   // const data = result.data[i];
-          //   // this.editData.push(result.data[i])
-          // }
+          //瀛愯〃  璧嬪��
+          var result = response.data.data[1]
+          for (var i = 0; i < result.length; i++) {
+            const data = result[i]
+            this.editData.push(
+              {
+                HSourceBillNo: data.HSourceBillNo
+                , HSourceBillType: data.HSourceBillType
+                , HSourceInterID: data.HSourceInterID
+                , HSourceEntryID: data.HSourceEntryID
+                , HMaterID:data.HMaterID
+                , 鐗╂枡浠g爜: data.鐗╂枡浠g爜
+                , 鐗╂枡鍚嶇О: data.鐗╂枡鍚嶇О
+                , 瑙勬牸鍨嬪彿: data.瑙勬牸鍨嬪彿
+                , HUnitID: data.HUnitID
+                , 璁¢噺鍗曚綅: data.璁¢噺鍗曚綅
+                , HPropertyID:data.HPropertyID
+                , 杈呭姪灞炴��:data.杈呭姪灞炴��
+                , HAuxPropID: data.HAuxPropID
+                , 鐗╂枡杈呭姪灞炴��: data.鐗╂枡杈呭姪灞炴��
+                , HSecUnitRate:data.HSecUnitRate
+                , HQtyMust: data.HQtyMust
+                , HQty: data.HQty
+                , HPieceQty: data.HPieceQty
+                , HPrice: data.HPrice
+                , HMoney: data.HMoney
+                , HWHID: data.HWHID
+                , 鏀舵枡浠撳簱: data.鏀舵枡浠撳簱
+                , HSPID: data.HSPID
+                , 浠撲綅鍚嶇О: data.浠撲綅鍚嶇О
+                , HBatchNo:data.HBatchNo
+                , HPOOrderInterID: data.HPOOrderInterID
+                , HPOOrderEntryID: data.HPOOrderEntryID
+                , HPOOrderBillNo: data.HPOOrderBillNo
+                , HSeOrderInterID: data.HSeOrderInterID
+                , HSeOrderEntryID: data.HSeOrderEntryID
+                , HSeOrderBillNo: data.HSeOrderBillNo
+                , HRemark: data.HRemark
+              }
+            )
+          }
 
           if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
             this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
@@ -1027,21 +1046,6 @@
     },
     //#endregion
 
-    //#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("鎺ュ彛璇锋眰澶辫触!");
-      });
-    },
-    //#endregion
-
     //#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
     getCustomerByCusID(HCusID) {
       axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
@@ -1076,25 +1080,6 @@
     },
     //#endregion
 
-    //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
-    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("鎺ュ彛璇锋眰澶辫触!");
-      });
-    },
-    //#endregion
     //#endregion
     
   }
diff --git a/src/views/basic/gy/gyDepartment.vue b/src/views/basic/gy/gyDepartment.vue
index 4853819..1ec9d23 100644
--- a/src/views/basic/gy/gyDepartment.vue
+++ b/src/views/basic/gy/gyDepartment.vue
@@ -619,6 +619,7 @@
         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
diff --git a/src/views/basic/gy/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
index 42a4349..19dbb6b 100644
--- a/src/views/basic/gy/gySupplier.vue
+++ b/src/views/basic/gy/gySupplier.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 10px; position: relative;">
+  <div style="padding: 10px;position: relative;">
     <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;">
@@ -668,6 +668,7 @@
         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
diff --git a/src/views/basic/gy/gySupplierEdit.vue b/src/views/basic/gy/gySupplierEdit.vue
index e566424..fc43a34 100644
--- a/src/views/basic/gy/gySupplierEdit.vue
+++ b/src/views/basic/gy/gySupplierEdit.vue
@@ -1,10 +1,10 @@
 <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="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 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>
@@ -14,7 +14,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="缂栫爜" prop="HNumber">
-                <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ョ紪鐮�" />
+                <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ョ紪鐮�"/>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -242,83 +242,19 @@
             @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column align="center" label="搴忓彿" type="index" width="80" />
-            <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
+            <el-table-column align="center" label="鑱旂郴浜�" width="120">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.鐗╂枡浠g爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
-                  @dblclick.native="openDataDialog(3, scope.row)" />
+                <el-input v-model="scope.row.HLinkMan" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+            <el-table-column align="center" label="鑱旂郴鐢佃瘽" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.鐗╂枡鍚嶇О }}</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)" />
+                <el-input v-model="scope.row.HLinkPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
               </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">
@@ -331,92 +267,33 @@
         </el-tab-pane>
         <el-tab-pane label="浠樻璁″垝" name="second">
           <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)"
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb1()" size="mini">澧炲姞涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb1(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-plus" @click="handleCopyZbRow1" 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 :data="editData1" style="width: 100%" height="300" width="100%" ref="zbTable1"
+            @selection-change="handleTableZbEdit1" :row-class-name="rowSysZbIndex1" show-summary border >
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column align="center" label="搴忓彿" type="index" width="80" />
-            <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
+            <el-table-column align="center" label="浠樻闃舵" width="120">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.鐗╂枡浠g爜" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.native.f7="openDataDialog(3, scope.row)"
-                  @dblclick.native="openDataDialog(3, scope.row)" />
+                <el-input v-model="scope.row.HPayType" placeholder="璇疯緭鍏ヤ粯娆鹃樁娈�" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
+            <el-table-column align="center" label="浠樻姣斾緥%" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.鐗╂枡鍚嶇О }}</span>
+                <el-input v-model="scope.row.HPayRate" placeholder="璇疯緭鍏ヤ粯娆炬瘮渚�%" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+            <el-table-column align="center" label="缁撶畻鍛ㄦ湡" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.瑙勬牸鍨嬪彿 }}</span>
+                <el-input v-model="scope.row.HPayTime" placeholder="璇疯緭鍏ョ粨绠楀懆鏈�" />
               </template>
             </el-table-column>
-            <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
+            <el-table-column align="center" label="澶囨敞璇存槑" width="120">
               <template slot-scope="scope">
-                <span>{{ scope.row.璁¢噺鍗曚綅 }}</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>
+                <el-input v-model="scope.row.HPayRemark" placeholder="璇疯緭鍏ュ娉ㄨ鏄�" />
               </template>
             </el-table-column>
             <el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -456,7 +333,7 @@
 import moment from 'moment';
 
 export default {
-  name: 'SellOutBillEdit',
+  name: 'GySupplierEdit',
   components: { Dept, Warehouse, Material, RowSettings },
   props: {
     OperationType: { type: Number, },
@@ -476,7 +353,9 @@
       hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
       addBtnShow: false,
       zbIndex: null,
+      zbIndex1: null,
       zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      zbSelForm1: {},//瀛愯〃閫変腑鏁版嵁
       dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
       deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
       warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
@@ -491,6 +370,7 @@
       baseURL: process.env.VUE_APP_BASE_API,
       checkedSysZb: [],
       editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+      editData1:[],
       editBtData: [],//瀛愯〃琛ㄥご
       activeName: 'first',
       activeNameZB: 'first',
@@ -827,6 +707,7 @@
         HStopDate: null,
       }
       this.editData = []
+      this.editData1 = []
       this.editBtData = []
       this.ids = []
       this.subDisabled = false
@@ -866,6 +747,7 @@
       this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
       if (this.OperationType == 1) {
         this.handleAddSysZb()
+        this.handleAddSysZb1()
       }
       this.$nextTick(() => {
         this.formShow = true
@@ -926,139 +808,53 @@
         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 = {
+            HCREATEORGID:data.HCREATEORGID,
+            HUSEORGID:data.HUSEORGID,
+            HUseOrg:data.浣跨敤缁勭粐,
+            HNumber:data.缂栫爜,
+            HHelpCode:data.鍔╄鐮�,
+            HShortName:data.绠�绉�,
+            HAddress:data.鍦板潃,
+            HLinkMan: data.鑱旂郴浜�,
+            HLinkPhone: data.鑱旂郴鐢佃瘽,
+            HMobilePhone: data.鎵嬫満,
+            HFax: data.浼犵湡,
+            HPostalCode: data.閭紪,
+            HEmail: data.鐢靛瓙閭欢,
+            HCorMan: data.娉曚汉浠h〃,
+            HBank: data.寮�鎴烽摱琛�,
+            HTaxNum: data.绋庡姟鐧昏鍙�,
+            HEnglishName: data.鑻辨枃鍚嶇О,
+            HEnglishAddress: data.鑻辨枃鍦板潃,
+            HCountry: data.鍥藉,
+            HAreaID: data.鍦板尯ID,
+            HAreaName: data.鍦板尯鍚嶇О,
+            HTaxRate: data.澧炲�肩◣鐜�,
+            HCurID: data.榛樿璐у竵ID,
+            HCurName: data.榛樿璐у竵,
+            HSSID: data.缁撶畻鏂瑰紡ID,
+            HSSName: data.缁撶畻鏂瑰紡,
+            HBankAccount: data.閾惰璐﹀彿,
+            HName: data.鍚嶇О,
+            HPSStyleID: data.閲囪喘鏂瑰紡ID,
+            HPSStyleName: data.閲囪喘鏂瑰紡鍚嶇О,
+            HRemark: data.澶囨敞,
+            HUpDater: sessionStorage["HUserName"],
+            HStopflag: data.绂佺敤鏍囧織,
+            HMaterClass: data.渚涜揣鏉愭枡绫诲埆,
+            HSupTypeID: data.HSupTypeID,
+            HSupClsName: data.渚涘簲鍟嗗垎绫�,
+            HMaker: data.鍒跺崟浜�,
+            HMakeDate: data.鍒跺崟鏃ユ湡,
+            HChecker: data.瀹℃牳浜�,
+            HCheckDate: data.瀹℃牳鏃堕棿,
+            HStopMan: data.绂佺敤浜�,
+            HStopDate: 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
-                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
-                , "鐗╂枡鍚嶇О": 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].褰撳墠搴撳瓨
-              }
-            );
-          }
+          this.editData = result.list[1].Gy_Supplier_Link
+          this.editData1 = result.list[0].Gy_Supplier_PayPlan
+          console.log(856,this.form,this.editData,this.editData1)
           if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
             this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
             this.subDisabled = true
@@ -1090,67 +886,18 @@
     rowSysZbIndex({ row, rowIndex }) {
       row.index = rowIndex + 1;
     },
+    rowSysZbIndex1({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
     /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
     handleAddSysZb(index, num) {
       if (num == 1 && !index) {
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-          HMaterID: 0,
-          鐗╂枡浠g爜: '',
-          鐗╂枡鍚嶇О: '',
-          瑙勬牸鍨嬪彿: '',
-          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,
+          HLinkMan:'',
+          HLinkPhone:'',
+          HRemark:'',
         }
         if (index) {
           this.editData.splice(index, 0, obj);
@@ -1160,12 +907,38 @@
         }
       }
     },
+    handleAddSysZb1(index, num) {
+      if (num == 1 && !index) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+      } else {
+        let obj = {
+          HPayType:'',
+          HPayRate:'',
+          HPayTime:'',
+          HPayRemark:'',
+        }
+        if (index) {
+          this.editData1.splice(index, 0, obj);
+          this.$set(this.editData1, index, obj)
+        } else {
+          this.editData1.push(obj);
+        }
+      }
+    },
     handleCopyZbRow() {
       if (!this.zbIndex) {
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
       } else {
         let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
         this.editData.push(copyRow);
+      }
+    },
+    handleCopyZbRow1() {
+      if (!this.zbIndex1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm1))
+        this.editData1.push(copyRow);
       }
     },
     handleMoveRowUp(zbSelForm) {
@@ -1218,6 +991,15 @@
         this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
       }
     },
+    handleTableZbEdit1(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.zbTable1.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}'`;
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index c5ea92b..a3bb86a 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -34,7 +34,7 @@
               v-for="(item, index) in organizationList"
               :key="index"
               :label="item.Name"
-              :value="item.ID"
+              :value="item.ID.toString()"
             >
             </el-option>
           </el-select>
@@ -509,7 +509,7 @@
   data() {
     return {
       activeSeach: "",
-      HModName: "Gy_Employee",
+      HModName: "Gy_EmployeeList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -517,7 +517,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1205",
+      HBillType: "Gy_EmployeeList",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -562,7 +562,7 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
+      organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
@@ -586,7 +586,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: null,
+        HOrgID: sessionStorage["OrganizationID"],
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -649,7 +649,8 @@
     };
   },
   created() {
-    this.fetchData();
+    // this.fetchData();
+    this.handleQuery();
     this.riqiChange();
   },
   methods: {
@@ -769,33 +770,6 @@
       this.dbEmitData(this.deptform, this.dialogTypeNum);
       this.deptform = {};
     },
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((response) => {
-          let data = response.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔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;
@@ -804,13 +778,15 @@
       }
       // this.queryParams.HOrgID = 100038
       this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
+      let OrgName =
+        this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)?.Name || "";
       //鐢熶骇璧勬枡鍒楄〃
       axios
         .get(this.baseURL + "/Gy_Employee/listPage", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
-            Organization: "娴欐睙鏅轰簯杩堟��",
+            user: sessionStorage["HUserName"],
+            Organization: OrgName,
             page: this.page,
             size: this.pageSize,
           },
@@ -900,7 +876,12 @@
               }
             }
             option.data = result;
-            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+            this.DisPlay_HideColumn(
+              this.HModName,
+              sessionStorage["HUserName"],
+              option,
+              this.dataList
+            );
           }
         })
         .catch((error) => {
@@ -1208,7 +1189,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1289,7 +1270,10 @@
           if (!this.rowForm.瀹℃牳浜�) {
             axios
               .get(this.baseURL + "DeltetGy_Employee", {
-                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+                params: {
+                  HItemID: this.rowForm.HItemID.toString(),
+                  user: sessionStorage["HUserName"],
+                },
               })
               .then((response) => {
                 if (response.data.count == 1) {
@@ -1314,7 +1298,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/AuditGy_Employee", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsAudit: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((response) => {
           let result = response.data;
@@ -1335,7 +1323,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((response) => {
           let result = response.data;
@@ -1401,7 +1393,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index 92720f7..c9af3c0 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 10px">
+  <div style="padding: 10px;position: relative">
     <el-form
       :model="queryParams"
       ref="queryForm"
@@ -488,7 +488,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API,
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -709,37 +708,6 @@
       this.dbEmitData(this.deptform, this.dialogTypeNum);
       this.deptform = {};
     },
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((response) => {
-          let data = response.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔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;
@@ -753,7 +721,7 @@
         .get(this.baseURL + "/Gy_StockPlace/list2Page", {
           params: {
             sWhere: `${this.sWhere}`,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             page: this.page,
             size: this.pageSize,
           },
@@ -842,7 +810,12 @@
               }
             }
             option.data = result;
-            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+            this.DisPlay_HideColumn(
+              this.HModName,
+              sessionStorage["HUserName"],
+              option,
+              this.dataList
+            );
           }
         })
         .catch((error) => {
@@ -1000,6 +973,9 @@
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
+      if (this.openPage) {
+        this.$emit("deptEmit", row, 9);
+      }
     },
     //閫変腑琛岄珮浜牱寮�
     rowStyle({ row, rowIndex }) {
@@ -1010,16 +986,32 @@
     //鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
       this.OperationType = 3;
-      this.handleEdit();
+      if (this.openPage) {
+        this.$emit("deptEmitDb", row, 9);
+      } 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) {
+      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];
+        }
       }
     },
     //鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1133,7 +1125,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1216,7 +1208,10 @@
           if (!this.rowForm.瀹℃牳浜�) {
             axios
               .get(this.baseURL + "Deltet_Gy_StockPlace", {
-                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+                params: {
+                  HItemID: this.rowForm.HItemID.toString(),
+                  user: sessionStorage["HUserName"],
+                },
               })
               .then((response) => {
                 if (response.data.count == 1) {
@@ -1286,7 +1281,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index c6cf099..89904cf 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,106 +1,199 @@
 <template>
-  <div style="padding: 10px; position: relative;">
-    <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+  <div style="padding: 10px; position: relative">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      label-width="98px"
+      :inline="true"
+      class="searchBox"
+    >
       <el-row>
         <el-form-item label="浠撳簱浠g爜" prop="HNumber" style="padding-left: 100px">
-          <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleQuery"
-            class="ForFilteringSchemes" />
+          <el-input
+            v-model="queryParams.HNumber"
+            placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
         </el-form-item>
         <el-form-item label="浠撳簱鍚嶇О" prop="HName">
-          <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" @keyup.enter.native="handleQuery"
-            class="ForFilteringSchemes" />
+          <el-input
+            v-model="queryParams.HName"
+            placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
+            @keyup.enter.native="handleQuery"
+            class="ForFilteringSchemes"
+          />
         </el-form-item>
         <el-form-item label="缁勭粐">
-          <el-select v-model="queryParams.HOrgName" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
-            <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.Name">
+          <el-select
+            v-model="queryParams.HOrgID"
+            placeholder="璇烽�夋嫨"
+            class="ForFilteringSchemes"
+          >
+            <el-option
+              v-for="(item, index) in organizationList"
+              :key="index"
+              :label="item.Name"
+              :value="item.ID.toString()"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="鍚屾" :inline="true">
-          <el-input v-model="queryParams.HSyncNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" @keyup.enter.native="handleSync">
+          <el-input
+            v-model="queryParams.HSyncNumber"
+            placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
+            @keyup.enter.native="handleSync"
+          >
             <el-button slot="append" type="primary" @click="handleSync">鍚屾</el-button>
           </el-input>
         </el-form-item>
       </el-row>
       <el-form-item label-width="78px">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">
-          鎼� 绱�</el-button>
-        <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false">鍙� 娑�</el-button>
+          鎼� 绱�</el-button
+        >
+        <el-button icon="el-icon-circle-close" size="mini" @click="searchOpen = false"
+          >鍙� 娑�</el-button
+        >
       </el-form-item>
       <el-collapse v-model="activeSeach">
         <el-collapse-item title="鏇村" name="1">
           <el-card class="box-card">
             <div slot="header" class="clearfix"><span>杩囨护</span></div>
             <div>
-              <el-form-item label-width="0">
-                <el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
-                    <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
-                      class="ForFilteringSchemes">
+                    <el-select
+                      v-model="queryParams.ColName1"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
                       <span v-for="(item, index) in btList" :key="index">
-                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        <el-option
+                          :label="item.field"
+                          :value="item.field"
+                          v-if="!item.hide"
+                        ></el-option>
                       </span>
                     </el-select>
                   </el-col>
                   <el-col :span="6" style="padding: 0 10px">
-                    <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
-                      class="ForFilteringSchemes">
-                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
-                        :value="item.value"></el-option>
+                    <el-select
+                      v-model="queryParams.Comparator1"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <el-option
+                        v-for="(item, index) in comparatorList"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
                     </el-select>
                   </el-col>
                   <el-col :span="11">
-                    <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
-                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+                    <el-input
+                      v-model="queryParams.ColContent1"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
-                    <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
-                      class="ForFilteringSchemes">
+                    <el-select
+                      v-model="queryParams.ColName2"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
                       <span v-for="(item, index) in btList" :key="index">
-                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+                        <el-option
+                          :label="item.field"
+                          :value="item.field"
+                          v-if="!item.hide"
+                        ></el-option>
                       </span>
                     </el-select>
                   </el-col>
                   <el-col :span="6" style="padding: 0 10px">
-                    <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
-                      class="ForFilteringSchemes">
+                    <el-select
+                      v-model="queryParams.Comparator2"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
                       <span v-for="(item, index) in comparatorList" :key="index">
-                        <el-option :label="item.label" :value="item.value" v-if="!item.hide"></el-option>
+                        <el-option
+                          :label="item.label"
+                          :value="item.value"
+                          v-if="!item.hide"
+                        ></el-option>
                       </span>
                     </el-select>
                   </el-col>
                   <el-col :span="11">
-                    <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
-                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+                    <el-input
+                      v-model="queryParams.ColContent2"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
                   </el-col>
-                </el-row>
-              </el-form-item>
-              <el-form-item label-width="0">
-                <el-row>
+                </el-form-item>
+              </el-row>
+              <el-row>
+                <el-form-item label-width="0">
                   <el-col :span="7">
-                    <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
-                      class="ForFilteringSchemes">
-                      <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
-                        :value="item.field"></el-option>
+                    <el-select
+                      v-model="queryParams.ColName"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <el-option
+                        v-for="(item, index) in btList"
+                        :key="index"
+                        :label="item.field"
+                        :value="item.field"
+                      ></el-option>
                     </el-select>
                   </el-col>
                   <el-col :span="6" style="padding: 0 10px">
-                    <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
-                      class="ForFilteringSchemes">
-                      <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
-                        :value="item.value"></el-option>
+                    <el-select
+                      v-model="queryParams.Comparator"
+                      placeholder="璇烽�夋嫨"
+                      @change="riqiChange"
+                      class="ForFilteringSchemes"
+                    >
+                      <el-option
+                        v-for="(item, index) in comparatorList"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value"
+                      ></el-option>
                     </el-select>
                   </el-col>
                   <el-col :span="11">
-                    <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
-                      @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+                    <el-input
+                      v-model="queryParams.ColContent"
+                      placeholder="璇疯緭鍏�"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                      class="ForFilteringSchemes"
+                    />
                   </el-col>
-                </el-row>
-              </el-form-item>
+                </el-form-item>
+              </el-row>
             </div>
           </el-card>
         </el-collapse-item>
@@ -109,119 +202,229 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">瀵煎叆</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleImport"
+          >瀵煎叆</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
-          id="btn-Add">鏂板</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAddEdit((OperationType = 1))"
+          id="btn-Add"
+          >鏂板</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
-          @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleEdit((row = rowForm), (OperationType = 3))"
+          >缂栬緫</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
-          @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleEdit((row = rowForm), (OperationType = 2))"
+          >澶嶅埗</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+        <el-button
+          type="primary"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="single"
+          @click="handleDelete"
+          >鍒犻櫎
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
-          @click="set_CheckBill(0, (form = rowForm))">瀹℃牳</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CheckBill(0, (form = rowForm))"
+          >瀹℃牳</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
-          @click="set_CheckBill(1, (form = rowForm))">杩斿鏍�</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_CheckBill(1, (form = rowForm))"
+          >杩斿鏍�</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
-          @click="set_De_Stop(0, (form = rowForm))">绂佺敤</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_De_Stop(0, (form = rowForm))"
+          >绂佺敤</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
-          @click="set_De_Stop(1, (form = rowForm))">鍙嶇鐢�</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="set_De_Stop(1, (form = rowForm))"
+          >鍙嶇鐢�</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleRowHide"
+          >闅愯棌鍒楄缃�</el-button
+        >
       </el-col>
       <el-col :span="1.5" class="zy-hidden">
-        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
+        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+          >鎼� 绱�</el-button
+        >
       </el-col>
       <el-col :span="1.5" class="zy-hidden">
-        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+        <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >閲� 缃�</el-button
+        >
       </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
     <div class="tableBox" v-loading="loading">
-      <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
-        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
-        @cell-dblclick="handleDblclick" v-if="tableShow">
+      <el-table
+        :data="tableData"
+        ref="tableData"
+        max-height="750"
+        :summary-method="getSummaries"
+        @selection-change="handleSelectionChange"
+        show-summary
+        border
+        @row-click="handleRowClick"
+        :row-style="rowStyle"
+        @cell-dblclick="handleDblclick"
+        v-if="tableShow"
+      >
         <template v-for="(item, index) in btList">
-          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
-            :key="index" />
-          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
-            :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
-            show-overflow-tooltip :fixed="item.fixed">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+            :fixed="item.fixed"
+            v-if="item.type == 'checkbox'"
+            :key="index"
+          />
+          <el-table-column
+            :align="item.align"
+            :prop="item.field"
+            :label="item.title"
+            :width="item.width"
+            :key="item.sorderid"
+            v-else-if="!item.hide && item.type != 'checkbox'"
+            :sortable="item.sort"
+            show-overflow-tooltip
+            :fixed="item.fixed"
+          >
             <template slot-scope="{ row, column }">
               <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
               <div :style="item.style">
                 <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 == '浠撳簱浠g爜'"
-                  >{{ row.浠撳簱浠g爜 }}</el-button
-                >
+                <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
+                  v-else-if="column.property == '浠撳簱浠g爜'">{{ row.浠撳簱浠g爜 }}</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>
-      <!-- 缂栬緫 -->
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="page"
+        :limit.sync="pageSize"
+        :pageSizes="pageSizes"
+        @pagination="getList"
+      />
       <el-dialog
-        title="缂栬緫浠撳簱"
-        :visible.sync="openEdit"
-        width="1480px"
+        title="闅愯棌鍒楄缃�"
+        :visible.sync="openRowHide"
+        width="816px"
         append-to-body
-        class="xsckdBox"
-        :before-close="close"
-        @close="editBeforeCloseHandle"
       >
-        <edit
-          :OperationType="OperationType"
-          :linterid="this.rowForm.HItemID"
-          :HSouceBillType="this.rowForm.HSourceBillType"
-          :copyType="copyType"
-          @editCloseGy="editGyClose"
-          v-if="editShow"
-          ref="editRef"
+        <RowSettings
+          :colName="btResList"
+          :HModName="HModName"
+          @rowEditClose="rowSetClose"
+          v-if="rowHideShow"
         />
       </el-dialog>
-      <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
+      <!-- 缂栬緫 -->
+      <el-dialog title="缂栬緫浠撳簱" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
+        :before-close="close" @close="editBeforeCloseHandle">
+        <edit :OperationType="OperationType" :linterid="this.rowForm.HItemID"
+          :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow"
+          ref="editRef" />
+      </el-dialog>
+      <el-dialog
+        :title="upload.title"
+        :visible.sync="upload.open"
+        width="1500px"
+        append-to-body
+      >
         <div style="margin-top: -20px">
           <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="浠撳簱浠g爜" align="center" width="120" />
           <el-table-column label="浠撳簱鍚嶇О" prop="浠撳簱鍚嶇О" align="center" width="120" />
@@ -231,13 +434,24 @@
           <el-table-column label="澶囨敞" prop="澶囨敞" align="center" width="120" />
           <el-table-column label="鎿嶄綔" align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" icon="el-icon-delete"
-                @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="uploadDataDelete(scope.row)"
+                >鍒犻櫎</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
-          :pageSizes="uploadPageSizes" @pagination="currentPage" />
+        <pagination
+          v-show="uploadTotal > 0"
+          :total="uploadTotal"
+          :page.sync="uploadPage"
+          :limit.sync="uploadPageSize"
+          :pageSizes="uploadPageSizes"
+          @pagination="currentPage"
+        />
       </el-dialog>
     </div>
   </div>
@@ -260,7 +474,7 @@
       editRef: null,
       activeSeach: "",
       HModName: "Gy_Warehouse",
-      activeSeach: '',
+      activeSeach: "",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -313,12 +527,11 @@
       openData: false, //鏁版嵁寮圭獥
       dialogTitle: "",
       zuzhiId: "",
-      organizationList: [], //缁勭粐鍒楄〃
+      organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
       subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API,
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -337,7 +550,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: null,
+        HOrgID: sessionStorage["OrganizationID"],
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -400,7 +613,7 @@
     };
   },
   created() {
-    this.getList();
+    this.handleQuery();
     this.riqiChange();
   },
   methods: {
@@ -539,33 +752,6 @@
       this.dbEmitData(this.deptform, this.dialogTypeNum);
       this.deptform = {};
     },
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((response) => {
-          let data = response.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔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;
@@ -579,7 +765,7 @@
         .get(this.baseURL + "/Gy_WareHouse/listpage", {
           params: {
             sWhere: `${this.sWhere}`,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             Organization: "娴欐睙鏅轰簯杩堟��",
             page: this.page,
             size: this.pageSize,
@@ -669,7 +855,12 @@
               }
             }
             option.data = result;
-            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+            this.DisPlay_HideColumn(
+              this.HModName,
+              sessionStorage["HUserName"],
+              option,
+              this.dataList
+            );
           }
         })
         .catch((error) => {
@@ -825,14 +1016,14 @@
     handleRowClick(row, column, event) {
       this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆¢�変腑鐨勮
       this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
-      if (this.checkIsIframe) {
+      if (this.checkIsIframe()) {
         // 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
         window.selectedRow = row;
       }
       this.lastSelectedRowIndex = this.tableData.indexOf(row);
       this.$refs.tableData.toggleRowSelection(row);
       if (this.openPage) {
-        this.$emit('deptEmit', row, 2)
+        this.$emit("deptEmit", row, 2);
       }
     },
     //閫変腑琛岄珮浜牱寮�
@@ -849,17 +1040,16 @@
     },
     //鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
-      if (this.checkIsIframe) {
-        // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
-        window.parent.iframeWareHouseCallBack(row);
-        return;
-      }
       this.OperationType = 3;
       if (this.openPage) {
-        this.$emit('deptEmitDb', row, 2)
-      }
-      else {
-      this.handleEdit();
+        this.$emit("deptEmitDb", row, 2);
+      } else {
+        if (this.checkIsIframe) {
+          // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+          window.parent.iframeWareHouseCallBack(row);
+          return;
+        }
+          this.handleEdit();
       }
     },
     // 澶氶�夋閫変腑鏁版嵁
@@ -868,19 +1058,19 @@
       if (this.openPage) {
         //鍒楄〃鍗曢��
         if (selection.length > 1) {
-          const del_row = selection.shift()
-          this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+          const del_row = selection.shift();
+          this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
         }
-        this.rowForm = {}
-        this.ids = selection.map(item => item.HItemID)
-        this.rowForm = selection[0]
-      } else {
-      this.ids = selection.map((item) => item.HItemID);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-      if (!this.single) {
+        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];
+        }
       }
     },
     //鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -966,8 +1156,10 @@
       if (this.queryParams.HName) {
         this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
       }
-      if (this.queryParams.HOrgName) {
-        this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+      if (this.queryParams.HOrgID) {
+        let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+          ?.Name;
+        this.sWhere += " and 缁勭粐鍚嶇О = '" + OrgName + "'";
       }
       // this.sWhere += this.addSWhereByOpenType()
       // this.sWhere += this.getOrgIDByUser()
@@ -992,7 +1184,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1074,7 +1266,10 @@
           if (!this.rowForm.瀹℃牳浜�) {
             axios
               .get(this.baseURL + "/DeltetGy_Warehouse", {
-                params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+                params: {
+                  HItemID: this.rowForm.HItemID.toString(),
+                  user: sessionStorage["HUserName"],
+                },
               })
               .then((response) => {
                 if (response.data.count == 1) {
@@ -1091,7 +1286,7 @@
             this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
           }
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     // 鍙嶅鏍�/瀹℃牳鏁版嵁
     set_CheckBill(num, form) {
@@ -1099,7 +1294,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsAudit: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((response) => {
           let result = response.data;
@@ -1120,7 +1319,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((response) => {
           let result = response.data;
@@ -1167,8 +1370,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 }
         );
@@ -1186,7 +1389,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
@@ -1197,8 +1400,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 }
           );
@@ -1222,7 +1425,7 @@
             return deleteList.indexOf(item.index) == -1;
           });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     getPage(page, list) {
       let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1245,7 +1448,7 @@
   width: 100%;
 }
 
-.form-item-inline>.el-form-item__content {
+.form-item-inline > .el-form-item__content {
   display: flex;
   flex-direction: row;
 }
diff --git a/src/views/gyMaterial/GyMaterial.vue b/src/views/gyMaterial/GyMaterial.vue
index 49028d1..6aab067 100644
--- a/src/views/gyMaterial/GyMaterial.vue
+++ b/src/views/gyMaterial/GyMaterial.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 10px">
+  <div style="padding: 10px; position: relative;">
     <el-card style="margin-bottom: 10px;">
       <el-form :inline="true" :model="queryParams" ref="queryForm" class="mb8">
         <el-form-item label="鐗╂枡浠g爜" prop="HNumber">
@@ -1158,6 +1158,9 @@
       this.$refs.tableData.toggleRowSelection(row);
       this.selectedRow = row;
       this.getFileList(row.鐗╂枡浠g爜);
+       if (this.openPage) {
+        this.$emit('deptEmit', row, 3)
+      }
     },
     
 
@@ -1216,18 +1219,23 @@
     
     // 琛屾牱寮�
     rowStyle({ row, rowIndex }) {
-      if (this.ids.includes(row.hmainid)) {
+      if (this.ids.includes(row.HItemID)) {
         return { background: "#ecf5ff" };
       }
     },
     
     // 鍙屽嚮琛�
     handleDblclick(row, column, cell, event) {
+       if (this.openPage) {
+        this.$emit('deptEmitDb', row, 3)
+      } else {
       this.handleMaterialCodeClick(row);
+      }
     },
 
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.hmainid);
+      console.log(selection)
+      this.ids = selection.map((item) => item.HItemID);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
       if (!this.single) {
diff --git a/src/views/login.vue b/src/views/login.vue
index 5eed124..fe62109 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -203,7 +203,6 @@
             Cookies.remove("password")
             Cookies.remove('rememberMe')
           }
-
           this.$store.dispatch("Login", this.loginForm).then(res => {
             this.$router.push({ path: this.redirect || "/" }).catch(() => { })
           }).catch(() => {
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index 266b2ed..ed95899 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -15,6 +15,8 @@
             type="date"
             placeholder="寮�濮嬫棩鏈�"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -24,6 +26,8 @@
             type="date"
             placeholder="缁撴潫鏃ユ湡"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -608,7 +612,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "GySource",
+  name: "cgPoInStockBill",
   components: { RowSettings, gySource },
   props: {
     openPage: { type: String },
@@ -618,7 +622,7 @@
       iframeUrl: "",
       activeSeach: "",
       dateRange: [],
-      HModName: "Cg_POOrderBillList",
+      HModName: "cgPoInStockBill",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -626,7 +630,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "1103",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -658,6 +662,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰闂撮殧", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -676,7 +681,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -777,7 +781,8 @@
   },
   created() {
     this.riqiChange();
-    this.getList();
+    // this.getList();
+    this.handleQuery();
   },
   beforeDestroy() {
     // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
@@ -859,6 +864,9 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        return;
+      }
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -923,7 +931,7 @@
         let res = await axios.get(this.baseURL + "Cg_POInStockBill/page", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             page: this.page,
             size: this.pageSize,
           },
@@ -1011,7 +1019,12 @@
             }
           }
           option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
         }
       } catch (err) {
         this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1298,7 +1311,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1387,7 +1400,7 @@
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,
                   HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
+                  user: sessionStorage["HUserName"],
                 },
               })
               .then((res) => {
@@ -1413,7 +1426,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsAudit: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1438,7 +1455,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1466,7 +1483,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1492,7 +1509,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1514,7 +1531,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1580,7 +1601,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index c913644..4eac4a8 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -15,6 +15,8 @@
             type="date"
             placeholder="寮�濮嬫棩鏈�"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -24,6 +26,8 @@
             type="date"
             placeholder="缁撴潫鏃ユ湡"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -613,7 +617,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "GySource",
+  name: "Cg_POOrderBillList",
   components: { RowSettings, gySource },
   props: {
     openPage: { type: String },
@@ -630,7 +634,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "1102",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -662,6 +666,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰闂撮殧", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -680,7 +685,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -781,7 +785,8 @@
   },
   created() {
     this.riqiChange();
-    this.getList();
+    // this.getList();
+    this.handleQuery();
   },
   beforeDestory() {
     delete window.editGyClose;
@@ -861,6 +866,9 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        return;
+      }
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -926,7 +934,7 @@
         .get(this.baseURL + "/Cg_POOrderBill/page", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             page: this.page,
             size: this.pageSize,
           },
@@ -1015,7 +1023,12 @@
               }
             }
             option.data = result;
-            this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+            this.DisPlay_HideColumn(
+              this.HModName,
+              sessionStorage["HUserName"],
+              option,
+              this.dataList
+            );
           }
         })
         .catch((error) => {
@@ -1317,7 +1330,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1400,7 +1413,10 @@
           if (!this.rowForm.瀹℃牳浜�) {
             axios
               .get(this.baseURL + "Cg_POOrderBill/DeltetCg_POOrderBill", {
-                params: { HInter: this.rowForm.HInterID.toString(), user: this.user },
+                params: {
+                  HInter: this.rowForm.HInterID.toString(),
+                  user: sessionStorage["HUserName"],
+                },
               })
               .then((response) => {
                 if (response.data.count == 1) {
@@ -1425,7 +1441,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Cg_POOrderBill/AuditCg_POOrderBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsAudit: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((response) => {
           let result = response.data;
@@ -1448,7 +1468,7 @@
           params: {
             HInterID: HInterID,
             Type: num,
-            user: this.user,
+            user: sessionStorage["HUserName"],
           },
         });
 
@@ -1475,7 +1495,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1499,7 +1519,7 @@
           params: {
             HInterID: HInterID,
             Type: num,
-            user: this.user,
+            user: sessionStorage["HUserName"],
           },
         });
 
@@ -1520,7 +1540,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((response) => {
           let result = response.data;
@@ -1586,7 +1610,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 41a40c8..55a336c 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -1 +1,1484 @@
-<template></template>
\ No newline at end of file
+<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 @click="cancel">鍙� 娑�</el-button> -->
+    </div>
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗f缂栬緫</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+      <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-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="璐т富绫诲瀷" prop="HMouldOWNER">
+                <el-select v-model="form.HMouldOWNER" placeholder="璇烽�夋嫨">
+                  <el-option label="鑷垂" value="鑷垂" />
+                  <el-option label="瀹緵" value="瀹緵" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿缂栧彿" prop="HMouldNo">
+                <el-input v-model="form.HMouldNo" placeholder="璇疯緭鍏ュ櫒鍏风紪鍙�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿鍚嶇О" prop="HName">
+                <el-input v-model="form.HName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿瑙勬牸" prop="HModel">
+                <el-input v-model="form.HModel" placeholder="璇疯緭鍏ュ櫒鍏疯鏍�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿鍨嬪彿" prop="HModel2">
+                <el-input v-model="form.HModel2" placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鐩村緞" prop="HDiameter">
+                <el-input v-model="form.HDiameter" placeholder="璇疯緭鍏ョ洿寰�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="杈呭姪灞炴��" prop="HSubjoin">
+                <el-input v-model="form.HSubjoin" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="杈呭姪灞炴��2" prop="HSubjoin2">
+                <el-input v-model="form.HSubjoin2" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�2" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍥惧彿" prop="HPICNo">
+                <el-input v-model="form.HPICNo" placeholder="璇疯緭鍏ュ浘鍙�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鐢熶骇浜у搧鍨嬪彿" prop="HWorkMaterModel">
+                <el-input v-model="form.HWorkMaterModel" placeholder="璇疯緭鍏ョ敓浜т骇鍝佸瀷鍙�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="瀵瑰簲ERP鐗╂枡" prop="HMaterNumber">
+                <el-input v-model="form.HMaterNumber" placeholder="璇疯緭鍏ュ搴擡RP鐗╂枡" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿鍒嗙被" prop="HMouleTypeName">
+                <el-input v-model="form.HMouleTypeName" 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="HUnitName">
+                <el-input v-model="form.HUnitName" 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="HOutComDate">
+                <el-date-picker v-model="form.HOutComDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍑哄巶缂栧彿" prop="HOutComNo">
+                <el-input v-model="form.HOutComNo" placeholder="璇疯緭鍏ュ嚭鍘傜紪鍙�" />
+              </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="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇疯緭鍏ヤ緵搴斿晢" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿鐘舵��" prop="HMouldStatus">
+                <el-select v-model="form.HMouldStatus" placeholder="璇烽�夋嫨">
+                  <el-option label="鍦ㄥ簱" value="鍦ㄥ簱" />
+                  <el-option label="涓婃満" value="涓婃満" />
+                  <el-option label="鍑哄簱" value="鍑哄簱" />
+                  <el-option label="鍦ㄩ��" value="鍦ㄩ��" />
+                  <el-option label="涓㈠け" value="涓㈠け" />
+                  <el-option label="閿佸畾" value="閿佸畾" />
+                  <el-option label="棰嗗嚭" value="棰嗗嚭" />
+                  <el-option label="鎶ュ簾" value="鎶ュ簾" />
+                  <el-option label="鏈惎鐢�" value="鏈惎鐢�" />
+                  <el-option label="浣滃簾" value="浣滃簾" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="瀹夊叏瀵垮懡" prop="HSaveLife">
+                <el-input v-model="form.HSaveLife" placeholder="璇疯緭鍏ュ畨鍏ㄥ鍛�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="榛樿浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇疯緭鍏ラ粯璁や粨搴�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = 1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鐗堟湰鍙�" prop="HVersion">
+                <el-input v-model="form.HVersion" placeholder="璇疯緭鍏ョ増鏈彿" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="榛樿浠撲綅" prop="HSPName">
+                <el-input v-model="form.HSPName" placeholder="璇疯緭鍏ラ粯璁や粨浣�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(9, cwType = 1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="璁捐瀵垮懡" prop="HDesignLife">
+                <el-input v-model="form.HDesignLife" placeholder="璇疯緭鍏ヨ璁″鍛�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="浣跨敤瀵垮懡" prop="HUseLife">
+                <el-input v-model="form.HUseLife" placeholder="璇疯緭鍏ヤ娇鐢ㄥ鍛�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍓╀綑瀵垮懡" prop="HLeaveLife">
+                <el-input v-model="form.HLeaveLife" placeholder="璇疯緭鍏ュ墿浣欏鍛�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="宸茬敓浜ф暟閲�" prop="HProdQty">
+                <el-input v-model="form.HProdQty" placeholder="璇疯緭鍏ュ凡鐢熶骇鏁伴噺" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="宸茬敓浜ч噸閲�" prop="HProdWeight">
+                <el-input v-model="form.HProdWeight" placeholder="璇疯緭鍏ュ凡鐢熶骇閲嶉噺" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="绌存暟" prop="HCaveQty">
+                <el-input v-model="form.HCaveQty" placeholder="璇疯緭鍏ョ┐鏁�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="榛樿淇濆吇瑙勭▼" prop="HMouldMaintainRuleInterName">
+                <el-input v-model="form.HMouldMaintainRuleInterName" 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="HBarCode">
+                <el-input v-model="form.HBarCode" placeholder="璇疯緭鍏ユ潯鐮佺紪鍙�" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒堕�犲巶鍟�" prop="HMadeSupName">
+                <el-input v-model="form.HMadeSupName" 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="HNextMainDate">
+                <el-date-picker v-model="form.HNextMainDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿绫诲瀷" prop="HMouldClass">
+                <el-select v-model="form.HMouldClass" placeholder="璇烽�夋嫨">
+                  <el-option label="妯″叿" value="妯″叿" />
+                  <el-option label="宸ヨ" value="宸ヨ" />
+                  <el-option label="澶瑰叿" value="澶瑰叿" />
+                  <el-option label="鍒�鍏�" value="鍒�鍏�" />
+                  <el-option label="妫�鍏�" value="妫�鍏�" />
+                  <el-option label="鍛ㄨ浆鍣ㄥ叿" value="鍛ㄨ浆鍣ㄥ叿" />
+                  <el-option label="鍏朵粬" value="鍏朵粬" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="涓婄嚎鍒濆鍖栧鍛�" prop="HInitLife">
+                <el-input v-model="form.HInitLife" placeholder="璇疯緭鍏ヤ笂绾垮垵濮嬪寲瀵垮懡" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="褰撳墠浠撳簱" prop="HNowWHName">
+                <el-input v-model="form.HNowWHName" placeholder="璇疯緭鍏ュ綋鍓嶄粨搴�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = 2)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="褰撳墠浠撲綅" prop="HNowSPName">
+                <el-input v-model="form.HNowSPName" placeholder="璇疯緭鍏ュ綋鍓嶄粨搴�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(9, cwType = 2)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍣ㄥ叿鍙敤鐘舵��" prop="HMouldUseStatus">
+                <el-select v-model="form.HMouldUseStatus" placeholder="璇烽�夋嫨">
+                  <el-option label="姝e父" value="姝e父" />
+                  <el-option label="寮傚父" value="寮傚父" />
+                  <el-option label="淇濆吇" value="淇濆吇" />
+                  <el-option label="缁翠慨" value="缁翠慨" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="浣跨敤缁勭粐" prop="HCREATEORGID">
+                <el-select v-model="form.HCREATEORGID" 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-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>
+      <el-tabs type="border-card">
+        <el-tab-pane label="瀛愬櫒鍏�">
+          <div style="margin-bottom: 10px;">
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'edit')"
+              size="mini">澧炲姞涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow(type = 'edit')"
+              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="瀛愬櫒鍏�">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMouldFileName" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="缁勮鏃ユ湡">
+              <template slot-scope="scope">
+                <el-date-picker v-model="scope.row.HUnionDate" type="date" placeholder="閫夋嫨缁勮鏃ユ湡">
+                </el-date-picker>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="澶囨敞">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鎿嶄綔">
+              <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-tab-pane>
+        <el-tab-pane label="淇濆吇瑙勭▼">
+          <div style="margin-bottom: 10px;">
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'maintain')"
+              size="mini">澧炲姞涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow(type = 'maintain')"
+              size="mini">澶嶅埗涓�琛�</el-button>
+          </div>
+          <el-table :data="maintainData" style="width: 100%" height="300" width="100%" ref="zbByTable"
+            @selection-change="handleTableZbByEdit" :row-class-name="rowSysZbByIndex" 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="淇濆吇瑙勭▼鍗曟嵁鍙�">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.淇濆吇瑙勭▼鍗曟嵁鍙�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="澶囨敞">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="榛樿鏍囪">
+              <template slot-scope="scope">
+                <el-checkbox v-model="scope.row.HStdFlag"></el-checkbox>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鎿嶄綔">
+              <template slot-scope="scope">
+                <el-button type="danger" icon="el-icon-delete" size="mini" circle
+                  @click="handleDeleteSysZbBy(scope.row)"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+        <el-tab-pane label="鐐规瑙勭▼">
+          <div style="margin-bottom: 10px;">
+            <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'dotCheck')"
+              size="mini">澧炲姞涓�琛�</el-button>
+            <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow(type = 'dotCheck')"
+              size="mini">澶嶅埗涓�琛�</el-button>
+          </div>
+          <el-table :data="dotCheckData" style="width: 100%" height="300" width="100%" ref="zbDjTable"
+            @selection-change="handleTableZbDjEdit" :row-class-name="rowSysZbDjIndex" 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="鐐规瑙勭▼鍗曟嵁鍙�">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.鐐规瑙勭▼鍗曟嵁鍙�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="澶囨敞">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="榛樿鏍囪">
+              <template slot-scope="scope">
+                <el-checkbox v-model="scope.row.HStdFlag"></el-checkbox>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鎿嶄綔">
+              <template slot-scope="scope">
+                <el-button type="danger" icon="el-icon-delete" size="mini" circle
+                  @click="handleDeleteSysZbDj(scope.row)"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+
+    </el-form>
+    <!-- 閮ㄩ棬寮圭獥 -->
+    <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySource @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySourceShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+      <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="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import Dept from '@/views/basic/gy/gyDepartment.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import Material from '@/views/gyMaterial/GyMaterial.vue'
+import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import GySource from '@/views/basic/production/gySource.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import moment from 'moment';
+
+export default {
+  name: 'Gy_MouldFile',
+  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      HModName: "Gy_MouldFile",
+      ckType: null,
+      cwType: null,
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      zzSelDis: false,
+      rowHideShow: false,
+      openRowHide: false,
+      hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      zbByIndex: null,
+      zbBySelForm: {},//瀛愯〃閫変腑鏁版嵁
+      zbDjIndex: null,
+      zbDjSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+      materialShow: false,//鐗╂枡鏁版嵁缁勪欢
+      gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySourceShow: false,
+      gySupplierShow: false,
+      gyCustomerShow: false,
+      gyStockPlaceShow: false,
+      deptform: {},//寮圭獥閫変腑鏁版嵁
+      openData: false,//鏁版嵁寮圭獥
+      dialogTitle: '',
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      checkedSysZb: [],
+      checkedSysZbBy: [],
+      checkedSysZbDj: [],
+      editData: [],//瀛愯〃
+      maintainData: [],
+      dotCheckData: [],
+      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.getdata()
+  },
+  methods: {
+    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
+                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                    , "鐗╂枡鍚嶇О": 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
+    },
+
+    organizationChange(val) {
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //閮ㄩ棬寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      console.log(deptRow)
+      if (deptRow.HItemID) {
+        if (num == 1) {
+          this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+          this.form.HDeptID = deptRow.HItemID
+          this.deptShow = false
+          this.openData = false
+        } else if (num == 2) {
+          if (this.ckType == 1) {
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О;
+            this.form.HWHID = deptRow.HItemID;
+          } else if (this.ckType == 2) {
+            this.form.HNowWHName = deptRow.浠撳簱鍚嶇О;
+            this.form.HNowWHID = deptRow.HItemID;
+          }
+          this.warehouseShow = false
+          this.openData = false
+        } else if (num == 3) {
+          this.form.HName = deptRow.鐗╂枡鍚嶇О;
+          this.form.HMaterNumber = deptRow.鐗╂枡浠g爜;
+          this.form.HMaterID = deptRow.HItemID;
+          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 if (num == 5) {
+          this.form.HSourceName = deptRow.鐢熶骇璧勬簮鍚嶇О
+          this.form.HSourceID = deptRow.HItemID
+          this.gySourceShow = false
+          this.openData = false
+        } else if (num == 6) {
+          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+          this.form.HSupID = deptRow.HItemID
+          this.gySupplierShow = false
+          this.openData = false
+        } else if (num == 7) {
+          console.log(deptRow)
+          this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
+          this.form.HCusID = deptRow.HItemID
+          this.gyCustomerShow = false
+          this.openData = false
+        } else if (num == 9) {
+          if (this.cwType == 1) {
+            this.form.HSPName = deptRow.浠撲綅鍚嶇О;
+            this.form.HSPID = deptRow.HMainID;
+          } else if (this.cwType == 2) {
+            this.form.HNowSPName = deptRow.浠撲綅鍚嶇О;
+            this.form.HNowSPID = deptRow.HMainID;
+          }
+          this.gyStockPlaceShow = false
+          this.openData = false
+        }
+      } else {
+        this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+      }
+
+    },
+    emitData(deptRow, num) {
+      this.dialogTypeNum = num
+      this.deptform = deptRow
+    },
+    deptClickSub() {
+      this.dbEmitData(this.deptform, this.dialogTypeNum)
+      this.deptform = {}
+    },
+    deptClose() {
+      this.deptform = {}
+      this.openData = false
+    },
+
+    //閫�鍑�
+    close() {
+      this.reset()
+      console.log(this.$route.path)
+      if (!this.OperationType && !this.copyType) {
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
+      } 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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+
+    //鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    reset() {
+      this.form = {
+        HInterID: 0,
+        HBillNo: '',
+        HDate: moment(new Date()).format('YYYY-MM-DDTHH:mm:ss'),
+        HMouldOWNER: '',
+        HMouldNo: '',
+        HName: '',
+        HModel: '',
+        HModel2: '',
+        HDiameter: '',
+        HSubjoin: '',
+        HSubjoin2: '',
+        HPICNo: '',
+        HWorkMaterModel: '',
+        HMaterID: 0,
+        HMaterNumber: '',
+        HMouleTypeID: 0,
+        HMouleTypeName: '',
+        HUnitID: 0,
+        HUnitName: '',
+        HOutComDate: moment(new Date()).format('YYYY-MM-DDTHH:mm:ss'),
+        HOutComNo: '',
+        HDeptID: 0,
+        HDeptName: '',
+        HSupID: 0,
+        HSupName: '',
+        HMouldStatus: '',
+        HSaveLife: 0,
+        HWHID: 0,
+        HWHName: '',
+        HVersion: '',
+        HSPID: 0,
+        HSPName: '',
+        HDesignLife: 0,
+        HUseLife: 0,
+        HLeaveLife: 0,
+        HInitLife: 0,
+        HCaveQty: 0,
+        HProdQty: 0,
+        HProdWeight: 0,
+        HMouldDotCheckRuleInterName: '',
+        HMouldDotCheckRuleInterID: 0,
+        HMouldMaintainRuleInterName: '',
+        HMouldMaintainRuleInterID: 0,
+        HBarCode: '',
+        HMadeSupID: 0,
+        HMadeSupName: '',
+        HMouldClass: '',
+        HNowWHID: 0,
+        HNowWHName: '',
+        HNowSPID: 0,
+        HNowSPName: '',
+        HMouldUseStatus: '',
+        HNextMainDate: '',
+        HUSEORGID: sessionStorage["OrganizationID"],
+        HCREATEORGID: sessionStorage["OrganizationID"],
+        HMaker: sessionStorage["HUserName"],
+        HMakeDate: '',
+        HChecker: '',
+        HCheckDate: '',
+        HUpDater: '',
+        HUpDateDate: '',
+        HCloseMan: '',
+        HCloseDate: '',
+        HDeleteMan: '',
+        HDeleteDate: '',
+      }
+      this.editData = []
+      this.editBtData = []
+      this.maintainData = []
+      this.dotCheckData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.resetForm("form");
+    },
+    /** 鏂板鎸夐挳鎿嶄綔 */
+    handleAdd() {
+      this.reset()
+      //鏂板鑾峰彇鍗曟嵁鍙�
+      this.getHBillNo()
+      if (this.OperationType == 1) {
+        this.handleAddSysZb()
+      }
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    getHBillNo() {
+      axios.get(this.baseURL + "/Web/GetMAXNum", {
+        params: {
+          HBillType: '3899'
+        }
+      }).then(response => {
+        this.form.HBillNo = response.data.data[0].HBillNo
+      }).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
+      axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
+        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()
+          } 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.HMouldOWNER = data.璐т富绫诲瀷
+          this.form.HMouldNo = data.妯″叿缂栧彿
+          this.form.HName = data.妯″叿鍚嶇О
+          this.form.HModel = data.褰撳墠妯″叿瑙勬牸
+          this.form.HModel2 = data.妯″叿鍨嬪彿
+          this.form.HDiameter = data.鐩村緞
+          this.form.HSubjoin = data.杈呭姪灞炴��
+          this.form.HSubjoin2 = data.杈呭姪灞炴��2
+          this.form.HPICNo = data.鍥惧彿
+          this.form.HWorkMaterModel = data.鐢熶骇浜у搧鍨嬪彿
+          this.form.HMaterID = data.HMaterID
+          this.form.HMaterNumber = data.瀵瑰簲ERP鐗╂枡缂栫爜
+          this.form.HMouleTypeID = data.HMouldTypeID
+          this.form.HMouleTypeName = data.妯″叿鍝佺被
+          this.form.HUnitID = data.HUnitID
+          this.form.HUnitName = data.璁¢噺鍗曚綅
+          this.form.HOutComDate = data.鍑哄巶鏃ユ湡
+          this.form.HOutComNo = data.鍑哄巶缂栧彿
+          this.form.HDeptID = data.HDeptID
+          this.form.HDeptName = data.浣跨敤閮ㄩ棬
+          this.form.HSupID = data.HSupID
+          this.form.HSupName = data.渚涘簲鍟�
+          this.form.HMouldStatus = data.妯″叿鐘舵��
+          this.form.HSaveLife = data.瀹夊叏瀵垮懡
+          this.form.HWHID = data.HWhID
+          this.form.HWHName = data.榛樿浠撳簱
+          this.form.HVersion = data.鐗堟湰
+          this.form.HSPID = data.HSPID
+          this.form.HSPName = data.榛樿浠撲綅
+          this.form.HDesignLife = data.鍒濆璁捐瀵垮懡
+          this.form.HUseLife = data.浣跨敤瀵垮懡
+          this.form.HLeaveLife = data.鍓╀綑瀵垮懡
+          this.form.HInitLife = data.涓婄嚎鍒濆鍖栧鍛� == null ? 0 : data.涓婄嚎鍒濆鍖栧鍛�
+          this.form.HCaveQty = data.绌存暟
+          this.form.HProdQty = data.宸茬敓浜ф暟閲�
+          this.form.HProdWeight = data.宸茬敓浜ч噸閲�
+          this.form.HMouldDotCheckRuleInterName = data.鐐规瑙勭▼鍗曞彿
+          this.form.HMouldDotCheckRuleInterID = data.HMouldDotCheckRuleInterID
+          this.form.HMouldMaintainRuleInterName = data.淇濆吇瑙勭▼鍗曞彿
+          this.form.HMouldMaintainRuleInterID = data.HMouldMaintainRuleInterID
+          this.form.HBarCode = data.鏉$爜缂栧彿
+          this.form.HMadeSupID = data.HMadeSupID
+          this.form.HMadeSupName = data.鍒堕�犲巶鍟�
+          this.form.HMouldClass = data.鍣ㄥ叿鍒嗙被
+          this.form.HNowWHID = data.褰撳墠浠撳簱ID
+          this.form.HNowWHName = data.褰撳墠浠撳簱
+          this.form.HNowSPID = data.褰撳墠浠撲綅ID
+          this.form.HNowSPName = data.褰撳墠浠撲綅
+          this.form.HMouldUseStatus = data.妯″叿鍙敤鐘舵��
+          this.form.HNextMainDate = data.鏍℃鏃ユ湡
+          this.form.HUSEORGID = data.HUSEORGID
+          for (var i = 0; i < result.data.length; i++) {
+            this.editData.push(
+              {
+                "HMouldFileID": result.data[i]["HMouldFileID"],
+                "HMouldFileName": result.data[i]["瀛愬櫒鍏�"],
+                "HUnionDate": result.data[i]["缁勮鏃ユ湡"],
+                "HRemark": result.data[i]["琛ㄤ綋澶囨敞"]
+              }
+            );
+          }
+          var HCycleUnit = data.鍛ㄦ湡鍗曚綅;
+          var HCheckCycle = data.淇濆吇鍛ㄦ湡;
+          if (!(HCycleUnit == null || HCheckCycle == null)) {
+            this.calculateHNextMainDate(data.hmainid, HCycleUnit, HCheckCycle);
+          }
+          this.formShow = true
+          this.formLoading = false
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+      axios.get(this.baseURL + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
+        params: { 'HInterID': rowHmainid }
+      }).then(response => {
+        if (response.data.code == 1) {
+          let data = response.data
+          var dataMaintainRule = data.data[0];
+          var dataDotCheckRule = data.data[1];
+          console.log(dataMaintainRule)
+          //瀛愯〃1璧嬪��
+          for (var i = 0; i < dataMaintainRule.length; i++) {
+            this.maintainData.push(
+              {
+                "HMaintainRuleID": dataMaintainRule[i].HMaintainRuleID,
+                "淇濆吇瑙勭▼鍗曟嵁鍙�": dataMaintainRule[i].HBillNo,
+                "HStdFlag": dataMaintainRule[i].HStdFlag,
+                "HRemark": dataMaintainRule[i].HRemark,
+                "HSourceInterID": dataMaintainRule[i].HSourceInterID,
+                "HSourceEntryID": dataMaintainRule[i].HSourceEntryID,
+                "HSourceBillNo": dataMaintainRule[i].HSourceBillNo,
+                "HSourceBillType": dataMaintainRule[i].HSourceBillType
+              }
+            )
+          }
+          for (var i = 0; i < dataDotCheckRule.length; i++) {
+            this.dotCheckData.push(
+              {
+                "HDotCheckRuleID": dataDotCheckRule[i].HDotCheckRuleID,
+                "鐐规瑙勭▼鍗曟嵁鍙�": dataDotCheckRule[i].HBillNo,
+                "HStdFlag": dataDotCheckRule[i].HStdFlag,
+                "HRemark": dataDotCheckRule[i].HRemark,
+                "HSourceInterID": dataDotCheckRule[i].HSourceInterID,
+                "HSourceEntryID": dataDotCheckRule[i].HSourceEntryID,
+                "HSourceBillNo": dataDotCheckRule[i].HSourceBillNo,
+                "HSourceBillType": dataDotCheckRule[i].HSourceBillType
+              }
+            )
+          }
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#region 璁$畻-涓嬫淇濆吇/鏍℃鏃ユ湡
+    calculateHNextMainDate(HInterID, HCycleUnit, HCheckCycle) {
+      axios.get(this.baseURL + "/Gy_Mould_Edit/calculateHNextMainDate", {
+        params: { 'HInterID': HInterID }
+      }).then(response => {
+        let d = response.data
+        var HDate = this.form.HDate
+        var HEndDate = d.data[0].淇濆吇璁板綍缁撴潫鏃ユ湡 == null ? moment(HDate).format('YYYY-MM-DD') : moment(d.data[0].淇濆吇璁板綍缁撴潫鏃ユ湡).format('YYYY-MM-DD');
+        if (HCycleUnit == "澶�") {
+          var time = HCheckCycle * 1000 * 60 * 60 * 24;
+          time += Date.parse(new Date(HEndDate));
+          var HNextMainDate = moment(time).format('YYYY-MM-DD')
+          this.form.HNextMainDate = HNextMainDate
+        } else if (HCycleUnit == "鍛�") {
+          var time = HCheckCycle * 7 * 1000 * 60 * 60 * 24;
+          time += Date.parse(new Date(HEndDate));
+          var HNextMainDate = moment(time).format('YYYY-MM-DD')
+          this.form.HNextMainDate = HNextMainDate
+        } else if (HCycleUnit == "鏈�") {
+          var year = HEndDate.split("-")[0] * 1;
+          var month = HEndDate.split("-")[1] * 1;
+          var day = HEndDate.split("-")[2] * 1;
+          if ((month + HCheckCycle) % 12 == 0) {
+            year += parseInt(((month + HCheckCycle) / 12 - 1));
+            month = 12;
+          } else {
+            year += parseInt((month + HCheckCycle) / 12);
+            month = (month + HCheckCycle) % 12;
+          }
+          var HNextMainDate = year + "-" + month + "-" + day;
+          this.form.HNextMainDate = HNextMainDate
+        }
+      })
+    },
+    //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
+    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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+
+    /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+    handleAddSysZb(type) {
+      let obj1 = {
+        "HMouldFileID": "0",
+        "HMouldFileName": "",
+        "HUnionDate": moment(new Date()).format('YYYY-MM-DD'),
+        "HRemark": "",
+        "HSourceInterID": "0",
+        "HSourceEntryID": "0",
+        "HSourceBillNo": "",
+        "HSourceBillType": ""
+      }
+      let obj2 = {
+        "HMaintainRuleID": "0",
+        "淇濆吇瑙勭▼鍗曟嵁鍙�": '',
+        "HStdFlag": false,
+        "HRemark": '',
+        "HSourceInterID": "0",
+        "HSourceEntryID": "0",
+        "HSourceBillNo": "",
+        "HSourceBillType": ""
+      }
+      let obj3 = {
+        "HDotCheckRuleID": "0",
+        "鐐规瑙勭▼鍗曟嵁鍙�": '',
+        "HStdFlag": false,
+        "HRemark": '',
+        "HSourceInterID": "0",
+        "HSourceEntryID": "0",
+        "HSourceBillNo": "",
+        "HSourceBillType": ""
+      }
+      if (type == 'edit') {
+        this.editData.push(obj1)
+      } else if (type == 'maintain') {
+        this.maintainData.push(obj2)
+      } else if (type == 'dotCheck') {
+        this.dotCheckData.push(obj3)
+      } else if (!type) {
+        this.editData.push(obj1)
+        this.maintainData.push(obj2)
+        this.dotCheckData.push(obj3)
+      }
+    },
+    handleCopyZbRow(type) {
+      let indexNum = null
+      if (type == 'edit') {
+        indexNum = this.zbIndex
+        if (!indexNum) {
+          this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+        } else {
+          let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+          this.editData.push(copyRow)
+        }
+      } else if (type == 'maintain') {
+        indexNum = this.zbByIndex
+        if (!indexNum) {
+          this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+        } else {
+          let copyRow = JSON.parse(JSON.stringify(this.zbBySelForm))
+          this.maintainData.push(copyRow)
+        }
+      } else if (type == 'dotCheck') {
+        indexNum = this.zbDjIndex
+        if (!indexNum) {
+          this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+        } else {
+          let copyRow = JSON.parse(JSON.stringify(this.zbDjSelForm))
+          this.dotCheckData.push(copyRow)
+        }
+      }
+
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    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) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    /** 瀛愯〃鏄庣粏搴忓彿 */
+    rowSysZbIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    handleDeleteSysZbBy(row) {
+      this.checkedSysZbBy = []
+      this.checkedSysZbBy.push(row.index)
+      if (this.checkedSysZbBy.length == 0) {
+        this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ゆ暟鎹�");
+      } else {
+        const editData = this.maintainData;
+        const checkedSysZb = this.checkedSysZbBy;
+        this.maintainData = editData.filter(function (item) {
+          return checkedSysZb.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+    handleTableZbByEdit(selection) {
+      this.checkedSysZbBy = selection.map(item => item.index)
+      this.zbBySelForm = selection[0]
+      this.zbByIndex = this.checkedSysZbBy[0]
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.zbByTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    /** 淇濆吇瀛愯〃鏄庣粏搴忓彿 */
+    rowSysZbByIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    handleDeleteSysZbDJ(row) {
+      this.checkedSysZbDJ = []
+      this.checkedSysZbDJ.push(row.index)
+      if (this.checkedSysZbDJ.length == 0) {
+        this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ゆ暟鎹�");
+      } else {
+        const editData = this.dotCheckData;
+        const checkedSysZb = this.checkedSysZbDJ;
+        this.dotCheckData = editData.filter(function (item) {
+          return checkedSysZb.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+    handleTableZbDjEdit(selection) {
+      this.checkedSysZbDy = selection.map(item => item.index)
+      this.zbDjSelForm = selection[0]
+      this.zbDjIndex = this.checkedSysZbDy[0]
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.zbDjTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    /** 鐐规瀛愯〃鏄庣粏搴忓彿 */
+    rowSysZbDjIndex({ row, rowIndex }) {
+      row.index = rowIndex + 1;
+    },
+    //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙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() {
+      console.log(1)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let url = null
+          var user = sessionStorage["HUserName"]
+          var ModRightNameAdd = 'Gy_MouldFile_Edit'
+          if (!this.form.HNextMainDate) {
+            this.form.HNextMainDate = moment(new Date()).format('YYYY-MM-DD');
+          }
+          if (this.OperationType == 3) {
+            this.form.HUpDater = sessionStorage["HUserName"]
+            url = '/Gy_Mould_Edit/AddBill1'
+          } else (
+            url = '/Gy_Mould_Edit/AddBill'
+          )
+          var sMainStr = JSON.stringify(this.form);
+          var sSubStr = JSON.stringify(this.editData);
+          var mainTableMaintainRuleStr = JSON.stringify(this.maintainData);
+          var mainTableDotCheckRuleStr = JSON.stringify(this.dotCheckData);
+          var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr + ";" + mainTableMaintainRuleStr + ";" + mainTableDotCheckRuleStr;
+          axios({
+            method: 'post',
+            url: this.baseURL + url,
+            data: {
+              'oMain': oMain
+            },
+          }).then(response => {
+            console.log(response)
+
+            if (response.data.count == 1) {
+              // this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+              this.$modal.msgSuccess(response.data.Message);
+              // this.addBtnShow = true
+              this.formShow = false
+              this.$emit('editClose', false)
+            }
+          }).catch(error => {
+            console.log(error)
+            this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+          });
+        }
+
+      });
+    },
+    showReset() {
+      this.deptShow = false
+      this.warehouseShow = false
+      this.materialShow = false
+      this.gyEmployeeShow = false
+      this.gySourceShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyStockPlaceShow = false
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+      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.gyEmployeeShow = true
+        this.openData = true
+      } else if (num == 5) {
+        this.dialogTitle = '鐢熶骇璧勬簮鍒楄〃'
+        this.gySourceShow = true
+        this.openData = true
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      } else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      } else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      }
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index 4f02606..9a5d999 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -187,7 +187,7 @@
       <el-dialog title="缂栬緫瀹瑰櫒涓绘。璧勬枡" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
         @close="close">
         <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
-          :copyType="copyType" @editCloseGy="editGyClose" v-if="editShow" />
+          :copyType="copyType" @editClose="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 ;">
@@ -525,65 +525,65 @@
             { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
             , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
             , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
-            , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true }
-            , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', sort: true }
-            , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true }
-            , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, }
-            , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true }
-            , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true }
-            , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true }
-            , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��', sort: true }
-            , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true }
-            , { field: '绌存暟', title: '绌存暟', sort: true }
-            , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡', sort: true }
-            , { field: '鐩村緞', title: '鐩村緞', sort: true }
-            , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true }
-            , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true }
-            , { field: '鍥惧彿', title: '鍥惧彿', sort: true }
-            , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true }
-            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
-            , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', sort: true }
-            , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', sort: true }
-            , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true }
-            , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true }
-            , { field: '浣跨敤閮ㄩ棬浠g爜', title: '浣跨敤閮ㄩ棬浠g爜', sort: true }
-            , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true }
-            , { field: 'HSupID', title: 'HSupID', hide: true, sort: true }
-            , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true }
-            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true }
-            , { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
-            , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true }
-            , { field: 'HSPID', title: 'HSPID', hide: true, sort: true }
-            , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true }
-            , { field: '鐗堟湰', title: '鐗堟湰', sort: true }
-            , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true }
-            , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true }
-            , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true }
-            , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true }
-            , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸', sort: true }
-            , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸', sort: true }
-            , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true }
-            , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true }
-            , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true }
-            , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true }
-            , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true }
-            , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true }
-            , { field: '澶囨敞', title: '澶囨敞', sort: true }
-            , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true }
-            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
-            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true }
-            , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
-            , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true }
-            , { field: '淇敼浜�', title: '淇敼浜�', sort: true }
-            , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true }
-            , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true }
-            , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true }
-            , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true }
-            , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true }
-            , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true }
-            , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
-            , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true }
-            , { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
+            , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 120 }
+            , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', sort: true, width: 120 }
+            , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true, width: 120 }
+            , { field: '妯″叿缂栧彿', title: '鍣ㄥ叿缂栧彿', sort: true, width: 120 }
+            , { field: '妯″叿鍚嶇О', title: '鍣ㄥ叿鍚嶇О', sort: true, width: 120 }
+            , { field: '妯″叿鍨嬪彿', title: '鍣ㄥ叿鍨嬪彿', sort: true, width: 120 }
+            , { field: '妯″叿鍝佺被', title: '鍣ㄥ叿鍝佺被', sort: true, width: 120 }
+            , { field: '妯″叿鐘舵��', title: '鍣ㄥ叿鐘舵��', sort: true, width: 120 }
+            , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true, width: 140 }
+            , { field: '绌存暟', title: '绌存暟', sort: true, width: 120 }
+            , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鍣ㄥ叿ERP鐗╂枡', sort: true, width: 140 }
+            , { field: '鐩村緞', title: '鐩村緞', sort: true, width: 120 }
+            , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true, width: 120 }
+            , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true, width: 120 }
+            , { field: '鍥惧彿', title: '鍥惧彿', sort: true, width: 120 }
+            , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true, width: 120 }
+            , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true, width: 120 }
+            , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', sort: true, width: 120 }
+            , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', sort: true, width: 120 }
+            , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true, width: 120 }
+            , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true, width: 120 }
+            , { field: '浣跨敤閮ㄩ棬浠g爜', title: '浣跨敤閮ㄩ棬浠g爜', sort: true, width: 120 }
+            , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true, width: 120 }
+            , { field: 'HSupID', title: 'HSupID', hide: true, sort: true, width: 120 }
+            , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true, width: 120 }
+            , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true, width: 120 }
+            , { field: 'HWhID', title: 'HWhID', hide: true, sort: true, width: 120 }
+            , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true, width: 120 }
+            , { field: 'HSPID', title: 'HSPID', hide: true, sort: true, width: 120 }
+            , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true, width: 120 }
+            , { field: '鐗堟湰', title: '鐗堟湰', sort: true, width: 120 }
+            , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true, width: 120 }
+            , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true, width: 120 }
+            , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true, width: 120 }
+            , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true, width: 120 }
+            , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠鍣ㄥ叿瑙勬牸', sort: true, width: 140 }
+            , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆鍣ㄥ叿瑙勬牸', sort: true, width: 140 }
+            , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
+            , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
+            , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true, width: 120 }
+            , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true, width: 120 }
+            , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true, width: 120 }
+            , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true, width: 120 }
+            , { field: '澶囨敞', title: '澶囨敞', sort: true, width: 120 }
+            , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true, width: 120 }
+            , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 120 }
+            , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true, width: 120 }
+            , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true, width: 120 }
+            , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true, width: 120 }
+            , { field: '淇敼浜�', title: '淇敼浜�', sort: true, width: 120 }
+            , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true, width: 120 }
+            , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true, width: 120 }
+            , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true, width: 120 }
+            , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true, width: 120 }
+            , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true, width: 120 }
+            , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true, width: 120 }
+            , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true, width: 120 }
+            , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true, width: 120 }
+            , { field: 'hsubid', title: 'hsubid', hide: true, sort: true, width: 120 }
           ]]
           this.dataList = option
           option.data = data1.data;
@@ -950,9 +950,10 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete() {
       this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        var ModRightNameDelete = 'Gy_MouldFile_Delete'
         if (!this.rowForm.瀹℃牳浜�) {
-          axios.get(this.baseURL + "DeltetGy_Source", {
-            params: { 'HItemID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+          axios.get(this.baseURL + "/Gy_Mould_Edit/Delete_Json", {
+            params: { 'HItemID': this.rowForm.hmainid.toString(), "ModRightNameDelete": ModRightNameDelete, 'user': sessionStorage["HUserName"] }
           }).then(response => {
             if (response.data.count == 1) {
               this.getList()
@@ -972,20 +973,25 @@
     set_CheckBill(num, form) {
       var InterID = form.hmainid || 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("鎺ュ彛璇锋眰澶辫触!");
-      });
+      if (form.HBillStatus == 0 && num == 1) {
+        this.$modal.msgSuccess('鍗曟嵁宸蹭负鏈鏍哥姸鎬�,鏃犻渶鍙嶅鏍革紒');
+      } else {
+        axios.get(this.baseURL + "/Gy_Mould/AuditProcessReportList", {
+          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) {
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
new file mode 100644
index 0000000..1f9264a
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -0,0 +1,1104 @@
+<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(1, 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="90px">
+      <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="12">
+              <el-form-item label="璋冨叆缁勭粐" prop="HStockInOrgID">
+                <el-select v-model="form.HStockInOrgID" 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-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+                <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+                  <el-option v-for="(item, index) in hSupTypeList" :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="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="璋冨嚭缁勭粐" prop="HStockOutOrgID">
+                <el-select v-model="form.HStockOutOrgID" 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-col>
+          </el-row>
+          <el-row>
+            <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,deptType=1)"></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="璇烽�夋嫨璋冨叆浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="璋冨嚭浠撳簱" prop="HSCWHName">
+                <el-input v-model="form.HSCWHName" placeholder="璇烽�夋嫨璋冨嚭浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=2)"></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" @click="openDataDialog(4,empType=1)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="涓荤" prop="HMangerName">
+                <el-input v-model="form.HMangerName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=3)"></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="璇烽�夋嫨" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+              </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>
+
+      <el-tabs v-model="activeName1" type="border-card">
+        <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+          <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="鍣ㄥ叿浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+                  @dblclick.native="openDataDialog(8, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterModel }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitName }}</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="璋冨叆浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆浠撳簱" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HWHName }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column align="center" label="璋冨叆浠撲綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
+                  @dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆浠撲綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSPName }}</span>
+              </template>
+            </el-table-column> -->
+            <el-table-column align="center" label="璋冨嚭浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSCWHNumber" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=4)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=4)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨嚭浠撳簱" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSCWHName }}</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column align="center" label="璋冨嚭浠撲綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSCSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
+                  @dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨嚭浠撲綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSCSPName }}</span>
+              </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="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-tab-pane>
+      </el-tabs>
+      
+    </el-form>
+    <!-- 寮圭獥 -->
+    <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
+      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+      <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="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldMoveStockRequestBillEdit',
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      HModName: "Sc_MouldMoveStockRequestBill",
+      formShow: false,
+      temp: undefined,
+      formLoading: true,
+      rowHideShow: false,
+      openRowHide: false,
+      hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
+      addBtnShow: false,
+      zbIndex: null,
+      zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
+      dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+      deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
+      warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
+      gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+      gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+      gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+      gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+      HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
+      deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
+      deptform: {},//寮圭獥閫変腑鏁版嵁
+      openData: false,//鏁版嵁寮圭獥
+      dialogTitle: '',
+      organizationList: [],//缁勭粐鍒楄〃
+      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: 0,
+      baseURL: process.env.VUE_APP_BASE_API,
+      checkedSysZb: [],
+      editData: [],//瀛愯〃
+      editData1: [],//姹囨�诲瓙琛�
+      editBtData: [],//瀛愯〃琛ㄥご
+      activeName: 'first',
+      activeName1:'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: {
+        HBillNo: [
+          { required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HDate: [
+          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HStockInOrgID: [
+          { required: true, message: "璋冨叆缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HStockOutOrgID: [
+          { required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.fetchData()
+    this.getdata()
+  },
+  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 == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
+        this.handleAdd()
+      } else if (this.OperationType == 2 || 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;
+    },
+    handleRowHide() {
+      this.rowHideShow = true
+      this.openRowHide = true
+    },
+    rowSetClose(val) {
+      this.rowHideShow = false
+      this.openRowHide = val
+    },
+
+    HStockOrgChange(val) {
+      console.log(549,val,this.zbIndex)
+      console.log(this.organizationList)
+      
+      // let options=undefined
+      //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+    },
+    //寮圭獥璧嬪��
+    dbEmitData(deptRow, num) {
+      // num=1閮ㄩ棬 num=2浠撳簱
+      console.log(deptRow)
+      if (deptRow.HItemID || deptRow.hmainid) {
+        if (num == 1) {
+          if(this.deptType == 1){
+            this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HDeptID = deptRow.HItemID
+          }else{
+            this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+          }
+          this.deptShow = false
+          this.openData = false
+        } else if (num == 2) {
+          if(this.eHWHType == 1){
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О
+            this.form.HWHID = deptRow.HItemID
+            this.form.HWHNumber = deptRow.浠撳簱浠g爜
+          }else if(this.eHWHType == 2){
+            this.form.HSCWHName = deptRow.浠撳簱鍚嶇О
+            this.form.HSCWHID = deptRow.HItemID
+            this.form.HSCWHNumber = deptRow.浠撳簱浠g爜
+          }else if(this.eHWHType == 3){
+            this.editData[this.zbIndex].HWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HWHNumber = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+          }else if(this.eHWHType == 4){
+            this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HSCWHNumber = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+          }
+          this.warehouseShow = false
+          this.openData = false
+        } else if (num == 4) {
+          if(this.empType == 1){
+            this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+            this.form.HEmpID = deptRow.HItemID
+          }else if(this.empType == 2){
+            this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HMangerID = deptRow.HItemID
+          }else if(this.empType == 3){
+            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HSecManagerID = deptRow.HItemID
+          }else if(this.empType == 4){
+            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+            this.form.HKeeperID = deptRow.HItemID
+          }else
+          this.gyEmployeeShow = false
+          this.openData = false
+        } else if (num == 6) {
+          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+          this.form.HSupID = deptRow.HItemID
+          this.gySupplierShow = false
+          this.openData = false
+        } else if (num == 7) {
+          this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+          this.form.HSupID = deptRow.HItemID
+          this.gyCustomerShow = false
+          this.openData = false
+        } else if (num == 8){
+          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+          this.editData[this.zbIndex].HMaterNumber = deptRow.妯″叿缂栧彿
+          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+          this.editData[this.zbIndex].HMaterModel = deptRow.妯″叿鍨嬪彿
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+          this.editData[this.zbIndex].HUnitNumber = deptRow.璁¢噺鍗曚綅浠g爜
+          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+          this.gyMouldShow = false
+          this.openData = false
+        } else if (num == 9){
+          if(this.HSPType == 1){
+            this.editData[this.zbIndex].HSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+          }else{
+            this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+          }
+          this.gyStockPlaceShow = false
+          this.openData = false
+        }
+      } else {
+        this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
+      }
+
+    },
+    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 = {
+        HBillNo: '',
+        HInterID: 0,
+        HDate: new Date(),
+        HStockInOrgID:sessionStorage["OrganizationID"] - 0,
+        HSupTypeID:1,
+        HSupName:'',
+        HSupID:0,
+        HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
+        HDeptName: '',
+        HDeptID: 0,
+        HWHName:'',
+        HWHNumber:'',
+        HWHID:0,
+        HSCWHName:'',
+        HSCWHNumber:'',
+        HSCWHID:0,
+        HEmpName:'',
+        HEmpID:'',
+        HMangerName:'',
+        HMangerID:'',
+        HSecManagerName:'',
+        HSecManagerID:'',
+        HKeeperName:'',
+        HKeeperID:'',
+        HExplanation:'',
+        HRemark:'',
+
+        HMaker: '',
+        HUpDater: '',
+        HChecker: '',
+        HMakeDate: new Date(),
+        HUpDateDate: '',
+        HCheckDate: '',
+        HCloseMan: '',
+        HDeleteMan: '',
+        HCloseDate: '',
+        HDeleteDate: '',
+      }
+      this.editData = []
+      this.editData1 = []
+      this.editBtData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.activeName1 = 'first'
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset()
+      console.log(this.$route.path)
+      if (!this.OperationType && !this.copyType) {
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
+      } 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
+      }).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/GetMaxBillNo_Json", {
+        params: {
+          HBillType: '3850'
+        }
+      }).then(response => {
+        this.form.HMaker = sessionStorage["HUserName"]
+        this.form.HBillNo = response.data.data[0].HBillNo
+        this.form.HInterID = 0
+        // this.copyType = 0
+        // this.getCzyglByUser()
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate() {
+      this.reset()
+      let rowHmainid = this.linterid
+      console.log(this.linterid)
+      //涓昏〃
+      axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Json", {
+        params: { 'HInterID': rowHmainid,'HMaker':sessionStorage["HUserName"] }
+      }).then(response => {
+        if (response.data.count == 1) {
+          var result = response.data
+          var data = response.data.data[0]
+          console.log(result,data)
+          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.鍗曟嵁鍙�
+                , "HDate": data.鏃ユ湡
+                , "HSupTypeID": data.HSupTypeID
+                , "HSupID": data.HSupID
+                , "HSupName": data.寰�鏉ュ崟浣�
+                , "HDeptID": data.HDeptID
+                , "HDeptName": data.閮ㄩ棬
+                , "HWHID": data.HWHID
+                , "HWHName": data.璋冨叆浠撳簱
+                , "HSCWHID": data.HSCWHID
+                , "HSCWHName": data.璋冨嚭浠撳簱
+                , "HEmpID": data.HEmpID
+                , "HEmpName": data.涓氬姟鍛�
+                , "HMangerID": data.HMangerID
+                , "HMangerName": data.涓荤
+                , "HSecManagerID": data.HSecManagerID
+                , "HSecManagerName": data.楠屾敹鍛�
+                , "HKeeperID": data.HKeeperID
+                , "HKeeperName": data.淇濈鍛�
+                , "HExplanation": data.鎽樿
+                , "HRemark": data.琛ㄥご澶囨敞
+                , "HStockInOrgID": data.HStockInOrgID
+                , "HStockOutOrgID": data.HStockOutOrgID
+                
+                , "HMaker": data.鍒跺崟浜�
+                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+                , "HChecker": data.瀹℃牳浜�
+                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+                , "HUpDater": data.淇敼浜�
+                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+                , "HCloseMan": data.鍏抽棴浜�
+                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+                , "HDeleteMan": data.浣滃簾浜�
+                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            }
+            this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID;
+            this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID;
+            //瀛愯〃
+            var rowdata = [];
+            for (let i = 0; i < result.data.length; i++) {
+              rowdata.push(
+                  {
+                      "HMaterID": result.data[i].HMaterID
+                      , "HMaterNumber": result.data[i].HMaterNumber
+                      , "HMaterName": result.data[i].HMaterName
+                      , "HMaterModel": result.data[i].HMaterModel
+                      , "HPropertyID": result.data[i].HProcID
+                      , "HSecUnitID": result.data[i].HSecUnitID
+                      , "HSecUnitRate": result.data[i].HSecUnitRate
+                      , "HUnitID": result.data[i].HUnitID
+                      , "HUnitNumber": result.data[i].HUnitNumber
+                      , "HUnitName": result.data[i].HUnitName
+                      , "HQtyMust": result.data[i].HQtyMust
+                      , "HQty": result.data[i].HQty
+                      , "HPrice": result.data[i].HPrice
+                      , "HMoney": result.data[i].HMoney
+                      , "HOutPrice": result.data[i].HOutPrice
+                      , "HOutMoney": result.data[i].HOutMoney
+                      , "HWHID": result.data[i].HWHID
+                      , "HWHNumber": result.data[i].HWHNumber
+                      , "HWHName": result.data[i].HWHName
+                      , "HSCWHID": result.data[i].HSCWHID
+                      , "HSCWHNumber": result.data[i].HSCWHNumber
+                      , "HSCWHName": result.data[i].HSCWHName
+                      , "HSPID": result.data[i].HSPID
+                      , "HSPNumber": result.data[i].HSPNumber
+                      , "HSPName": result.data[i].HSPName
+                      , "HSCSPID": result.data[i].HSCSPID
+                      , "HSCSPNumber": result.data[i].HSCSPNumber
+                      , "HSCSPName": result.data[i].HSCSPName
+                      , "HERPInterID": result.data[i].HERPInterID
+                      , "HERPEntryID": result.data[i].HERPEntryID
+                      , "HPOOrderInterID": result.data[i].HPOOrderInterID
+                      , "HPOOrderEntryID": result.data[i].HPOOrderEntryID
+                      , "HPOOrderBillNo": result.data[i].HPOOrderBillNo
+                      , "HSeOrderInterID": result.data[i].HSeOrderInterID
+                      , "HSeOrderEntryID": result.data[i].HSeOrderEntryID
+                      , "HSeOrderBillNo": result.data[i].HSeOrderBillNo
+                      , "HICMOInterID": result.data[i].HICMOInterID
+                      , "HICMOEntryID": result.data[i].HICMOEntryID
+                      , "HICMOBillNo": result.data[i].HICMOBillNo
+                      , "HSTOCKORGID": result.data[i].HSTOCKORGID
+                      , "HSTOCKORGName": result.data[i].HSTOCKORGName
+                      , "HOWNERID": result.data[i].HOWNERID
+                      , "HOWNERTYPEID": result.data[i].HOWNERTYPEID
+                      , "HSTOCKORGINID": result.data[i].HSTOCKORGINID
+                      , "HSTOCKORGINName": result.data[i].HSTOCKORGINName
+                      , "HOWNERINID": result.data[i].HOWNERINID
+                      , "HOWNERTYPEINID": result.data[i].HOWNERTYPEINID
+                      , "HBASEUNITID": result.data[i].HBASEUNITID
+                      , "HEXTAUXUNITID": result.data[i].HEXTAUXUNITID
+                      , "HSECQTY": result.data[i].HSECQTY
+                      , "HSourceBillType": result.data[i].HSourceBillType
+                      , "HSourceInterID": result.data[i].HSourceInterID
+                      , "HSourceEntryID": result.data[i].HSourceEntryID
+                      , "HSourceBillNo": result.data[i].HSourceBillNo
+                      , "HRemark": result.data[i].HRemark
+                  }
+              )
+            }
+            this.editData = rowdata
+          }
+          this.formShow = true
+          this.formLoading = false
+        }
+      }).catch(error => {
+        console.log(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"
+          , "HMaterNumber": ""
+          , "HMaterName": ""
+          , "HMaterModel": ""
+          , "HUnitID": "0"
+          , "HUnitNumber": ""
+          , "HUnitName": ""
+          , "HQty": "0"
+          , "HWHID": "0"
+          , "HWHNumber": ""
+          , "HWHName": ""
+          , "HSPID": "0"
+          , "HSPNumber": ""
+          , "HSPName": ""
+          , "HSCWHID": "0"
+          , "HSCWHNumber": ""
+          , "HSCWHName": ""
+          , "HSCSPID": "0"
+          , "HSCSPNumber": ""
+          , "HSCSPName": ""
+          , "HRemark": ""
+          , "HPropertyID": "0"
+          , "HSecUnitID": "0"
+          , "HSecUnitRate": "0"
+          , "HQtyMust": "0"
+          , "HPrice": "0"
+          , "HMoney": "0"
+          , "HOutPrice": "0"
+          , "HOutMoney": "0"
+          , "HERPInterID": "0"
+          , "HERPEntryID": "0"
+          , "HPOOrderInterID": "0"
+          , "HPOOrderEntryID": "0"
+          , "HPOOrderBillNo": ""
+          , "HSeOrderInterID": "0"
+          , "HSeOrderEntryID": "0"
+          , "HSeOrderBillNo": ""
+          , "HICMOInterID": "0"
+          , "HICMOEntryID": "0"
+          , "HICMOBillNo": ""
+          , "HSTOCKORGID": "0"
+          , "HOWNERID": "0"
+          , "HOWNERTYPEID": ""
+          , "HSTOCKORGINID": "0"
+          , "HOWNERINID": "0"
+          , "HOWNERTYPEINID": ""
+          , "HBASEUNITID": "0"
+          , "HEXTAUXUNITID": "0"
+          , "HSECQTY": "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) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let fhck = false
+          if(this.editData.length == 0){
+              fhck = true
+              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          }
+          this.editData.map((item, index) => {
+            if (!item.HMaterID) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+            }else if(!item.HQty || item.HQty == 0){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+            }
+          })
+          this.$nextTick(() => {
+            if (!fhck) {
+              if(this.OperationType == 2){
+                this.form.HInterID = this.linterid
+              }
+              var sMainStr = JSON.stringify(this.form);
+              var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"];
+              axios({
+                method: 'post',
+                url: this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Save_Json",
+                data: {
+                  'sMainSub': sMainSub
+                },
+              }).then(response => {
+                if (response.data.count == 1) {
+                  this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                  this.$modal.msgSuccess(response.data.Message);
+                  // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  // {
+                  //   this.set_CheckBill(1, this.form); //瀹℃牳
+                  // }
+                  this.addBtnShow = true
+                  this.close()
+                } else {
+                  this.$modal.msgError(response.data.code + response.data.Message);
+                }
+              }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+            }
+          })
+        }
+      });
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
+        params: { "HInterID": InterID, "flag": num, "user": 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.gyEmployeeShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyMouldShow = false
+      this.gyStockPlaceShow = false
+    },
+    //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+    openDataDialog(num, row) {
+      //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+      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 == 4) {
+        if(this.empType == 1){
+          this.dialogTitle = '涓氬姟鍛樺垪琛�'
+        }else if(this.empType == 2){
+          this.dialogTitle = '涓荤鍒楄〃'
+        }else if(this.empType == 3){
+          this.dialogTitle = '楠屾敹鍛樺垪琛�'
+        }else if(this.empType == 4){
+          this.dialogTitle = '淇濈鍛樺垪琛�'
+        }
+        this.gyEmployeeShow = true
+        this.openData = true
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      }  else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      }  else if (num == 8) {
+        this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+        this.gyMouldShow = true
+        this.openData = true
+      }  else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      } 
+    },
+    //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+    openDataDialogChoose(){
+      if(this.form.HSupTypeID == 1){
+        this.openDataDialog(6)
+      }else if(this.form.HSupTypeID == 2){
+        this.openDataDialog(7)
+      }else if(this.form.HSupTypeID == 3){
+        this.deptType = 2
+        this.openDataDialog(1)
+      }
+    }
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
new file mode 100644
index 0000000..de42970
--- /dev/null
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillList.vue
@@ -0,0 +1,829 @@
+<template>
+  <div style="padding: 10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+      <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
+        <el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="缁撴潫鏃ユ湡">
+        <el-date-picker v-model="eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="鏃ユ湡闂撮殧">
+        <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange" style="width: 150px;">
+          <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+        <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label-width="78px">
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
+        <el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
+      </el-form-item>
+      <el-collapse v-model="activeSeach">
+        <el-collapse-item title="鏇村" name="1">
+          <el-card class="box-card">
+            <el-form-item label="鐘舵��" prop="HStatus">
+              <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨鐘舵��">
+                <el-option v-for="(item, index) in HStatusList" :key="index" :label="item.name" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="璋冨嚭缁勭粐">
+              <el-select v-model="queryParams.HStockOutOrgID" 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="閮ㄩ棬淇℃伅" prop="HDept">
+              <el-input v-model="queryParams.HDept" placeholder="璇疯緭鍏ラ儴闂ㄤ俊鎭�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="鍣ㄥ叿浠g爜" prop="HModelNumber">
+              <el-input v-model="queryParams.HModelNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+              <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <div slot="header" class="clearfix"><span>杩囨护</span></div>
+            <div>
+              <el-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <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">
+                        <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-row>
+                <el-form-item label-width="0">
+                  <el-row>
+                    <el-col :span="7">
+                      <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
+                        <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">
+                        <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.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="璇烽�夋嫨" @change="riqiChange">
+                      <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">
+                      <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-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 = 2)">缂栬緫</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
+          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</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-outline" 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-outline" size="mini" :disabled="single"
+          @click="set_CheckBill(2, 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-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
+      </el-col> -->
+    </el-row>
+    <div class="tableBox" v-loading="loading">
+      <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+        @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
+        @cell-dblclick="handleDblclick" v-if="tableShow">
+        <template v-for="(item, index) in btList">
+          <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
+            :key="index" />
+          <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width" :key="item.id"
+            v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+            :fixed="item.fixed">
+            <template slot-scope="{row,  column }">
+              <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+              <div :style="item.style">
+                <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property], '{y}-{m}-{d}') }}</span>
+                <el-button type="text" @click="handleEdit(row, OperationType = 2)"
+                  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.hmainid :HSouceBillType=this.rowForm.HSourceBillType
+          :copyType="copyType" @editClose="editClose" v-if="editShow" />
+      </el-dialog>
+      <el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
+        <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
+          :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+        <!-- <div>111</div> -->
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+import RowSettings from '@/views/component/rowSettings'
+import Edit from '@/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit'
+import PrintList from '@/views/component/printList'
+import moment from 'moment';
+
+export default {
+  name: 'Sc_MouldMoveStockRequestBillList',
+  components: { RowSettings, Edit, PrintList },
+  data() {
+    return {
+      HModName: "Sc_MouldMoveStockRequestBillList",
+      activeSeach: '',
+      editShow: false,
+      openEdit: false,
+      totalNameList: [],
+      tableShow: true,
+      openPrintList: false,
+      printListShow: false,
+      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 },
+      ],
+      organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+      HStatusList: [{name:'鍏ㄩ儴',value:'-1'},{name:'鏈鏍�',value:'0'},{name:'宸插鏍�',value:'1'},{name:'宸插叧闂�',value:'2'}],
+      addBtnShow: false,
+      dialogTitle: '',
+      OperationType: null,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼2锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
+      lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
+      selectedRow: null, // 褰撳墠閫変腑鐨勮
+      rowForm: {},
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      tyResList: [],//鍒楄〃锛堟帴鍙f暟鎹級
+      btList: [],//琛ㄥご鍒楄〃鏄剧ず
+      btResList: [],
+      tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+      dataList: [],
+      titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+      pageSizes: [50, 100, 500, 5000, 50000],
+      page: 1,
+      pageSize: 0,
+      total: 0,
+    };
+  },
+  created() {
+    // this.fetchData()
+    this.riqiChange()
+    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()
+    },
+    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
+    },
+    getList() {
+      this.pageSize = 50
+      this.tableShow = false
+      this.loading = true
+      if (this.sTime && !this.sWhere) {
+        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'"
+        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'"
+      }
+      this.sWhere += " and HSTOCKORGID=" + this.queryParams.HStockOutOrgID;
+      if (this.pageSize == 0) {
+        this.pageSize = 50
+      }
+      // 閿�鍞嚭搴撳崟鍒楄〃
+      axios.get(this.baseURL + '/Sc_MouldMoveStockRequestBillController/page', {
+        params: {
+          "sWhere": this.sWhere,
+          "user": sessionStorage["HUserName"],
+          "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 });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
+          }
+          //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+          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]
+          option.data = data1.data
+          this.dataList = option
+          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.hmainid)) {
+        return { "background": "#ecf5ff" }
+      }
+    },
+    //鍙屽嚮琛�
+    handleDblclick(row, column, cell, event) {
+      this.OperationType = 2
+      this.handleEdit()
+    },
+    // 澶氶�夋閫変腑鏁版嵁
+    handleSelectionChange(selection) {
+      // this.rowForm = {}
+      this.ids = selection.map(item => item.hmainid)
+      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.sTime) {
+        this.sTime = moment(this.sTime).format('YYYY-MM-DD')
+        this.eTime = moment(this.eTime).format('YYYY-MM-DD')
+        console.log(this.sTime, this.eTime)
+        this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
+      }
+      
+      if (this.queryParams.HBillNo) {
+        this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+      }
+      if (this.queryParams.HDept) {
+          sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+      }
+      if (this.queryParams.HMaterNumber) {
+          sWhere += " and 鐗╂枡浠g爜 like '%" + this.queryParams.HMaterNumber + "%'";
+      }
+      if (this.queryParams.HModelNumber) {
+          sWhere += " and 妯″叿浠g爜 like '%" + this.queryParams.HModelNumber + "%'";
+      }
+      if (this.queryParams.HSupName) {
+          sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+      }
+      this.getList()
+    },
+    /** 閲嶇疆鎸夐挳鎿嶄綔 */
+    resetQuery() {
+      this.sWhere = ''
+      this.queryParams = {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HStockOutOrgID: sessionStorage["OrganizationID"] - 0,
+        HStatus:'-1',
+        HDept:'',
+        HModelNumber:'',
+        HSupName:'',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      }
+      this.riqiChange()
+      this.resetForm("queryForm")
+      this.getList()
+    },
+
+    //閫�鍑�
+    close() {
+      // this.reset()
+      this.tableShow = true
+      this.openEdit = false
+      this.editShow = false
+      this.getList()
+    },
+    //鎵撳紑鏂板缁勪欢寮圭獥
+    handleAddEdit() {
+      this.rowForm.hmainid = 0
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鎵撳紑淇敼缁勪欢寮圭獥
+    handleEdit(row) {
+      this.rowForm = row
+      this.editShow = true
+      this.openEdit = true
+    },
+    //鍏抽棴缂栬緫椤甸潰
+    editClose(val) {
+      this.open = val
+      this.editShow = false
+      this.openEdit = val
+      this.getList()
+    },
+    /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+    handleDelete() {
+      this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
+        axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json", {
+            params: { 'HInterID': this.rowForm.hmainid.toString(), 'HMaker': 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("鎺ュ彛璇锋眰澶辫触!");
+          });
+      }).catch(() => { })
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json", {
+        params: { "HInterID": InterID, "Type": num, "HMaker": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.count == 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, `sellOutBill_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢      
+    },
+    //鎵撳嵃
+    get_PrintReport() {
+      if (this.ids.length != 1) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
+        this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+      } else {
+        axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+          params: { "HInterID": this.rowForm.hmainid }
+        }).then(response => {
+          var result = response.data
+          if (result.count == 1) {
+            this.printListShow = true
+            this.openPrintList = true
+            // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
+          } else {
+            this.$modal.msgError(result.code + result.Message)
+          }
+        }).catch(error => {
+          this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+        });
+
+
+      }
+      //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
+    },
+
+    //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
+    defaintOperationByCompanyName() {
+      var result = false;
+      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;
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index 7731239..8610292 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -3,18 +3,18 @@
     <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="set_CheckBill(1, 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">
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿棰嗙敤閫�搴撳崟</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="90px">
       <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 label="鍗曟嵁鍙�" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -24,158 +24,80 @@
               </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 label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+                <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
               </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-form-item label="鍣ㄥ叿浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></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" @click="openDataDialog(4)"></el-button>
+              <el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨楠屾敹鍛�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></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-form-item label="淇濈鍛�" prop="HKeeperName">
+                <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨淇濈鍛�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></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-form-item label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></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="椤圭洰浠g爜" 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-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+                <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+                  <el-option v-for="(item, index) in hSupTypeList" :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 label="寰�鏉ュ崟浣�" prop="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+                </el-input>
               </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-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+                <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨">
+                  <el-option label="鐢熶骇浠诲姟鍗�" value="鐢熶骇浠诲姟鍗�" />
+                  <el-option label="鎵嬪伐褰曞叆" value="鎵嬪伐褰曞叆" />
                 </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 label="閫夊崟鍙�" prop="XDH">
+                <el-input v-model="form.XDH" placeholder="璇疯緭鍏ラ�夊崟鍙�" />
               </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-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
-                <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+            <el-col :span="12">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -246,113 +168,159 @@
           </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.鐗╂枡浠g爜" 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-tabs v-model="activeName1" type="border-card">
+        <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+          <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="鍣ㄥ叿浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+                  @dblclick.native="openDataDialog(8, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterSpec }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HQtyMust }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+              <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="鍙戞枡浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HWHName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撲綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
+                  @dblclick.native="openDataDialog(9, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撲綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSPName }}</span>
+              </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="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-tab-pane>
+        <!-- <el-tab-pane label="姹囨�讳俊鎭�" name="second">
+          <el-table :data="editData1" 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="鐗╂枡浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.鐗╂枡浠g爜 }}</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">
+                <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="鍙戞枡浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.鍙戞枡浠撳簱浠g爜 }}</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>
+        </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" />
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
       <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
         <el-button @click="deptClose">鍙� 娑�</el-button>
@@ -366,16 +334,19 @@
 
 <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 GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
 import moment from 'moment';
 
 export default {
-  name: 'SellOutBillEdit',
-  components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+  name: 'Sc_MouldProdBackBillEdit',
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
   props: {
     OperationType: { type: Number, },
     linterid: { type: Number, },
@@ -385,34 +356,42 @@
   },
   data() {
     return {
-      HModName: "Kf_SellOutBill",
+      HModName: "Sc_MouldProdBackBillEdit",
       formShow: false,
       temp: undefined,
       formLoading: true,
       zzSelDis: false,
       rowHideShow: false,
       openRowHide: false,
-      hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+      hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
       addBtnShow: false,
       zbIndex: null,
       zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
       dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
       deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
       warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
-      materialShow: false,//鐗╂枡鏁版嵁缁勪欢
       gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+      gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+      gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+      gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+      deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
       deptform: {},//寮圭獥閫変腑鏁版嵁
       openData: false,//鏁版嵁寮圭獥
       dialogTitle: '',
       organizationList: [],//缁勭粐鍒楄〃
       subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-      HInterID: null,
+      HInterID: 0,
       baseURL: process.env.VUE_APP_BASE_API,
       checkedSysZb: [],
-      editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+      editData: [],//瀛愯〃
+      editData1: [],//姹囨�诲瓙琛�
       editBtData: [],//瀛愯〃琛ㄥご
       activeName: 'first',
+      activeName1:'first',
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -452,14 +431,20 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
-        HSupName: [
-          { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
-        ],
         HDate: [
           { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
         ],
-        HExRate: [
-          { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+        HWHName: [
+          { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HSecManagerName: [
+          { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HKeeperName: [
+          { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HDeptName: [
+          { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
         ]
       }
     };
@@ -467,9 +452,6 @@
   created() {
     this.fetchData()
     this.getdata()
-  },
-  beforeDestroy() {
-    this.$destroy()
   },
   methods: {
     fetchData() {
@@ -486,118 +468,7 @@
       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
-                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                    , "鐗╂枡鍚嶇О": 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)) {
+      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
         this.handleAdd()
       } else if (this.OperationType == 3 || this.copyType == 1) {
         this.handleUpdate()
@@ -611,70 +482,81 @@
       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鍑哄簱浠撳簱
+      // num=1閮ㄩ棬 num=2浠撳簱
       console.log(deptRow)
-      if (deptRow.HItemID) {
+      if (deptRow.HItemID || deptRow.hmainid) {
         if (num == 1) {
-          this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-          this.form.HDeptID = deptRow.HItemID
-          this.form.HManagerName = deptRow.璐熻矗浜�
+          if(this.deptType == 1){
+            this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HDeptID = deptRow.HItemID
+          }else{
+            this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+          }
           this.deptShow = false
           this.openData = false
         } else if (num == 2) {
-          this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-          this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+          if(this.eHWHType == 1){
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О
+            this.form.HWHID = deptRow.HItemID
+            this.form.HWHNumber = deptRow.浠撳簱浠g爜
+          }else{
+            this.editData[this.zbIndex].HWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+          }
           this.warehouseShow = false
           this.openData = false
-        } else if (num == 3) {
-          this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-          this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
-          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
+          if(this.empType == 1){
+            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HSecManagerID = deptRow.HItemID
+          }else{
+            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+            this.form.HKeeperID = deptRow.HItemID
+          }
           this.gyEmployeeShow = false
+          this.openData = false
+        } else if (num == 6) {
+          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+          this.form.HSupID = deptRow.HItemID
+          this.gySupplierShow = false
+          this.openData = false
+        } else if (num == 7) {
+          this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+          this.form.HSupID = deptRow.HItemID
+          this.gyCustomerShow = false
+          this.openData = false
+        } else if (num == 8){
+          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+          this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
+          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+          this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+          this.editData[this.zbIndex].HUnitCode = deptRow.璁¢噺鍗曚綅浠g爜
+          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+          this.gyMouldShow = false
+          this.openData = false
+        } else if (num == 9){
+          this.editData[this.zbIndex].HSPID = deptRow.HMainID
+          this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+          this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+          this.gyStockPlaceShow = false
           this.openData = false
         }
       } else {
@@ -695,63 +577,30 @@
       this.openData = false
     },
 
-    //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    //琛ㄥ崟鍒濆鍖�
     reset() {
       this.form = {
-        BillType: '1402',
         HBillNo: '',
-        HInterID: '',
-        HBillSubType: '1205',
+        HInterID: 0,
         HDate: new Date(),
-        HMainSourceInterID: 0,
-        HMainSourceEntryID: 0,
-        HMainSourceBillType: '',
-        HMainSourceBillNo: '',
-        HEmpName: '',
-        HEmpID: 0,
+        HInnerBillNo:'',
+        HWHName:'',
+        HWHNumber:'',
+        HWHID:0,
+        HSecManagerName:'',
+        HSecManagerID:0,
+        HKeeperName:'',
+        HKeeperID:0,
         HDeptName: '',
         HDeptID: 0,
-        HManagerName: '',
-        HManagerID: 0,
-        HSupName: sessionStorage["HSupName"],
-        HSupID: sessionStorage["HSupID"],
-        HLinkMan: '',
-        HLinkPhone: '',
-        HSecManagerName: '',
-        HSecManagerID: 0,
-        HKeeperName: '',
-        HKeeperID: 0,
-        HRemark: '',
-        HProjectNumber: '',
-        HProjectID: 0,
-        HProjectName: '',
-        HGroupName: '',
-        HGroupID: 0,
-        HWHName: '',
-        HWHID: 0,
-        HConveyCompName: '',
-        HConveyCompID: 0,
-        HConveyTypeName: '',
-        HConveyTypeID: 0,
-        HConveyMoney: '0',
-        HCarriage: '0',
-        HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
-        HOWNERID: sessionStorage["OrganizationID"] - 0,
-        HSCWHName: '',
-        HSCWHID: 0,
-        HCheckStatusMan: '',
-        HExplanation: '',
-        HInnerBillNo: '',
-        HCurName: '浜烘皯甯�',
-        HCurID: 1,
-        HExRate: '1',
-        HSellSName: '',
-        HSellSID: 0,
-        HCusBalance: '0',
-        HCreditRating_Now: '0',
-        HAvailableBalance: '0',
-        HPriceType: '鎴愭湰浠�',
-        HOrgID: sessionStorage["OrganizationID"] - 0,
+        HSupTypeID: 1,
+        HSupName:'',
+        HSupID:0,
+        HSourceBillType:'',
+        XDH:'',
+        HExplanation:'',
+        HRemark:'',
+
         HMaker: '',
         HUpDater: '',
         HChecker: '',
@@ -764,21 +613,35 @@
         HDeleteDate: '',
       }
       this.editData = []
+      this.editData1 = []
       this.editBtData = []
       this.ids = []
       this.subDisabled = false
       this.addBtnShow = false
       // this.$refs.tableData.clearSelection()
       this.activeName = 'first'
+      this.activeName1 = 'first'
       this.resetForm("form");
     },
     //閫�鍑�
     close() {
       this.reset()
-
+      console.log(this.$route.path)
       if (!this.OperationType && !this.copyType) {
-        const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
-        this.$tab.closePage(obj);
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
       } else {
         this.formShow = false
         this.$emit('editClose', false)
@@ -794,8 +657,6 @@
         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("鎺ュ彛璇锋眰澶辫触!");
       });
@@ -816,44 +677,16 @@
       })
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+      axios.get(this.baseURL + "/Web/GetMAXNum", {
         params: {
-          HBillType: '1205'
+          HBillType: '3803'
         }
       }).then(response => {
         this.form.HMaker = sessionStorage["HUserName"]
         this.form.HBillNo = response.data.data[0].HBillNo
-        this.form.HInterID = response.data.data[0].HInterID
+        this.form.HInterID = 0
         // 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("鎺ュ彛璇锋眰澶辫触!");
       });
@@ -863,173 +696,75 @@
       this.reset()
       let rowHmainid = this.linterid
       console.log(this.linterid)
-      axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
-        params: { 'HInterID': rowHmainid }
+      //涓昏〃
+      axios.get(this.baseURL + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListCheckDetai", {
+        params: { 'HID': rowHmainid }
       }).then(response => {
-        if (response.data.count == 1) {
-          var result = response.data
-          var data = response.data.data[0]
-          this.form.BillType = data.HSourceBillType
+        if (response.data.code == 1) {
+          var data = response.data.data.h_v_Sc_MouldProdBackBill_Edit[0]
+          console.log(data)
           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
-                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
-                , "鐗╂枡鍚嶇О": 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.form = {
+                  "HBillNo": data.鍗曟嵁鍙�
+                , "HDate": data.鏃ユ湡
+                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                , "HWHID": data.HWHID                    //浠撳簱ID
+                , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
+                , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
+                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
+                , "HKeeperID": data.hkeeperid            //淇濈鍛業D
+                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
+                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
+                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
+                , "XDH": ""                               //閫夊崟鍙�
+                , "HExplanation": data.鎽樿              //鎽樿
+                , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
+                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
+                , "HSupName": data.寰�鏉ュ崟浣�              
+                , "HSupID": data.HSupID                    
+
+                , "HMaker": data.鍒跺崟浜�
+                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+                , "HChecker": data.瀹℃牳浜�
+                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+                , "HUpDater": data.淇敼浜�
+                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+                , "HCloseMan": data.鍏抽棴浜�
+                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+                , "HDeleteMan": data.浣滃簾浜�
+                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            }
           }
           this.formShow = true
           this.formLoading = false
-
         }
       }).catch(error => {
+        console.log(error)
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
-    },
-    //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
-    getCustomerByCusID(HCusID) {
-      axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
-        params: {
-          HCusID: HCusID
-        }
+      //瀛愯〃
+      axios.get(this.baseURL + "/Sc_MouldProdBackBill/Sc_MouldProdBackBillListProjectDetai", {
+        params: { 'sqlWhere': "and hmainid=" + rowHmainid }
       }).then(response => {
-        this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
-        this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
-        // this.form = response.data.data[0]
-
+        if (response.data.count == 1) {
+          var data = response.data
+          console.log(data)
+          this.editData = data.list[0]
+          this.editData1 = data.list[1]
+          this.formShow = true
+          this.formLoading = false
+        }
       }).catch(error => {
+        console.log(error)
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
-    /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+    /** 瀛愯〃鏄庣粏搴忓彿 */
     rowSysZbIndex({ row, rowIndex }) {
       row.index = rowIndex + 1;
     },
@@ -1039,61 +774,29 @@
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-          HMaterID: 0,
-          鐗╂枡浠g爜: '',
-          鐗╂枡鍚嶇О: '',
-          瑙勬牸鍨嬪彿: '',
-          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,
+          HBatchNo: "",
+          HDesignLife: 0,
+          HLeaveLife: 0,
+          HMaterCode:"",
+          HMaterID:0,
+          HMaterName:"",
+          HMaterSpec:"",
+          HMoney:0,
+          HPrice:0,
+          HQty:0,
+          HQtyMust:0,
+          HSPCode:"",
+          HSPID:0,
+          HSPName:"",
+          HStockOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
+          HUnitCode:"",
+          HUnitID:0,
+          HUnitName:"",
+          HUseLife:0,
+          HWHCode:"",
+          HWHID:0,
+          HWHName:"",
+          HRemark:"",
         }
         if (index) {
           this.editData.splice(index, 0, obj);
@@ -1161,42 +864,38 @@
         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.鍙戣揣浠撳簱) {
+          if(this.editData.length == 0){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          }
+          this.editData.map((item, index) => {
+            if (!item.HMaterID) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+            }else if(!item.HWHID){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+            }else if(item.HQty == 0){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�");
             }
           })
           this.$nextTick(() => {
             if (!fhck) {
+              if(this.OperationType == 3){
+                this.form.HInterID = this.linterid
+              }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
               axios({
                 method: 'post',
-                url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+                url: this.baseURL + "/Sc_MouldProdBackBill/SaveGetMouldProdBackBillList",
                 data: {
                   'msg': sMainSub
                 },
@@ -1204,12 +903,14 @@
                 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); //瀹℃牳
-                  }
+                  // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  // {
+                  //   this.set_CheckBill(1, this.form); //瀹℃牳
+                  // }
                   this.addBtnShow = true
+                  this.close()
+                } else {
+                  this.$modal.msgError(response.data.code + response.data.Message);
                 }
               }).catch(error => {
                 this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1223,8 +924,8 @@
     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"] }
+      axios.get(this.baseURL + "/Sc_MouldProdBackBill/AuditMouldProdBackBill", {
+        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
       }).then(response => {
         let result = response.data
         if (result.code == 1) {
@@ -1240,8 +941,11 @@
     showReset() {
       this.deptShow = false
       this.warehouseShow = false
-      this.materialShow = false
       this.gyEmployeeShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyMouldShow = false
+      this.gyStockPlaceShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
@@ -1255,19 +959,46 @@
         this.deptShow = true
         this.openData = true
       } else if (num == 2) {
-        this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+        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 = '閿�鍞憳鍒楄〃'
+        if(this.empType == 1){
+          this.dialogTitle = '楠屾敹鍛樺垪琛�'
+        }else{
+          this.dialogTitle = '淇濈鍛樺垪琛�'
+        }
         this.gyEmployeeShow = true
         this.openData = true
-      }
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      }  else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      }  else if (num == 8) {
+        this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+        this.gyMouldShow = true
+        this.openData = true
+      }  else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      } 
     },
+    //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+    openDataDialogChoose(){
+      if(this.form.HSupTypeID == 1){
+        this.openDataDialog(6)
+      }else if(this.form.HSupTypeID == 2){
+        this.openDataDialog(7)
+      }else if(this.form.HSupTypeID == 3){
+        this.deptType = 2
+        this.openDataDialog(1)
+      }
+    }
   }
 };
 </script>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index dc0127d..5d0c77f 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -187,7 +187,7 @@
           v-if="rowHideShow" />
       </el-dialog>
       <!-- 缂栬緫 -->
-      <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+      <el-dialog title="缂栬緫鍣ㄥ叿棰嗙敤閫�搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
         <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
           :copyType="copyType" @editClose="editClose" v-if="editShow" />
       </el-dialog>
@@ -402,6 +402,11 @@
           //缁欑┖鐨勬暟缁勮祴鍊�
           for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
             data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
           }
           //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
           col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -743,22 +748,18 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete() {
       this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
-        if (this.rowForm.鐘舵�� == "鍒涘缓") {
-          axios.get(this.baseURL + "/Sc_MouldProdBackBill/DeltetMouldProdBackBill", {
-            params: { 'HInterID': this.rowForm.hmainid.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("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
-        }
+        axios.get(this.baseURL + "/Sc_MouldProdBackBill/DeltetMouldProdBackBill", {
+          params: { 'HInterID': this.rowForm.hmainid.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("鎺ュ彛璇锋眰澶辫触!");
+        });
       }).catch(() => { })
     },
     // 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 7731239..2f35de3 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -3,18 +3,18 @@
     <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="set_CheckBill(1, 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">
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿鐩存帴璋冩嫧鍗�</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="90px">
       <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 label="鍗曟嵁鍙�" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -24,158 +24,70 @@
               </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 label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+                <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
               </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-form-item label="鍣ㄥ叿浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></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" @click="openDataDialog(4)"></el-button>
+              <el-form-item label="棰嗘枡浜�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨棰嗘枡浜�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></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-form-item label="鍙戞枡浜�" prop="HKeeperName">
+                <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨鍙戞枡浜�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></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 label="璋冩嫧绫诲瀷" prop="HStockStyle">
+                <el-select v-model="form.HStockStyle" placeholder="璇烽�夋嫨">
+                  <el-option label="鍚岀粍缁囪皟鎷�" value="鍚岀粍缁囪皟鎷�" />
+                  <el-option label="璺ㄧ粍缁囪皟鎷�" value="璺ㄧ粍缁囪皟鎷�" />
+                </el-select>
               </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="椤圭洰浠g爜" 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-select v-model="form.HOrgID" 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="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-col :span="12">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
               </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-col :span="12">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -246,113 +158,225 @@
           </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.鐗╂枡浠g爜" 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-tabs v-model="activeName1" type="border-card">
+        <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+          <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="鍣ㄥ叿浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+                  @dblclick.native="openDataDialog(8, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterSpec }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鎵规" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HBatchNo" placeholder="璇疯緭鍏�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁捐瀵垮懡" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HDesignLife" placeholder="璇疯緭鍏�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍓╀綑瀵垮懡" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HLeaveLife" placeholder="璇疯緭鍏�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="绱浣跨敤瀵垮懡" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HUseLife" placeholder="璇疯緭鍏�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HQtyMust }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+              <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 v-model="scope.row.HPrice" placeholder="璇疯緭鍏�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="閲戦" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMoney" placeholder="璇疯緭鍏�" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆缁勭粐浠g爜" width="120">
+              <template slot-scope="scope">
+                <!-- <el-select v-model="scope.row.HStockOrgCode" placeholder="璇烽�夋嫨缁勭粐" @change="HStockOrgChange(zbIndex = scope.row.index - 1)">
+                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID"></el-option>>
+                  </el-option>
+                </el-select> -->
+                <span>{{ scope.row.HStockOrgCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆缁勭粐" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HStockOrgName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆浠撳簱" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HWHName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆浠撲綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
+                  @dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨叆浠撲綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSPName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨嚭浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSCWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=3)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=3)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨嚭浠撳簱" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSCWHName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨嚭浠撲綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSCSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
+                  @dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璋冨嚭浠撲綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSCSPName }}</span>
+              </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="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-tab-pane>
+        <!-- <el-tab-pane label="姹囨�讳俊鎭�" name="second">
+          <el-table :data="editData1" 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="鐗╂枡浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.鐗╂枡浠g爜 }}</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">
+                <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="鍙戞枡浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.鍙戞枡浠撳簱浠g爜 }}</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>
+        </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" />
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
       <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
         <el-button @click="deptClose">鍙� 娑�</el-button>
@@ -366,16 +390,19 @@
 
 <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 GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
 import moment from 'moment';
 
 export default {
-  name: 'SellOutBillEdit',
-  components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+  name: 'Sc_MouldProdMoveBillEdit',
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
   props: {
     OperationType: { type: Number, },
     linterid: { type: Number, },
@@ -385,34 +412,41 @@
   },
   data() {
     return {
-      HModName: "Kf_SellOutBill",
+      HModName: "Sc_MouldProdMoveBillEdit",
       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,//鐗╂枡鏁版嵁缁勪欢
       gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+      gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+      gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+      gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+      HSPType:1,//浠撲綅寮圭獥鍖哄垎鏍囧織
       deptform: {},//寮圭獥閫変腑鏁版嵁
       openData: false,//鏁版嵁寮圭獥
       dialogTitle: '',
       organizationList: [],//缁勭粐鍒楄〃
       subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-      HInterID: null,
+      HInterID: 0,
       baseURL: process.env.VUE_APP_BASE_API,
       checkedSysZb: [],
-      editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+      editData: [],//瀛愯〃
+      editData1: [],//姹囨�诲瓙琛�
       editBtData: [],//瀛愯〃琛ㄥご
       activeName: 'first',
+      activeName1:'first',
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -452,14 +486,20 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
-        HSupName: [
-          { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
-        ],
         HDate: [
           { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
         ],
-        HExRate: [
-          { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+        HWHName: [
+          { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HSecManagerName: [
+          { required: true, message: "棰嗘枡浜轰笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HKeeperName: [
+          { required: true, message: "鍙戞枡浜轰笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HDeptName: [
+          { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
         ]
       }
     };
@@ -467,9 +507,6 @@
   created() {
     this.fetchData()
     this.getdata()
-  },
-  beforeDestroy() {
-    this.$destroy()
   },
   methods: {
     fetchData() {
@@ -486,118 +523,7 @@
       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
-                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                    , "鐗╂枡鍚嶇О": 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)) {
+      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
         this.handleAdd()
       } else if (this.OperationType == 3 || this.copyType == 1) {
         this.handleUpdate()
@@ -611,70 +537,80 @@
       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) {
+    HStockOrgChange(val) {
+      console.log(549,val,this.zbIndex)
+      console.log(this.organizationList)
+      
       // let options=undefined
       //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
     },
-    //閮ㄩ棬寮圭獥璧嬪��
+    //寮圭獥璧嬪��
     dbEmitData(deptRow, num) {
-      // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+      // num=1閮ㄩ棬 num=2浠撳簱
       console.log(deptRow)
-      if (deptRow.HItemID) {
+      if (deptRow.HItemID || deptRow.hmainid) {
         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.浠撳簱鍚嶇О;
+          if(this.eHWHType == 1){
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О
+            this.form.HWHID = deptRow.HItemID
+            this.form.HWHNumber = deptRow.浠撳簱浠g爜
+          }else if(this.eHWHType == 2){
+            this.editData[this.zbIndex].HWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+          }else if(this.eHWHType == 3){
+            this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HSCWHCode = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HSCWHName = deptRow.浠撳簱鍚嶇О
+          }
           this.warehouseShow = false
           this.openData = false
-        } else if (num == 3) {
-          this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-          this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
-          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
+          if(this.empType == 1){
+            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HSecManagerID = deptRow.HItemID
+          }else{
+            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+            this.form.HKeeperID = deptRow.HItemID
+          }
           this.gyEmployeeShow = false
+          this.openData = false
+        } else if (num == 8){
+          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+          this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
+          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+          this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+          this.editData[this.zbIndex].HUnitCode = deptRow.璁¢噺鍗曚綅浠g爜
+          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+          this.editData[this.zbIndex].HQty = 1
+          this.gyMouldShow = false
+          this.openData = false
+        } else if (num == 9){
+          if(this.HSPType == 1){
+            this.editData[this.zbIndex].HSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+          }else{
+            this.editData[this.zbIndex].HSCSPID = deptRow.HMainID
+            this.editData[this.zbIndex].HSCSPCode = deptRow.浠撲綅浠g爜
+            this.editData[this.zbIndex].HSCSPName = deptRow.浠撲綅鍚嶇О
+          }
+          this.gyStockPlaceShow = false
           this.openData = false
         }
       } else {
@@ -695,63 +631,29 @@
       this.openData = false
     },
 
-    //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    //琛ㄥ崟鍒濆鍖�
     reset() {
       this.form = {
-        BillType: '1402',
         HBillNo: '',
-        HInterID: '',
-        HBillSubType: '1205',
+        HInterID: 0,
         HDate: new Date(),
-        HMainSourceInterID: 0,
-        HMainSourceEntryID: 0,
-        HMainSourceBillType: '',
-        HMainSourceBillNo: '',
-        HEmpName: '',
-        HEmpID: 0,
+        HInnerBillNo:'',
+        HWHName:'',
+        HWHNumber:'',
+        HWHID:0,
+        HSecManagerName:'',
+        HSecManagerID:0,
+        HKeeperName:'',
+        HKeeperID:0,
         HDeptName: '',
         HDeptID: 0,
-        HManagerName: '',
-        HManagerID: 0,
-        HSupName: sessionStorage["HSupName"],
-        HSupID: sessionStorage["HSupID"],
-        HLinkMan: '',
-        HLinkPhone: '',
-        HSecManagerName: '',
-        HSecManagerID: 0,
-        HKeeperName: '',
-        HKeeperID: 0,
-        HRemark: '',
-        HProjectNumber: '',
-        HProjectID: 0,
-        HProjectName: '',
-        HGroupName: '',
-        HGroupID: 0,
-        HWHName: '',
-        HWHID: 0,
-        HConveyCompName: '',
-        HConveyCompID: 0,
-        HConveyTypeName: '',
-        HConveyTypeID: 0,
-        HConveyMoney: '0',
-        HCarriage: '0',
-        HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
-        HOWNERID: sessionStorage["OrganizationID"] - 0,
-        HSCWHName: '',
-        HSCWHID: 0,
-        HCheckStatusMan: '',
-        HExplanation: '',
-        HInnerBillNo: '',
-        HCurName: '浜烘皯甯�',
-        HCurID: 1,
-        HExRate: '1',
-        HSellSName: '',
-        HSellSID: 0,
-        HCusBalance: '0',
-        HCreditRating_Now: '0',
-        HAvailableBalance: '0',
-        HPriceType: '鎴愭湰浠�',
-        HOrgID: sessionStorage["OrganizationID"] - 0,
+        HStockStyle:'鍚岀粍缁囪皟鎷�',
+        HOrgID:sessionStorage["OrganizationID"] - 0,
+        HSourceBillType:'',
+        XDH:'',
+        HExplanation:'',
+        HRemark:'',
+
         HMaker: '',
         HUpDater: '',
         HChecker: '',
@@ -764,21 +666,35 @@
         HDeleteDate: '',
       }
       this.editData = []
+      this.editData1 = []
       this.editBtData = []
       this.ids = []
       this.subDisabled = false
       this.addBtnShow = false
       // this.$refs.tableData.clearSelection()
       this.activeName = 'first'
+      this.activeName1 = 'first'
       this.resetForm("form");
     },
     //閫�鍑�
     close() {
       this.reset()
-
+      console.log(this.$route.path)
       if (!this.OperationType && !this.copyType) {
-        const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
-        this.$tab.closePage(obj);
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
       } else {
         this.formShow = false
         this.$emit('editClose', false)
@@ -794,8 +710,6 @@
         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("鎺ュ彛璇锋眰澶辫触!");
       });
@@ -816,44 +730,16 @@
       })
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+      axios.get(this.baseURL + "/Web/GetMAXNum", {
         params: {
-          HBillType: '1205'
+          HBillType: '3814'
         }
       }).then(response => {
         this.form.HMaker = sessionStorage["HUserName"]
         this.form.HBillNo = response.data.data[0].HBillNo
-        this.form.HInterID = response.data.data[0].HInterID
+        this.form.HInterID = 0
         // 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("鎺ュ彛璇锋眰澶辫触!");
       });
@@ -863,173 +749,73 @@
       this.reset()
       let rowHmainid = this.linterid
       console.log(this.linterid)
-      axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
-        params: { 'HInterID': rowHmainid }
+      //涓昏〃
+      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai", {
+        params: { 'HID': rowHmainid }
       }).then(response => {
-        if (response.data.count == 1) {
-          var result = response.data
-          var data = response.data.data[0]
-          this.form.BillType = data.HSourceBillType
+        if (response.data.code == 1) {
+          var data = response.data.data.h_v_Sc_MouldProdMoveBill_Edit[0]
+          console.log(data)
           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
-                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
-                , "鐗╂枡鍚嶇О": 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.form = {
+                  "HBillNo": data.鍗曟嵁鍙�
+                , "HDate": data.鏃ユ湡
+                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                , "HWHID": data.HWHID1                    //浠撳簱ID
+                , "HWHName": data.鍣ㄥ叿浠撳簱                   //浠撳簱鍚嶇О
+                , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
+                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
+                , "HKeeperID": data.hkeeperid            //淇濈鍛業D
+                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
+                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
+                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
+                , "XDH": ""                               //閫夊崟鍙�
+                , "HExplanation": data.鎽樿              //鎽樿
+                , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
+                , "HStockStyle": data.璋冩嫧绫诲瀷
+                
+                , "HMaker": data.鍒跺崟浜�
+                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+                , "HChecker": data.瀹℃牳浜�
+                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+                , "HUpDater": data.淇敼浜�
+                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+                , "HCloseMan": data.鍏抽棴浜�
+                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+                , "HDeleteMan": data.浣滃簾浜�
+                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            }
           }
           this.formShow = true
           this.formLoading = false
-
         }
       }).catch(error => {
+        console.log(error)
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
-    },
-    //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
-    getCustomerByCusID(HCusID) {
-      axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
-        params: {
-          HCusID: HCusID
-        }
+      //瀛愯〃
+      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListProjectDetai", {
+        params: { 'sqlWhere': "and hmainid=" + rowHmainid }
       }).then(response => {
-        this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
-        this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
-        // this.form = response.data.data[0]
-
+        if (response.data.count == 1) {
+          var data = response.data
+          console.log(data)
+          this.editData = data.list[0]
+          this.editData1 = data.list[1]
+          this.formShow = true
+          this.formLoading = false
+        }
       }).catch(error => {
+        console.log(error)
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
-    /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+    /** 瀛愯〃鏄庣粏搴忓彿 */
     rowSysZbIndex({ row, rowIndex }) {
       row.index = rowIndex + 1;
     },
@@ -1039,61 +825,38 @@
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-          HMaterID: 0,
-          鐗╂枡浠g爜: '',
-          鐗╂枡鍚嶇О: '',
-          瑙勬牸鍨嬪彿: '',
-          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,
+          HBatchNo: "",
+          HDesignLife: 0,
+          HLeaveLife: 0,
+          HMaterCode:"",
+          HMaterID:0,
+          HMaterName:"",
+          HMaterSpec:"",
+          HMoney:0,
+          HPrice:0,
+          HQty:0,
+          HQtyMust:0,
+          HSPCode:"",
+          HSPID:0,
+          HSPName:"",
+          HOtherOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
+          HStockOrgID:0,
+          HStockOrgCode:"",
+          HStockOrgName:"",
+          HUnitCode:"",
+          HUnitID:0,
+          HUnitName:"",
+          HUseLife:0,
+          HWHCode:"",
+          HWHID:0,
+          HWHName:"",
+          HSCWHID:0,
+          HSCWHCode:"",
+          HSCWHName:"",
+          HSCSPID:0,
+          HSCSPCode:"",
+          HSCSPName:"",
+          HRemark:"",
         }
         if (index) {
           this.editData.splice(index, 0, obj);
@@ -1161,42 +924,38 @@
         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.鍙戣揣浠撳簱) {
+          if(this.editData.length == 0){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          }
+          this.editData.map((item, index) => {
+            if (!item.HMaterID) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+            }else if(!item.HWHID){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
+            }else if(!item.HSCWHID){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨嚭浠撳簱鏈�夋嫨锛�");
             }
           })
           this.$nextTick(() => {
             if (!fhck) {
+              if(this.OperationType == 3){
+                this.form.HInterID = this.linterid
+              }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
               axios({
                 method: 'post',
-                url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+                url: this.baseURL + "/Sc_MouldProdMoveBill/SaveGetMouldProdMoveBillList",
                 data: {
                   'msg': sMainSub
                 },
@@ -1204,12 +963,14 @@
                 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); //瀹℃牳
-                  }
+                  // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  // {
+                  //   this.set_CheckBill(1, this.form); //瀹℃牳
+                  // }
                   this.addBtnShow = true
+                  this.close()
+                } else {
+                  this.$modal.msgError(response.data.code + response.data.Message);
                 }
               }).catch(error => {
                 this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1223,8 +984,8 @@
     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"] }
+      axios.get(this.baseURL + "/Sc_MouldProdMoveBill/AuditMouldProdMoveBill", {
+        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
       }).then(response => {
         let result = response.data
         if (result.code == 1) {
@@ -1240,8 +1001,11 @@
     showReset() {
       this.deptShow = false
       this.warehouseShow = false
-      this.materialShow = false
       this.gyEmployeeShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyMouldShow = false
+      this.gyStockPlaceShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
@@ -1255,18 +1019,34 @@
         this.deptShow = true
         this.openData = true
       } else if (num == 2) {
-        this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+        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 = '閿�鍞憳鍒楄〃'
+        if(this.empType == 1){
+          this.dialogTitle = '楠屾敹鍛樺垪琛�'
+        }else{
+          this.dialogTitle = '淇濈鍛樺垪琛�'
+        }
         this.gyEmployeeShow = true
         this.openData = true
-      }
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      }  else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      }  else if (num == 8) {
+        this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+        this.gyMouldShow = true
+        this.openData = true
+      }  else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      } 
     },
   }
 };
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
index 40feaf4..c4d4a8d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillList.vue
@@ -187,7 +187,7 @@
           v-if="rowHideShow" />
       </el-dialog>
       <!-- 缂栬緫 -->
-      <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+      <el-dialog title="缂栬緫鍣ㄥ叿鐩存帴璋冩嫧鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
         <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
           :copyType="copyType" @editClose="editClose" v-if="editShow" />
       </el-dialog>
@@ -402,6 +402,11 @@
           //缁欑┖鐨勬暟缁勮祴鍊�
           for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
             data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
           }
           //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
           col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -743,22 +748,18 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete() {
       this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
-        if (this.rowForm.鐘舵�� == "鍒涘缓") {
-          axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
-            params: { 'HInterID': this.rowForm.hmainid.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("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
-        }
+        axios.get(this.baseURL + "/Sc_MouldProdMoveBill/DeltetMouldProdMoveBill", {
+          params: { 'HInterID': this.rowForm.hmainid.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("鎺ュ彛璇锋眰澶辫触!");
+        });
       }).catch(() => { })
     },
     // 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index b6e5481..b40720e 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -3,18 +3,18 @@
     <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="set_CheckBill(1, 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">
+    <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿棰嗙敤鍑哄簱鍗�</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="90px">
       <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 label="鍗曟嵁鍙�" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -24,111 +24,18 @@
               </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 label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
+                <el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏ュ唴閮ㄥ崟鎹彿" />
               </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-form-item label="鍣ㄥ叿浠撳簱" prop="HWHName">
+                <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨鍣ㄥ叿浠撳簱" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></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" @click="openDataDialog(4)"></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="椤圭洰浠g爜" 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">
@@ -139,43 +46,61 @@
               </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 label="楠屾敹鍛�" prop="HSecManagerName">
+                <el-input v-model="form.HSecManagerName" placeholder="璇烽�夋嫨楠屾敹鍛�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
+                </el-input>
               </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 label="淇濈鍛�" prop="HKeeperName">
+                <el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨淇濈鍛�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=2)"></el-button>
+                </el-input>
               </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 label="閮ㄩ棬" prop="HDeptName">
+                <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1,deptType=1)"></el-button>
+                </el-input>
               </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-form-item label="寰�鏉ョ被鍨�" prop="HSupTypeID">
+                <el-select v-model="form.HSupTypeID" placeholder="璇烽�夋嫨寰�鏉ョ被鍨�">
+                  <el-option v-for="(item, index) in hSupTypeList" :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="HCusBalance">
-                <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
+              <el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
+                <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨寰�鏉ュ崟浣�" disabled>
+                  <el-button slot="append" icon="el-icon-search" @click="openDataDialogChoose()"></el-button>
+                </el-input>
               </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-row>
+          <el-row>
+            <!-- <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="12">
+              <el-form-item label="鎽樿" prop="HExplanation">
+                <el-input v-model="form.HExplanation" placeholder="璇疯緭鍏ユ憳瑕�" />
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
-                <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+            <el-col :span="12">
+              <el-form-item label="澶囨敞" prop="HRemark">
+                <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -246,113 +171,159 @@
           </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.鐗╂枡浠g爜" 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-tabs v-model="activeName1" type="border-card">
+        <el-tab-pane label="鏄庣粏淇℃伅" name="first">
+          <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="鍣ㄥ叿浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HMaterCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(8, scope.row)"
+                  @dblclick.native="openDataDialog(8, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍣ㄥ叿鍚嶇О" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瑙勬牸鍨嬪彿" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HMaterSpec }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitCode }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="璁¢噺鍗曚綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HUnitName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="搴斿彂鏁伴噺" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HQtyMust }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="瀹炲彂鏁伴噺" width="120">
+              <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="鍙戞枡浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HWHCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(2, scope.row ,eHWHType=2)"
+                  @dblclick.native="openDataDialog(2, scope.row ,eHWHType=2)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="鍙戞枡浠撳簱" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HWHName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撲綅浠g爜" width="120">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.HSPCode" placeholder="璇疯緭鍏�" @keyup.native.f7="openDataDialog(9, scope.row)"
+                  @dblclick.native="openDataDialog(9, scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column align="center" label="浠撲綅" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.HSPName }}</span>
+              </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="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-tab-pane>
+        <!-- <el-tab-pane label="姹囨�讳俊鎭�" name="second">
+          <el-table :data="editData1" 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="鐗╂枡浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.鐗╂枡浠g爜 }}</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">
+                <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="鍙戞枡浠撳簱浠g爜" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.鍙戞枡浠撳簱浠g爜 }}</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>
+        </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" />
+      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
+      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
       <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
+      <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
         <el-button @click="deptClose">鍙� 娑�</el-button>
@@ -366,16 +337,19 @@
 
 <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 GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyCustomer from '@/views/GyCustomer'
+import GyMould from '@/views/scMould/basicModeling/Gy_MouldFileList.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
 import moment from 'moment';
 
 export default {
   name: 'Sc_MouldProdOutBillEdit',
-  components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+  components: { Dept, Warehouse, RowSettings, GyEmployee,GySupplier,GyCustomer,GyMould,GyStockPlace },
   props: {
     OperationType: { type: Number, },
     linterid: { type: Number, },
@@ -392,27 +366,35 @@
       zzSelDis: false,
       rowHideShow: false,
       openRowHide: false,
-      hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
+      hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
       addBtnShow: false,
       zbIndex: null,
       zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
       dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
       deptShow: false,//閮ㄩ棬鏁版嵁缁勪欢
       warehouseShow: false,//浠撳簱鏁版嵁缁勪欢
-      materialShow: false,//鐗╂枡鏁版嵁缁勪欢
       gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+      gySupplierShow: false,//渚涘簲鍟嗘暟鎹粍浠�
+      gyCustomerShow: false,//瀹㈡埛鏁版嵁缁勪欢
+      gyMouldShow: false,//鍣ㄥ叿鏁版嵁缁勪欢
+      gyStockPlaceShow: false,//浠撲綅鏁版嵁缁勪欢
+      eHWHType:1,//浠撳簱寮圭獥鍖哄垎鏍囧織
+      empType:1,//鑱屽憳寮圭獥鍖哄垎鏍囧織
+      deptType:1,//閮ㄩ棬寮圭獥鍖哄垎鏍囧織
       deptform: {},//寮圭獥閫変腑鏁版嵁
       openData: false,//鏁版嵁寮圭獥
       dialogTitle: '',
       organizationList: [],//缁勭粐鍒楄〃
       subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
       // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
-      HInterID: null,
+      HInterID: 0,
       baseURL: process.env.VUE_APP_BASE_API,
       checkedSysZb: [],
-      editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+      editData: [],//瀛愯〃
+      editData1: [],//姹囨�诲瓙琛�
       editBtData: [],//瀛愯〃琛ㄥご
       activeName: 'first',
+      activeName1:'first',
       // 寮瑰嚭灞傛爣棰�
       title: "",
       // 鏄惁鏄剧ず寮瑰嚭灞�
@@ -452,14 +434,20 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
-        HSupName: [
-          { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
-        ],
         HDate: [
           { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
         ],
-        HExRate: [
-          { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+        HWHName: [
+          { required: true, message: "鍣ㄥ叿浠撳簱涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HSecManagerName: [
+          { required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HKeeperName: [
+          { required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }
+        ],
+        HDeptName: [
+          { required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
         ]
       }
     };
@@ -467,9 +455,6 @@
   created() {
     this.fetchData()
     this.getdata()
-  },
-  beforeDestroy() {
-    this.$destroy()
   },
   methods: {
     fetchData() {
@@ -486,118 +471,7 @@
       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
-                    , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
-                    , "鐗╂枡鍚嶇О": 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)) {
+      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
         this.handleAdd()
       } else if (this.OperationType == 3 || this.copyType == 1) {
         this.handleUpdate()
@@ -611,70 +485,81 @@
       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鍑哄簱浠撳簱
+      // num=1閮ㄩ棬 num=2浠撳簱
       console.log(deptRow)
-      if (deptRow.HItemID) {
+      if (deptRow.HItemID || deptRow.hmainid) {
         if (num == 1) {
-          this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
-          this.form.HDeptID = deptRow.HItemID
-          this.form.HManagerName = deptRow.璐熻矗浜�
+          if(this.deptType == 1){
+            this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HDeptID = deptRow.HItemID
+          }else{
+            this.form.HSupName = deptRow.閮ㄩ棬鍚嶇О
+            this.form.HSupID = deptRow.HItemID
+          }
           this.deptShow = false
           this.openData = false
         } else if (num == 2) {
-          this.editData[this.zbIndex].HWHID = deptRow.HItemID;
-          this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+          if(this.eHWHType == 1){
+            this.form.HWHName = deptRow.浠撳簱鍚嶇О
+            this.form.HWHID = deptRow.HItemID
+            this.form.HWHNumber = deptRow.浠撳簱浠g爜
+          }else{
+            this.editData[this.zbIndex].HWHID = deptRow.HItemID
+            this.editData[this.zbIndex].HWHCode = deptRow.浠撳簱浠g爜
+            this.editData[this.zbIndex].HWHName = deptRow.浠撳簱鍚嶇О
+          }
           this.warehouseShow = false
           this.openData = false
-        } else if (num == 3) {
-          this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
-          this.editData[this.zbIndex].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
-          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
+          if(this.empType == 1){
+            this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+            this.form.HSecManagerID = deptRow.HItemID
+          }else{
+            this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+            this.form.HKeeperID = deptRow.HItemID
+          }
           this.gyEmployeeShow = false
+          this.openData = false
+        } else if (num == 6) {
+          this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+          this.form.HSupID = deptRow.HItemID
+          this.gySupplierShow = false
+          this.openData = false
+        } else if (num == 7) {
+          this.form.HSupName = deptRow.瀹㈡埛鍚嶇О
+          this.form.HSupID = deptRow.HItemID
+          this.gyCustomerShow = false
+          this.openData = false
+        } else if (num == 8){
+          this.editData[this.zbIndex].HMaterID = deptRow.hmainid
+          this.editData[this.zbIndex].HMaterCode = deptRow.妯″叿缂栧彿
+          this.editData[this.zbIndex].HMaterName = deptRow.妯″叿鍚嶇О
+          this.editData[this.zbIndex].HMaterSpec = deptRow.妯″叿鍨嬪彿
+          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID
+          this.editData[this.zbIndex].HUnitCode = deptRow.璁¢噺鍗曚綅浠g爜
+          this.editData[this.zbIndex].HUnitName = deptRow.璁¢噺鍗曚綅
+          this.gyMouldShow = false
+          this.openData = false
+        } else if (num == 9){
+          this.editData[this.zbIndex].HSPID = deptRow.HMainID
+          this.editData[this.zbIndex].HSPCode = deptRow.浠撲綅浠g爜
+          this.editData[this.zbIndex].HSPName = deptRow.浠撲綅鍚嶇О
+          this.gyStockPlaceShow = false
           this.openData = false
         }
       } else {
@@ -695,63 +580,31 @@
       this.openData = false
     },
 
-    //閿�鍞嚭搴撳崟鏂板缂栬緫琛ㄥ崟鍒濆鍖�
+    //琛ㄥ崟鍒濆鍖�
     reset() {
       this.form = {
-        BillType: '1402',
         HBillNo: '',
-        HInterID: '',
-        HBillSubType: '1205',
+        HInterID: 0,
         HDate: new Date(),
-        HMainSourceInterID: 0,
-        HMainSourceEntryID: 0,
-        HMainSourceBillType: '',
-        HMainSourceBillNo: '',
-        HEmpName: '',
-        HEmpID: 0,
+        HInnerBillNo:'',
+        HWHName:'',
+        HWHNumber:'',
+        HWHID:0,
+        HOrgID:sessionStorage["OrganizationID"] - 0,
+        HSecManagerName:'',
+        HSecManagerID:0,
+        HKeeperName:'',
+        HKeeperID:0,
         HDeptName: '',
         HDeptID: 0,
-        HManagerName: '',
-        HManagerID: 0,
-        HSupName: sessionStorage["HSupName"],
-        HSupID: sessionStorage["HSupID"],
-        HLinkMan: '',
-        HLinkPhone: '',
-        HSecManagerName: '',
-        HSecManagerID: 0,
-        HKeeperName: '',
-        HKeeperID: 0,
-        HRemark: '',
-        HProjectNumber: '',
-        HProjectID: 0,
-        HProjectName: '',
-        HGroupName: '',
-        HGroupID: 0,
-        HWHName: '',
-        HWHID: 0,
-        HConveyCompName: '',
-        HConveyCompID: 0,
-        HConveyTypeName: '',
-        HConveyTypeID: 0,
-        HConveyMoney: '0',
-        HCarriage: '0',
-        HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
-        HOWNERID: sessionStorage["OrganizationID"] - 0,
-        HSCWHName: '',
-        HSCWHID: 0,
-        HCheckStatusMan: '',
-        HExplanation: '',
-        HInnerBillNo: '',
-        HCurName: '浜烘皯甯�',
-        HCurID: 1,
-        HExRate: '1',
-        HSellSName: '',
-        HSellSID: 0,
-        HCusBalance: '0',
-        HCreditRating_Now: '0',
-        HAvailableBalance: '0',
-        HPriceType: '鎴愭湰浠�',
-        HOrgID: sessionStorage["OrganizationID"] - 0,
+        HSupTypeID: 1,
+        HSupName:'',
+        HSupID:0,
+        HSourceBillType:'',
+        XDH:'',
+        HExplanation:'',
+        HRemark:'',
+
         HMaker: '',
         HUpDater: '',
         HChecker: '',
@@ -764,21 +617,35 @@
         HDeleteDate: '',
       }
       this.editData = []
+      this.editData1 = []
       this.editBtData = []
       this.ids = []
       this.subDisabled = false
       this.addBtnShow = false
       // this.$refs.tableData.clearSelection()
       this.activeName = 'first'
+      this.activeName1 = 'first'
       this.resetForm("form");
     },
     //閫�鍑�
     close() {
       this.reset()
-
+      console.log(this.$route.path)
       if (!this.OperationType && !this.copyType) {
-        const obj = { path: "/sell/sellOut/sellOutBillEdit", name: "SellOutBillEdit" };
-        this.$tab.closePage(obj);
+        console.log(this.$route.path)
+        const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+        this.$tab.closePage(obj).then(res => {
+          const latestView = res.visitedViews.slice(-1)[0]
+          if (latestView) {
+            this.$router.push(latestView.fullPath)
+          } else {
+            if (obj.name === 'Dashboard') {
+              this.$router.replace({ path: '/redirect' + obj.fullPath })
+            } else {
+              this.$router.push('/')
+            }
+          }
+        });
       } else {
         this.formShow = false
         this.$emit('editClose', false)
@@ -794,8 +661,6 @@
         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("鎺ュ彛璇锋眰澶辫触!");
       });
@@ -816,44 +681,16 @@
       })
     },
     getHBillNo() {
-      axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+      axios.get(this.baseURL + "/Web/GetMAXNum", {
         params: {
-          HBillType: '1205'
+          HBillType: '3802'
         }
       }).then(response => {
         this.form.HMaker = sessionStorage["HUserName"]
         this.form.HBillNo = response.data.data[0].HBillNo
-        this.form.HInterID = response.data.data[0].HInterID
+        this.form.HInterID = 0
         // 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("鎺ュ彛璇锋眰澶辫触!");
       });
@@ -863,173 +700,75 @@
       this.reset()
       let rowHmainid = this.linterid
       console.log(this.linterid)
-      axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
-        params: { 'HInterID': rowHmainid }
+      //涓昏〃
+      axios.get(this.baseURL + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListCheckDetai", {
+        params: { 'HID': rowHmainid }
       }).then(response => {
-        if (response.data.count == 1) {
-          var result = response.data
-          var data = response.data.data[0]
-          this.form.BillType = data.HSourceBillType
+        if (response.data.code == 1) {
+          var data = response.data.data.h_v_Sc_MouldProdOutHouseBill_Edit[0]
+          console.log(data)
           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
-                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
-                , "鐗╂枡鍚嶇О": 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.form = {
+                  "HBillNo": data.鍗曟嵁鍙�
+                , "HDate": data.鏃ユ湡
+                , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+                , "HWHID": data.HWHID                    //浠撳簱ID
+                , "HWHName": data.浠撳簱                   //浠撳簱鍚嶇О
+                , "HSecManagerID": data.hsecmanagerid    //楠屾敹鍛業D
+                , "HSecManagerName": data.棰嗘枡浜�         //楠屾敹鍛樺悕绉�
+                , "HKeeperID": data.hkeeperid            //淇濈鍛業D
+                , "HKeeperName": data.鍙戞枡浜�            //淇濈鍛樺悕绉�
+                , "HDeptID": data.HDeptID                 //閮ㄩ棬ID
+                , "HDeptName": data.閮ㄩ棬                //閮ㄩ棬鍚嶇О
+                , "HSourceBillType": ""                   //婧愬崟绫诲瀷
+                , "XDH": ""                               //閫夊崟鍙�
+                , "HExplanation": data.鎽樿              //鎽樿
+                , "HRemark": data.琛ㄥご澶囨敞                    //澶囨敞
+                , "HSupTypeID": data.寰�鏉ョ被鍨�                             //閫夊崟鍙�
+                , "HSupName": data.寰�鏉ュ崟浣�              
+                , "HSupID": data.HSupID                    
+
+                , "HMaker": data.鍒跺崟浜�
+                , "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
+                , "HChecker": data.瀹℃牳浜�
+                , "HCheckDate": data.瀹℃牳鏃ユ湡 == null ? "" : data.瀹℃牳鏃ユ湡
+                , "HUpDater": data.淇敼浜�
+                , "HUpDateDate": data.淇敼鏃ユ湡 == null ? "" : data.淇敼鏃ユ湡
+                , "HCloseMan": data.鍏抽棴浜�
+                , "HCloseDate": data.鍏抽棴鏃ユ湡 == null ? "" : data.鍏抽棴鏃ユ湡
+                , "HDeleteMan": data.浣滃簾浜�
+                , "HDeleteDate": data.浣滃簾鏃ユ湡 == null ? "" : data.浣滃簾鏃ユ湡
+            }
           }
           this.formShow = true
           this.formLoading = false
-
         }
       }).catch(error => {
+        console.log(error)
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
-    },
-    //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
-    getCustomerByCusID(HCusID) {
-      axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
-        params: {
-          HCusID: HCusID
-        }
+      //瀛愯〃
+      axios.get(this.baseURL + "/Sc_MouldProdOutBill/Sc_MouldProdOutBillListProjectDetai", {
+        params: { 'sqlWhere': "and hmainid=" + rowHmainid }
       }).then(response => {
-        this.form.鑱旂郴浜� = response.data.data[0].HLinkMan
-        this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone
-        // this.form = response.data.data[0]
-
+        if (response.data.count == 1) {
+          var data = response.data
+          console.log(data)
+          this.editData = data.list[0]
+          this.editData1 = data.list[1]
+          this.formShow = true
+          this.formLoading = false
+        }
       }).catch(error => {
+        console.log(error)
         this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
       });
     },
-    /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+    /** 瀛愯〃鏄庣粏搴忓彿 */
     rowSysZbIndex({ row, rowIndex }) {
       row.index = rowIndex + 1;
     },
@@ -1039,61 +778,29 @@
         this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
       } else {
         let obj = {
-          HMaterID: 0,
-          鐗╂枡浠g爜: '',
-          鐗╂枡鍚嶇О: '',
-          瑙勬牸鍨嬪彿: '',
-          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,
+          HBatchNo: "",
+          HDesignLife: 0,
+          HLeaveLife: 0,
+          HMaterCode:"",
+          HMaterID:0,
+          HMaterName:"",
+          HMaterSpec:"",
+          HMoney:0,
+          HPrice:0,
+          HQty:0,
+          HQtyMust:0,
+          HSPCode:"",
+          HSPID:0,
+          HSPName:"",
+          HStockOrgID:sessionStorage["OrganizationID"] - 0,//缁勭粐id
+          HUnitCode:"",
+          HUnitID:0,
+          HUnitName:"",
+          HUseLife:0,
+          HWHCode:"",
+          HWHID:0,
+          HWHName:"",
+          HRemark:"",
         }
         if (index) {
           this.editData.splice(index, 0, obj);
@@ -1161,42 +868,38 @@
         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.鍙戣揣浠撳簱) {
+          if(this.editData.length == 0){
               fhck = true
-              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+              this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
+          }
+          this.editData.map((item, index) => {
+            if (!item.HMaterID) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+            }else if(!item.HWHID){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浠撳簱鏈�夋嫨锛�");
+            }else if(item.HQty == 0){
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細浜у搧鍏ュ簱璁板綍鏈壂鐮侊紙瀹炲彂鏁伴噺涓�0锛�");
             }
           })
           this.$nextTick(() => {
             if (!fhck) {
+              if(this.OperationType == 3){
+                this.form.HInterID = this.linterid
+              }
               var sMainStr = JSON.stringify(this.form);
               var sSubStr = JSON.stringify(this.editData);
-              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
               axios({
                 method: 'post',
-                url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+                url: this.baseURL + "/Sc_MouldProdOutBill/SaveGetMouldProdOutBillList",
                 data: {
                   'msg': sMainSub
                 },
@@ -1204,12 +907,14 @@
                 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); //瀹℃牳
-                  }
+                  // if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  // {
+                  //   this.set_CheckBill(1, this.form); //瀹℃牳
+                  // }
                   this.addBtnShow = true
+                  this.close()
+                } else {
+                  this.$modal.msgError(response.data.code + response.data.Message);
                 }
               }).catch(error => {
                 this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -1223,8 +928,8 @@
     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"] }
+      axios.get(this.baseURL + "/Sc_MouldProdOutBill/AuditMouldProdOutBill", {
+        params: { "HInterID": InterID, "flag": num, "user": sessionStorage["HUserName"] }
       }).then(response => {
         let result = response.data
         if (result.code == 1) {
@@ -1240,8 +945,11 @@
     showReset() {
       this.deptShow = false
       this.warehouseShow = false
-      this.materialShow = false
       this.gyEmployeeShow = false
+      this.gySupplierShow = false
+      this.gyCustomerShow = false
+      this.gyMouldShow = false
+      this.gyStockPlaceShow = false
     },
     //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
     openDataDialog(num, row) {
@@ -1255,19 +963,46 @@
         this.deptShow = true
         this.openData = true
       } else if (num == 2) {
-        this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+        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 = '閿�鍞憳鍒楄〃'
+        if(this.empType == 1){
+          this.dialogTitle = '楠屾敹鍛樺垪琛�'
+        }else{
+          this.dialogTitle = '淇濈鍛樺垪琛�'
+        }
         this.gyEmployeeShow = true
         this.openData = true
-      }
+      } else if (num == 6) {
+        this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+        this.gySupplierShow = true
+        this.openData = true
+      }  else if (num == 7) {
+        this.dialogTitle = '瀹㈡埛鍒楄〃'
+        this.gyCustomerShow = true
+        this.openData = true
+      }  else if (num == 8) {
+        this.dialogTitle = '鍣ㄥ叿鍒楄〃'
+        this.gyMouldShow = true
+        this.openData = true
+      }  else if (num == 9) {
+        this.dialogTitle = '浠撲綅鍒楄〃'
+        this.gyStockPlaceShow = true
+        this.openData = true
+      } 
     },
+    //鏍规嵁寰�鏉ョ被鍨嬪垽鏂線鏉ュ崟浣�
+    openDataDialogChoose(){
+      if(this.form.HSupTypeID == 1){
+        this.openDataDialog(6)
+      }else if(this.form.HSupTypeID == 2){
+        this.openDataDialog(7)
+      }else if(this.form.HSupTypeID == 3){
+        this.deptType = 2
+        this.openDataDialog(1)
+      }
+    }
   }
 };
 </script>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 1aa1d91..06b0aea 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -181,7 +181,7 @@
           v-if="rowHideShow" />
       </el-dialog>
       <!-- 缂栬緫 -->
-      <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+      <el-dialog title="缂栬緫鍣ㄥ叿棰嗙敤鍑哄簱鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
         <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
           :copyType="copyType" @editClose="editClose" v-if="editShow" />
       </el-dialog>
@@ -395,6 +395,11 @@
           //缁欑┖鐨勬暟缁勮祴鍊�
           for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
             data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+            //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+            var patrn = new RegExp(/^h/i);
+            if (patrn.test(data1.list[key].ColmCols)) {
+                this.titleData[key] = data1.list[key].ColmCols;
+            }
           }
           //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
           col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -737,22 +742,18 @@
     /** 鍒犻櫎鎸夐挳鎿嶄綔 */
     handleDelete() {
       this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
-        if (this.rowForm.鐘舵�� == "鍒涘缓") {
-          axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
-            params: { 'HInterID': this.rowForm.hmainid.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("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
-        }
+        axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
+          params: { 'HInterID': this.rowForm.hmainid.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("鎺ュ彛璇锋眰澶辫触!");
+        });
       }).catch(() => { })
     },
     // 鍙嶅鏍�/瀹℃牳鏁版嵁
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
index 98a6022..6e9bc8b 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -445,7 +445,7 @@
                 }}</span>
                 <el-button
                   type="text"
-                  @click="handleEdit(row, (OperationType = 3))"
+                  @click="handleDblclick1"
                   v-else-if="column.property == '鍗曟嵁鍙�'"
                   >{{ row.鍗曟嵁鍙� }}</el-button
                 >
@@ -660,7 +660,7 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
+      user: sessionStorage["HUserName"],
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -752,6 +752,17 @@
     this.getList();
   },
   methods: {
+    handleDblclick1(){
+      // 寤惰繜鎵ц绗竴涓嚱鏁�
+      setTimeout(() => {
+        this.handleRowClick();
+      });
+      
+      // 寤惰繜鎵ц绗簩涓嚱鏁帮紙鍙互璁剧疆鐩稿悓鎴栦笉鍚岀殑寤惰繜鏃堕棿锛�
+      setTimeout(() => {
+        this.handleDblclick();
+      }, 300);
+    },
     BillSync() {
       axios.get(`${this.baseURL}/Kf_ICStockBillMain/GetCStockBillList`, {
         params: { BillNo: this.form.HBillno2, BillType: 1403 },
@@ -1340,14 +1351,15 @@
     //閫�鍑�
     close() {
       this.tableShow = true;
+      this.editShow = false;
       this.openEdit = false;
       this.getList();
     },
     //鎵撳紑鏂板缁勪欢寮圭獥
     handleAddEdit() {
      this.rowForm.hmainid = 0
-      this.editShow = true
       this.openEdit = true
+      this.editShow = true
     },
     //鎵撳紑淇敼缁勪欢寮圭獥
     handleEdit() {
@@ -1358,10 +1370,13 @@
           this.$modal.msgError("璇烽�夋嫨瑕佺紪杈戠殑鏁版嵁!");
           return;
       }
-        this.openEdit = true;
         this.editShow = true;
+        this.openEdit = true;
+
       });
     },
+    // 鎵撳紑淇敼缁勪欢寮圭獥
+   
     //鍏抽棴缂栬緫椤甸潰
     editGyClose(val) {
       this.editShow = false;
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
index 876016f..34bd751 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -723,37 +723,37 @@
           this.form.HExplanation =data.鎽樿
           this.form.HInnerBillNo= data.鍐呴儴鍗曟嵁鍙�
           
-          //瀛愯〃  璧嬪��
-          // for (var i = 0; i < result.data.length; i++) {
-          //   this.editData.push(
-          //     {
-          //       "HMaterID": result.data[i].HMaterID
-          //       , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
-          //       , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
-          //       , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
-          //       , "HUnitID": result.data[i].HUnitID
-          //       , "璁¢噺鍗曚綅": result.data[i].璁¢噺鍗曚綅
-          //       , "HQtyMust": result.data[i].搴旀敹鏁伴噺
-          //       , "HQty": result.data[i].瀹炴敹鏁伴噺
-          //       , "HRemark": result.data[i].琛ㄤ綋澶囨敞
-          //       , "HPrice": result.data[i].鍗曚环
-          //       , "HMoney": result.data[i].閲戦
-          //       , "HOrderPrice": result.data[i].閲囪喘閲戦
-          //       , "HWHID": result.data[i].HWHID
-          //       , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
-          //       , "HSPID": result.data[i].HSPID
-          //       , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
-          //       , "HBatchNo": result.data[i].鎵规
-          //       , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿    //婧愬崟鍙�
-          //       , "HSourceBillType": result.data[i].婧愬崟绫诲瀷   //婧愬崟绫诲瀷
-          //       , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�   //婧愬崟涓诲唴鐮�
-          //       , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�     //婧愬崟瀛愬唴鐮�
-          //       , "HTaxRate": result.data[i].绋庣巼
-          //       , "HTaxPrice": result.data[i].鍚◣鍗曚环
-          //       , "HlineTotal": result.data[i].鍚◣閲戦
-          //     }
-          //   )
-          // }
+          // 瀛愯〃  璧嬪��
+          for (var i = 0; i < result.data.length; i++) {
+            this.editData.push(
+              {
+                "HMaterID": result.data[i].HMaterID
+                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
+                , "鐗╂枡鍚嶇О": result.data[i].鐗╂枡鍚嶇О
+                , "瑙勬牸鍨嬪彿": result.data[i].瑙勬牸鍨嬪彿
+                , "HUnitID": result.data[i].HUnitID
+                , "璁¢噺鍗曚綅": result.data[i].璁¢噺鍗曚綅
+                , "HQtyMust": result.data[i].搴旀敹鏁伴噺
+                , "HQty": result.data[i].瀹炴敹鏁伴噺
+                , "HRemark": result.data[i].琛ㄤ綋澶囨敞
+                , "HPrice": result.data[i].鍗曚环
+                , "HMoney": result.data[i].閲戦
+                , "HOrderPrice": result.data[i].閲囪喘閲戦
+                , "HWHID": result.data[i].HWHID
+                , "鏀舵枡浠撳簱": result.data[i].鏀舵枡浠撳簱
+                , "HSPID": result.data[i].HSPID
+                , "浠撲綅鍚嶇О": result.data[i].浠撲綅鍚嶇О
+                , "HBatchNo": result.data[i].鎵规
+                , "HSourceBillNo": result.data[i].婧愬崟鍗曞彿    //婧愬崟鍙�
+                , "HSourceBillType": result.data[i].婧愬崟绫诲瀷   //婧愬崟绫诲瀷
+                , "HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�   //婧愬崟涓诲唴鐮�
+                , "HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�     //婧愬崟瀛愬唴鐮�
+                , "HTaxRate": result.data[i].绋庣巼
+                , "HTaxPrice": result.data[i].鍚◣鍗曚环
+                , "HlineTotal": result.data[i].鍚◣閲戦
+              }
+            )
+          }
 
           if (data.鐘舵�� != '鍒涘缓' && this.copyType != 1) {
             this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵�侊紝涓嶈兘淇敼");
diff --git a/src/views/sell/XsSeOutStockBackBillEdit.vue b/src/views/sell/XsSeOutStockBackBillEdit.vue
index 4960eb4..74c215d 100644
--- a/src/views/sell/XsSeOutStockBackBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBackBillEdit.vue
@@ -414,7 +414,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "SellOutBill",
+  name: "XsSeOutStockBackBillEdit",
   components: { Dept, Warehouse, Material, RowSettings },
   props: {
     OperationType: { type: Number },
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index f73c289..7e8ac2f 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -15,6 +15,8 @@
             type="date"
             placeholder="寮�濮嬫棩鏈�"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -24,6 +26,8 @@
             type="date"
             placeholder="缁撴潫鏃ユ湡"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -624,7 +628,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "GySource",
+  name: "XsSeOutStockBackBillList",
   components: { RowSettings },
   props: {
     openPage: { type: String },
@@ -632,7 +636,7 @@
   data() {
     return {
       activeSeach: "",
-      HModName: "Cg_POOrderBillList",
+      HModName: "XsSeOutStockBackBillList",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -641,7 +645,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "1105",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -673,6 +677,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰鏃堕棿", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -691,7 +696,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -878,6 +882,10 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        // 浠绘剰鏃堕棿
+        return;
+      }
       const end = dayjs(new Date()).format("YYYY-MM-DD");
       const start = dayjs(new Date())
         .subtract(this.queryParams.HInitTimeCycle, "d")
@@ -953,7 +961,7 @@
         let res = await axios.get(this.baseURL + "/Xs_SeOutStockBackBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             Organization: HOrgName,
             page: this.page,
             size: this.pageSize,
@@ -1042,7 +1050,12 @@
             }
           }
           option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
         }
       } catch (err) {
         this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1335,7 +1348,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1424,7 +1437,7 @@
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,
                   HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
+                  user: sessionStorage["HUserName"],
                 },
               })
               .then((res) => {
@@ -1450,7 +1463,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
-          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            TypeError: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1475,7 +1492,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1503,7 +1520,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1529,7 +1546,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1551,7 +1568,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1617,7 +1638,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 3ee1ef7..dd2c4ce 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -15,6 +15,8 @@
             type="date"
             placeholder="寮�濮嬫棩鏈�"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -24,6 +26,8 @@
             type="date"
             placeholder="缁撴潫鏃ユ湡"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -66,7 +70,7 @@
               v-for="(item, index) in organizationList"
               :key="index"
               :label="item.Name"
-              :value="item.ID"
+              :value="item.ID.toString()"
             >
             </el-option>
           </el-select>
@@ -631,7 +635,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "GySource",
+  name: "XsSeOutStockBill",
   components: { RowSettings },
   props: {
     openPage: { type: String },
@@ -640,7 +644,7 @@
     return {
       iframeUrl: "",
       activeSeach: "",
-      HModName: "Cg_POOrderBillList",
+      HModName: "XsSeOutStockBill",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -649,7 +653,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "1402",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -681,6 +685,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰闂撮殧", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -699,7 +704,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -718,7 +722,7 @@
       dateRange: [],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        HOrgID: null,
+        HOrgID: sessionStorage["OrganizationID"],
         HName: null,
         HNumber: null,
         Comparator1: "",
@@ -798,7 +802,6 @@
     };
   },
   created() {
-    this.queryParams.HOrgID = sessionStorage["OrganizationID"];
     this.riqiChange();
     this.getList();
   },
@@ -887,6 +890,9 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        return;
+      }
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -954,13 +960,13 @@
         this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
       }
       let Organization = this.organizationList.find(
-        (e) => (e.ID = this.queryParams.HOrgID)
+        (e) => e.ID == this.queryParams.HOrgID
       )?.Name;
       try {
         let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             Organization: Organization,
             page: this.page,
             size: this.pageSize,
@@ -1049,7 +1055,12 @@
             }
           }
           option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
         }
       } catch (err) {
         this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1354,7 +1365,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1443,7 +1454,7 @@
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,
                   HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
+                  user: sessionStorage["HUserName"],
                 },
               })
               .then((res) => {
@@ -1469,7 +1480,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
-          params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            TypeError: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1494,7 +1509,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1522,7 +1537,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1548,7 +1563,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1570,7 +1585,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1636,7 +1655,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/sell/XsSeOutStockBillEdit.vue b/src/views/sell/XsSeOutStockBillEdit.vue
index 0824847..b2eaeb2 100644
--- a/src/views/sell/XsSeOutStockBillEdit.vue
+++ b/src/views/sell/XsSeOutStockBillEdit.vue
@@ -431,7 +431,7 @@
 import dayjs from "dayjs";
 
 export default {
-  name: "SellOutBill",
+  name: "XsSeOutStockBillEdit",
   components: { Dept, Warehouse, Material, RowSettings },
   props: {
     OperationType: { type: Number },
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index e94af0f..e97661f 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -304,6 +304,9 @@
           >鎵撳嵃</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single" @click="get_BarCodeDetail">鏉$爜鏄庣粏</el-button>
+      </el-col>
     </el-row>
     <div class="tableBox" v-loading="loading">
       <el-table
@@ -412,6 +415,8 @@
         />
         <!-- <div>111</div> -->
       </el-dialog>
+      <!-- 鏉$爜鏄庣粏 -->
+      <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail"/>
     </div>
   </div>
 </template>
@@ -421,11 +426,12 @@
 import RowSettings from "@/views/component/rowSettings";
 import Edit from "@/views/sell/sellOut/sellOutBillEdit";
 import PrintList from "@/views/component/printList";
+import BarCodeDetail from '@/views/component/BarCodeDetail'               //鏉$爜鏄庣粏缁勪欢
 import moment from "moment";
 
 export default {
   name: "SellOutBill",
-  components: { RowSettings, Edit, PrintList },
+  components: { RowSettings, Edit, PrintList,BarCodeDetail },
   data() {
     return {
       activeSeach: "",
@@ -435,6 +441,7 @@
       tableShow: true,
       openPrintList: false,
       printListShow: false,
+      barCodeDetailShow: false,                             //鏉$爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -1131,6 +1138,19 @@
       }
       //  var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
     },
+    //#region 鏉$爜鏄庣粏
+    get_BarCodeDetail() {
+      // if (this.selectedRow.length !== 1) {
+      //   this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
+      //   return
+      // }
+      this.barCodeDetailShow = true
+      this.$nextTick(() => {
+        this.$refs.barcodeDetail.open(this.rowForm)
+      })
+		},
+    //#endregion
+
 
     //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
     defaintOperationByCompanyName() {
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index b8e751c..f30edcf 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -15,6 +15,8 @@
             type="date"
             placeholder="寮�濮嬫棩鏈�"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -24,6 +26,8 @@
             type="date"
             placeholder="缁撴潫鏃ユ湡"
             style="width: 150px"
+            :disabled="queryParams.HInitTimeCycle != -1"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>
@@ -613,11 +617,9 @@
 import axios from "axios";
 import RowSettings from "@/views/component/rowSettings";
 import dayjs from "dayjs";
-import { computed } from "vue";
-import { watch } from "vue";
 
 export default {
-  name: "GySource",
+  name: "xsSeOrderBill",
   components: { RowSettings },
   props: {
     openPage: { type: String },
@@ -626,7 +628,7 @@
     return {
       iframeUrl: "",
       activeSeach: "",
-      HModName: "Cg_POOrderBillList",
+      HModName: "xsSeOrderBill",
       editShow: false,
       openEdit: false,
       totalNameList: [],
@@ -635,7 +637,7 @@
       openPrintList: false,
       printListShow: false,
       HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
-      HBillType: "1202",
+      HBillType: "1401",
       openBtnHide: false,
       btnHideShow: false,
       rowHideShow: false,
@@ -667,6 +669,7 @@
         { label: "杩�30澶�", value: 29 },
         { label: "杩戝崐骞�", value: 180 },
         { label: "杩戜竴骞�", value: 365 },
+        { label: "浠绘剰鏃ユ湡", value: -1 },
       ],
       hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
       addBtnShow: false,
@@ -685,7 +688,6 @@
       OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
       HInterID: null,
       baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
-      user: "admin",
       currentRow: [],
       lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
       lastSelectedRow: null, // 涓婁竴娆¢�変腑鐨勮
@@ -869,6 +871,10 @@
       this.getList();
     },
     riqiChange() {
+      if (this.queryParams.HInitTimeCycle == -1) {
+        // 闅忔剰鏃ユ湡涓嶈绠�
+        return;
+      }
       const end = new Date();
       const start = new Date();
       start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -919,35 +925,6 @@
       this.dbEmitData(this.deptform, this.dialogTypeNum);
       this.deptform = {};
     },
-    fetchData() {
-      //鐧诲綍鐢ㄦ埛淇℃伅
-      axios
-        .get(
-          "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
-        )
-        .then((res) => {
-          let data = res.data.data[0];
-          this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔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;
@@ -965,7 +942,7 @@
         let res = await axios.get(this.baseURL + "Xs_SeOrderBill/list_ByPage", {
           params: {
             sWhere: this.sWhere,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             Organization: sessionStorage["Organization"],
             page: this.page,
             size: this.pageSize,
@@ -1054,7 +1031,12 @@
             }
           }
           option.data = result;
-          this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+          this.DisPlay_HideColumn(
+            this.HModName,
+            sessionStorage["HUserName"],
+            option,
+            this.dataList
+          );
         }
       } catch (err) {
         this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1354,7 +1336,7 @@
         .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
           params: {
             HModName: this.HModName,
-            user: this.user,
+            user: sessionStorage["HUserName"],
             HOrgID: this.zuzhiId,
           },
         })
@@ -1442,7 +1424,7 @@
                   HQty: this.rowForm.HQty,
                   HSourceInterID: this.rowForm.HSourceInterID,
                   HSourceEntryID: this.rowForm.HSourceEntryID,
-                  user: this.user,
+                  user: sessionStorage["HUserName"],
                 },
               })
               .then((res) => {
@@ -1468,7 +1450,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Cg_POInStockBill/AuditCg_POInStockBill", {
-          params: { HInterID: InterID, IsAudit: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsAudit: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1493,7 +1479,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1521,7 +1507,7 @@
               HInterID: HInterID,
               HEntryID: HEntryID,
               ISAudit: num,
-              CurUserName: this.user,
+              CurUserName: sessionStorage["HUserName"],
             },
           }
         );
@@ -1547,7 +1533,7 @@
             params: {
               HInterID: HInterID,
               Type: num,
-              user: this.user,
+              user: sessionStorage["HUserName"],
             },
           }
         );
@@ -1569,7 +1555,11 @@
       //閫昏緫瀹℃牳鏂规硶
       axios
         .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
-          params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+          params: {
+            HInterID: InterID,
+            IsStop: num,
+            CurUserName: sessionStorage["HUserName"],
+          },
         })
         .then((res) => {
           let result = res.data;
@@ -1635,7 +1625,7 @@
         }
       }
       var sSubStr = JSON.stringify(num);
-      var sMainSub = sSubStr + "&鍜�" + this.user;
+      var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
       axios({
         method: "post",
         url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue
new file mode 100644
index 0000000..3331bf6
--- /dev/null
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill copy.vue
@@ -0,0 +1,1088 @@
+<template>
+    <div v-loading="formLoading" v-if="formShow" style="margin: 10px;">
+        <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+            <el-button type="primary">棰勮鎵撳嵃</el-button>
+            <el-button type="primary">鐢熸垚</el-button>
+            <el-button type="primary">閲嶇疆</el-button>
+            <el-button type="primary">搴撳瓨</el-button>
+            <el-button type="primary">鍚屾璧勬枡</el-button>
+            <el-button type="primary">鎵规</el-button>
+            <el-button type="primary" @click="close">閫� 鍑�</el-button>
+        </div>
+        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗f缂栬緫</div>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="缁勭粐" prop="HOrgID">
+                        <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange"
+                            style="width: 100%">
+                            <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="宸ュ巶浠g爜" prop="HWorksNumber">
+                        <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
+                            <el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
+                                :value="item">
+                            </el-option>
+                        </el-select>
+                    </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"
+                            style="width: 100%"> </el-date-picker>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+                        <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%"
+                            @change="HSourceBillTypeChange">
+                            <el-option v-for="(item, index) in HSourceBillTypeList" :key="index" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
+                        <el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
+                            <el-button slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="鏉$爜绫诲瀷" prop="HBarCodeType">
+                        <el-select v-model="form.HBarCodeType" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option v-for="(item, index) in HBarCodeTypeList" :key="index" :label="item"
+                                :value="item">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-tabs type="border-card">
+                <el-tab-pane label="鐗╂枡淇℃伅">
+                    <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="handleCopyZbRow"
+                            size="mini">澶嶅埗涓�琛�</el-button>
+                    </div>
+                    <el-table :data="editWlxxData" style="width: 100%" height="480" width="100%" ref="wlxxzbTable"
+                        @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
+                        <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+                        <template v-for="(item, index) in wlxxBtList">
+                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+                                :key="index" show-overflow-tooltip v-if="!item.hide">
+                                <template slot-scope="{row,  column }">
+                                    <div :style="item.style">
+                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+                                            :min="0" controls-position="right" style="width: 100%;" />
+                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+                                            style="width: 100%"> </el-date-picker>
+                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
+                                            v-model="row[column.label]"></el-checkbox>
+                                        <span v-else>{{ row[column.label] }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </template>
+                        <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-tab-pane>
+                <el-tab-pane label="鏉$爜淇℃伅">
+                    <el-table :data="editTmData" style="width: 100%" height="480" width="100%" ref="tbzbTable"
+                        @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
+                        <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+                        <template v-for="(item, index) in tmBtList">
+                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+                                :key="index" show-overflow-tooltip v-if="!item.hide">
+                                <template slot-scope="{row,  column }">
+                                    <div :style="item.style">
+                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+                                            :min="0" controls-position="right" style="width: 100%;" />
+                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+                                            style="width: 100%"> </el-date-picker>
+                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
+                                            v-model="row[column.label]"></el-checkbox>
+                                        <span v-else>{{ row[column.label] }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </template>
+                        <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-tab-pane>
+                <el-tab-pane label="妗f鍒楄〃"><el-table :data="editDaData" style="width: 100%" height="480" width="100%"
+                        ref="dazbTable" @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex"
+                        border>
+                        <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+                        <template v-for="(item, index) in daBtList">
+                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+                                :key="index" show-overflow-tooltip v-if="!item.hide">
+                                <template slot-scope="{row,  column }">
+                                    <div :style="item.style">
+                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+                                            :min="0" controls-position="right" style="width: 100%;" />
+                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+                                            style="width: 100%"> </el-date-picker>
+                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
+                                            v-model="row[column.label]"></el-checkbox>
+                                        <span v-else>{{ row[column.label] }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </template>
+                        <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-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" />
+            <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+            <ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
+            <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 GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
+import moment from 'moment';
+
+export default {
+    name: 'Gy_BarCodeBill',
+    components: { Dept, Warehouse, Material, RowSettings, GyEmployee, ScICMOBillList },
+    props: {
+        OperationType: { type: Number, },
+        linterid: { type: Number, },
+        HSouceBillType: { type: String, },
+        propsData: { type: String, },
+        copyType: { type: Number, },
+    },
+    data() {
+        return {
+            HModName: "Gy_BarCodeBill",
+            openNum: 10,
+            zbDataShow:true,
+            HSourceBillTypeList: [
+                { value: 1, label: '鐢熶骇璁㈠崟', },
+                { value: 2, label: '鐢熶骇姹囨姤鍗�', },
+                { value: 3, label: '閲囪喘璁㈠崟', },
+                { value: 4, label: '鏀舵枡閫氱煡鍗�', },
+                { value: 5, label: '濮斿璁㈠崟', },
+                { value: 6, label: '鐢熶骇鍏ュ簱鍗�', },
+                { value: 7, label: '閲囪喘鍏ュ簱鍗�', },
+                { value: 8, label: '閿�鍞��璐у崟', },
+                { value: 9, label: '鐢熶骇閫�鏂欏崟', },
+                { value: 10, label: '宸ュ簭娴佽浆鍗�', },
+                { value: 11, label: '閿�鍞嚭搴撳崟', },
+                { value: 12, label: '棰嗘枡鍑哄簱鍗�', }
+            ],
+            wlxxBtList: [{ field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
+                , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+                , { field: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
+                , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterNumber', width: 200 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+                , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
+                , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
+                , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
+                , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
+                , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+                , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
+                , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
+                , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
+                , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
+                , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+                , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
+                , { field: 'HQty', title: '鏁伴噺', edit: 'number', width: 100, totalRow: true }
+                , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'number', totalRow: true, width: 100 }
+                , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
+                , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
+                , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+                , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+                , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+                , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+                , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', edit: 'date', event: 'HProduceDate', width: 160 }
+                , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', edit: 'date', event: 'HExpiryDate', width: 160 }
+                , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
+                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
+                , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
+                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
+                , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
+                , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
+                , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 120, edit: 'checkbox', templet: '#switchTp3', unresize: false }
+                , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, edit: 'checkbox', templet: '#switchTpl', unresize: false }
+                , { field: 'HDate', title: '鏉$爜鏃ユ湡', width: 100, hide: true }
+            ],
+            tmBtList: [
+                { field: 'HBarCode2', title: '鏉$爜缂栧彿', width: 100 }
+                , { field: 'HMaterNumber2', title: '鐗╂枡浠g爜', width: 100 }
+                , { field: 'HMaterName2', title: '鐗╂枡鍚嶇О', width: 100 }
+                , { field: 'HMaterModel2', title: '瑙勬牸鍨嬪彿', width: 100 }
+                , { field: 'HAuxPropNumber2', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
+                , { field: 'HAuxPropName2', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
+                , { field: 'HGiveAwayFlag2', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
+                , { field: 'HUnitCode2', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                , { field: 'HUnitName2', title: '璁¢噺鍗曚綅', width: 120 }
+                , { field: 'HQty2', title: '鏁伴噺', width: 120 }
+                , { field: 'HDate2', title: '杩涙枡鏃ユ湡', width: 120 }
+                , { field: 'HCusNumber2', title: '瀹㈡埛浠g爜', width: 120 }
+                , { field: 'HCusName2', title: '瀹㈡埛', width: 120 }
+                , { field: 'HSourceBillNo2', title: '婧愬崟鍗曞彿', width: 120 }
+                , { field: 'HSeOrderBillNo2', title: '閿�鍞鍗曞彿', width: 120 }
+                , { field: 'HRemark2', title: '澶囨敞', width: 120 }
+                , { field: 'HMTONo2', title: '璁″垝璺熻釜鍙�', width: 120 }
+                , { field: 'HShowDate2', title: '鏃ユ湡', width: 100 }
+                , { field: 'HInnerBillNo2', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
+                , { field: 'HMaker2', title: '鍒跺崟浜�', width: 100 }
+            ],
+            daBtList: [
+                { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
+                , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
+                , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
+                , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
+                , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
+                , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
+                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
+                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
+                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
+                , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
+                , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
+                , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
+                , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
+                , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
+                , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
+                , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
+                , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
+                , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                , { field: '瀹㈡埛鏉$爜缂栧彿', title: '瀹㈡埛鏉$爜缂栧彿', width: 120 }
+                , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 120 }
+                , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 120 }
+                , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 120 }
+                , { field: '閿�鍞鍗曡鍙�', title: '閿�鍞鍗曡鍙�', width: 120 }
+                , { field: '鎵樺彿', title: '鎵樺彿', width: 120 }
+                , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 100 }
+                , { field: '鏉$爜鏃ユ湡', title: '鏉$爜鏃ユ湡', width: 120 }
+                , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 120 }
+                , { field: '鐢熶骇鍏ュ簱鍗曞彿', title: '鐢熶骇鍏ュ簱鍗曞彿', width: 120 }
+                , { field: '鐢熶骇鍏ュ簱娆℃暟', title: '鐢熶骇鍏ュ簱娆℃暟', width: 100 }
+                , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 120 }
+                , { field: '閿�鍞嚭搴撳崟鍙�', title: '閿�鍞嚭搴撳崟鍙�', width: 120 }
+                , { field: '閿�鍞嚭搴撴鏁�', title: '閿�鍞嚭搴撴鏁�', width: 100 }
+                , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
+                , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
+                , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
+                , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+                , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
+                , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
+                , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
+                , { field: '鐢熸垚缁勭粐', title: '鐢熸垚缁勭粐', width: 120 }
+            ],
+            HBarCodeTypeList: [],
+            HWorksNumberList: [],
+            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,//鐗╂枡鏁版嵁缁勪欢
+            gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+            ScICMOBillShow: false,
+            deptform: {},//寮圭獥閫変腑鏁版嵁
+            openData: false,//鏁版嵁寮圭獥
+            dialogTitle: '',
+            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+            subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+            // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+            HInterID: null,
+            baseURL: process.env.VUE_APP_BASE_API,
+            checkedSysZb: [],
+            editWlxxData: [],//瀛愯〃
+            editTmData: [],
+            editDaData: [],
+            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.set_HBarCodeType()
+        this.getdata()
+    },
+    methods: {
+        HSourceBillTypeChange(val) {
+            if (val == 1) {
+                this.openNum == 10
+            }
+        },
+        set_HBarCodeType() {
+            //鑾峰彇鏉$爜绫诲瀷浠g爜
+            axios.get(this.baseURL + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
+                console.log(response)
+                let result = response.data
+                if (result.count == 1) {
+                    this.HBarCodeTypeList = result.list
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+            axios.get(this.baseURL + '/Sc_BarCode/GetHWorksNumberBill').then(response => {
+                console.log(response)
+                let result = response.data
+                if (result.count == 1) {
+                    this.HWorksNumberList = result.list
+                }
+            }).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.editWlxxData.push(
+                                    {
+                                        "HMaterID": dataArray[i].HMaterID
+                                        , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                        , "鐗╂枡鍚嶇О": 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
+        },
+
+        organizationChange(val) {
+            // let options=undefined
+            //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+        },
+        //閮ㄩ棬寮圭獥璧嬪��
+        dbEmitData(deptRow, num) {
+            // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+            console.log(deptRow)
+            if (deptRow.length>0) {
+                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].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
+                    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 if (num == 10) {
+                    this.zbDataShow=false
+                    let data=deptRow
+                    this.editWlxxData=[]
+                    for (var i = 0; i < data.length; i++) {                        
+                        this.editWlxxData.push({
+                            "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+                            , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+                            , "HUnitNumber": data[i].璁¢噺鍗曚綅浠g爜, "HUnitName": data[i].璁¢噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+                            , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+                            , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+                            , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": moment(new Date()).format('YYYY-MM-DD')
+                            , "HExpiryDate": moment(new Date()).format('YYYY-MM-DD'), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+                            , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+                            , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+                            , "HCheckEmpName": ""
+                        })
+                    }
+                    console.log( this.editWlxxData)
+                    this.ScICMOBillShow = false
+                    this.zbDataShow=true
+                    this.openData = false
+                }
+            } else {
+                this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
+            }
+
+        },
+        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 = {
+                HOrgID: sessionStorage["OrganizationID"] - 0,
+                HWorksNumber: '',
+                HDate: moment(new Date()).format('YYYY-MM-DD'),
+                HSourceBillType: 1,
+                HSourceBillNo: '',
+                HBarCodeType: '',
+            }
+            this.editWlxxData = []
+            this.editBtData = []
+            this.ids = []
+            this.subDisabled = false
+            this.addBtnShow = false
+            // this.$refs.tableData.clearSelection()
+            this.activeName = 'first'
+            this.resetForm("form");
+        },
+        //閫�鍑�
+        close() {
+            this.reset()
+            console.log(1111)
+            console.log(this.$route.path)
+            if (!this.OperationType && !this.copyType) {
+                console.log(this.$route.path)
+                const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+                this.$tab.closePage(obj).then(res => {
+                    const latestView = res.visitedViews.slice(-1)[0]
+                    if (latestView) {
+                        this.$router.push(latestView.fullPath)
+                    } else {
+                        if (obj.name === 'Dashboard') {
+                            this.$router.replace({ path: '/redirect' + obj.fullPath })
+                        } else {
+                            this.$router.push('/')
+                        }
+                    }
+                });
+            } 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.handleAddSysZb()
+            this.$nextTick(() => {
+                this.formShow = true
+                this.formLoading = false
+            })
+        },
+        //鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
+        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) {
+                        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.editWlxxData.push(
+                            {
+                                "HMaterID": result.data[i].HMaterID
+                                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
+                                , "鐗╂枡鍚嶇О": 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("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+        wlxxzbRowSysZbIndex({ row, rowIndex }) {
+            row.index = rowIndex + 1;
+        },
+        /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+        handleAddSysZb(index, num) {
+            if (num == 1 && !index) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+            } else {
+                let obj = {
+                    HMainID: 0,
+                    HSubID: 0,
+                    HSourceBillSEQ: '',
+                    HBillNo: '',
+                    HMaterID: '',
+                    HMaterNumber: '',
+                    HMaterName: '',
+                    HMaterModel: '',
+                    HCusModel: '',
+                    HCusMaterName: '',
+                    HEmpID: 0,
+                    HEmpNumber: '',
+                    HEmpName: '',
+                    HGroupID: 0,
+                    HGroupNumber: '',
+                    HGroupName: '',
+                    HCheckEmpName: '',
+                    HBatchNo: '',
+                    HMTONo: '',
+                    HQty: 0,
+                    HMinQty: 0,
+                    HBQty: 0,
+                    HPackQty: '',
+                    HCoilNO: '',
+                    HFurnaceNO: '',
+                    HFactory: '',
+                    HCusID: 0,
+                    HCusNumber: '',
+                    HCusName: '',
+                    HSeOrderBillNo: '',
+                    HRemark: '',
+                    HProduceDate: this.form.HDate,
+                    HExpiryDate: this.form.HDate,
+                    HheatNO: '',
+                    HAuxPropID: 0,
+                    HAuxPropNumber: '',
+                    HAuxPropName: '',
+                    HUnitID: 0,
+                    HUnitNumber: '',
+                    HUnitName: '',
+                    HAuxQty: '',
+                    HExpirationDateFlag: '',
+                    HGiveAwayFlag: '',
+                    HDate: this.form.HDate,
+                }
+                if (index) {
+                    this.editWlxxData.splice(index, 0, obj);
+                    this.$set(this.editWlxxData, index, obj)
+                } else {
+                    this.editWlxxData.push(obj);
+                }
+            }
+        },
+        handleCopyZbRow() {
+            if (!this.zbIndex) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+            } else {
+                let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+                this.editWlxxData.push(copyRow);
+            }
+        },
+        /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+        handleDeleteSysZb(row) {
+            this.checkedSysZb = []
+            this.checkedSysZb.push(row.index)
+            if (this.checkedSysZb.length == 0) {
+                this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+            } else {
+                const editWlxxData = this.editWlxxData;
+                const checkedSysZb = this.checkedSysZb;
+                this.editWlxxData = editWlxxData.filter(function (item) {
+                    return checkedSysZb.indexOf(item.index) == -1
+                });
+            }
+        },
+        /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+        handleTableWlxxZbEdit(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.wlxxzbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+            }
+        },
+        showReset() {
+            this.deptShow = false
+            this.warehouseShow = false
+            this.materialShow = false
+            this.gyEmployeeShow = false
+            this.ScICMOBillShow = false
+        },
+        //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+        openDataDialog(num, row) {
+            //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+            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.gyEmployeeShow = true
+                this.openData = true
+            } else if (num == 10) {
+                this.dialogTitle = '鐢熶骇璁㈠崟鍒楄〃'
+                this.ScICMOBillShow = true
+                this.openData = true
+            }
+        },
+    }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 41a40c8..1bb21c8 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -1 +1,1238 @@
-<template></template>
\ No newline at end of file
+<template>
+    <div v-loading="formLoading" v-if="formShow" style="margin: 10px;">
+        <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
+            <el-button type="primary">棰勮鎵撳嵃</el-button>
+            <el-button type="primary">鐢熸垚</el-button>
+            <el-button type="primary">閲嶇疆</el-button>
+            <el-button type="primary">搴撳瓨</el-button>
+            <el-button type="primary">鍚屾璧勬枡</el-button>
+            <el-button type="primary">鎵规</el-button>
+            <el-button type="primary" @click="close">閫� 鍑�</el-button>
+        </div>
+        <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗f缂栬緫</div>
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="缁勭粐" prop="HOrgID">
+                        <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange"
+                            style="width: 100%">
+                            <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="宸ュ巶浠g爜" prop="HWorksNumber">
+                        <el-select v-model="form.HWorksNumber" placeholder="璇烽�夋嫨缁勭粐" style="width: 100%">
+                            <el-option v-for="(item, index) in HWorksNumberList" :key="index" :label="item"
+                                :value="item">
+                            </el-option>
+                        </el-select>
+                    </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"
+                            style="width: 100%"> </el-date-picker>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="6">
+                    <el-form-item label="婧愬崟绫诲瀷" prop="HSourceBillType">
+                        <el-select v-model="form.HSourceBillType" placeholder="璇烽�夋嫨" style="width: 100%"
+                            @change="HSourceBillTypeChange">
+                            <el-option v-for="(item, index) in HSourceBillTypeList" :key="index" :label="item.label"
+                                :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
+                        <el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
+                            <el-button slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
+                        </el-input>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                    <el-form-item label="鏉$爜绫诲瀷" prop="HBarCodeType">
+                        <el-select v-model="form.HBarCodeType" placeholder="璇烽�夋嫨" style="width: 100%">
+                            <el-option v-for="(item, index) in HBarCodeTypeList" :key="index" :label="item"
+                                :value="item">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+            </el-row>
+            <el-tabs type="border-card">
+                <el-tab-pane label="鐗╂枡淇℃伅">
+                    <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="handleCopyZbRow"
+                            size="mini">澶嶅埗涓�琛�</el-button>
+                    </div>
+                    <el-table :data="editWlxxData" style="width: 100%" height="480" width="100%" ref="wlxxzbTable"
+                        @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
+                        <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed show-overflow-tooltip/>
+                        <el-table-column align="center" label="婧愬崟鍗曞彿" prop="HBillNo" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HBillNo }} </template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐗╂枡浠g爜" prop="HMaterNumber" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HMaterNumber" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐗╂枡鍚嶇О" prop="HMaterName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HMaterName }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="瑙勬牸鍨嬪彿" prop="HMaterModel" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HMaterModel }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="瀹㈡埛瑙勬牸鍨嬪彿" prop="HCusModel" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HCusModel" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="瀹㈡埛鐗╂枡鍚嶇О" prop="HCusMaterName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"> <el-input v-model="scope.row.HCusMaterName" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鎿嶄綔鍛樹唬鐮�" prop="HEmpNumber" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"> <el-input v-model="scope.row.HEmpNumber" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鎿嶄綔鍛�" prop="HEmpName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HEmpName }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐝粍浠g爜" prop="HGroupNumber" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HGroupNumber" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐝粍鍚嶇О" prop="HGroupName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HGroupName }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="妫�楠屽憳" prop="HCheckEmpName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HCheckEmpName" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鎵瑰彿" prop="HBatchNo" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HBatchNo" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="璁″垝璺熻釜鍙�" prop="HMTONo" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HMTONo" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鏁伴噺" prop="HQty" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <el-input-number v-model="scope.row.HQty" :min="0" controls-position="right"
+                                    style="width: 100%;" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鏈�灏忓寘瑁呮暟" prop="HMinQty" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <el-input-number v-model="scope.row.HMinQty" :min="0" controls-position="right"
+                                    style="width: 100%;" />
+                            </template>
+                        </el-table-column>
+                        <el-table-column align="center" label="绠辨暟" prop="HBQty" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HBQty }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="澶栫鏁�" prop="HPackQty" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HPackQty" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="閽㈠嵎鎹嗗寘鍙�" prop="HCoilNO" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HCoilNO" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐐夊彿" prop="HFurnaceNO" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HFurnaceNO" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鍘傚晢" prop="HFactory" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HFactory" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="瀹㈡埛浠g爜" prop="HCusNumber" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HCusNumber" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="瀹㈡埛鍚嶇О" prop="HCusName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HCusName }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="閿�鍞鍗曞彿" prop="HSeOrderBillNo" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HSeOrderBillNo }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="澶囨敞" prop="HRemark" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HRemark }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐢熶骇鏃ユ湡" prop="HProduceDate" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <el-date-picker v-model="scope.row.HProduceDate" type="date" placeholder="閫夋嫨鏃ユ湡"
+                                    value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
+                            </template>
+                        </el-table-column>
+                        <el-table-column align="center" label="淇濊川鏈熻嚦" prop="HExpiryDate" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <el-date-picker v-model="scope.row.HExpiryDate" type="date" placeholder="閫夋嫨鏃ユ湡"
+                                    value-format="yyyy-MM-dd" style="width: 100%"> </el-date-picker>
+                            </template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鐑鐞�" prop="HheatNO" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HheatNO" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="杈呭姪灞炴�т唬鐮�" prop="HAuxPropNumber" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HAuxPropNumber" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="杈呭姪灞炴�у悕绉�" prop="HAuxPropName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HAuxPropName }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="璁¢噺鍗曚綅浠g爜" prop="HUnitNumber" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HUnitNumber" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="璁¢噺鍗曚綅鍚嶇О" prop="HUnitName" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">{{ scope.row.HUnitName }}</template>
+                        </el-table-column>
+                        <el-table-column align="center" label="杈呭崟浣嶆暟閲�" prop="HAuxQty" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope"><el-input v-model="scope.row.HAuxQty" /></template>
+                        </el-table-column>
+                        <el-table-column align="center" label="鏄惁鍚敤淇濊川鏈�" prop="HExpirationDateFlag" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <el-checkbox v-model="scope.row.HExpirationDateFlag"></el-checkbox>
+                            </template>
+                        </el-table-column>
+                           <el-table-column align="center" label="鏄惁璧犲搧" prop="HGiveAwayFlag" width="120" show-overflow-tooltip>
+                            <template slot-scope="scope">
+                                <el-checkbox v-model="scope.row.HGiveAwayFlag"></el-checkbox>
+                            </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-tab-pane>
+                <el-tab-pane label="鏉$爜淇℃伅">
+                    <el-table :data="editTmData" style="width: 100%" height="480" width="100%" ref="tbzbTable"
+                        @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex" border>
+                        <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+                        <template v-for="(item, index) in tmBtList">
+                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+                                :key="index" show-overflow-tooltip v-if="!item.hide">
+                                <template slot-scope="{row,  column }">
+                                    <div :style="item.style">
+                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+                                            :min="0" controls-position="right" style="width: 100%;" />
+                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+                                            style="width: 100%"> </el-date-picker>
+                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
+                                            v-model="row[column.label]"></el-checkbox>
+                                        <span v-else>{{ row[column.label] }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </template>
+                        <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-tab-pane>
+                <el-tab-pane label="妗f鍒楄〃"><el-table :data="editDaData" style="width: 100%" height="480" width="100%"
+                        ref="dazbTable" @selection-change="handleTableWlxxZbEdit" :row-class-name="wlxxzbRowSysZbIndex"
+                        border>
+                        <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column align="center" label="搴忓彿" type="index" width="80" fixed />
+                        <template v-for="(item, index) in daBtList">
+                            <el-table-column align="center" :prop="item.field" :label="item.title" :width="item.width"
+                                :key="index" show-overflow-tooltip v-if="!item.hide">
+                                <template slot-scope="{row,  column }">
+                                    <div :style="item.style">
+                                        <el-input v-if="item.edit == 'text'" v-model="row[column.label]" />
+                                        <el-input-number v-else-if="item.edit == 'number'" v-model="row[column.label]"
+                                            :min="0" controls-position="right" style="width: 100%;" />
+                                        <el-date-picker v-else-if="item.edit == 'date'" v-model="row[column.label]"
+                                            type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT"
+                                            style="width: 100%"> </el-date-picker>
+                                        <el-checkbox v-else-if="item.edit == 'checkbox'"
+                                            v-model="row[column.label]"></el-checkbox>
+                                        <span v-else>{{ row[column.label] }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </template>
+                        <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-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" />
+            <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+            <ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
+            <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 GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import ScICMOBillList from '@/views/ICMO/ScICMOBillList.vue'
+import moment from 'moment';
+
+export default {
+    name: 'Gy_BarCodeBill',
+    components: { Dept, Warehouse, Material, RowSettings, GyEmployee, ScICMOBillList },
+    props: {
+        OperationType: { type: Number, },
+        linterid: { type: Number, },
+        HSouceBillType: { type: String, },
+        propsData: { type: String, },
+        copyType: { type: Number, },
+    },
+    data() {
+        return {
+            HModName: "Gy_BarCodeBill",
+            openNum: 10,
+            zbDataShow: true,
+            HSourceBillTypeList: [
+                { value: 1, label: '鐢熶骇璁㈠崟', },
+                { value: 2, label: '鐢熶骇姹囨姤鍗�', },
+                { value: 3, label: '閲囪喘璁㈠崟', },
+                { value: 4, label: '鏀舵枡閫氱煡鍗�', },
+                { value: 5, label: '濮斿璁㈠崟', },
+                { value: 6, label: '鐢熶骇鍏ュ簱鍗�', },
+                { value: 7, label: '閲囪喘鍏ュ簱鍗�', },
+                { value: 8, label: '閿�鍞��璐у崟', },
+                { value: 9, label: '鐢熶骇閫�鏂欏崟', },
+                { value: 10, label: '宸ュ簭娴佽浆鍗�', },
+                { value: 11, label: '閿�鍞嚭搴撳崟', },
+                { value: 12, label: '棰嗘枡鍑哄簱鍗�', }
+            ],
+            wlxxBtList: [{ field: 'HMainID', title: '婧愬崟涓诲唴鐮�', width: 100, hide: true }
+                , { field: 'HSubID', title: '婧愬崟瀛愬唴鐮�', width: 100, hide: true }
+                , { field: 'HSourceBillSEQ', title: '婧愬崟琛屽彿', width: 100, hide: true }
+                , { field: 'HBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', edit: 'text', event: 'HMaterNumber', width: 200 }
+                , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+                , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+                , { field: 'HCusModel', title: '瀹㈡埛瑙勬牸鍨嬪彿', edit: 'text', width: 200 }
+                , { field: 'HCusMaterName', title: '瀹㈡埛鐗╂枡鍚嶇О', edit: 'text', width: 200 }
+                , { field: 'HEmpID', title: '鎿嶄綔鍛業D', width: 100, hide: true }
+                , { field: 'HEmpNumber', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 200, event: 'HEmpNumber' }
+                , { field: 'HEmpName', title: '鎿嶄綔鍛�', width: 200 }
+                , { field: 'HGroupID', title: '鐝粍ID', width: 100, hide: true }
+                , { field: 'HGroupNumber', title: '鐝粍浠g爜', edit: 'text', width: 200, event: 'HGroupNumber' }
+                , { field: 'HGroupName', title: '鐝粍鍚嶇О', width: 200 }
+                , { field: 'HCheckEmpName', title: '妫�楠屽憳', width: 200, edit: 'text' }
+                , { field: 'HBatchNo', title: '鎵瑰彿', edit: 'text', width: 100 }
+                , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100, edit: 'text' }
+                , { field: 'HQty', title: '鏁伴噺', edit: 'number', width: 100, totalRow: true }
+                , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'number', totalRow: true, width: 100 }
+                , { field: 'HBQty', title: '绠辨暟', width: 100, totalRow: true }
+                , { field: 'HPackQty', title: '澶栫鏁�', edit: 'text', width: 100, totalRow: true }
+                , { field: 'HCoilNO', title: '閽㈠嵎鎹嗗寘鍙�', edit: 'text', width: 100 }
+                , { field: 'HFurnaceNO', title: '鐐夊彿', edit: 'text', width: 100 }
+                , { field: 'HFactory', title: '鍘傚晢', edit: 'text', width: 100 }
+                , { field: 'HCusID', title: '瀹㈡埛ID', width: 100, hide: true }
+                , { field: 'HCusNumber', title: '瀹㈡埛浠g爜', edit: 'text', event: 'HCusNumber', width: 120 }
+                , { field: 'HCusName', title: '瀹㈡埛鍚嶇О', width: 120 }
+                , { field: 'HSeOrderBillNo', title: '閿�鍞鍗曞彿', width: 200 }
+                , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+                , { field: 'HProduceDate', title: '鐢熶骇鏃ユ湡', edit: 'date', event: 'HProduceDate', width: 160 }
+                , { field: 'HExpiryDate', title: '淇濊川鏈熻嚦', edit: 'date', event: 'HExpiryDate', width: 160 }
+                , { field: 'HheatNO', title: '鐑鐞�', edit: 'text', width: 100 }
+                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                , { field: 'HAuxPropNumber', title: '杈呭姪灞炴�т唬鐮�', edit: 'text', event: 'HAuxPropNumber', width: 100 }
+                , { field: 'HAuxPropName', title: '杈呭姪灞炴�у悕绉�', width: 100 }
+                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                , { field: 'HUnitNumber', title: '璁¢噺鍗曚綅浠g爜', edit: 'text', event: 'HUnitNumber', width: 100 }
+                , { field: 'HUnitName', title: '璁¢噺鍗曚綅', width: 100 }
+                , { field: 'HAuxQty', title: '杈呭崟浣嶆暟閲�', edit: 'text', width: 100, totalRow: true }
+                , { field: 'HExpirationDateFlag', title: '鏄惁鍚敤淇濊川鏈�', width: 120, edit: 'checkbox', templet: '#switchTp3', unresize: false }
+                , { field: 'HGiveAwayFlag', title: '鏄惁璧犲搧', width: 100, edit: 'checkbox', templet: '#switchTpl', unresize: false }
+                , { field: 'HDate', title: '鏉$爜鏃ユ湡', width: 100, hide: true }
+            ],
+            tmBtList: [
+                { field: 'HBarCode2', title: '鏉$爜缂栧彿', width: 100 }
+                , { field: 'HMaterNumber2', title: '鐗╂枡浠g爜', width: 100 }
+                , { field: 'HMaterName2', title: '鐗╂枡鍚嶇О', width: 100 }
+                , { field: 'HMaterModel2', title: '瑙勬牸鍨嬪彿', width: 100 }
+                , { field: 'HAuxPropNumber2', title: '杈呭姪灞炴�т唬鐮�', width: 100 }
+                , { field: 'HAuxPropName2', title: '杈呭姪灞炴��', event: 'HWHCode', width: 120 }
+                , { field: 'HGiveAwayFlag2', title: '鏄惁璧犲搧', width: 120, templet: '#switchTpl', unresize: false }
+                , { field: 'HUnitCode2', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                , { field: 'HUnitName2', title: '璁¢噺鍗曚綅', width: 120 }
+                , { field: 'HQty2', title: '鏁伴噺', width: 120 }
+                , { field: 'HDate2', title: '杩涙枡鏃ユ湡', width: 120 }
+                , { field: 'HCusNumber2', title: '瀹㈡埛浠g爜', width: 120 }
+                , { field: 'HCusName2', title: '瀹㈡埛', width: 120 }
+                , { field: 'HSourceBillNo2', title: '婧愬崟鍗曞彿', width: 120 }
+                , { field: 'HSeOrderBillNo2', title: '閿�鍞鍗曞彿', width: 120 }
+                , { field: 'HRemark2', title: '澶囨敞', width: 120 }
+                , { field: 'HMTONo2', title: '璁″垝璺熻釜鍙�', width: 120 }
+                , { field: 'HShowDate2', title: '鏃ユ湡', width: 100 }
+                , { field: 'HInnerBillNo2', title: '鍐呴儴閲囪喘璁㈠崟鍙�', width: 100 }
+                , { field: 'HMaker2', title: '鍒跺崟浜�', width: 100 }
+            ],
+            daBtList: [
+                { field: 'HItemID', title: 'HItemID', width: 100, hide: true }
+                , { field: 'hmainid', title: 'hmainid', width: 100, hide: true }
+                , { field: 'hsubid', title: 'hsubid', width: 100, hide: true }
+                , { field: 'HinterID', title: 'HinterID', width: 100, hide: true }
+                , { field: '鏉$爜绫诲瀷', title: '鏉$爜绫诲瀷', width: 100 }
+                , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿', width: 120 }
+                , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+                , { field: '鐗╂枡浠g爜', title: '鐗╂枡浠g爜', width: 120 }
+                , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
+                , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120 }
+                , { field: 'HUnitID', title: '璁¢噺鍗曚綅ID', width: 100, hide: true }
+                , { field: '璁¢噺鍗曚綅浠g爜', title: '璁¢噺鍗曚綅浠g爜', width: 120 }
+                , { field: '璁¢噺鍗曚綅', title: '璁¢噺鍗曚綅', width: 120 }
+                , { field: 'HAuxPropID', title: '杈呭姪灞炴�D', width: 100, hide: true }
+                , { field: '杈呭姪灞炴�т唬鐮�', title: '杈呭姪灞炴�т唬鐮�', width: 120 }
+                , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', width: 120 }
+                , { field: '鎵瑰彿', title: '鎵瑰彿', width: 120 }
+                , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+                , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 120 }
+                , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 120 }
+                , { field: '鏄惁璧犲搧', title: '鏄惁璧犲搧', width: 100 }
+                , { field: 'DeptID', title: '杞﹂棿ID', width: 100, hide: true }
+                , { field: '杞﹂棿', title: '杞﹂棿', width: 120 }
+                , { field: 'HSupID', title: '渚涘簲鍟咺D', width: 100, hide: true }
+                , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120 }
+                , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 120 }
+                , { field: '瀹㈡埛鏉$爜缂栧彿', title: '瀹㈡埛鏉$爜缂栧彿', width: 120 }
+                , { field: '瀹㈡埛鍨嬪彿', title: '瀹㈡埛鍨嬪彿', width: 120 }
+                , { field: '寰�鏉ュ崟浣�', title: '寰�鏉ュ崟浣�', width: 120 }
+                , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 120 }
+                , { field: '閿�鍞鍗曡鍙�', title: '閿�鍞鍗曡鍙�', width: 120 }
+                , { field: '鎵樺彿', title: '鎵樺彿', width: 120 }
+                , { field: '鎬绘墭鏁�', title: '鎬绘墭鏁�', width: 100 }
+                , { field: '鏉$爜鏃ユ湡', title: '鏉$爜鏃ユ湡', width: 120 }
+                , { field: '鐢熶骇鍏ュ簱鏃ユ湡', title: '鐢熶骇鍏ュ簱鏃ユ湡', width: 120 }
+                , { field: '鐢熶骇鍏ュ簱鍗曞彿', title: '鐢熶骇鍏ュ簱鍗曞彿', width: 120 }
+                , { field: '鐢熶骇鍏ュ簱娆℃暟', title: '鐢熶骇鍏ュ簱娆℃暟', width: 100 }
+                , { field: '閿�鍞嚭搴撴棩鏈�', title: '閿�鍞嚭搴撴棩鏈�', width: 120 }
+                , { field: '閿�鍞嚭搴撳崟鍙�', title: '閿�鍞嚭搴撳崟鍙�', width: 120 }
+                , { field: '閿�鍞嚭搴撴鏁�', title: '閿�鍞嚭搴撴鏁�', width: 100 }
+                , { field: '浣滃簾鏍囪', title: '浣滃簾鏍囪', width: 100 }
+                , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100 }
+                , { field: '澶囨敞', title: '澶囨敞', width: 120 }
+                , { field: '鍒朵綔浜�', title: '鍒朵綔浜�', width: 100 }
+                , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120 }
+                , { field: '璁″垝瀹屽伐鏃ユ湡', title: '璁″垝瀹屽伐鏃ユ湡', width: 120 }
+                , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 100 }
+                , { field: 'HSTOCKORGID', title: 'HSTOCKORGID', width: 100, hide: true }
+                , { field: '鐢熸垚缁勭粐', title: '鐢熸垚缁勭粐', width: 120 }
+            ],
+            HBarCodeTypeList: [],
+            HWorksNumberList: [],
+            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,//鐗╂枡鏁版嵁缁勪欢
+            gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
+            ScICMOBillShow: false,
+            deptform: {},//寮圭獥閫変腑鏁版嵁
+            openData: false,//鏁版嵁寮圭獥
+            dialogTitle: '',
+            organizationList: JSON.parse(sessionStorage.getItem('organizationList')),//缁勭粐鍒楄〃
+            subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+            // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+            HInterID: null,
+            baseURL: process.env.VUE_APP_BASE_API,
+            checkedSysZb: [],
+            editWlxxData: [],//瀛愯〃
+            editTmData: [],
+            editDaData: [],
+            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.set_HBarCodeType()
+        this.getdata()
+    },
+    methods: {
+        editMainTable(obj) {
+            console.log(obj)
+            var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+                , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+                , field = obj.field; //寰楀埌瀛楁
+            //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+            switch (field) {
+                case "HQty":  //鏁伴噺
+                    value = isNaN(value) ? 0 : value;
+                    var HMinQty = isNaN(data.HMinQty) ? 0 : data.HMinQty;
+                    if (HMinQty == 0) {
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: value,                                   //鏁伴噺
+                            HBQty: 0,                                      //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                        });
+                    }
+                    else {
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HQty: value,                                   //鏁伴噺
+                            HBQty: Math.ceil(value / HMinQty),             //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                        });
+                    }
+                    break;
+                case "HMinQty":  //鏈�灏忓寘瑁呮暟閲�
+                    value = isNaN(value) ? 0 : value;
+                    HMinQty2 = value;   //缁欐壒娆℃寜閽姛鑳戒腑鐨勬渶灏忓寘瑁呮暟璧嬪��
+                    var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+                    if (HQty == 0) //闄ゆ暟涓�0
+                    {
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMinQty: value,                                //鏈�灏忓寘瑁呮暟閲�
+                            HBQty: 0,                                      //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                        });
+                    }
+                    else {
+                        //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+                        obj.update({
+                            HMinQty: value,                                //鏈�灏忓寘瑁呮暟閲�
+                            HBQty: Math.ceil(HQty / value),                //绠辨暟=鏁伴噺/鏈�灏忓寘瑁呮暟閲�
+                        });
+                    }
+
+                    break;
+                default:
+            }
+        },
+        HSourceBillTypeChange(val) {
+            if (val == 1) {
+                this.openNum == 10
+            }
+        },
+        set_HBarCodeType() {
+            //鑾峰彇鏉$爜绫诲瀷浠g爜
+            axios.get(this.baseURL + '/Sc_BarCode/GetHBarCodeTypeBill').then(response => {
+                console.log(response)
+                let result = response.data
+                if (result.count == 1) {
+                    this.HBarCodeTypeList = result.list
+                }
+            }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+            });
+            axios.get(this.baseURL + '/Sc_BarCode/GetHWorksNumberBill').then(response => {
+                console.log(response)
+                let result = response.data
+                if (result.count == 1) {
+                    this.HWorksNumberList = result.list
+                }
+            }).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.editWlxxData.push(
+                                    {
+                                        "HMaterID": dataArray[i].HMaterID
+                                        , "鐗╂枡浠g爜": dataArray[i].鐗╂枡浠g爜
+                                        , "鐗╂枡鍚嶇О": 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
+        },
+
+        organizationChange(val) {
+            // let options=undefined
+            //  this.form=this.organizationList.find(option => option.ID === val)?.Name || '';
+        },
+        //閮ㄩ棬寮圭獥璧嬪��
+        dbEmitData(deptRow, num) {
+            // num=1閮ㄩ棬 num=2鍑哄簱浠撳簱
+            console.log(deptRow)
+            if (deptRow.length > 0) {
+                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].鐗╂枡浠g爜 = deptRow.鐗╂枡浠g爜;
+                    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 if (num == 10) {
+                    this.zbDataShow = false
+                    let data = deptRow
+                    this.editWlxxData = deptRow
+                    // for (var i = 0; i < data.length; i++) {
+                    //     this.editWlxxData.push({
+                    //         "HMaterID": data[i].HMaterID, "HMaterCode": "", "HMaterNumber": data[i].鐗╂枡浠g爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+                    //         , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HMaterSpec": "", "HBatchNo": data[i].鎵规, "HUnitID": data[i].HUnitID
+                    //         , "HUnitNumber": data[i].璁¢噺鍗曚綅浠g爜, "HUnitName": data[i].璁¢噺鍗曚綅, "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0
+                    //         , "HQtyMust": 0, "HQty": data[i].鏁伴噺, "HBQty": 1, "HMinQty": data[i].鏁伴噺, "HPackQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0
+                    //         , "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"]
+                    //         , "HRemark": "", "HCoilNO": "", "HFurnaceNO": "", "HFactory": "", "HAuxQty": 0, "HheatNO": "", "HProduceDate": moment(new Date()).format('YYYY-MM-DD')
+                    //         , "HExpiryDate": moment(new Date()).format('YYYY-MM-DD'), "HExpirationDateFlag": data[i].HISKFPERIOD == false ? 0 : 1
+                    //         , "HEmpID": sessionStorage["HEmpID"], "HEmpNumber": sessionStorage["HEmpNumber"], "HEmpName": sessionStorage["HEmpName"]
+                    //         , "HGroupID": 0, "HGroupNumber": "", "HGroupName": "", "HMTONo": data[i].璁″垝璺熻釜鍙�, "HCusModel": "", "HCusMaterName": ""
+                    //         , "HCheckEmpName": ""
+                    //     })
+                    // }
+                    console.log(this.editWlxxData)
+                    this.ScICMOBillShow = false
+                    this.zbDataShow = true
+                    this.openData = false
+                }
+            } else {
+                this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
+            }
+
+        },
+        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 = {
+                HOrgID: sessionStorage["OrganizationID"] - 0,
+                HWorksNumber: '',
+                HDate: moment(new Date()).format('YYYY-MM-DD'),
+                HSourceBillType: 1,
+                HSourceBillNo: '',
+                HBarCodeType: '',
+            }
+            this.editWlxxData = []
+            this.editBtData = []
+            this.ids = []
+            this.subDisabled = false
+            this.addBtnShow = false
+            // this.$refs.tableData.clearSelection()
+            this.activeName = 'first'
+            this.resetForm("form");
+        },
+        //閫�鍑�
+        close() {
+            this.reset()
+            console.log(1111)
+            console.log(this.$route.path)
+            if (!this.OperationType && !this.copyType) {
+                console.log(this.$route.path)
+                const obj = { fullPath: this.$route.path, path: this.$route.path, name: this.$route.name, };
+                this.$tab.closePage(obj).then(res => {
+                    const latestView = res.visitedViews.slice(-1)[0]
+                    if (latestView) {
+                        this.$router.push(latestView.fullPath)
+                    } else {
+                        if (obj.name === 'Dashboard') {
+                            this.$router.replace({ path: '/redirect' + obj.fullPath })
+                        } else {
+                            this.$router.push('/')
+                        }
+                    }
+                });
+            } 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.handleAddSysZb()
+            this.$nextTick(() => {
+                this.formShow = true
+                this.formLoading = false
+            })
+        },
+        //鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
+        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) {
+                        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.editWlxxData.push(
+                            {
+                                "HMaterID": result.data[i].HMaterID
+                                , "鐗╂枡浠g爜": result.data[i].鐗╂枡浠g爜
+                                , "鐗╂枡鍚嶇О": 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("鎺ュ彛璇锋眰澶辫触!");
+            });
+        },
+        /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+        wlxxzbRowSysZbIndex({ row, rowIndex }) {
+            row.index = rowIndex + 1;
+        },
+        /** 缂栬緫椤靛瓙琛ㄦ坊鍔犳寜閽搷浣� */
+        handleAddSysZb(index, num) {
+            if (num == 1 && !index) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹紪杈�!");
+            } else {
+                let obj = {
+                    HMainID: 0,
+                    HSubID: 0,
+                    HSourceBillSEQ: '',
+                    HBillNo: '',
+                    HMaterID: '',
+                    HMaterNumber: '',
+                    HMaterName: '',
+                    HMaterModel: '',
+                    HCusModel: '',
+                    HCusMaterName: '',
+                    HEmpID: 0,
+                    HEmpNumber: '',
+                    HEmpName: '',
+                    HGroupID: 0,
+                    HGroupNumber: '',
+                    HGroupName: '',
+                    HCheckEmpName: '',
+                    HBatchNo: '',
+                    HMTONo: '',
+                    HQty: 0,
+                    HMinQty: 0,
+                    HBQty: 0,
+                    HPackQty: '',
+                    HCoilNO: '',
+                    HFurnaceNO: '',
+                    HFactory: '',
+                    HCusID: 0,
+                    HCusNumber: '',
+                    HCusName: '',
+                    HSeOrderBillNo: '',
+                    HRemark: '',
+                    HProduceDate: this.form.HDate,
+                    HExpiryDate: this.form.HDate,
+                    HheatNO: '',
+                    HAuxPropID: 0,
+                    HAuxPropNumber: '',
+                    HAuxPropName: '',
+                    HUnitID: 0,
+                    HUnitNumber: '',
+                    HUnitName: '',
+                    HAuxQty: '',
+                    HExpirationDateFlag: '',
+                    HGiveAwayFlag: '',
+                    HDate: this.form.HDate,
+                }
+                if (index) {
+                    this.editWlxxData.splice(index, 0, obj);
+                    this.$set(this.editWlxxData, index, obj)
+                } else {
+                    this.editWlxxData.push(obj);
+                }
+            }
+        },
+        handleCopyZbRow() {
+            if (!this.zbIndex) {
+                this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+            } else {
+                let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+                this.editWlxxData.push(copyRow);
+            }
+        },
+        /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+        handleDeleteSysZb(row) {
+            this.checkedSysZb = []
+            this.checkedSysZb.push(row.index)
+            if (this.checkedSysZb.length == 0) {
+                this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+            } else {
+                const editWlxxData = this.editWlxxData;
+                const checkedSysZb = this.checkedSysZb;
+                this.editWlxxData = editWlxxData.filter(function (item) {
+                    return checkedSysZb.indexOf(item.index) == -1
+                });
+            }
+        },
+        /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+        handleTableWlxxZbEdit(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.wlxxzbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+            }
+        },
+        showReset() {
+            this.deptShow = false
+            this.warehouseShow = false
+            this.materialShow = false
+            this.gyEmployeeShow = false
+            this.ScICMOBillShow = false
+        },
+        //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+        openDataDialog(num, row) {
+            //num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+            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.gyEmployeeShow = true
+                this.openData = true
+            } else if (num == 10) {
+                this.dialogTitle = '鐢熶骇璁㈠崟鍒楄〃'
+                this.ScICMOBillShow = true
+                this.openData = true
+            }
+        },
+    }
+};
+</script>
\ No newline at end of file

--
Gitblit v1.9.1