From 9215dfa012c3af1b0ea78f3d44fd874baae9e01a Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 20 十一月 2025 14:02:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

---
 src/views/scMould/basicModeling/Gy_MouldFile.vue                     | 1286 ++++++++++++++++
 src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue                 | 1051 +++++++++++++
 src/permission.js                                                    |  101 
 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue |    4 
 src/store/modules/user.js                                            |   14 
 src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue                |  870 +++++++++++
 src/views/KCGL/OtherOutBill/Kf_OtherOutBillEdit.vue                  |  103 
 src/layout/components/Navbar.vue                                     |    2 
 src/store/modules/permission.js                                      |   32 
 src/router/index.js                                                  |   40 
 src/views/sell/sellOut/sellOutBill.vue                               |   22 
 src/views/login.vue                                                  |    1 
 src/layout/components/Sidebar/index.vue                              |    1 
 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue                | 1179 ++++++++++++++
 src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue     |    6 
 15 files changed, 4,594 insertions(+), 118 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3ba4078..88e4751 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -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..51a70de 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -774,6 +774,46 @@
       },
     ],
   },
+  //鐩存帴璋冩嫧鍗曠淮鎶�
+  {
+    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..5b0689e 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,
@@ -349,6 +349,32 @@
                     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",
+                  },
                 ],
               },
               {
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/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/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/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 41a40c8..624d3e0 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -1 +1,1285 @@
-<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="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;">鍣ㄥ叿妗f缂栬緫</div>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-tabs v-model="activeName" type="card">
+        <el-tab-pane label="鍩烘湰淇℃伅" name="first">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍗曟嵁缂栧彿" prop="HBillNo">
+                <el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鏃ユ湡" prop="HDate">
+                <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-ddT">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟绫诲瀷" prop="BillType">
+                <el-select v-model="form.BillType" placeholder="璇烽�夋嫨">
+                  <el-option label="閿�鍞鍗�" value="1401" />
+                  <el-option label="鍙戣揣閫氱煡鍗�" value="1402" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
+                <el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿" disabled>
+                  <el-button slot="append" icon="el-icon-search"></el-button>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="閿�鍞憳" prop="HEmpName">
+                <el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ラ攢鍞憳" disabled>
+                  <el-button slot="append" icon="el-icon-search" @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">
+                <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" :disabled="zzSelDis">
+                  <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="甯佸埆" prop="HCurName">
+                <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="姹囩巼" prop="HExRate">
+                <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="閿�鍞柟寮�" prop="HSellSName">
+                <el-input v-model="form.HSellSName" placeholder="璇疯緭鍏ラ攢鍞柟寮�" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍗曚环绫诲瀷" prop="HPriceType">
+                <el-select v-model="form.HPriceType" placeholder="璇烽�夋嫨鍗曚环绫诲瀷" @change="organizationChange">
+                  <el-option v-for="(item, index) in hPriceTypeList" :key="index" :label="item" :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹㈡埛浣欓" prop="HCusBalance">
+                <el-input v-model="form.HCusBalance" placeholder="璇疯緭鍏ュ鎴蜂綑棰�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇$敤棰濆害" prop="HCreditRating_Now">
+                <el-input v-model="form.HCreditRating_Now" placeholder="璇疯緭鍏ヤ俊鐢ㄩ搴�" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍙敤棰濆害" prop="HAvailableBalance">
+                <el-input v-model="form.HAvailableBalance" placeholder="璇疯緭鍏ュ彲鐢ㄩ搴�" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="鍒跺崟淇℃伅" name="third">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟浜�" prop="HMaker">
+                <el-input v-model="form.HMaker" placeholder="璇疯緭鍏ュ埗鍗曚汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼浜�" prop="HUpDater">
+                <el-input v-model="form.HUpDater" placeholder="璇疯緭鍏ヤ慨鏀逛汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳浜�" prop="HChecker">
+                <el-input v-model="form.HChecker" placeholder="璇疯緭鍏ュ鏍镐汉" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴浜�" prop="HCloseMan">
+                <el-input v-model="form.HCloseMan" placeholder="璇疯緭鍏ュ叧闂汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
+                <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
+                <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
+                <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
+                <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾浜�" prop="HDeleteMan">
+                <el-input v-model="form.HDeleteMan" placeholder="璇疯緭鍏ヤ綔搴熶汉" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="浣滃簾鏃ユ湡" prop="HDeleteDate">
+                <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+      </el-tabs>
+      <div style="margin-bottom: 10px;">
+        <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb()" size="mini">澧炲姞涓�琛�</el-button>
+        <el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(zbIndex, 1)"
+          size="mini">鎻掑叆涓�琛�</el-button>
+        <el-button type="success" plain icon="el-icon-plus" @click="handleCopyZbRow" size="mini">澶嶅埗涓�琛�</el-button>
+        <el-button type="success" plain icon="el-icon-arrow-up" @click="handleMoveRowUp(zbSelForm)"
+          size="mini">涓婄Щ</el-button>
+        <el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
+          size="mini">涓嬬Щ</el-button>
+      </div>
+      <el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
+        @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column align="center" label="搴忓彿" type="index" width="80" />
+        <el-table-column align="center" label="鐗╂枡缂栫爜" width="120">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.鐗╂枡浠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-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" />
+      <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/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 moment from 'moment';
+
+export default {
+  name: 'SellOutBillEdit',
+  components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+  props: {
+    OperationType: { type: Number, },
+    linterid: { type: Number, },
+    HSouceBillType: { type: String, },
+    propsData: { type: String, },
+    copyType: { type: Number, },
+  },
+  data() {
+    return {
+      HModName: "Kf_SellOutBill",
+      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,//閿�鍞憳鏁版嵁缁勪欢
+      deptform: {},//寮圭獥閫変腑鏁版嵁
+      openData: false,//鏁版嵁寮圭獥
+      dialogTitle: '',
+      organizationList: [],//缁勭粐鍒楄〃
+      subDisabled: false,//缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
+      // OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
+      HInterID: null,
+      baseURL: process.env.VUE_APP_BASE_API,
+      checkedSysZb: [],
+      editData: [],//閿�鍞嚭搴撳崟瀛愯〃
+      editBtData: [],//瀛愯〃琛ㄥご
+      activeName: 'first',
+      // 寮瑰嚭灞傛爣棰�
+      title: "",
+      // 鏄惁鏄剧ず寮瑰嚭灞�
+      open: false,
+      // 鏃ユ湡鑼冨洿
+      dateRange: [],
+      // 鏌ヨ鍙傛暟
+      queryParams: {
+        HBillNo: '',
+        HInitTimeCycle: 29,
+        HProjectNumber: '',
+        HCusID: null,
+        HMaterNumber: '',
+        HMaterName: '',
+        ColName1: '',
+        ColName2: '',
+        ColName: '',
+        Comparator1: '',
+        Comparator2: '',
+        Comparator: '',
+        ColContent1: '',
+        ColContent2: '',
+        ColContent: '',
+      },
+      // 鏄剧ず鎼滅储鏉′欢
+      showSearch: true,
+      // 閫変腑鏁扮粍
+      ids: [],
+      // 闈炲崟涓鐢�
+      single: true,
+      // 闈炲涓鐢�
+      multiple: true,
+      // 閬僵灞�
+      loading: true,
+      btResList: [],
+      // 琛ㄥ崟鍙傛暟
+      form: {},
+      // 琛ㄥ崟鏍¢獙
+      rules: {
+        HSupName: [
+          { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HDate: [
+          { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        HExRate: [
+          { required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.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 == 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.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 {
+        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 = {
+        BillType: '1402',
+        HBillNo: '',
+        HInterID: '',
+        HBillSubType: '1205',
+        HDate: new Date(),
+        HMainSourceInterID: 0,
+        HMainSourceEntryID: 0,
+        HMainSourceBillType: '',
+        HMainSourceBillNo: '',
+        HEmpName: '',
+        HEmpID: 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,
+        HMaker: '',
+        HUpDater: '',
+        HChecker: '',
+        HMakeDate: new Date(),
+        HUpDateDate: '',
+        HCheckDate: '',
+        HCloseMan: '',
+        HDeleteMan: '',
+        HCloseDate: '',
+        HDeleteDate: '',
+      }
+      this.editData = []
+      this.editBtData = []
+      this.ids = []
+      this.subDisabled = false
+      this.addBtnShow = false
+      // this.$refs.tableData.clearSelection()
+      this.activeName = 'first'
+      this.resetForm("form");
+    },
+    //閫�鍑�
+    close() {
+      this.reset()
+      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.getHBillNo()
+      let date = new Date()
+      this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+      if (this.OperationType == 1) {
+        this.handleAddSysZb()
+      }
+      this.$nextTick(() => {
+        this.formShow = true
+        this.formLoading = false
+      })
+    },
+    getHBillNo() {
+      axios.get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+        params: {
+          HBillType: '1205'
+        }
+      }).then(response => {
+        this.form.HMaker = sessionStorage["HUserName"]
+        this.form.HBillNo = response.data.data[0].HBillNo
+        this.form.HInterID = response.data.data[0].HInterID
+        // this.copyType = 0
+        // this.getCzyglByUser()
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
+    getBarCodeNoteBySellOutBill(rowHmainid) {
+      axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+        params: { "HInterID": rowHmainid }
+      }).then(response => {
+        if (response.data.count == 1) {
+          if (response.data.data[2].length > 0) {
+            this.$modal.msgError("褰撳墠鍗曟嵁鐢辨壂鐮佺敓鎴愶紝涓嶅彲浠ョ紪杈戯紒");
+            this.subDisabled = true
+          }
+        } else { }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    //#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
+    getCustomerBalance(HCusID) {
+      axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+        params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
+      }).then(response => {
+        var data = response.data.data[0];
+        this.form.HCusBalance = data.HCusBalance
+        this.form.HCreditRating_Now = data.HCreditRating_Now
+        this.form.HAvailableBalance = data.HAvailableBalance
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 淇敼鎸夐挳鎿嶄綔 */
+    handleUpdate() {
+      this.reset()
+      let rowHmainid = this.linterid
+      console.log(this.linterid)
+      axios.get(this.baseURL + "/Kf_SellOutBill/cx", {
+        params: { 'HInterID': rowHmainid }
+      }).then(response => {
+        if (response.data.count == 1) {
+          var result = response.data
+          var data = response.data.data[0]
+          this.form.BillType = data.HSourceBillType
+          if (this.copyType == 1) {
+            this.getHBillNo()
+            let date = new Date()
+            this.form.HDate = moment(date).format('YYYY-MM-DDTHH:mm:ss')
+          } else {
+            this.form.HBillNo = data.鍗曟嵁鍙�
+            this.form.HInterID = data.hmainid
+            this.form.HDate = data.鏃ユ湡
+            this.form.HMaker = data.鍒跺崟浜�
+            this.form.HUpDater = data.淇敼浜�
+            this.form.HChecker = data.瀹℃牳浜�
+            this.form.HMakeDate = data.鍒跺崟鏃ユ湡
+            this.form.HUpDateDate = data.淇敼鏃ユ湡
+            this.form.HCheckDate = data.瀹℃牳鏃ユ湡
+            this.form.HCloseMan = data.鍏抽棴浜�
+            this.form.HDeleteMan = data.浣滃簾浜�
+            this.form.HCloseDate = data.鍏抽棴鏃ユ湡
+            this.form.HDeleteDate = data.浣滃簾鏃ユ湡
+          }
+          this.form.HBillSubType = data.HBillSubType
+          this.form.HMainSourceInterID = data.HMainSourceInterID
+          this.form.HMainSourceEntryID = data.HMainSourceEntryID
+          this.form.HMainSourceBillType = data.HMainSourceBillType
+          this.form.HMainSourceBillNo = data.HMainSourceBillNo
+          this.form.HEmpName = data.涓氬姟鍛�
+          this.form.HEmpID = data.HEmpID
+          this.form.HDeptName = data.閮ㄩ棬
+          this.form.HDeptID = data.HDeptID
+          this.form.HManagerName = data.涓荤
+          this.form.HManagerID = data.HManagerID
+          this.form.HSupName = data.瀹㈡埛
+          this.form.HSupID = data.HSupID
+          this.form.HLinkMan = data.鑱旂郴浜�
+          this.form.HLinkPhone = data.鑱旂郴鐢佃瘽
+          this.form.HSecManagerName = data.鍙戣揣浜�
+          this.form.HSecManagerID = data.HSecManagerID
+          this.form.HKeeperName = data.淇濈鍛�
+          this.form.HKeeperID = data.HKeeperID
+          this.form.HRemark = data.琛ㄥご澶囨敞
+          this.form.HProjectNumber = data.椤圭洰缂栫爜
+          this.form.HProjectID = data.HProjectID
+          this.form.HProjectName = data.椤圭洰鍚嶇О
+          this.form.HGroupName = data.鐝粍
+          this.form.HGroupID = data.HGroupID
+          this.form.HWHName = data.涓昏〃浠撳簱
+          this.form.HWHID = data.HWHID_Main
+          this.form.HConveyCompName = data.杩愯緭鍏徃
+          this.form.HConveyCompID = data.HConveyCompID
+          this.form.HConveyTypeName = data.杩愯緭鏂瑰紡
+          this.form.HConveyTypeID = data.HConveyTypeID
+          this.form.HConveyMoney = data.HConveyMoney
+          this.form.HCarriage = data.杩愯垂
+          this.form.HSTOCKORGID = data.HSTOCKORGID
+          this.form.HOWNERID = data.HOWNERID
+          this.form.HSCWHName = data.涓昏〃璋冨嚭浠撳簱
+          this.form.HSCWHID = data.HSCWHID
+          this.form.HCheckStatusMan = data.鏍搁攢浜�
+          this.form.HExplanation = data.鎽樿
+          this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
+          this.form.HCurName = data.甯佸埆
+          this.form.HCurID = data.HCurID
+          this.form.HExRate = data.姹囩巼
+          this.form.HSellSName = data.閿�鍞柟寮�
+          this.form.HSellSID = data.HSellSID
+          //  this.form.HCusBalance=data
+          //  this.form.HCreditRating_Now=HConveyMoney
+          //  this.form.HAvailableBalance=data
+          this.form.HPriceType = data.鍗曚环绫诲瀷
+          this.form.HOrgID = data.HOrgID
+          this.getCustomerByCusID(response.data.data[0].HSupID)//鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+          this.getBarCodeNoteBySellOutBill(rowHmainid)//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁嗘槸鍚﹀彲缂栬緫
+          for (var i = 0; i < result.data.length; i++) {
+            this.editData.push(
+              {
+                "HMaterID": result.data[i].HMaterID
+                , "鐗╂枡浠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("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    /** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
+    rowSysZbIndex({ 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,
+        }
+        if (index) {
+          this.editData.splice(index, 0, obj);
+          this.$set(this.editData, index, obj)
+        } else {
+          this.editData.push(obj);
+        }
+      }
+    },
+    handleCopyZbRow() {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
+        this.editData.push(copyRow);
+      }
+    },
+    handleMoveRowUp(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == 1) {
+          this.$modal.msgError("绗竴琛屾暟鎹棤娉曚笂绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num - 1, 0, record);
+        }
+      }
+    },
+    handleMoveRowDown(zbSelForm) {
+      if (!this.zbIndex) {
+        this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
+      } else {
+        if (zbSelForm.index == this.editData.length) {
+          this.$modal.msgError("鏈�鍚庝竴琛屾暟鎹棤娉曚笅绉�");
+        } else { // 纭繚涓嶆槸绗竴琛�
+          let num = zbSelForm.index - 1
+          const record = this.editData.splice(num, 1)[0];
+          this.editData.splice(num + 1, 0, record);
+        }
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ垹闄ゆ寜閽搷浣� */
+    handleDeleteSysZb(row) {
+      this.checkedSysZb = []
+      this.checkedSysZb.push(row.index)
+      if (this.checkedSysZb.length == 0) {
+        this.$modal.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑鍟嗗搧璁㈠崟鏄庣粏鏁版嵁");
+      } else {
+        const editData = this.editData;
+        const checkedSysZb = this.checkedSysZb;
+        this.editData = editData.filter(function (item) {
+          return checkedSysZb.indexOf(item.index) == -1
+        });
+      }
+    },
+    /** 缂栬緫椤靛瓙琛ㄥ閫夋閫変腑鏁版嵁 */
+    handleTableZbEdit(selection) {
+      this.checkedSysZb = selection.map(item => item.index)
+      this.zbSelForm = selection[0]
+      this.zbIndex = this.checkedSysZb[0]
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.zbTable.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+      }
+    },
+    //鑾峰彇鏈�澶у崟鎹彿_浠诲姟绫伙紙Type涓�0鏃跺彧鑾峰彇涓嶆柊澧炴祦姘村彿锛屼负1鏃舵柊澧炰笖鑾峰彇娴佹按鍙凤級
+    get_MAXNum_Task(Type) {
+      var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+      axios({
+        method: 'get',
+        url: this.baseURL + "/CommonModel/searchMethod",
+        params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
+      }).then(response => {
+        if (response.data.count == 1) {
+          this.form.HBillNo = response.data.data[0].HBillNo;
+        } else {
+          this.$modal.msgError(response.data.code + response.data.Message);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    // 缂栬緫鎻愪氦淇濆瓨
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let fhck = false
+          this.editData.map((item, index) => {
+            if (!item.鍙戣揣浠撳簱) {
+              fhck = true
+              this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+            }
+          })
+          this.$nextTick(() => {
+            if (!fhck) {
+              var sMainStr = JSON.stringify(this.form);
+              var sSubStr = JSON.stringify(this.editData);
+              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+              axios({
+                method: 'post',
+                url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+                data: {
+                  'msg': sMainSub
+                },
+              }).then(response => {
+                if (response.data.count == 1) {
+                  this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+                  this.$modal.msgSuccess(response.data.Message);
+                  this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+                  if (response.data.Verify == "Y") //鑷姩瀹℃牳
+                  {
+                    this.set_CheckBill(0, this.form); //瀹℃牳
+                  }
+                  this.addBtnShow = true
+                }
+              }).catch(error => {
+                this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+              });
+            }
+          })
+        }
+      });
+    },
+    // 鍙嶅鏍�/瀹℃牳鏁版嵁
+    set_CheckBill(num, form) {
+      var InterID = form.hmainid || form.HInterID
+      //閫昏緫瀹℃牳鏂规硶
+      axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+        params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+      }).then(response => {
+        let result = response.data
+        if (result.code == 1) {
+          this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+        }
+        else {
+          this.$modal.msgError("閿欒:" + result.code + result.Message,);
+        }
+      }).catch(error => {
+        this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+      });
+    },
+    showReset() {
+      this.deptShow = false
+      this.warehouseShow = false
+      this.materialShow = false
+      this.gyEmployeeShow = 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
+      }
+    },
+  }
+};
+</script>
+<style>
+.xsckdBox .el-date-editor.el-input {
+  width: 100%;
+}
+</style>
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
index b73ffb6..98a6022 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainList.vue
@@ -1352,6 +1352,12 @@
     //鎵撳紑淇敼缁勪欢寮圭獥
     handleEdit() {
       this.$nextTick(() => {
+        if(this.rowForm.hmainid == 0)
+      
+        {
+          this.$modal.msgError("璇烽�夋嫨瑕佺紪杈戠殑鏁版嵁!");
+          return;
+      }
         this.openEdit = true;
         this.editShow = true;
       });
diff --git a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
index f44a073..876016f 100644
--- a/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
+++ b/src/views/sell/Kf_ICStockBillMainList/Kf_ICStockBillMainListEdit.vue
@@ -948,7 +948,9 @@
 
       if (!this.OperationType && !this.copyType) {
         // this.$router.back()
-        window.close()
+        this.formShow = false
+        this.$emit('editCloseGy', false)
+        //window.close()
       } else {
         this.formShow = false
 
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/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 41a40c8..c3f0161 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -1 +1,1050 @@
-<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%">
+                            <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(4)"></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" />
+            <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 moment from 'moment';
+
+export default {
+    name: 'Gy_BarCodeBill',
+    components: { Dept, Warehouse, Material, RowSettings, GyEmployee },
+    props: {
+        OperationType: { type: Number, },
+        linterid: { type: Number, },
+        HSouceBillType: { type: String, },
+        propsData: { type: String, },
+        copyType: { type: Number, },
+    },
+    data() {
+        return {
+            HModName: "Gy_BarCodeBill",
+            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,//閿�鍞憳鏁版嵁缁勪欢
+            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: {
+        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.HItemID) {
+                if (num == 1) {
+                    this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О
+                    this.form.HDeptID = deptRow.HItemID
+                    this.form.HManagerName = deptRow.璐熻矗浜�
+                    this.deptShow = false
+                    this.openData = false
+                } else if (num == 2) {
+                    this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+                    this.editData[this.zbIndex].鍙戣揣浠撳簱 = deptRow.浠撳簱鍚嶇О;
+                    this.warehouseShow = false
+                    this.openData = false
+                } else if (num == 3) {
+                    this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
+                    this.editData[this.zbIndex].鐗╂枡浠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 {
+                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
+        },
+        //  鎵撳紑鏁版嵁鍒楄〃寮圭獥
+        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
+            }
+        },
+    }
+};
+</script>
\ No newline at end of file

--
Gitblit v1.9.1